From 6280dbe8a31b9fe9afcf28041cecd29382bfa437 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Wed, 25 Oct 2023 17:17:25 -0300 Subject: [PATCH] 20953: Adds TLS certificate expiration red/yellow/green light on main dashboard Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- .../aws/dashboards/arvados_overview.json | 237 +++++++++++++++--- 1 file changed, 200 insertions(+), 37 deletions(-) diff --git a/tools/salt-install/config_examples/multi_host/aws/dashboards/arvados_overview.json b/tools/salt-install/config_examples/multi_host/aws/dashboards/arvados_overview.json index 36f24c2c4d..daf8f2f0a7 100644 --- a/tools/salt-install/config_examples/multi_host/aws/dashboards/arvados_overview.json +++ b/tools/salt-install/config_examples/multi_host/aws/dashboards/arvados_overview.json @@ -9,6 +9,33 @@ "pluginName": "Prometheus" } ], + "__elements": {}, + "__requires": [ + { + "type": "grafana", + "id": "grafana", + "name": "Grafana", + "version": "10.2.0" + }, + { + "type": "panel", + "id": "graph", + "name": "Graph (old)", + "version": "" + }, + { + "type": "datasource", + "id": "prometheus", + "name": "Prometheus", + "version": "1.0.0" + }, + { + "type": "panel", + "id": "table", + "name": "Table", + "version": "" + } + ], "annotations": { "list": [ { @@ -34,10 +61,132 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "id": 6, + "id": null, "links": [], "liveNow": false, "panels": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "fieldConfig": { + "defaults": { + "color": { + "mode": "thresholds" + }, + "custom": { + "align": "center", + "cellOptions": { + "type": "auto" + }, + "inspect": false + }, + "decimals": 2, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + } + ] + }, + "unit": "dtdurations" + }, + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "Earliest SSL cert expiration" + }, + "properties": [ + { + "id": "thresholds", + "value": { + "mode": "absolute", + "steps": [ + { + "color": "red", + "value": null + }, + { + "color": "yellow", + "value": __TLS_EXPIRATION_YELLOW__ + }, + { + "color": "green", + "value": __TLS_EXPIRATION_GREEN__ + } + ] + } + }, + { + "id": "custom.cellOptions", + "value": { + "type": "color-background" + } + } + ] + } + ] + }, + "gridPos": { + "h": 3, + "w": 24, + "x": 0, + "y": 0 + }, + "id": 35, + "links": [], + "options": { + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" + ], + "show": false + }, + "showHeader": false + }, + "pluginVersion": "10.2.0", + "targets": [ + { + "datasource": { + "type": "prometheus", + "uid": "${DS_PROMETHEUS}" + }, + "editorMode": "code", + "exemplar": false, + "expr": "min(probe_ssl_earliest_cert_expiry)-time()", + "format": "time_series", + "instant": true, + "legendFormat": "__auto", + "range": false, + "refId": "A" + } + ], + "title": "Earliest SSL certificate expiration", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": { + "Time": true + }, + "indexByName": {}, + "renameByName": { + "Time": "", + "min(probe_ssl_earliest_cert_expiry)-time()": "Earliest SSL cert expiration" + } + } + } + ], + "type": "table" + }, { "aliasColors": {}, "bars": false, @@ -53,7 +202,7 @@ "h": 8, "w": 12, "x": 0, - "y": 0 + "y": 3 }, "hiddenSeries": false, "id": 34, @@ -73,7 +222,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -153,7 +302,7 @@ "h": 8, "w": 12, "x": 12, - "y": 0 + "y": 3 }, "hiddenSeries": false, "id": 14, @@ -173,7 +322,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -248,7 +397,7 @@ "h": 8, "w": 12, "x": 0, - "y": 8 + "y": 11 }, "hiddenSeries": false, "id": 8, @@ -268,7 +417,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -342,7 +491,7 @@ "h": 8, "w": 12, "x": 12, - "y": 8 + "y": 11 }, "hiddenSeries": false, "id": 12, @@ -362,7 +511,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -456,7 +605,7 @@ "h": 8, "w": 12, "x": 0, - "y": 16 + "y": 19 }, "hiddenSeries": false, "id": 10, @@ -476,7 +625,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -544,7 +693,7 @@ "h": 8, "w": 12, "x": 12, - "y": 16 + "y": 19 }, "hiddenSeries": false, "id": 24, @@ -564,7 +713,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -648,7 +797,7 @@ "h": 8, "w": 12, "x": 0, - "y": 24 + "y": 27 }, "hiddenSeries": false, "id": 6, @@ -668,7 +817,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -768,7 +917,7 @@ "h": 8, "w": 12, "x": 12, - "y": 24 + "y": 27 }, "hiddenSeries": false, "id": 22, @@ -788,7 +937,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -867,7 +1016,7 @@ "h": 8, "w": 12, "x": 0, - "y": 32 + "y": 35 }, "hiddenSeries": false, "id": 32, @@ -887,7 +1036,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -961,7 +1110,7 @@ "h": 8, "w": 12, "x": 12, - "y": 32 + "y": 35 }, "hiddenSeries": false, "id": 2, @@ -981,7 +1130,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1055,7 +1204,7 @@ "h": 8, "w": 12, "x": 0, - "y": 40 + "y": 43 }, "hiddenSeries": false, "id": 16, @@ -1075,7 +1224,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1151,7 +1300,7 @@ "h": 8, "w": 12, "x": 12, - "y": 40 + "y": 43 }, "hiddenSeries": false, "id": 4, @@ -1171,7 +1320,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.3", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1245,7 +1394,7 @@ "h": 8, "w": 12, "x": 0, - "y": 48 + "y": 51 }, "hiddenSeries": false, "id": 18, @@ -1261,8 +1410,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null as zero", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "8.4.5", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1332,7 +1484,7 @@ "h": 8, "w": 12, "x": 12, - "y": 48 + "y": 51 }, "hiddenSeries": false, "id": 26, @@ -1348,8 +1500,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null as zero", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "8.4.5", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1423,7 +1578,7 @@ "h": 8, "w": 12, "x": 0, - "y": 56 + "y": 59 }, "hiddenSeries": false, "id": 20, @@ -1439,8 +1594,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null as zero", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "8.4.5", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1518,7 +1676,7 @@ "h": 8, "w": 12, "x": 0, - "y": 64 + "y": 67 }, "hiddenSeries": false, "id": 28, @@ -1534,8 +1692,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null as zero", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "8.4.5", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1603,7 +1764,7 @@ "h": 8, "w": 12, "x": 0, - "y": 72 + "y": 75 }, "hiddenSeries": false, "id": 30, @@ -1619,8 +1780,11 @@ "lines": true, "linewidth": 1, "nullPointMode": "null", + "options": { + "alertThreshold": true + }, "percentage": false, - "pluginVersion": "8.4.5", + "pluginVersion": "10.2.0", "pointradius": 2, "points": false, "renderer": "flot", @@ -1678,7 +1842,6 @@ "refresh": "10s", "revision": 1, "schemaVersion": 38, - "style": "dark", "tags": [], "templating": { "list": [] @@ -1703,6 +1866,6 @@ "timezone": "", "title": "Arvados cluster overview", "uid": "ArvadosClusterOverviewDashboard", - "version": 6, + "version": 1, "weekStart": "" } \ No newline at end of file -- 2.30.2