From d1e166633406d801db29386b27c534fa6aa4f285 Mon Sep 17 00:00:00 2001 From: BOUHOURS Antoine Date: Tue, 4 Jun 2024 14:54:33 +0200 Subject: [PATCH 1/4] Dashboard improvements Signed-off-by: BOUHOURS Antoine --- .../grafana/dashboards/pods_supervision.json | 131 +++++++++++++++++- .../grafana/dashboards/users_metrics.json | 4 +- 2 files changed, 128 insertions(+), 7 deletions(-) diff --git a/docker-compose/technical/grafana/dashboards/pods_supervision.json b/docker-compose/technical/grafana/dashboards/pods_supervision.json index ea90c672..fa192155 100644 --- 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", @@ -1408,7 +1434,7 @@ "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=\"OOMKilled\"}[10m]) == 1", + "expr": "(kube_pod_container_status_restarts_total - kube_pod_container_status_restarts_total offset 10m) and ignoring (reason) min_over_time(kube_pod_container_status_last_terminated_reason{reason=\"OOMKilled\"}[10m]) == 1", "instant": false, "legendFormat": "{{pod}}", "range": true, @@ -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": true + }, + "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) 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 index a0df72ec..d2b949ef 100644 --- 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, From 3aacd81bd3eafbb77224ed835f671281fc1ac87e Mon Sep 17 00:00:00 2001 From: BOUHOURS Antoine Date: Tue, 11 Jun 2024 09:08:25 +0200 Subject: [PATCH 2/4] Fix legends Signed-off-by: BOUHOURS Antoine --- .../technical/grafana/dashboards/users_metrics.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose/technical/grafana/dashboards/users_metrics.json b/docker-compose/technical/grafana/dashboards/users_metrics.json index d2b949ef..c3dcf30b 100644 --- a/docker-compose/technical/grafana/dashboards/users_metrics.json +++ b/docker-compose/technical/grafana/dashboards/users_metrics.json @@ -162,7 +162,7 @@ "exemplar": true, "expr": "count(count by (user) (app_users)) OR on() vector(0)", "interval": "", - "legendFormat": "", + "legendFormat": "User count", "range": true, "refId": "A" } @@ -258,12 +258,12 @@ "exemplar": true, "expr": "sum(app_users) OR on() vector(0)", "interval": "", - "legendFormat": "", + "legendFormat": "Connection count", "range": true, "refId": "A" } ], - "title": "Connexion count", + "title": "Connection count", "type": "timeseries" }, { From 5d878923005cf342c0d430f5950d2b1b680832f3 Mon Sep 17 00:00:00 2001 From: BOUHOURS Antoine Date: Mon, 8 Jul 2024 11:06:04 +0200 Subject: [PATCH 3/4] Improve logs formatting Signed-off-by: BOUHOURS Antoine --- docker-compose/technical/grafana/dashboards/logs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/technical/grafana/dashboards/logs.json b/docker-compose/technical/grafana/dashboards/logs.json index 9949dc1e..07a10ff5 100644 --- a/docker-compose/technical/grafana/dashboards/logs.json +++ b/docker-compose/technical/grafana/dashboards/logs.json @@ -183,7 +183,7 @@ "uid": "${datasource}" }, "editorMode": "code", - "expr": "{pod=\"$pod\"} |~ \"$search\"", + "expr": "{pod=\"$pod\"} |~ \"$search\" | pattern \" stdout F \" | line_format \"{{.message}}\"", "maxLines": 5000, "queryType": "range", "refId": "A" From 316ef39ba1cbedf0ed1f31040877788387916457 Mon Sep 17 00:00:00 2001 From: BOUHOURS Antoine Date: Mon, 8 Jul 2024 11:35:40 +0200 Subject: [PATCH 4/4] Improve logs display Signed-off-by: BOUHOURS Antoine --- docker-compose/technical/grafana/dashboards/logs.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/technical/grafana/dashboards/logs.json b/docker-compose/technical/grafana/dashboards/logs.json index 07a10ff5..ae86cfce 100644 --- a/docker-compose/technical/grafana/dashboards/logs.json +++ b/docker-compose/technical/grafana/dashboards/logs.json @@ -173,7 +173,7 @@ "showCommonLabels": false, "showLabels": false, "showTime": false, - "sortOrder": "Descending", + "sortOrder": "Ascending", "wrapLogMessage": true }, "targets": [