Fixing bugs found during testing in rolling restart and set dashboards (

#87) * sit_nov_release - testing fixed quety to use bottomk fixed data-type to use bytes(IEC) removed unnecessary query in set dashboard fixed parenthesis in query in set dashboard * sit-nov-release testing removed inputs and elements section
aerospike · Nov 8, 2023 · 4e275f0 · 4e275f0
1 parent 671eb64
commit 4e275f0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 24 deletions.
diff --git a/config/grafana/dashboards/set.json b/config/grafana/dashboards/set.json
@@ -925,7 +925,7 @@
               }
             ]
           },
-          "unit": "decbytes"
+          "unit": "bytes"
         },
         "overrides": []
       },
@@ -959,7 +959,7 @@
             "uid": "${DS_AEROSPIKE_PROMETHEUS}"
           },
           "editorMode": "code",
-          "expr": "sum( aerospike_sets_memory_data_bytes{job=\"$job_name\", cluster_name=~\"$cluster|$^\",  service=~\"$node|$^\", ns=~\"$namespace\", set=~\"$set\", })\nor\n aerospike_sets_device_data_bytes{job=\"$job_name\", cluster_name=~\"$cluster|$^\",  service=~\"$node|$^\", ns=~\"$namespace\", set=~\"$set\", } \n",
+          "expr": "sum( aerospike_sets_memory_data_bytes{job=\"$job_name\", cluster_name=~\"$cluster|$^\",  service=~\"$node|$^\", ns=~\"$namespace\", set=~\"$set\", }\nor\n aerospike_sets_device_data_bytes{job=\"$job_name\", cluster_name=~\"$cluster|$^\",  service=~\"$node|$^\", ns=~\"$namespace\", set=~\"$set\", })\n",
           "hide": false,
           "legendFormat": "Memory",
           "range": true,
@@ -1025,18 +1025,6 @@
           "legendFormat": "{{set}} Limit ",
           "range": true,
           "refId": "stop_writes_size"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${DS_AEROSPIKE_PROMETHEUS}"
-          },
-          "editorMode": "code",
-          "expr": "\n aerospike_sets_device_data_bytes{job=\"$job_name\", cluster_name=~\"$cluster|$^\",  service=~\"$node|$^\", ns=~\"$namespace\", set=~\"$set|$^\" }\n",
-          "hide": false,
-          "legendFormat": "{{service}} : Device",
-          "range": true,
-          "refId": "A"
         }
       ],
       "title": "Data used (bytes) ",
@@ -1983,6 +1971,6 @@
   "timezone": "",
   "title": "Set Dashboard",
   "uid": "A4YjjqbVk",
-  "version": 2,
+  "version": 3,
   "weekStart": ""
 }
diff --git a/config/grafana/dashboards/usecases/rolling_restart.json b/config/grafana/dashboards/usecases/rolling_restart.json
@@ -3658,7 +3658,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -3793,7 +3794,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -3904,7 +3906,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -4156,7 +4159,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -4255,7 +4259,7 @@
               "refId": "sys_kernel_cpu"
             }
           ],
-          "title": "% CPU - Process, Total, User, Kernel",
+          "title": "% CPU - Process, Total, User, Kernel (topk)",
           "type": "timeseries"
         },
         {
@@ -4304,7 +4308,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -4431,7 +4436,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -4487,7 +4493,7 @@
                 "uid": "${DS_AEROSPIKE_PROMETHEUS}"
               },
               "editorMode": "code",
-              "expr": "topk($topk_limit, \nsum by (service) (\n  aerospike_node_stats_system_free_mem_pct{cluster_name=~\"$cluster\", service=~\"$node|$^\"})\n)",
+              "expr": "bottomk($topk_limit, \nsum by (service) (\n  aerospike_node_stats_system_free_mem_pct{cluster_name=~\"$cluster\", service=~\"$node|$^\"})\n)",
               "hide": false,
               "interval": "",
               "legendFormat": "{{service}} - Free (bottomk)",
@@ -5277,6 +5283,6 @@
   "timezone": "",
   "title": "Rolling Restarts",
   "uid": "9p1Tc1uVz",
-  "version": 2,
+  "version": 4,
   "weekStart": ""
 }