From 4992fef0c7440c779f2695503dde3c140ad0b70a Mon Sep 17 00:00:00 2001 From: Haitao Zhang Date: Wed, 10 Jul 2024 17:31:03 -0700 Subject: [PATCH] fix jmx to prometheus metric exporting rule (#13578) --- .../jmx_prometheus_javaagent/configs/broker.yml | 2 +- .../configs/controller.yml | 2 +- .../etc/jmx_prometheus_javaagent/configs/pinot.yml | 14 +++++++------- .../jmx_prometheus_javaagent/configs/server.yml | 12 ++++++------ 4 files changed, 15 insertions(+), 15 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 3e74ae244ebc..cabeb7048bdc 100644 --- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml +++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml @@ -219,7 +219,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\"?<>(\\w+)" +- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\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 81bb7b0e5b84..2de30b46a5c7 100644 --- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml +++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml @@ -261,7 +261,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\"?<>(\\w+)" +- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)" name: "pinot_$1_$2_$9" 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 b530a79b363b..dd25f3719c79 100644 --- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml +++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/pinot.yml @@ -448,7 +448,7 @@ rules: database: "$2" table: "$1$3" tableType: "$4" -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_$7_$8" cache: true labels: @@ -463,7 +463,7 @@ rules: - pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_helix_zookeeperReconnects_$1" cache: true -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\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\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\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\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_lastRealtimeSegment$1Seconds_$8" cache: true labels: @@ -493,7 +493,7 @@ rules: - pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_llcControllerResponse_$1_$2" cache: true -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_llcPartitionConsuming_$7" cache: true labels: @@ -593,7 +593,7 @@ rules: tableType: "$4" partition: "$5" #grpc related metrics -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_grpc$1_$2" cache: true @@ -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\"?<>(\\w+)" +- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\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 6503388ca319..780c9fffc584 100644 --- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml +++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml @@ -19,7 +19,7 @@ rules: - pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_helix_zookeeperReconnects_$1" cache: true -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_highestKafkaOffsetConsumed_$7" cache: true labels: @@ -28,7 +28,7 @@ rules: tableType: "$4" topic: "$5" partition: "$6" -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_highestStreamOffsetConsumed_$7" cache: true labels: @@ -37,7 +37,7 @@ rules: tableType: "$4" topic: "$5" partition: "$6" -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_lastRealtimeSegment$1Seconds_$8" cache: true labels: @@ -49,7 +49,7 @@ rules: - pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_llcControllerResponse_$1_$2" cache: true -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_llcPartitionConsuming_$7" cache: true labels: @@ -176,7 +176,7 @@ rules: tableType: "$4" partition: "$5" #grpc related metrics -- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" +- pattern: "\"org\\.apache\\.pinot\\.common\\.metrics\"<>(\\w+)" name: "pinot_server_grpc$1_$2" cache: true @@ -209,7 +209,7 @@ rules: table: "$2$4" tableType: "$5" #when there is partition and topic in the metric -- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)" +- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<>(\\w+)" name: "pinot_$1_$2_$9" cache: true labels: