monitoring/grafana: replace filestore osd count

Signed-off-by: Pere Diaz Bou <pdiazbou@redhat.com>
(cherry picked from commit 57c26311de9f747122720e14da8e8fea0f889632)

diff --git a/monitoring/grafana/dashboards/jsonnet/grafana_dashboards.jsonnet b/monitoring/grafana/dashboards/jsonnet/grafana_dashboards.jsonnet
index f2f6736fbe6e394c42f49ff1c20be8253208cac9..d4d19ffa0af4fa96614fb6ed2f34e4020ba0dbd4 100644 (file)
--- a/monitoring/grafana/dashboards/jsonnet/grafana_dashboards.jsonnet
+++ b/monitoring/grafana/dashboards/jsonnet/grafana_dashboards.jsonnet
@@ -1287,7 +1287,7 @@ local addStyle(alias, colorMode, colors, dateFormat, decimals, mappingType, patt
         'OSD Objectstore Types'
       )
       .addTarget(addTargetSchema('count(ceph_bluefs_wal_total_bytes)', 1, 'time_series', 'bluestore'))
-      .addTarget(addTargetSchema('count(ceph_osd_metadata) - count(ceph_bluefs_wal_total_bytes)', 1, 'time_series', 'filestore')) + {gridPos: {x: 4, y: 8, w: 4, h: 8}},
+      .addTarget(addTargetSchema('absent(ceph_bluefs_wal_total_bytes)*count(ceph_osd_metadata)', 1, 'time_series', 'filestore')) + {gridPos: {x: 4, y: 8, w: 4, h: 8}},
       OsdOverviewPieChartPanel(
         {},
         'The pie chart shows the various OSD sizes used within the cluster',

diff --git a/monitoring/grafana/dashboards/osds-overview.json b/monitoring/grafana/dashboards/osds-overview.json
index 3e88e5910b7dc6516ab04e179828de904ca2a872..a3c93b53d1cb8c04fca47697c04cafbc73847825 100644 (file)
--- a/monitoring/grafana/dashboards/osds-overview.json
+++ b/monitoring/grafana/dashboards/osds-overview.json
@@ -477,7 +477,7 @@
                "refId": "A"
             },
             {
-               "expr": "count(ceph_osd_metadata) - count(ceph_bluefs_wal_total_bytes)",
+               "expr": "absent(ceph_bluefs_wal_total_bytes)*count(ceph_osd_metadata)",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "filestore",