]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: fix flaky promql query test 63519/head
authorAashish Sharma <Aashish.Sharma1@ibm.com>
Wed, 14 May 2025 08:05:10 +0000 (13:35 +0530)
committerAashish Sharma <Aashish.Sharma1@ibm.com>
Tue, 27 May 2025 08:17:09 +0000 (13:47 +0530)
There is a test collision in "promql-query-test" test suite because two different IOPS panels with the same title and legend labels (Read, Write) are present, and the test framework is not able to distinguish between them.
There are two panels with the same title IOPS and legends Read / Write, but different expressions:\
1. ceph-application-overview.json
2. ceph-cluster-advanced.json

Fixes: https://tracker.ceph.com/issues/71318
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 5798d2fc9a50881e8ec7c9c2343f9796eadf7533)

monitoring/ceph-mixin/dashboards_out/ceph-application-overview.json

index b49a666816593ff07ef1bcdd6dff92ca607f6159..eb4ba8029ab2451d929a08d213e9f1acde27ec24 100644 (file)
@@ -38,7 +38,7 @@
       },
       "id": 11,
       "panels": [],
-      "title": "Application ($application)",
+      "title": "Application (${application:csv})",
       "type": "row"
     },
     {
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "Sum(rate(ceph_pool_wr{cluster=~\"$cluster\",}[$__rate_interval]) *\n  on(pool_id) group_left(instance,name) ceph_pool_metadata{cluster=~\"$cluster\",name=~\"$pool\"})",
+          "expr": "sum(rate(ceph_pool_wr{cluster=~\"$cluster\",}[$__rate_interval]) *\n  on(pool_id) group_left(instance,name) ceph_pool_metadata{cluster=~\"$cluster\",name=~\"$pool\"})",
           "legendFormat": "Write",
           "range": true,
           "refId": "A"
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "Sum(rate(ceph_pool_rd{cluster=~\"$cluster\",}[$__rate_interval]) *\n  on(pool_id) group_left(instance,name) ceph_pool_metadata{cluster=~\"$cluster\",name=~\"$pool\"})",
+          "expr": "sum(rate(ceph_pool_rd{cluster=~\"$cluster\",}[$__rate_interval]) *\n  on(pool_id) group_left(instance,name) ceph_pool_metadata{cluster=~\"$cluster\",name=~\"$pool\"})",
           "hide": false,
           "legendFormat": "Read",
           "range": true,
           "refId": "B"
         }
       ],
-      "title": "IOPS",
+      "title": "IOPS (${application:csv} - $pool)",
       "type": "stat"
     },
     {
           "refId": "B"
         }
       ],
-      "title": "Throughput",
+      "title": "Throughput (${application:csv} - $pool)",
       "type": "stat"
     },
     {