monitoring/ceph-mixin/dashboards_out: Correct panel title in ceph-cluster-advanced...

Signed-off-by: Anthony D'Atri <anthonyeleven@users.noreply.github.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 8380f6c06e0a3d5c21e339d1c7730e8f7582790e..014e64b7328ae569f09e3f058fdf7a9b36ffbb2f 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -1,6 +1,6 @@
 >=20.0.0
 
-* RADOS: leader monitor and stretch mode status are now included in the `ceph status` output.
+* RADOS: lead Monitor and stretch mode status are now included in the `ceph status` output.
   Related Tracker: https://tracker.ceph.com/issues/70406
 * RGW: The User Account feature introduced in Squid provides first-class support for
   IAM APIs and policy. Our preliminary STS support was instead based on tenants, and

diff --git a/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet b/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
index 6b5baff3f56d1480829f9728509c797afe589d46..1a7dd8fe6dbd88c99b23cbd0900d7db1a9b960bf 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/ceph-cluster.libsonnet
@@ -974,7 +974,7 @@ local g = import 'grafonnet/grafana.libsonnet';
       $.addRowSchema(collapse=false, showTitle=true, title='OBJECTS') + { gridPos: { x: 0, y: 31, w: 24, h: 1 } },
 
       $.timeSeriesPanel(
-        title='OSD Type Count',
+        title='RADOS Object Count',
         datasource='$datasource',
         gridPosition={ h: 12, w: 6, x: 0, y: 32 },
         fillOpacity=10,

diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
index da2f676b202f96673c59e5c72f20cee986866494..a31cd5ec3f5b0ef4724927c6956e15efa1b0e858 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-cluster-advanced.json
@@ -2232,7 +2232,7 @@
                "step": 200
             }
          ],
-         "title": "OSD Type Count",
+         "title": "RADOS Object Count",
          "type": "timeseries"
       },
       {

diff --git a/monitoring/ceph-mixin/tests_dashboards/features/ceph-cluster.feature b/monitoring/ceph-mixin/tests_dashboards/features/ceph-cluster.feature
index f39cb4be59ee3048577cfae7fe8d07a927d9e19a..c144e52664d04ffd07b01d204dc0cc5adeb78221 100644 (file)
--- a/monitoring/ceph-mixin/tests_dashboards/features/ceph-cluster.feature
+++ b/monitoring/ceph-mixin/tests_dashboards/features/ceph-cluster.feature
@@ -315,12 +315,12 @@ Feature: Ceph Cluster Dashboard
       | {job="ceph", cluster="mycluster", name="pool2", pool_id="2"}       | 30000 |
       | {job="ceph", cluster="mycluster", name="pool3", pool_id="3"}       | 45000|
 
-  Scenario: "Test OSD Type Count"
+  Scenario: "Test RADOS Object Count"
     Given the following series:
       | metrics                          | values |
       | ceph_pool_objects{job="ceph", cluster="mycluster", osd="osd.0"} | 10 |
       | ceph_pool_objects{job="ceph", cluster="mycluster", osd="osd.1"} | 20 |
-    Then Grafana panel `OSD Type Count` with legend `Total` shows:
+    Then Grafana panel `RADOS Object Count` with legend `Total` shows:
       | metrics | values |
       | {}      | 30 |