This is an automated email from the ASF dual-hosted git repository. rongr 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 0f6015a5d3 JMX Exporter Preserve Original Regexes (#12295) 0f6015a5d3 is described below commit 0f6015a5d39455f93d51ed14a7af69579c818f93 Author: Prashant Pandey <84911643+suddend...@users.noreply.github.com> AuthorDate: Mon Jan 22 02:56:32 2024 +0530 JMX Exporter Preserve Original Regexes (#12295) * jmx -> prom exporter catch-all regexes * Keep the previous regex * Fix incorrect capture group number * Add regex to pinot.yml --- .../jmx_prometheus_javaagent/configs/server.yml | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) 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 2ec4b39f16..837e6cc3fe 100644 --- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml +++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml @@ -31,6 +31,14 @@ rules: tableType: "$2" topic: "$3" partition: "$4" +- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.highestStreamOffsetConsumed.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)" + name: "pinot_server_highestStreamOffsetConsumed_$5" + cache: true + labels: + table: "$1" + tableType: "$2" + topic: "$3" + partition: "$4" - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.lastRealtimeSegment(\\w+)Seconds.([^\\.]*?)_(OFFLINE|REALTIME)\\-(.+)\\-(\\w+)\"><>(\\w+)" name: "pinot_server_lastRealtimeSegment$1Seconds_$6" cache: true @@ -42,6 +50,21 @@ rules: - 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+)" + name: "pinot_server_llcPartitionConsuming_$5" + cache: true + labels: + table: "$1" + tableType: "$2" + topic: "$3" + partition: "$4" +- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.realtimeIngestionDelayMs.([^\\.]*?)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)" + name: "pinot_server_realtimeIngestionDelayMs_$4" + cache: true + labels: + table: "$1" + tableType: "$2" + partition: "$3" - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.llcSimultaneousSegmentBuilds\"><>(\\w+)" name: "pinot_server_llcSimultaneousSegmentBuilds_$1" cache: true @@ -89,17 +112,44 @@ rules: cache: true labels: table: "$1" +- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.numResizes.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)" + name: "pinot_server_numResizes_$3" + cache: true + labels: + table: "$1" + tableType: "$2" - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.resizeTimeMs.([^\\.]*?)_(OFFLINE|REALTIME)\"><>(\\w+)" name: "pinot_server_resizeTimeMs_$3" cache: true labels: table: "$1" tableType: "$2" +- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertPrimaryKeysCount.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)" + name: "pinot_server_upsertPrimaryKeysCount_$4" + cache: true + labels: + table: "$1" + tableType: "$2" + partition: "$3" - pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?, name=\"?pinot\\.(\\w+)\\.version\\.(\\w+)\"?><>(\\w+)" name: "pinot_$1_version" cache: true labels: version: "$2" +- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertValidDocSnapshotCount.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)" + name: "pinot_server_upsertValidDocSnapshotCount_$4" + cache: true + labels: + table: "$1" + tableType: "$2" + partition: "$3" +- pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.upsertPrimaryKeysInSnapshotCount.([^\\.]*?)_(OFFLINE|REALTIME).(\\w+)\"><>(\\w+)" + name: "pinot_server_upsertPrimaryKeysInSnapshotCount_$4" + cache: true + labels: + table: "$1" + tableType: "$2" + partition: "$3" #grpc related metrics - pattern: "\"org.apache.pinot.common.metrics\"<type=\"ServerMetrics\", name=\"pinot.server.grpc(.+)\"><>(\\w+)" name: "pinot_server_grpc$1_$2" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org