Dashboard improvements

Signed-off-by: BOUHOURS Antoine <[email protected]>
gridsuite · Jun 4, 2024 · 7e4a6b2 · 7e4a6b2
1 parent 43bfbb9
commit 7e4a6b2
Show file tree

Hide file tree

Showing 2 changed files with 128 additions and 7 deletions.
diff --git a/docker-compose/technical/grafana/dashboards/pods_supervision.json b/docker-compose/technical/grafana/dashboards/pods_supervision.json
@@ -801,7 +801,7 @@
           "disableTextWrap": false,
           "editorMode": "code",
           "exemplar": false,
-          "expr": "kube_pod_created{pod!~\".*cronjob.*\"} * 1000",
+          "expr": "kube_pod_created * 1000",
           "format": "table",
           "fullMetaSearch": false,
           "hide": false,
@@ -883,6 +883,22 @@
               ]
             }
           }
+        },
+        {
+          "id": "filterByValue",
+          "options": {
+            "filters": [
+              {
+                "config": {
+                  "id": "isNull",
+                  "options": {}
+                },
+                "fieldName": "Value #CPU Usage"
+              }
+            ],
+            "match": "any",
+            "type": "exclude"
+          }
         }
       ],
       "type": "table"
@@ -1117,6 +1133,13 @@
                   }
                 },
                 "fieldName": "last termination reason"
+              },
+              {
+                "config": {
+                  "id": "isNotNull",
+                  "options": {}
+                },
+                "fieldName": "last termination reason"
               }
             ],
             "match": "all",
@@ -1183,7 +1206,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1277,7 +1301,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1371,7 +1396,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1394,7 +1420,7 @@
               "calcs": [],
               "displayMode": "list",
               "placement": "bottom",
-              "showLegend": true
+              "showLegend": false
             },
             "tooltip": {
               "mode": "single",
@@ -1417,6 +1443,101 @@
           ],
           "title": "OOMKilled events",
           "type": "timeseries"
+        },
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "$datasource"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisBorderShow": false,
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "insertNulls": false,
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green",
+                    "value": null
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 8,
+            "w": 12,
+            "x": 12,
+            "y": 33
+          },
+          "id": 53,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": false
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "targets": [
+            {
+              "datasource": {
+                "type": "prometheus",
+                "uid": "${datasource}"
+              },
+              "editorMode": "code",
+              "expr": "(kube_pod_container_status_restarts_total - kube_pod_container_status_restarts_total offset 10m >= 1) and ignoring (reason) min_over_time(kube_pod_container_status_last_terminated_reason{reason=\"Error\"}[10m]) == 1",
+              "instant": false,
+              "legendFormat": "{{pod}}",
+              "range": true,
+              "refId": "A"
+            }
+          ],
+          "title": "Error events",
+          "type": "timeseries"
         }
       ],
       "title": "Detailed infos",

diff --git a/docker-compose/technical/grafana/dashboards/users_metrics.json b/docker-compose/technical/grafana/dashboards/users_metrics.json
@@ -160,7 +160,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "count(count by (user) (app_users))",
+          "expr": "count(count by (user) (app_users)) OR on() vector(0)",
           "interval": "",
           "legendFormat": "",
           "range": true,
@@ -256,7 +256,7 @@
           },
           "editorMode": "code",
           "exemplar": true,
-          "expr": "sum(app_users)",
+          "expr": "sum(app_users) OR on() vector(0)",
           "interval": "",
           "legendFormat": "",
           "range": true,