monitoring: fix display ceph_osd_in in Grafana panel

Signed-off-by: Patrick Seidensal <pseidensal@suse.com>
(cherry picked from commit 4a6b2c1dfbbe7182beaf510c4a7297a79c6e2524)

diff --git a/monitoring/grafana/dashboards/ceph-cluster.json b/monitoring/grafana/dashboards/ceph-cluster.json
index 1b91bfe418512c83d9f8024e8724291a0731555b..6988a629986c3ab9b2a4bd49af254f532162e603 100644 (file)
--- a/monitoring/grafana/dashboards/ceph-cluster.json
+++ b/monitoring/grafana/dashboards/ceph-cluster.json
@@ -190,7 +190,7 @@
           "displayAliasType": "Always",
           "displayType": "Regular",
           "displayValueWithAlias": "When Alias Displayed",
-          "expr": "sum(ceph_osds_in)",
+          "expr": "sum(ceph_osd_in)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "In",

diff --git a/monitoring/grafana/dashboards/tests/features/ceph-cluster.feature b/monitoring/grafana/dashboards/tests/features/ceph-cluster.feature
index f8b580566f45137acae3bea2367e12d5e196b76f..0035a79595243bafba24dc7090a179ce7b6c8aa5 100644 (file)
--- a/monitoring/grafana/dashboards/tests/features/ceph-cluster.feature
+++ b/monitoring/grafana/dashboards/tests/features/ceph-cluster.feature
@@ -2,9 +2,20 @@ Feature: Ceph Cluster Dashboard
 
 Scenario: "Test total PG States"
   Given the following series:
-    | metrics | values |
+    | metrics                  | values |
     | ceph_pg_total{foo="var"} | 10 100 |
     | ceph_pg_total{foo="bar"} | 20 200 |
   Then Grafana panel `PG States` with legend `Total` shows:
     | metrics | values |
-    | {} | 300 |
\ No newline at end of file
+    | {}      | 300    |
+
+Scenario: "Test OSDs in"
+  Given the following series:
+    | metrics                          | values |
+    | ceph_osd_in{ceph_daemon="osd.0"} | 1.0    |
+    | ceph_osd_in{ceph_daemon="osd.1"} | 0.0    |
+    | ceph_osd_in{ceph_daemon="osd.2"} | 1.0    |
+  When variable `instance` is `.*`
+  Then Grafana panel `OSDs` with legend `In` shows:
+    | metrics | values |
+    | {}      | 2      |