fix inaccurate Hierarchy of RabbitMQ metrics. (apache#12144)

renovamens · Apr 22, 2024 · e9a2ed2 · e9a2ed2
1 parent 5808627
commit e9a2ed2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -113,6 +113,7 @@
 * Calculate Nginx service HTTP Latency by MQE.
 * MQE query: make metadata not return `null`.
 * MQE labeled metrics Binary Operation: return empty value if the labels not match rather than report error.
+* Fix inaccurate Hierarchy of RabbitMQ Server monitoring metrics.
 
 #### UI
 

diff --git a/...server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-cluster.json b/...server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-cluster.json
@@ -530,11 +530,11 @@
       "isRoot": false,
       "isDefault": true,
       "expressions": [
-        "avg(meter_rabbitmq_messages_published)",
-        "avg(meter_rabbitmq_messages_unconfirmed)",
-        "avg(meter_rabbitmq_queues)",
-        "avg(meter_rabbitmq_channels)",
-        "avg(meter_rabbitmq_connections)"
+        "aggregate_labels(meter_rabbitmq_messages_published,sum)",
+        "aggregate_labels(meter_rabbitmq_messages_unconfirmed,sum)",
+        "aggregate_labels(meter_rabbitmq_queues,sum)",
+        "aggregate_labels(meter_rabbitmq_channels,sum)",
+        "aggregate_labels(meter_rabbitmq_connections,sum)"
       ],
       "expressionsConfig": [
         {

diff --git a/test/e2e-v2/cases/rabbitmq/otel-collector-config.yaml b/test/e2e-v2/cases/rabbitmq/otel-collector-config.yaml
@@ -68,6 +68,8 @@ exporters:
     endpoint: oap:11800
     tls:
       insecure: true
+  logging:
+    loglevel: debug
 
 service:
   pipelines:
@@ -77,4 +79,5 @@ service:
       processors:
         - batch
       exporters:
-        - otlp
+        - otlp
+        - logging