This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new cf35e6e Fixing pinot controller metrics prefix (#6499)
cf35e6e is described below
commit cf35e6e54a7daf4c7d53ceb10ccc6df963de0a2f
Author: Xiang Fu <[email protected]>
AuthorDate: Thu Jan 28 12:34:40 2021 -0800
Fixing pinot controller metrics prefix (#6499)
---
.../etc/jmx_prometheus_javaagent/configs/pinot.yml | 30 +++++++++++-----------
.../apache/pinot/common/utils/CommonConstants.java | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
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 b2cd702..312512c 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml
@@ -1,52 +1,52 @@
rules:
# Pinot Controller
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllercontroller(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.controller(\\w+)\"><>(\\w+)"
name: "pinot_controller_$1_$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerhelix\\.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.helix\\.(\\w+)\"><>(\\w+)"
name: "pinot_controller_helix_$1_$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerhelixZookeeperReconnects\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.helixZookeeperReconnects\"><>(\\w+)"
name: "pinot_controller_helix_ZookeeperReconnects_$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controlleridealstateZnodeSize.(\\w+)_(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.idealstateZnodeSize.(\\w+)_(\\w+)\"><>(\\w+)"
name: "pinot_controller_idealstateZnodeSize_$3"
labels:
table: "$1"
tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllernumberOfReplicas.(\\w+)_(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.numberOfReplicas.(\\w+)_(\\w+)\"><>(\\w+)"
name: "pinot_controller_numberOfReplicas_$3"
labels:
table: "$1"
tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpercentOfReplicas.(\\w+)_(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.percentOfReplicas.(\\w+)_(\\w+)\"><>(\\w+)"
name: "pinot_controller_percentOfReplicas_$3"
labels:
table: "$1"
tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpercentSegmentsAvailable.(\\w+)_(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.percentSegmentsAvailable.(\\w+)_(\\w+)\"><>(\\w+)"
name: "pinot_controller_percentSegmentsAvailable_$3"
labels:
table: "$1"
tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllersegmentCount.(\\w+)_(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.segmentCount.(\\w+)_(\\w+)\"><>(\\w+)"
name: "pinot_controller_segmentCount_$3"
labels:
table: "$1"
tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllersegmentsInErrorState.(\\w+)_(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.segmentsInErrorState.(\\w+)_(\\w+)\"><>(\\w+)"
name: "pinot_controller_segmentsInErrorState_$3"
labels:
table: "$1"
tableType: "$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllernumberSegmentUploadTimeoutExceeded\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.numberSegmentUploadTimeoutExceeded\"><>(\\w+)"
name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllernumberTimesScheduleTasksCalled\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.numberTimesScheduleTasksCalled\"><>(\\w+)"
name: "pinot_controller_numberTimesScheduleTasksCalled_$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerperiodicTaskNumTablesProcessed.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.periodicTaskNumTablesProcessed.(\\w+)\"><>(\\w+)"
name: "pinot_controller_periodicTaskNumTablesProcessed_$1_$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpinotControllerLeader\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.pinotControllerLeader\"><>(\\w+)"
name: "pinot_controller_pinotControllerLeader_$1"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerpinotControllerPartitionLeader.(\\w+)\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.pinotControllerPartitionLeader.(\\w+)\"><>(\\w+)"
name: "pinot_controller_partitionLeader_$1_$2"
-- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controllerrealtimeTableCount\"><>(\\w+)"
+- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ControllerMetrics\",
name=\"pinot.controller.realtimeTableCount\"><>(\\w+)"
name: "pinot_controller_realtimeTableCount_$1"
- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ValidationMetrics\",
name=\"pinot.controller.(\\w+)\\.(\\w+)\"><>(\\w+)"
name: "pinot_controller_validateion_$2_$3"
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
b/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
index 69b1ca1..191ae93 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/utils/CommonConstants.java
@@ -333,7 +333,7 @@ public class CommonConstants {
// FYI this is incorrect as it generate metrics named without a dot after
pinot.controller part,
// but we keep this default for backward compatibility in case someone
relies on this format
// see Server or Broker class for correct prefix format you should use
- public static final String DEFAULT_METRICS_PREFIX = "pinot.controller";
+ public static final String DEFAULT_METRICS_PREFIX = "pinot.controller.";
}
public static class Minion {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
