From 6f0ea04ff3e26251161dde5460fd14f4f94886e7 Mon Sep 17 00:00:00 2001
From: "Luke Mallon (Nalum)" <luke.mallon@weave.works>
Date: Thu, 9 Dec 2021 09:09:00 +0000
Subject: [PATCH] [refactor] Update JSON from Grafana export
Signed-off-by: Luke Mallon (Nalum) <luke.mallon@weave.works>
---
.../grafana/dashboards/control-plane.json | 288 +++++-------------
1 file changed, 80 insertions(+), 208 deletions(-)
diff --git a/manifests/monitoring/grafana/dashboards/control-plane.json b/manifests/monitoring/grafana/dashboards/control-plane.json
index 2aedd589..3eff4d57 100644
--- a/manifests/monitoring/grafana/dashboards/control-plane.json
+++ b/manifests/monitoring/grafana/dashboards/control-plane.json
@@ -8,22 +8,30 @@
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
+ "target": {
+ "limit": 100,
+ "matchAny": false,
+ "tags": [],
+ "type": "dashboard"
+ },
"type": "dashboard"
}
]
},
"editable": true,
+ "fiscalYearStartMonth": 0,
"gnetId": null,
"graphTooltip": 0,
- "iteration": 1596541513301,
+ "id": 29,
+ "iteration": 1639041352219,
"links": [],
+ "liveNow": false,
"panels": [
{
"datasource": "${DS_PROMETHEUS}",
"description": "",
"fieldConfig": {
"defaults": {
- "custom": {},
"decimals": 0,
"mappings": [],
"thresholds": {
@@ -62,9 +70,10 @@
"fields": "",
"values": false
},
+ "text": {},
"textMode": "value"
},
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"targets": [
{
"expr": "sum(go_info{namespace=\"$namespace\",pod=~\".*-controller-.*\"})",
@@ -83,7 +92,6 @@
"description": "",
"fieldConfig": {
"defaults": {
- "custom": {},
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -125,9 +133,10 @@
"fields": "",
"values": false
},
+ "text": {},
"textMode": "auto"
},
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"targets": [
{
"expr": "max(workqueue_longest_running_processor_seconds{namespace=\"$namespace\",pod=~\".*-controller-.*\"})",
@@ -147,7 +156,6 @@
"description": "",
"fieldConfig": {
"defaults": {
- "custom": {},
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -187,9 +195,10 @@
"values": false
},
"showThresholdLabels": false,
- "showThresholdMarkers": true
+ "showThresholdMarkers": true,
+ "text": {}
},
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"targets": [
{
"expr": "sum(go_memstats_alloc_bytes{namespace=\"$namespace\",pod=~\".*-controller-.*\"})",
@@ -208,9 +217,6 @@
"description": "",
"fieldConfig": {
"defaults": {
- "custom": {
- "align": null
- },
"mappings": [],
"thresholds": {
"mode": "absolute",
@@ -251,9 +257,10 @@
"fields": "",
"values": false
},
+ "text": {},
"textMode": "auto"
},
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"targets": [
{
"expr": "sum(rate(rest_client_requests_total{namespace=\"$namespace\",pod=~\".*-controller-.*\"}[1m]))",
@@ -267,131 +274,6 @@
"title": "API Requests",
"type": "stat"
},
- {
- "collapsed": false,
- "datasource": "${DS_PROMETHEUS}",
- "gridPos": {
- "h": 1,
- "w": 24,
- "x": 0,
- "y": 5
- },
- "id": 15,
- "panels": [],
- "title": "Resource Usage",
- "type": "row"
- },
- {
- "aliasColors": {},
- "bars": false,
- "dashLength": 10,
- "dashes": false,
- "datasource": "${DS_PROMETHEUS}",
- "description": "",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
- "fill": 1,
- "fillGradient": 0,
- "gridPos": {
- "h": 8,
- "w": 12,
- "x": 0,
- "y": 6
- },
- "hiddenSeries": false,
- "id": 8,
- "legend": {
- "alignAsTable": true,
- "avg": true,
- "current": true,
- "max": false,
- "min": false,
- "rightSide": false,
- "show": true,
- "total": false,
- "values": true
- },
- "lines": true,
- "linewidth": 1,
- "nullPointMode": "null",
- "percentage": false,
- "pluginVersion": "7.1.1",
- "pointradius": 2,
- "points": false,
- "renderer": "flot",
- "seriesOverrides": [],
- "spaceLength": 10,
- "stack": false,
- "steppedLine": false,
- "targets": [
- {
- "expr": "histogram_quantile(0.50, sum(rate(rest_client_request_latency_seconds_bucket{namespace=\"$namespace\"}[5m])) by (le))",
- "interval": "",
- "legendFormat": "P50",
- "refId": "A"
- },
- {
- "expr": "histogram_quantile(0.90, sum(rate(rest_client_request_latency_seconds_bucket{namespace=\"$namespace\"}[5m])) by (le))",
- "hide": true,
- "interval": "",
- "legendFormat": "P90",
- "refId": "B"
- },
- {
- "expr": "histogram_quantile(0.99, sum(rate(rest_client_request_latency_seconds_bucket{namespace=\"$namespace\"}[5m])) by (le))",
- "hide": false,
- "interval": "",
- "legendFormat": "P99",
- "refId": "C"
- }
- ],
- "thresholds": [],
- "timeFrom": null,
- "timeRegions": [],
- "timeShift": null,
- "title": "Kubernetes API Requests Duration",
- "tooltip": {
- "shared": true,
- "sort": 0,
- "value_type": "individual"
- },
- "type": "graph",
- "xaxis": {
- "buckets": null,
- "mode": "time",
- "name": null,
- "show": true,
- "values": []
- },
- "yaxes": [
- {
- "$$hashKey": "object:912",
- "format": "s",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- },
- {
- "$$hashKey": "object:913",
- "format": "short",
- "label": null,
- "logBase": 1,
- "max": null,
- "min": null,
- "show": true
- }
- ],
- "yaxis": {
- "align": false,
- "alignLevel": null
- }
- },
{
"aliasColors": {},
"bars": false,
@@ -400,19 +282,13 @@
"datasource": "${DS_PROMETHEUS}",
"decimals": null,
"description": "",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
"h": 8,
- "w": 12,
- "x": 12,
- "y": 6
+ "w": 24,
+ "x": 0,
+ "y": 5
},
"hiddenSeries": false,
"id": 21,
@@ -430,8 +306,11 @@
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
+ "options": {
+ "alertThreshold": true
+ },
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -499,18 +378,30 @@
"alignLevel": null
}
},
+ {
+ "collapsed": false,
+ "datasource": "${DS_PROMETHEUS}",
+ "fieldConfig": {
+ "defaults": {},
+ "overrides": []
+ },
+ "gridPos": {
+ "h": 1,
+ "w": 24,
+ "x": 0,
+ "y": 13
+ },
+ "id": 15,
+ "panels": [],
+ "title": "Resource Usage",
+ "type": "row"
+ },
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_PROMETHEUS}",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -534,8 +425,11 @@
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
+ "options": {
+ "alertThreshold": true
+ },
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -600,12 +494,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "${DS_PROMETHEUS}",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -629,8 +517,11 @@
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
+ "options": {
+ "alertThreshold": true
+ },
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -694,6 +585,10 @@
{
"collapsed": false,
"datasource": "${DS_PROMETHEUS}",
+ "fieldConfig": {
+ "defaults": {},
+ "overrides": []
+ },
"gridPos": {
"h": 1,
"w": 24,
@@ -711,12 +606,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "${DS_PROMETHEUS}",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -741,8 +630,11 @@
"lines": true,
"linewidth": 1,
"nullPointMode": "null",
+ "options": {
+ "alertThreshold": true
+ },
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -810,12 +702,6 @@
"datasource": "${DS_PROMETHEUS}",
"decimals": 2,
"description": "",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -841,7 +727,7 @@
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -916,12 +802,6 @@
"datasource": "${DS_PROMETHEUS}",
"decimals": 2,
"description": "",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -947,7 +827,7 @@
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1017,6 +897,10 @@
{
"collapsed": false,
"datasource": "${DS_PROMETHEUS}",
+ "fieldConfig": {
+ "defaults": {},
+ "overrides": []
+ },
"gridPos": {
"h": 1,
"w": 24,
@@ -1034,12 +918,6 @@
"dashLength": 10,
"dashes": false,
"datasource": "${DS_PROMETHEUS}",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -1065,7 +943,7 @@
"linewidth": 1,
"nullPointMode": "null as zero",
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1147,12 +1025,6 @@
"datasource": "${DS_PROMETHEUS}",
"decimals": 2,
"description": "",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -1178,7 +1050,7 @@
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1253,12 +1125,6 @@
"datasource": "${DS_PROMETHEUS}",
"decimals": 2,
"description": "",
- "fieldConfig": {
- "defaults": {
- "custom": {}
- },
- "overrides": []
- },
"fill": 1,
"fillGradient": 0,
"gridPos": {
@@ -1284,7 +1150,7 @@
"linewidth": 1,
"nullPointMode": "null",
"percentage": false,
- "pluginVersion": "7.1.1",
+ "pluginVersion": "8.2.3",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1353,7 +1219,7 @@
}
],
"refresh": "10s",
- "schemaVersion": 26,
+ "schemaVersion": 31,
"style": "light",
"tags": [
"flux"
@@ -1366,6 +1232,8 @@
"text": "Prometheus",
"value": "Prometheus"
},
+ "description": null,
+ "error": null,
"hide": 2,
"includeAll": false,
"label": null,
@@ -1387,19 +1255,23 @@
},
"datasource": "${DS_PROMETHEUS}",
"definition": "workqueue_work_duration_seconds_count",
+ "description": null,
+ "error": null,
"hide": 0,
"includeAll": false,
"label": null,
"multi": false,
"name": "namespace",
"options": [],
- "query": "workqueue_work_duration_seconds_count",
+ "query": {
+ "query": "workqueue_work_duration_seconds_count",
+ "refId": "Prometheus-namespace-Variable-Query"
+ },
"refresh": 2,
"regex": "/.*namespace=\"([^\"]*).*/",
"skipUrlSync": false,
"sort": 0,
"tagValuesQuery": "",
- "tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
@@ -1426,5 +1298,5 @@
"timezone": "",
"title": "Flux Control Plane",
"uid": "flux-control-plane",
- "version": 1
-}
+ "version": 2
+}
\ No newline at end of file
--
GitLab