From e9a2ed2c03bb86153a3edfe7ec644f6530e2836b Mon Sep 17 00:00:00 2001
From: Harry <innerpeace.zhai@gmail.com>
Date: Mon, 22 Apr 2024 14:55:13 +0800
Subject: [PATCH] fix inaccurate Hierarchy of RabbitMQ metrics. (#12144)

---
 docs/en/changes/changes.md                             |  1 +
 .../rabbitmq/rabbitmq-cluster.json                     | 10 +++++-----
 test/e2e-v2/cases/rabbitmq/otel-collector-config.yaml  |  5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 03aa9ab5bc..7f91d6a8cd 100644
--- 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/oap-server/server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-cluster.json b/oap-server/server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-cluster.json
index af09eff594..8706a32e1f 100644
--- a/oap-server/server-starter/src/main/resources/ui-initialized-templates/rabbitmq/rabbitmq-cluster.json
+++ b/oap-server/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
index 2b01c217b1..6802f3cc69 100644
--- 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
\ No newline at end of file
+        - otlp
+        - logging
\ No newline at end of file