monitoring: Fix application overview to show Raw used

- Updated capacity used to show Raw capacity
- Pool table shows Raw capacity
- Total used capacity graph shows raw capacity

fixes: https://tracker.ceph.com/issues/76456

Signed-off-by: Ankush Behl <cloudbehl@gmail.com>

diff --git a/monitoring/ceph-mixin/dashboards_out/ceph-application-overview.json b/monitoring/ceph-mixin/dashboards_out/ceph-application-overview.json
index ab5d4335a910fd4c16ee87de8c606f3340e6538d..6eac961d836e8a34622e1d60f8d97f09e3240ca4 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/ceph-application-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/ceph-application-overview.json
@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 14,
+  "id": 34,
   "links": [],
   "panels": [
     {
@@ -56,7 +56,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               }
             ]
           },
@@ -88,7 +89,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -121,7 +122,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               }
             ]
           },
@@ -153,7 +155,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -210,11 +212,12 @@
           "firing": true,
           "noData": false,
           "normal": false,
-          "pending": true
+          "pending": true,
+          "recovering": true
         },
         "viewMode": "list"
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "title": "Application Alerts",
       "type": "alertlist"
     },
@@ -234,7 +237,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               }
             ]
           },
@@ -273,7 +277,7 @@
         "sizing": "auto",
         "valueMode": "color"
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -282,7 +286,7 @@
           },
           "editorMode": "code",
           "exemplar": false,
-          "expr": "sum by (application) (ceph_pool_stored{cluster=~\"$cluster|\",} *\n  on(pool_id) group_left(instance, name, application) ceph_pool_metadata{cluster=~\"$cluster|\",application=~\"(.*Block.*)|(.*Filesystem.*)|(.*Object.*)\"})",
+          "expr": "sum by (application) (ceph_pool_bytes_used{cluster=~\"$cluster|\",} *\n  on(pool_id) group_left(instance, name, application) ceph_pool_metadata{cluster=~\"$cluster|\",application=~\"(.*Block.*)|(.*Filesystem.*)|(.*Object.*)\"})",
           "format": "time_series",
           "instant": true,
           "legendFormat": "__auto",
@@ -309,7 +313,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               }
             ]
           },
@@ -341,7 +346,7 @@
         "textMode": "auto",
         "wideLayout": true
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -384,6 +389,9 @@
               "type": "auto"
             },
             "filterable": true,
+            "footer": {
+              "reducers": []
+            },
             "inspect": false
           },
           "mappings": [],
@@ -391,7 +399,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -509,7 +518,7 @@
             "properties": [
               {
                 "id": "displayName",
-                "value": "Stored"
+                "value": "Used"
               },
               {
                 "id": "unit",
@@ -552,6 +561,22 @@
                 "value": "bytes"
               }
             ]
+          },
+          {
+            "matcher": {
+              "id": "byName",
+              "options": "Value #A"
+            },
+            "properties": [
+              {
+                "id": "unit",
+                "value": "bytes"
+              },
+              {
+                "id": "displayName",
+                "value": "Raw used"
+              }
+            ]
           }
         ]
       },
@@ -564,15 +589,7 @@
       "id": 50,
       "options": {
         "cellHeight": "sm",
-        "footer": {
-          "countRows": false,
-          "enablePagination": false,
-          "fields": "",
-          "reducer": [
-            "sum"
-          ],
-          "show": false
-        },
+        "enablePagination": false,
         "frameIndex": 1,
         "showHeader": true,
         "sortBy": [
@@ -582,7 +599,7 @@
           }
         ]
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -659,7 +676,7 @@
           "hide": false,
           "instant": true,
           "intervalFactor": 1,
-          "legendFormat": "J",
+          "legendFormat": "__auto",
           "refId": "J"
         },
         {
@@ -691,6 +708,19 @@
           "legendFormat": "N",
           "range": false,
           "refId": "N"
+        },
+        {
+          "datasource": {
+            "uid": "${datasource}"
+          },
+          "editorMode": "code",
+          "expr": "ceph_pool_bytes_used{cluster=~\"$cluster|\", } * on(pool_id) group_left ceph_pool_metadata{cluster=~\"$cluster|\", application=~\"$application\", name=~\"$pool\"}",
+          "format": "table",
+          "hide": false,
+          "instant": true,
+          "intervalFactor": 1,
+          "legendFormat": "__auto",
+          "refId": "A"
         }
       ],
       "title": "Pool Overview",
@@ -704,7 +734,7 @@
           "options": {
             "excludeByName": {
               "Time": true,
-              "Value #A": true,
+              "Value #A": false,
               "Value #B": false,
               "Value #C": true,
               "Value #D": false,
@@ -722,28 +752,25 @@
             "includeByName": {},
             "indexByName": {
               "Time": 0,
-              "Value #A": 20,
-              "Value #B": 10,
-              "Value #C": 21,
-              "Value #D": 12,
-              "Value #E": 22,
-              "Value #G": 13,
-              "Value #H": 14,
-              "Value #I": 18,
-              "Value #J": 8,
-              "Value #K": 19,
+              "Value #A": 7,
+              "Value #B": 11,
+              "Value #D": 13,
+              "Value #G": 14,
+              "Value #H": 15,
+              "Value #I": 19,
+              "Value #J": 9,
               "Value #M": 6,
-              "Value #N": 11,
-              "__name__": 15,
+              "Value #N": 12,
+              "__name__": 16,
               "application": 4,
               "cluster": 1,
-              "compression_mode": 16,
+              "compression_mode": 17,
               "description": 5,
-              "instance": 7,
+              "instance": 8,
               "job": 2,
               "name": 3,
-              "pool_id": 9,
-              "type": 17
+              "pool_id": 10,
+              "type": 18
             },
             "renameByName": {
               "Value #B": "",
@@ -799,6 +826,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -813,7 +841,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               }
             ]
           },
@@ -845,7 +874,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -853,7 +882,7 @@
             "uid": "${datasource}"
           },
           "editorMode": "code",
-          "expr": "ceph_pool_stored{cluster=~\"$cluster|\",} *\n  on(pool_id) group_left(instance, name) ceph_pool_metadata{cluster=~\"$cluster|\",name=~\"$pool\"}",
+          "expr": "ceph_pool_bytes_used{cluster=~\"$cluster|\",} *\n  on(pool_id) group_left(instance, name) ceph_pool_metadata{cluster=~\"$cluster|\",name=~\"$pool\"}",
           "legendFormat": "{{name}}",
           "range": true,
           "refId": "A"
@@ -896,6 +925,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -910,7 +940,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -946,7 +977,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -1009,6 +1040,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -1023,7 +1055,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -1059,7 +1092,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -1122,6 +1155,7 @@
               "type": "linear"
             },
             "showPoints": "auto",
+            "showValues": false,
             "spanNulls": false,
             "stacking": {
               "group": "A",
@@ -1136,7 +1170,8 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green"
+                "color": "green",
+                "value": 0
               },
               {
                 "color": "red",
@@ -1172,7 +1207,7 @@
           "sort": "none"
         }
       },
-      "pluginVersion": "11.6.0",
+      "pluginVersion": "12.3.1",
       "targets": [
         {
           "datasource": {
@@ -1192,7 +1227,7 @@
   ],
   "preload": false,
   "refresh": "30s",
-  "schemaVersion": 41,
+  "schemaVersion": 42,
   "tags": [
     "ceph-mixin",
     "overview"
@@ -1284,5 +1319,5 @@
   "timezone": "",
   "title": "Ceph Application - Overview",
   "uid": "92LBIaJIz2",
-  "version": 1
+  "version": 5
 }