This is an automated email from the ASF dual-hosted git repository.
kharekartik 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 fb64ec29e9 Fix few metric rules which were affected by the database
prefix handling (#13290)
fb64ec29e9 is described below
commit fb64ec29e9949aee70e2d92c9821edf0cf56fd09
Author: Shounak kulkarni <shounakmk...@gmail.com>
AuthorDate: Fri Jun 7 11:34:13 2024 +0500
Fix few metric rules which were affected by the database prefix handling
(#13290)
---
.../jmx_prometheus_javaagent/configs/broker.yml | 12 +++++++++++
.../configs/controller.yml | 7 ++++++
.../jmx_prometheus_javaagent/configs/server.yml | 25 +++++++++++++++-------
3 files changed, 36 insertions(+), 8 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 5c7a6cc8a9..3e74ae244e 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/broker.yml
@@ -59,6 +59,12 @@ rules:
labels:
database: "$2"
table: "$1$3"
+- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\",
name=\"pinot\\.broker\\.requestSize\\.(([^.]+)\\.)?([^.]*)\"><>(\\w+)"
+ name: "pinot_broker_requestSize_$4"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\",
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.scatterGather\"><>(\\w+)"
name: "pinot_broker_scatterGather_$4"
cache: true
@@ -112,6 +118,12 @@ rules:
- 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\\.adaptiveServerSelectorType\"><>(\\w+)"
+ name: "pinot_broker_adaptiveServerSelectorType_$1"
+ cache: true
+- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\",
name=\"pinot\\.broker\\.adaptiveServerSelectorType\\.(\\w+)\"><>(\\w+)"
+ name: "pinot_broker_adaptiveServerSelectorType_$1_$2"
+ cache: true
- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"BrokerMetrics\",
name=\"pinot\\.broker\\.(([^.]+)\\.)?([^.]*)\\.brokerResponsesWithPartialServersResponded\"><>(\\w+)"
name: "pinot_broker_brokerResponsesWithPartialServersResponded_$4"
cache: true
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 a036a13053..81bb7b0e5b 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/controller.yml
@@ -64,6 +64,9 @@ rules:
database: "$2"
table: "$1$3"
tableType: "$4"
+- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\",
name=\"pinot\\.controller\\.dataDir\\.(\\w+)\"><>(\\w+)"
+ name: "pinot_controller_dataDir_$1_$2"
+ cache: true
- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\",
name=\"pinot\\.controller\\.numberSegmentUploadTimeoutExceeded\"><>(\\w+)"
name: "pinot_controller_numberSegmentUploadTimeoutExceeded_$1"
cache: true
@@ -228,6 +231,10 @@ rules:
database: "$2"
table: "$1$3"
tableType: "$4"
+# Controller periodic task metrics
+- pattern:
"\"?org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ControllerMetrics\",
name=\"?pinot\\.controller\\.(\\w+)\\.controllerPeriodicTaskRun\"?><>(\\w+)"
+ name: "pinot_controller_periodicTaskRun_$1_$2"
+ cache: true
- pattern: "\"?org\\.apache\\.pinot\\.common\\.metrics\"?<type=\"?\\w+\"?,
name=\"?pinot\\.(\\w+)\\.version\\.(\\w+)\"?><>(\\w+)"
name: "pinot_$1_version"
cache: true
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 1aae226de3..c711d3cfd5 100644
--- a/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
+++ b/docker/images/pinot/etc/jmx_prometheus_javaagent/configs/server.yml
@@ -13,13 +13,6 @@ rules:
database: "$2"
table: "$1$3"
tableType: "$4"
-- 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+)"
name: "pinot_server_helix_connected_$1"
cache: true
@@ -73,6 +66,14 @@ rules:
table: "$1$3"
tableType: "$4"
partition: "$5"
+- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\",
name=\"pinot\\.server\\.endToEndRealtimeIngestionDelayMs\\.(([^.]+)\\.)?([^.]*)_(OFFLINE|REALTIME)\\.(\\w+)\"><>(\\w+)"
+ name: "pinot_server_endToEndRealtimeIngestionDelayMs_$6"
+ cache: true
+ labels:
+ database: "$2"
+ table: "$1$3"
+ tableType: "$4"
+ partition: "$5"
- pattern:
"\"org\\.apache\\.pinot\\.common\\.metrics\"<type=\"ServerMetrics\",
name=\"pinot\\.server\\.llcSimultaneousSegmentBuilds\"><>(\\w+)"
name: "pinot_server_llcSimultaneousSegmentBuilds_$1"
cache: true
@@ -85,7 +86,7 @@ rules:
- 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:
@@ -171,6 +172,14 @@ rules:
name: "pinot_server_grpc$1_$2"
cache: true
+- 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"
+
## Metrics that fit the catch-all patterns above should not be added to this
file.
## In case a metric does not fit the catch-all patterns, add them before
this comment
# when there is partition but no topic in the metric
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
