This is an automated email from the ASF dual-hosted git repository.

jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new d4cb93dbda Fix metric rule pattern regex (#12856)
d4cb93dbda is described below

commit d4cb93dbda1e268e0c064b1b3c62e8b81599db32
Author: Shounak kulkarni <shounakmk...@gmail.com>
AuthorDate: Tue Apr 16 23:27:40 2024 +0500

    Fix metric rule pattern regex (#12856)
---
 .../jmx_prometheus_javaagent/configs/broker.yml    |  68 +++----
 .../configs/controller.yml                         |  80 ++++----
 .../jmx_prometheus_javaagent/configs/minion.yml    |  10 +-
 .../etc/jmx_prometheus_javaagent/configs/pinot.yml | 220 ++++++++++-----------
 .../jmx_prometheus_javaagent/configs/server.yml    |  60 +++---
 5 files changed, 219 insertions(+), 219 deletions(-)

diff --git 
a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml 
b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
index ce5e5df7b9..5c7a6cc8a9 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
@@ -1,173 +1,173 @@
 rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?).authorization\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.authorization\"><>(\\w+)"
   name: "pinot_broker_authorization_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.documentsScanned\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.documentsScanned\"><>(\\w+)"
   name: "pinot_broker_documentsScanned_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.entriesScannedInFilter\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.entriesScannedInFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedInFilter_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.entriesScannedPostFilter\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.entriesScannedPostFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedPostFilter_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.freshnessLagMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.freshnessLagMs\"><>(\\w+)"
   name: "pinot_broker_freshnessLagMs_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queries\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queries\"><>(\\w+)"
   name: "pinot_broker_queries_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryExecution\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryExecution\"><>(\\w+)"
   name: "pinot_broker_queryExecution_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryRouting\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryRouting\"><>(\\w+)"
   name: "pinot_broker_queryRouting_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.reduce\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.reduce\"><>(\\w+)"
   name: "pinot_broker_reduce_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.requestCompilation\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.requestCompilation\"><>(\\w+)"
   name: "pinot_broker_requestCompilation_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.scatterGather\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.scatterGather\"><>(\\w+)"
   name: "pinot_broker_scatterGather_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.totalServerResponseSize\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.totalServerResponseSize\"><>(\\w+)"
   name: "pinot_broker_totalServerResponseSize_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).groupBySize\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.groupBySize\"><>(\\w+)"
   name: "pinot_broker_groupBySize_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).noServingHostForSegment\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.noServingHostForSegment\"><>(\\w+)"
   name: "pinot_broker_noServingHostForSegment_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.healthcheck(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.healthcheck(\\w+)\"><>(\\w+)"
   name: "pinot_broker_healthcheck_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.helix.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.helix\\.(\\w+)\"><>(\\w+)"
   name: "pinot_broker_helix_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.helixZookeeper(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.helixZookeeper(\\w+)\"><>(\\w+)"
   name: "pinot_broker_helix_zookeeper_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.nettyConnection(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.nettyConnection(\\w+)\"><>(\\w+)"
   name: "pinot_broker_nettyConnection_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.unhealthyServers\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.unhealthyServers\"><>(\\w+)"
   name: "pinot_broker_unhealthyServers_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.clusterChangeCheck\"\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.clusterChangeCheck\"\"><>(\\w+)"
   name: "pinot_broker_clusterChangeCheck_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.proactiveClusterChangeCheck\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.proactiveClusterChangeCheck\"><>(\\w+)"
   name: "pinot_broker_proactiveClusterChangeCheck_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(\\w+)Exceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(\\w+)Exceptions\"><>(\\w+)"
   name: "pinot_broker_exceptions_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.routingTableUpdateTime\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.routingTableUpdateTime\"><>(\\w+)"
   name: "pinot_broker_routingTableUpdateTime_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithPartialServersResponded_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithTimeouts\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithTimeouts\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithTimeouts_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.noServerFoundExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.noServerFoundExceptions\"><>(\\w+)"
   name: "pinot_broker_noServerFoundExceptions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithProcessingExceptions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryQuotaExceeded\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryQuotaExceeded\"><>(\\w+)"
   name: "pinot_broker_queryQuotaExceeded_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryTotalTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryTotalTimeMs\"><>(\\w+)"
   name: "pinot_broker_queryTotalTimeMs_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).serverMissingForRouting\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.serverMissingForRouting\"><>(\\w+)"
   name: "pinot_broker_serverMissingForRouting_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.deserialization\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.deserialization\"><>(\\w+)"
   name: "pinot_broker_deserialization_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.requestConnectionWait\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.requestConnectionWait\"><>(\\w+)"
   name: "pinot_broker_requestConnectionWait_$4"
   cache: true
   labels:
@@ -207,7 +207,7 @@ rules:
     table: "$3$5"
     tableType: "$6"
   #This is a catch-all pattern for pinot table metrics with offline/realtime 
suffix that also contain kafka topic
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"?><>(\\w+)"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"?><>(\\w+)"
   name: "pinot_$1_$2_$9"
   cache: true
   labels:
diff --git 
a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml 
b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
index 44b07d1718..a441f714e4 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
@@ -1,138 +1,138 @@
 rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.controller(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.controller(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.helix\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.helix\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_helix_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.helixZookeeperReconnects\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_controller_helix_ZookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.idealstateZnodeSize.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.idealstateZnodeSize\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeSize_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.idealstateZnodeByteSize.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.idealstateZnodeByteSize\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeByteSize_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.replicationFromConfig.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.replicationFromConfig\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_replicationFromConfig_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.numberOfReplicas.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.numberOfReplicas\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_numberOfReplicas_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.percentOfReplicas.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.percentOfReplicas\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentOfReplicas_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.percentSegmentsAvailable.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.percentSegmentsAvailable\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentSegmentsAvailable_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.segmentCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.segmentCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentCount_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.segmentsInErrorState.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.segmentsInErrorState\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentsInErrorState_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.numberSegmentUploadTimeoutExceeded\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.numberSegmentUploadTimeoutExceeded\"><>(\\w+)"
   name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.numberTimesScheduleTasksCalled\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.numberTimesScheduleTasksCalled\"><>(\\w+)"
   name: "pinot_controller_numberTimesScheduleTasksCalled_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.periodicTaskNumTablesProcessed.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.periodicTaskNumTablesProcessed\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_periodicTaskNumTablesProcessed_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.pinotControllerLeader\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.pinotControllerLeader\"><>(\\w+)"
   name: "pinot_controller_pinotControllerLeader_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.pinotControllerPartitionLeader.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.pinotControllerPartitionLeader\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_partitionLeader_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.realtimeTableCount\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.realtimeTableCount\"><>(\\w+)"
   name: "pinot_controller_realtimeTableCount_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.offlineTableCount\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.offlineTableCount\"><>(\\w+)"
   name: "pinot_controller_offlineTableCount_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ValidationMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_validateion_$4_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.cronSchedulerJobScheduled.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.cronSchedulerJobScheduled\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobScheduled_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).cronSchedulerJobTriggered\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.cronSchedulerJobTriggered\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobTriggered_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).cronSchedulerJobSkipped\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.cronSchedulerJobSkipped\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobSkipped_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).tableRebalanceExecutionTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.tableRebalanceExecutionTimeMs\"><>(\\w+)"
   name: "pinot_controller_tableRebalanceExecutionTimeMs_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     result: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.taskStatus.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.taskStatus\\.([^.]*)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_taskStatus_$3"
   cache: true
   labels:
     taskType: "$1"
     status: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.timeMsSinceLastMinionTaskMetadataUpdate.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.timeMsSinceLastMinionTaskMetadataUpdate\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$6"
   cache: true
   labels:
@@ -140,7 +140,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError)\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$7"
   cache: true
   labels:
@@ -148,12 +148,12 @@ rules:
     table: "$2$4"
     tableType: "$5"
     taskType: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(numMinionTasksInProgress|numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(numMinionTasksInProgress|numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$3"
   cache: true
   labels:
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.timeMsSinceLastSuccessfulMinionTaskGeneration.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.timeMsSinceLastSuccessfulMinionTaskGeneration\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$6"
   cache: true
   labels:
@@ -161,7 +161,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.lastMinionTaskGenerationEncountersError.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.lastMinionTaskGenerationEncountersError\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_lastMinionTaskGenerationEncountersError_$6"
   cache: true
   labels:
@@ -169,23 +169,23 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.pinotLeadControllerResourceEnabled\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.pinotLeadControllerResourceEnabled\"><>(\\w+)"
   name: "pinot_controller_pinotLeadControllerResourceEnabled_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.offlineTableEstimatedSize.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.offlineTableEstimatedSize\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_controller_offlineTableEstimatedSize_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableQuota.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableQuota\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableQuota_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).periodicTaskError\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\\.periodicTaskError\"><>(\\w+)"
   name: "pinot_controller_periodicTaskError_$6"
   cache: true
   labels:
@@ -193,33 +193,33 @@ rules:
     table: "$1$3"
     tableType: "$4"
     periodicTask: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableStorageQuotaUtilization.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableStorageQuotaUtilization\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageQuotaUtilization_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableStorageEstMissingSegmentPercent.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableStorageEstMissingSegmentPercent\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageEstMissingSegmentPercent_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableTotalSizeOnServer.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableTotalSizeOnServer\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableTotalSizeOnServer_$5"
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableSizePerReplicaOnServer.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableSizePerReplicaOnServer\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableSizePerReplicaOnServer_$5"
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableCompressedSize.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableCompressedSize\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableCompressedSize_$5"
   labels:
     database: "$2"
@@ -251,7 +251,7 @@ rules:
     table: "$2$4"
     tableType: "$5"
   #This is a catch-all pattern for pinot table metrics with offline/realtime 
suffix that also contain kafka topic
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"?><>(\\w+)"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"?><>(\\w+)"
   name: "pinot_$1_$2_$9"
   cache: true
   labels:
diff --git 
a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml 
b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
index 3541cc8f36..4d21107a1b 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/minion.yml
@@ -1,17 +1,17 @@
 rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.version.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.version\\.(\\w+)\"><>(\\w+)"
   name: "pinot_minion_version"
   cache: true
   labels:
     version: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.numberOfTasks.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.numberOfTasks\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_minion_numberOfTasks_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).(taskExecution|taskQueueing|numberTasks|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\\.(taskExecution|taskQueueing|numberTasks|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
   name: "pinot_minion_$6_$7"
   cache: true
   labels:
@@ -19,10 +19,10 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.(\\w+)\"><>(\\w+)"
   name: "pinot_minion_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.(\\w+).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.(\\w+)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_minion_$2_$3"
   cache: true
   labels:
diff --git a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml 
b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
index 2739fb557d..b530a79b36 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
@@ -5,140 +5,140 @@
 
 rules:
 # Pinot Controller
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.controller(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.controller(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.helix\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.helix\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_helix_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.helixZookeeperReconnects\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_controller_helix_ZookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.idealstateZnodeSize.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.idealstateZnodeSize\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeSize_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.idealstateZnodeByteSize.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.idealstateZnodeByteSize\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_idealstateZnodeByteSize_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.replicationFromConfig.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.replicationFromConfig\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_replicationFromConfig_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.numberOfReplicas.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.numberOfReplicas\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_numberOfReplicas_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.percentOfReplicas.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.percentOfReplicas\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentOfReplicas_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.percentSegmentsAvailable.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.percentSegmentsAvailable\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_percentSegmentsAvailable_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.segmentCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.segmentCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentCount_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.segmentsInErrorState.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.segmentsInErrorState\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_segmentsInErrorState_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.numberSegmentUploadTimeoutExceeded\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.numberSegmentUploadTimeoutExceeded\"><>(\\w+)"
   name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.numberTimesScheduleTasksCalled\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.numberTimesScheduleTasksCalled\"><>(\\w+)"
   name: "pinot_controller_numberTimesScheduleTasksCalled_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.periodicTaskNumTablesProcessed.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.periodicTaskNumTablesProcessed\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_periodicTaskNumTablesProcessed_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.pinotControllerLeader\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.pinotControllerLeader\"><>(\\w+)"
   name: "pinot_controller_pinotControllerLeader_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.pinotControllerPartitionLeader.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.pinotControllerPartitionLeader\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_partitionLeader_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.realtimeTableCount\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.realtimeTableCount\"><>(\\w+)"
   name: "pinot_controller_realtimeTableCount_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.offlineTableCount\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.offlineTableCount\"><>(\\w+)"
   name: "pinot_controller_offlineTableCount_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ValidationMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_validateion_$4_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.cronSchedulerJobScheduled.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.cronSchedulerJobScheduled\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobScheduled_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).cronSchedulerJobTriggered\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.cronSchedulerJobTriggered\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobTriggered_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).cronSchedulerJobSkipped\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.cronSchedulerJobSkipped\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobSkipped_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.cronSchedulerJobExecutionTimeMs\"><>(\\w+)"
   name: "pinot_controller_cronSchedulerJobExecutionTimeMs_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     taskType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)\\.(\\w+).tableRebalanceExecutionTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)\\.(\\w+)\\.tableRebalanceExecutionTimeMs\"><>(\\w+)"
   name: "pinot_controller_tableRebalanceExecutionTimeMs_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     result: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.taskStatus.([^\\.]*?)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.taskStatus\\.([^.]*)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_taskStatus_$3"
   cache: true
   labels:
     taskType: "$1"
     status: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.timeMsSinceLastMinionTaskMetadataUpdate.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.timeMsSinceLastMinionTaskMetadataUpdate\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastMinionTaskMetadataUpdate_$6"
   cache: true
   labels:
@@ -146,7 +146,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError)\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$7"
   cache: true
   labels:
@@ -154,12 +154,12 @@ rules:
     table: "$2$4"
     tableType: "$5"
     taskType: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(numMinionTasksInProgress|numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(numMinionTasksInProgress|numMinionSubtasksRunning|numMinionSubtasksWaiting|numMinionSubtasksError|percentMinionSubtasksInQueue|percentMinionSubtasksInError)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_$1_$3"
   cache: true
   labels:
     taskType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.timeMsSinceLastSuccessfulMinionTaskGeneration.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.timeMsSinceLastSuccessfulMinionTaskGeneration\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_timeMsSinceLastSuccessfulMinionTaskGeneration_$6"
   cache: true
   labels:
@@ -167,7 +167,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.lastMinionTaskGenerationEncountersError.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.lastMinionTaskGenerationEncountersError\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_controller_lastMinionTaskGenerationEncountersError_$6"
   cache: true
   labels:
@@ -175,47 +175,47 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.pinotLeadControllerResourceEnabled\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.pinotLeadControllerResourceEnabled\"><>(\\w+)"
   name: "pinot_controller_pinotLeadControllerResourceEnabled_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.offlineTableEstimatedSize.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.offlineTableEstimatedSize\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_controller_offlineTableEstimatedSize_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.largestSegmentSizeOnServer.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.largestSegmentSizeOnServer\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_controller_largestSegmentSizeOnServer_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableTotalSizeOnServer.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableTotalSizeOnServer\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableTotalSizeOnServer_$5"
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableSizePerReplicaOnServer.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableSizePerReplicaOnServer\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableSizePerReplicaOnServer_$5"
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableCompressedSize.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableCompressedSize\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableCompressedSize_$5"
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableQuota.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableQuota\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableQuota_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).periodicTaskError\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\\.periodicTaskError\"><>(\\w+)"
   name: "pinot_controller_periodicTaskError_$6"
   cache: true
   labels:
@@ -223,14 +223,14 @@ rules:
     table: "$1$3"
     tableType: "$4"
     periodicTask: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableStorageQuotaUtilization.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableStorageQuotaUtilization\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageQuotaUtilization_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot.controller.tableStorageEstMissingSegmentPercent.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\", 
name=\"pinot\\.controller\\.tableStorageEstMissingSegmentPercent\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_controller_tableStorageEstMissingSegmentPercent_$5"
   cache: true
   labels:
@@ -239,187 +239,187 @@ rules:
     tableType: "$4"
 
   # Pinot Broker
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?).authorization\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.authorization\"><>(\\w+)"
   name: "pinot_broker_authorization_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.documentsScanned\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.documentsScanned\"><>(\\w+)"
   name: "pinot_broker_documentsScanned_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.entriesScannedInFilter\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.entriesScannedInFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedInFilter_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.entriesScannedPostFilter\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.entriesScannedPostFilter\"><>(\\w+)"
   name: "pinot_broker_entriesScannedPostFilter_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.freshnessLagMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.freshnessLagMs\"><>(\\w+)"
   name: "pinot_broker_freshnessLagMs_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queries\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queries\"><>(\\w+)"
   name: "pinot_broker_queries_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryExecution\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryExecution\"><>(\\w+)"
   name: "pinot_broker_queryExecution_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryRouting\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryRouting\"><>(\\w+)"
   name: "pinot_broker_queryRouting_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryTotalTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryTotalTimeMs\"><>(\\w+)"
   name: "pinot_broker_queryTotalTimeMs_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.reduce\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.reduce\"><>(\\w+)"
   name: "pinot_broker_reduce_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.requestCompilation\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.requestCompilation\"><>(\\w+)"
   name: "pinot_broker_requestCompilation_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.scatterGather\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.scatterGather\"><>(\\w+)"
   name: "pinot_broker_scatterGather_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.totalServerResponseSize\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.totalServerResponseSize\"><>(\\w+)"
   name: "pinot_broker_totalServerResponseSize_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).groupBySize\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.groupBySize\"><>(\\w+)"
   name: "pinot_broker_groupBySize_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).noServingHostForSegment\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.noServingHostForSegment\"><>(\\w+)"
   name: "pinot_broker_noServingHostForSegment_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.healthcheck(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.healthcheck(\\w+)\"><>(\\w+)"
   name: "pinot_broker_healthcheck_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.helix.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.helix\\.(\\w+)\"><>(\\w+)"
   name: "pinot_broker_helix_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.helixZookeeper(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.helixZookeeper(\\w+)\"><>(\\w+)"
   name: "pinot_broker_helix_zookeeper_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.nettyConnection(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.nettyConnection(\\w+)\"><>(\\w+)"
   name: "pinot_broker_nettyConnection_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.unhealthyServers\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.unhealthyServers\"><>(\\w+)"
   name: "pinot_broker_unhealthyServers_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.clusterChangeCheck\"\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.clusterChangeCheck\"\"><>(\\w+)"
   name: "pinot_broker_clusterChangeCheck_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.proactiveClusterChangeCheck\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.proactiveClusterChangeCheck\"><>(\\w+)"
   name: "pinot_broker_proactiveClusterChangeCheck_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(\\w+)Exceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(\\w+)Exceptions\"><>(\\w+)"
   name: "pinot_broker_exceptions_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.routingTableUpdateTime\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.routingTableUpdateTime\"><>(\\w+)"
   name: "pinot_broker_routingTableUpdateTime_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithPartialServersResponded_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithProcessingExceptions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithNumGroupsLimitReached\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithNumGroupsLimitReached_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryQuotaExceeded\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryQuotaExceeded\"><>(\\w+)"
   name: "pinot_broker_queryQuotaExceeded_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).serverMissingForRouting\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.serverMissingForRouting\"><>(\\w+)"
   name: "pinot_broker_serverMissingForRouting_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.deserialization\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.deserialization\"><>(\\w+)"
   name: "pinot_broker_deserialization_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.requestConnectionWait\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.requestConnectionWait\"><>(\\w+)"
   name: "pinot_broker_requestConnectionWait_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithTimeouts\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithTimeouts\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithTimeouts_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.noServerFoundExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.noServerFoundExceptions\"><>(\\w+)"
   name: "pinot_broker_noServerFoundExceptions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithProcessingExceptions\"><>(\\w+)"
   name: "pinot_broker_brokerResponsesWithProcessingExceptions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot.broker.(([^\\.]+)\\.)?([^\\.]*?)\\.queryTotalTimeMs\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\", 
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.queryTotalTimeMs\"><>(\\w+)"
   name: "pinot_broker_queryTotalTimeMs_$4"
   cache: true
   labels:
@@ -427,28 +427,28 @@ rules:
     table: "$1$3"
 
 # Pinot Server
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.documentCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.documentCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_documentCount_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.segmentCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.segmentCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_segmentCount_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_$5_$6"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+).(invalidRealtimeRowsDropped|incompleteRealtimeRowsConsumed|rowsWithErrors|realtimeRowsConsumed|realtimeRowsFetched|streamConsumerCreateExceptions)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\\.(invalidRealtimeRowsDropped|incompleteRealtimeRowsConsumed|rowsWithErrors|realtimeRowsConsumed|realtimeRowsFetched|streamConsumerCreateExceptions)\"><>(\\w+)"
   name: "pinot_server_$7_$8"
   cache: true
   labels:
@@ -457,13 +457,13 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.helix.connected\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.helix\\.connected\"><>(\\w+)"
   name: "pinot_server_helix_connected_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.helixZookeeperReconnects\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_server_helix_zookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.highestKafkaOffsetConsumed.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.highestKafkaOffsetConsumed\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestKafkaOffsetConsumed_$7"
   cache: true
   labels:
@@ -472,7 +472,7 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.highestStreamOffsetConsumed.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.highestStreamOffsetConsumed\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestStreamOffsetConsumed_$7"
   cache: true
   labels:
@@ -481,7 +481,7 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.lastRealtimeSegment(\\w+)Seconds\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_lastRealtimeSegment$1Seconds_$8"
   cache: true
   labels:
@@ -490,10 +490,10 @@ rules:
     tableType: "$5"
     topic: "$6"
     partition: "$7"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.llcControllerResponse(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.llcControllerResponse(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcControllerResponse_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.llcPartitionConsuming.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.llcPartitionConsuming\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcPartitionConsuming_$7"
   cache: true
   labels:
@@ -502,65 +502,65 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.llcSimultaneousSegmentBuilds\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.llcSimultaneousSegmentBuilds\"><>(\\w+)"
   name: "pinot_server_llcSimultaneousSegmentBuilds_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.memory.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.memory\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_memory_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.queries\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.queries\"><>(\\w+)"
   name: "pinot_server_queries_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeConsumptionExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeConsumptionExceptions\"><>(\\w+)"
   name: "pinot_server_realtime_consumptionExceptions_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeOffheapMemoryUsed.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeOffheapMemoryUsed\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_server_realtime_offheapMemoryUsed_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeOffsetCommits\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeOffsetCommits\"><>(\\w+)"
   name: "pinot_server_realtime_offsetCommits_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeRowsConsumed\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeRowsConsumed\"><>(\\w+)"
   name: "pinot_server_realtime_rowsConsumed_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.rowsWithErrors\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.rowsWithErrors\"><>(\\w+)"
   name: "pinot_server_realtime_rowsErrored_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.(\\w+)Exceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.(\\w+)Exceptions\"><>(\\w+)"
   name: "pinot_server_realtime_exceptions_$1_$2"
   cache: true
-- pattern: 
"\"org.apache.pinot.transport.netty.NettyTCPServer_(\\w+)_\"<type=\"\", 
name=\"(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.transport\\.netty\\.NettyTCPServer_(\\w+)_\"<type=\"\",
 name=\"(\\w+)\"><>(\\w+)"
   name: "pinot_server_netty_tcp_$2_$3"
   cache: true
   labels:
     id: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.nettyConnection(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.nettyConnection(\\w+)\"><>(\\w+)"
   name: "pinot_server_nettyConnection_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeSegmentNumPartitions.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeSegmentNumPartitions\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_server_realtimeSegmentNumPartitions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.resizeTimeMs.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.resizeTimeMs\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_resizeTimeMs_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.numResizes.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.numResizes\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_numResizes_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.upsertPrimaryKeysCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.upsertPrimaryKeysCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertPrimaryKeysCount_$6"
   cache: true
   labels:
@@ -568,7 +568,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     partition: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeIngestionDelayMs.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeIngestionDelayMs\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_realtimeIngestionDelayMs_$6"
   cache: true
   labels:
@@ -576,7 +576,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     partition: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.upsertValidDocSnapshotCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.upsertValidDocSnapshotCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertValidDocSnapshotCount_$6"
   cache: true
   labels:
@@ -584,7 +584,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     partition: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.upsertPrimaryKeysInSnapshotCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.upsertPrimaryKeysInSnapshotCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertPrimaryKeysInSnapshotCount_$6"
   cache: true
   labels:
@@ -593,19 +593,19 @@ rules:
     tableType: "$4"
     partition: "$5"
   #grpc related metrics
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.grpc(.+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.grpc(\\.+)\"><>(\\w+)"
   name: "pinot_server_grpc$1_$2"
   cache: true
 
 # Pinot Minions
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.numberOfTasks.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.numberOfTasks\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_minion_numberOfTasks_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+).(taskExecution|taskQueueing|numberTasks|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\\.(taskExecution|taskQueueing|numberTasks|numberTasksExecuted|numberTasksCompleted|numberTasksCancelled|numberTasksFailed|numberTasksFatalFailed)\"><>(\\w+)"
   name: "pinot_minion_$6_$7"
   cache: true
   labels:
@@ -613,10 +613,10 @@ rules:
     table: "$1$3"
     tableType: "$4"
     taskType: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.(\\w+)\"><>(\\w+)"
   name: "pinot_minion_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"MinionMetrics\", 
name=\"pinot.minion.(\\w+).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"MinionMetrics\", 
name=\"pinot\\.minion\\.(\\w+)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_minion_$2_$3"
   cache: true
   labels:
@@ -652,7 +652,7 @@ rules:
     tableType: "$5"
   # This is a catch-all pattern for pinot table metrics with offline/realtime 
suffix with topic and partition
   # Patterns after this line may be skipped.
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"?><>(\\w+)"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"?><>(\\w+)"
   name: "pinot_$1_$2_$9"
   cache: true
   labels:
diff --git 
a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml 
b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
index f59c707d68..1aae226de3 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
@@ -1,32 +1,32 @@
 rules:
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.documentCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.documentCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_documentCount_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.segmentCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.segmentCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_segmentCount_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_$5_$6"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.helix.connected\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.helix\\.connected\"><>(\\w+)"
   name: "pinot_server_helix_connected_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.helixZookeeperReconnects\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.helixZookeeperReconnects\"><>(\\w+)"
   name: "pinot_server_helix_zookeeperReconnects_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.highestKafkaOffsetConsumed.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.highestKafkaOffsetConsumed\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestKafkaOffsetConsumed_$7"
   cache: true
   labels:
@@ -35,7 +35,7 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.highestStreamOffsetConsumed.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.highestStreamOffsetConsumed\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_highestStreamOffsetConsumed_$7"
   cache: true
   labels:
@@ -44,7 +44,7 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.lastRealtimeSegment(\\w+)Seconds\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_lastRealtimeSegment$1Seconds_$8"
   cache: true
   labels:
@@ -53,10 +53,10 @@ rules:
     tableType: "$5"
     topic: "$6"
     partition: "$7"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.llcControllerResponse(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.llcControllerResponse(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcControllerResponse_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.llcPartitionConsuming.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.llcPartitionConsuming\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"><>(\\w+)"
   name: "pinot_server_llcPartitionConsuming_$7"
   cache: true
   labels:
@@ -65,7 +65,7 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeIngestionDelayMs.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeIngestionDelayMs\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_realtimeIngestionDelayMs_$6"
   cache: true
   labels:
@@ -73,19 +73,19 @@ rules:
     table: "$1$3"
     tableType: "$4"
     partition: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.llcSimultaneousSegmentBuilds\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.llcSimultaneousSegmentBuilds\"><>(\\w+)"
   name: "pinot_server_llcSimultaneousSegmentBuilds_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.memory.(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.memory\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_memory_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.queries\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.queries\"><>(\\w+)"
   name: "pinot_server_queries_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeConsumptionExceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeConsumptionExceptions\"><>(\\w+)"
   name: "pinot_server_realtime_consumptionExceptions_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+).(invalidRealtimeRowsDropped|incompleteRealtimeRowsConsumed|rowsWithErrors|realtimeRowsFiltered|realtimeRowsConsumed|realtimeRowsFetched|streamConsumerCreateExceptions)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\\.(invalidRealtimeRowsDropped|incompleteRealtimeRowsConsumed|rowsWithErrors|realtimeRowsFiltered|realtimeRowsConsumed|realtimeRowsFetched|streamConsumerCreateExceptions)\"><>(\\w+)"
   name: "pinot_server_$7_$8"
   cache: true
   labels:
@@ -94,50 +94,50 @@ rules:
     tableType: "$4"
     topic: "$5"
     partition: "$6"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeOffheapMemoryUsed.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeOffheapMemoryUsed\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_server_realtime_offheapMemoryUsed_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeOffsetCommits\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeOffsetCommits\"><>(\\w+)"
   name: "pinot_server_realtime_offsetCommits_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeRowsConsumed\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeRowsConsumed\"><>(\\w+)"
   name: "pinot_server_realtime_rowsConsumed_$1"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.(\\w+)Exceptions\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.(\\w+)Exceptions\"><>(\\w+)"
   name: "pinot_server_realtime_exceptions_$1_$2"
   cache: true
-- pattern: 
"\"org.apache.pinot.transport.netty.NettyTCPServer_(\\w+)_\"<type=\"\", 
name=\"(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.transport\\.netty\\.NettyTCPServer_(\\w+)_\"<type=\"\",
 name=\"(\\w+)\"><>(\\w+)"
   name: "pinot_server_netty_tcp_$2_$3"
   cache: true
   labels:
     id: "$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.nettyConnection(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.nettyConnection(\\w+)\"><>(\\w+)"
   name: "pinot_server_nettyConnection_$1_$2"
   cache: true
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.realtimeSegmentNumPartitions.(([^\\.]+)\\.)?([^\\.]*?)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.realtimeSegmentNumPartitions\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
   name: "pinot_server_realtimeSegmentNumPartitions_$4"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.numResizes.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.numResizes\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_numResizes_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.resizeTimeMs.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.resizeTimeMs\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\"><>(\\w+)"
   name: "pinot_server_resizeTimeMs_$5"
   cache: true
   labels:
     database: "$2"
     table: "$1$3"
     tableType: "$4"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.upsertPrimaryKeysCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.upsertPrimaryKeysCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertPrimaryKeysCount_$6"
   cache: true
   labels:
@@ -150,7 +150,7 @@ rules:
   cache: true
   labels:
     version: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.upsertValidDocSnapshotCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.upsertValidDocSnapshotCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertValidDocSnapshotCount_$6"
   cache: true
   labels:
@@ -158,7 +158,7 @@ rules:
     table: "$1$3"
     tableType: "$4"
     partition: "$5"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.upsertPrimaryKeysInSnapshotCount.(([^\\.]+)\\.)?([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.upsertPrimaryKeysInSnapshotCount\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
   name: "pinot_server_upsertPrimaryKeysInSnapshotCount_$6"
   cache: true
   labels:
@@ -167,7 +167,7 @@ rules:
     tableType: "$4"
     partition: "$5"
 #grpc related metrics
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", 
name=\"pinot.server.grpc(.+)\"><>(\\w+)"
+- pattern: 
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\", 
name=\"pinot\\.server\\.grpc(\\.+)\"><>(\\w+)"
   name: "pinot_server_grpc$1_$2"
   cache: true
 
@@ -192,7 +192,7 @@ rules:
     table: "$2$4"
     tableType: "$5"
 #when there is partition and topic in the metric
-- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"?><>(\\w+)"
+- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, 
name=\"?pinot\\.(\\w+)\\.(\\w+)\\.((\\w+)\\.)?(\\w+)_(OFFLINE|REALTIME)\\-(\\.+)\\-(\\w+)\"?><>(\\w+)"
   name: "pinot_$1_$2_$9"
   cache: true
   labels:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org

Reply via email to