From 05988a8956cbbb36cbfdea758d2f2cc095c5e501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Wed, 14 Feb 2024 11:03:46 +0100 Subject: [PATCH] chore: re-import global, namespace and nodes (#98) --- dashboards/k8s-views-global.json | 92 ++++++++++++--------- dashboards/k8s-views-namespaces.json | 87 +++++++++----------- dashboards/k8s-views-nodes.json | 119 ++++++++++++++------------- 3 files changed, 155 insertions(+), 143 deletions(-) diff --git a/dashboards/k8s-views-global.json b/dashboards/k8s-views-global.json index 89a3045..f94e5ed 100644 --- a/dashboards/k8s-views-global.json +++ b/dashboards/k8s-views-global.json @@ -9,25 +9,25 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ + { + "type": "panel", + "id": "bargauge", + "name": "Bar gauge", + "version": "" + }, { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "10.3.1" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "timeseries", - "name": "Time series", - "version": "" + "version": "1.0.0" }, { "type": "panel", @@ -37,8 +37,8 @@ }, { "type": "panel", - "id": "gauge", - "name": "Gauge", + "id": "timeseries", + "name": "Time series", "version": "" } ], @@ -114,7 +114,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -127,6 +128,7 @@ "id": 77, "options": { "displayMode": "lcd", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, "namePlacement": "auto", @@ -139,9 +141,10 @@ "values": false }, "showUnfilled": true, + "sizing": "auto", "valueMode": "color" }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -211,7 +214,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -224,6 +228,7 @@ "id": 78, "options": { "displayMode": "lcd", + "maxVizHeight": 300, "minVizHeight": 10, "minVizWidth": 0, "namePlacement": "auto", @@ -236,10 +241,11 @@ "values": false }, "showUnfilled": true, + "sizing": "auto", "text": {}, "valueMode": "color" }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -299,7 +305,8 @@ "value": null } ] - } + }, + "unitScale": true }, "overrides": [] }, @@ -322,11 +329,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "value", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -399,7 +407,8 @@ } ] }, - "unit": "short" + "unit": "short", + "unitScale": true }, "overrides": [] }, @@ -604,7 +613,8 @@ "value": null } ] - } + }, + "unitScale": true }, "overrides": [] }, @@ -627,11 +637,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "value", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -665,7 +676,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -688,11 +700,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -765,7 +778,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -788,11 +802,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -864,7 +879,8 @@ "value": null } ] - } + }, + "unitScale": true }, "overrides": [] }, @@ -887,11 +903,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "value", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -989,7 +1006,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -1089,7 +1107,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -1196,7 +1215,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -1298,7 +1318,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -2858,7 +2879,7 @@ } ], "refresh": "30s", - "schemaVersion": 38, + "schemaVersion": 39, "tags": [ "Kubernetes", "Prometheus" @@ -2884,12 +2905,7 @@ "type": "datasource" }, { - "current": { - "isNone": true, - "selected": false, - "text": "None", - "value": "" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" @@ -2968,6 +2984,6 @@ "timezone": "", "title": "Kubernetes / Views / Global", "uid": "k8s_views_global", - "version": 36, + "version": 37, "weekStart": "" } diff --git a/dashboards/k8s-views-namespaces.json b/dashboards/k8s-views-namespaces.json index 22d8919..d51631e 100644 --- a/dashboards/k8s-views-namespaces.json +++ b/dashboards/k8s-views-namespaces.json @@ -9,30 +9,36 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ + { + "type": "panel", + "id": "gauge", + "name": "Gauge", + "version": "" + }, { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "10.3.1" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" + "version": "1.0.0" }, { "type": "panel", - "id": "timeseries", - "name": "Time series", + "id": "stat", + "name": "Stat", "version": "" }, { "type": "panel", - "id": "stat", - "name": "Stat", + "id": "timeseries", + "name": "Time series", "version": "" } ], @@ -110,7 +116,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -134,9 +141,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -184,7 +192,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -208,9 +217,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -283,7 +293,8 @@ } ] }, - "unit": "short" + "unit": "short", + "unitScale": true }, "overrides": [] }, @@ -446,7 +457,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -469,11 +481,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -546,7 +559,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -569,11 +583,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -701,7 +716,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -799,7 +815,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -893,8 +910,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -2137,7 +2153,7 @@ } ], "refresh": "30s", - "schemaVersion": 38, + "schemaVersion": 39, "tags": [ "Kubernetes", "Prometheus" @@ -2145,11 +2161,7 @@ "templating": { "list": [ { - "current": { - "selected": false, - "text": "", - "value": "" - }, + "current": {}, "hide": 0, "includeAll": false, "multi": false, @@ -2163,12 +2175,7 @@ "type": "datasource" }, { - "current": { - "isNone": true, - "selected": false, - "text": "None", - "value": "" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" @@ -2191,15 +2198,7 @@ "type": "query" }, { - "current": { - "selected": true, - "text": [ - "monitoring" - ], - "value": [ - "monitoring" - ] - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" @@ -2271,11 +2270,7 @@ "type": "custom" }, { - "current": { - "selected": false, - "text": "All", - "value": "$__all" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" diff --git a/dashboards/k8s-views-nodes.json b/dashboards/k8s-views-nodes.json index 5d135d7..2a4221a 100644 --- a/dashboards/k8s-views-nodes.json +++ b/dashboards/k8s-views-nodes.json @@ -9,25 +9,25 @@ "pluginName": "Prometheus" } ], - "__elements": [], + "__elements": {}, "__requires": [ + { + "type": "panel", + "id": "gauge", + "name": "Gauge", + "version": "" + }, { "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "8.3.4" + "version": "10.3.1" }, { "type": "datasource", "id": "prometheus", "name": "Prometheus", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "timeseries", - "name": "Time series", - "version": "" + "version": "1.0.0" }, { "type": "panel", @@ -37,14 +37,14 @@ }, { "type": "panel", - "id": "gauge", - "name": "Gauge", + "id": "table", + "name": "Table", "version": "" }, { "type": "panel", - "id": "table", - "name": "Table", + "id": "timeseries", + "name": "Time series", "version": "" } ], @@ -122,7 +122,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -146,9 +147,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -194,7 +196,8 @@ } ] }, - "unit": "percentunit" + "unit": "percentunit", + "unitScale": true }, "overrides": [] }, @@ -218,9 +221,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -255,7 +259,8 @@ "value": null } ] - } + }, + "unitScale": true }, "overrides": [] }, @@ -278,11 +283,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "value", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -336,7 +342,8 @@ "value": 80 } ] - } + }, + "unitScale": true }, "overrides": [ { @@ -421,7 +428,7 @@ "showHeader": true, "sortBy": [] }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -541,7 +548,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -564,11 +572,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -604,7 +613,8 @@ } ] }, - "unit": "none" + "unit": "none", + "unitScale": true }, "overrides": [] }, @@ -627,11 +637,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -666,7 +677,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -689,11 +701,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -729,7 +742,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -752,11 +766,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -800,7 +815,8 @@ } ] }, - "unit": "s" + "unit": "s", + "unitScale": true }, "overrides": [] }, @@ -823,11 +839,12 @@ "fields": "", "values": false }, + "showPercentChange": false, "text": {}, "textMode": "auto", "wideLayout": true }, - "pluginVersion": "10.2.2", + "pluginVersion": "10.3.1", "targets": [ { "datasource": { @@ -922,7 +939,8 @@ } ] }, - "unit": "percent" + "unit": "percent", + "unitScale": true }, "overrides": [] }, @@ -1022,7 +1040,8 @@ } ] }, - "unit": "bytes" + "unit": "bytes", + "unitScale": true }, "overrides": [] }, @@ -1181,8 +1200,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -1277,8 +1295,7 @@ "mode": "absolute", "steps": [ { - "color": "green", - "value": null + "color": "green" }, { "color": "red", @@ -3772,7 +3789,7 @@ } ], "refresh": "30s", - "schemaVersion": 38, + "schemaVersion": 39, "tags": [ "Kubernetes", "Prometheus" @@ -3780,11 +3797,7 @@ "templating": { "list": [ { - "current": { - "selected": false, - "text": "", - "value": "" - }, + "current": {}, "hide": 0, "includeAll": false, "multi": false, @@ -3798,11 +3811,7 @@ "type": "datasource" }, { - "current": { - "selected": false, - "text": "None", - "value": "" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" @@ -3872,11 +3881,7 @@ "type": "custom" }, { - "current": { - "selected": false, - "text": "", - "value": "" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" @@ -3898,11 +3903,7 @@ "type": "query" }, { - "current": { - "selected": false, - "text": "", - "value": "" - }, + "current": {}, "datasource": { "type": "prometheus", "uid": "${datasource}" @@ -3933,6 +3934,6 @@ "timezone": "", "title": "Kubernetes / Views / Nodes", "uid": "k8s_views_nodes", - "version": 28, + "version": 29, "weekStart": "" }