updating review comment

Signed-off-by: Anushruti Sharma <anushruti10116@gmail.com>
updating changes

diff --git a/monitoring/ceph-mixin/dashboards/rgw.libsonnet b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
index 0b6c10e988cd24a4187868150d8a73b2c6a830f8..ed417437c34b17da9151d11799016d2597109d06 100644 (file)
--- a/monitoring/ceph-mixin/dashboards/rgw.libsonnet
+++ b/monitoring/ceph-mixin/dashboards/rgw.libsonnet
@@ -310,18 +310,6 @@ local g = import 'grafonnet/grafana.libsonnet';
         ''
       )
     )
-    .addTemplate(
-      $.addTemplateSchema(
-        'topic',
-        '$datasource',
-        'label_values(ceph_rgw_topic_persistent_topic_len,topic)',
-        1,
-        true,
-        1,
-        'Topic',
-        ''
-      )
-    )
     .addPanels([
       $.addRowSchema(false,
                      true,
@@ -726,30 +714,30 @@ local g = import 'grafonnet/grafana.libsonnet';
         'short',
         |||
           (
-           ceph_rgw_topic_persistent_topic_len{topic=~"$topic"}
+           ceph_rgw_topic_persistent_topic_len
           )
         |||,
         '{{topic}}',
         0,
         28,
-        24,
-        7
+        12,
+        8
       ),
        RgwOverviewPanel(
         'Persistent Topic Size',
         '',
-        'bytes',
+        'deckbytes',
         'short',
         |||
           (
-           ceph_rgw_topic_persistent_topic_size{topic=~"$topic"}
+           ceph_rgw_topic_persistent_topic_size
           )
         |||,
         '{{topic}}',
-        0,
-        35,
-        24,
-        7
+        12,
+        28,
+        12,
+        8
       ),
     ]),
   'radosgw-detail.json':

diff --git a/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json b/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
index 768d7b42225be00c7854a6beacae1dc0f18aa746..28f5627473de9262ba0c1841036728936d2b96f7 100644 (file)
--- a/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
+++ b/monitoring/ceph-mixin/dashboards_out/radosgw-overview.json
@@ -1224,8 +1224,8 @@
          "fill": 1,
          "fillGradient": 0,
          "gridPos": {
-            "h": 7,
-            "w": 24,
+            "h": 8,
+            "w": 12,
             "x": 0,
             "y": 28
          },
@@ -1257,7 +1257,7 @@
          "steppedLine": false,
          "targets": [
             {
-               "expr": "(\n ceph_rgw_topic_persistent_topic_len{topic=~\"$topic\"}\n)\n",
+               "expr": "(\n ceph_rgw_topic_persistent_topic_len\n)\n",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "{{topic}}",
@@ -1313,16 +1313,16 @@
                   "fillOpacity": 8,
                   "showPoints": "never"
                },
-               "unit": "bytes"
+               "unit": "deckbytes"
             }
          },
          "fill": 1,
          "fillGradient": 0,
          "gridPos": {
-            "h": 7,
-            "w": 24,
-            "x": 0,
-            "y": 35
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 28
          },
          "id": 16,
          "legend": {
@@ -1352,7 +1352,7 @@
          "steppedLine": false,
          "targets": [
             {
-               "expr": "(\n ceph_rgw_topic_persistent_topic_size{topic=~\"$topic\"}\n)\n",
+               "expr": "(\n ceph_rgw_topic_persistent_topic_size\n)\n",
                "format": "time_series",
                "intervalFactor": 1,
                "legendFormat": "{{topic}}",
@@ -1378,7 +1378,7 @@
          },
          "yaxes": [
             {
-               "format": "bytes",
+               "format": "deckbytes",
                "label": null,
                "logBase": 1,
                "max": null,
@@ -1519,26 +1519,6 @@
             "tagsQuery": "",
             "type": "query",
             "useTags": false
-         },
-         {
-            "allValue": null,
-            "current": { },
-            "datasource": "$datasource",
-            "hide": 0,
-            "includeAll": true,
-            "label": "Topic",
-            "multi": false,
-            "name": "topic",
-            "options": [ ],
-            "query": "label_values(ceph_rgw_topic_persistent_topic_len,topic)",
-            "refresh": 1,
-            "regex": "",
-            "sort": 1,
-            "tagValuesQuery": "",
-            "tags": [ ],
-            "tagsQuery": "",
-            "type": "query",
-            "useTags": false
          }
       ]
    },