From 67b2dc25d4cd42ed9b79d474b9b9afba246c0cd5 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Tue, 14 May 2024 23:06:33 +0100 Subject: [PATCH 1/4] Bump flake.lock --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1b31b41a..8ffe3fdf 100644 --- a/flake.lock +++ b/flake.lock @@ -13,11 +13,11 @@ ] }, "locked": { - "lastModified": 1714835121, - "narHash": "sha256-HjCulMw/n6LDt25ixfSfOaNbk87D+TQuWrQKPUgfJWs=", + "lastModified": 1715237858, + "narHash": "sha256-2UdDTeUtmVkzswS/8ql7Sa+LD2UWP0rXnhYHg7hHfO8=", "owner": "barrucadu", "repo": "bookdb", - "rev": "b2b4e03fb214b07c6f3c6bc2f06c75aca75a3173", + "rev": "7edef34f315d4e01536bc96ff9ae875e2190afda", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1714723921, - "narHash": "sha256-DV8cIiqfcNkNc95D/69srRBAtf6jBSynF56NlV78U4c=", + "lastModified": 1715202300, + "narHash": "sha256-RvT2ByuiU1ULhczRVPyCdm0IvaXvV39cDZg5SV8E5Nw=", "owner": "barrucadu", "repo": "bookmarks", - "rev": "80f5abfc3dddea010bc653390fbf0e4b63fe16f0", + "rev": "2ef386d15eadd73b694d24890135bc63b95e4613", "type": "github" }, "original": { @@ -92,11 +92,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714685007, - "narHash": "sha256-Q4ddhb5eC5pwci0QhAapFwnsc8X8H9ZMQiWpsofBsDc=", + "lastModified": 1715542476, + "narHash": "sha256-FF593AtlzQqa8JpzrXyRws4CeKbc5W86o8tHt4nRfIg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "383ffe076d9b633a2e97b6e4dd97fc15fcf30159", + "rev": "44072e24566c5bcc0b7aa9178a0104f4cfffab19", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1714788771, - "narHash": "sha256-UxFPoIskGHp1lFetK55jsuCvagqLXVE9pD+IjWQUWiY=", + "lastModified": 1715652909, + "narHash": "sha256-aCLEDvzL1j51Rf2mCFOqK1mieMO3pAn5ItCIdr5h2LA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b37d96b614c38922674fd8d81ebc2fe807667a5b", + "rev": "1d8fcbbfcfd3476c2665384a46ee9d07ef2b4dd9", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1713892811, - "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=", + "lastModified": 1715482972, + "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd", + "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e", "type": "github" }, "original": { From 1ff270bb11f2fdc850ae40c11b1810a1a710a797 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Tue, 14 May 2024 22:49:33 +0100 Subject: [PATCH 2/4] Bump grafana dashboards --- hosts/nyarlathotep/dashboards/finance.json | 133 ++++++++--- hosts/nyarlathotep/dashboards/smart-home.json | 20 +- shared/concourse/dashboard.json | 225 ++++++++++++++++-- .../dashboards/container-stats-detailed.json | 38 ++- shared/dashboards/node-stats-detailed.json | 80 ++++--- shared/resolved/dashboard.json | 29 ++- 6 files changed, 410 insertions(+), 115 deletions(-) diff --git a/hosts/nyarlathotep/dashboards/finance.json b/hosts/nyarlathotep/dashboards/finance.json index 36c7aa0a..b6e21d23 100644 --- a/hosts/nyarlathotep/dashboards/finance.json +++ b/hosts/nyarlathotep/dashboards/finance.json @@ -76,9 +76,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -149,9 +150,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -223,9 +225,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -295,9 +298,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -365,9 +369,10 @@ "values": false }, "text": {}, - "textMode": "value" + "textMode": "value", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -437,9 +442,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -523,9 +529,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -554,6 +561,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -567,6 +575,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "stepAfter", "lineWidth": 1, "pointSize": 5, @@ -1092,9 +1101,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -1232,9 +1242,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -1316,9 +1327,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -1400,9 +1412,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -1484,9 +1497,10 @@ "values": false }, "text": {}, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -1515,6 +1529,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1528,6 +1543,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "stepAfter", "lineWidth": 1, "pointSize": 5, @@ -1689,6 +1705,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1702,6 +1719,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "stepAfter", "lineWidth": 1, "pointSize": 5, @@ -1866,6 +1884,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1879,6 +1898,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "stepAfter", "lineWidth": 1, "pointSize": 5, @@ -2078,6 +2098,8 @@ }, "id": 78, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2088,9 +2110,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2149,6 +2172,8 @@ }, "id": 31, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2159,9 +2184,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2220,6 +2246,8 @@ }, "id": 32, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2230,9 +2258,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2292,6 +2321,8 @@ }, "id": 42, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2302,9 +2333,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2361,6 +2393,8 @@ }, "id": 88, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2371,9 +2405,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2432,6 +2467,8 @@ }, "id": 37, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2442,9 +2479,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2503,6 +2541,8 @@ }, "id": 33, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2513,9 +2553,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2574,6 +2615,8 @@ }, "id": 38, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2584,9 +2627,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2646,6 +2690,8 @@ }, "id": 34, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2656,9 +2702,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2717,6 +2764,8 @@ }, "id": 35, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2727,9 +2776,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2788,6 +2838,8 @@ }, "id": 36, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2798,9 +2850,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -2859,6 +2912,8 @@ }, "id": 40, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2869,9 +2924,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -3514,8 +3570,7 @@ ], "refresh": "", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -3530,7 +3585,7 @@ "current": { "selected": false, "text": "promscale", - "value": "promscale" + "value": "P3354215654B729CB" }, "hide": 0, "includeAll": false, diff --git a/hosts/nyarlathotep/dashboards/smart-home.json b/hosts/nyarlathotep/dashboards/smart-home.json index 71a4d563..609b7ab1 100644 --- a/hosts/nyarlathotep/dashboards/smart-home.json +++ b/hosts/nyarlathotep/dashboards/smart-home.json @@ -94,9 +94,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -126,6 +127,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -139,6 +141,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -235,6 +238,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -248,6 +252,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -341,6 +346,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -354,6 +360,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -447,6 +454,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -460,6 +468,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -545,6 +554,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -558,6 +568,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -643,6 +654,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -656,6 +668,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -733,8 +746,7 @@ ], "refresh": "30s", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [] diff --git a/shared/concourse/dashboard.json b/shared/concourse/dashboard.json index a8007e80..9621b91c 100644 --- a/shared/concourse/dashboard.json +++ b/shared/concourse/dashboard.json @@ -3,7 +3,10 @@ "list": [ { "builtIn": 1, - "datasource": "-- Grafana --", + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "enable": true, "hide": true, "iconColor": "rgba(0, 211, 255, 1)", @@ -21,7 +24,6 @@ "editable": true, "fiscalYearStartMonth": 0, "graphTooltip": 0, - "iteration": 1648334400998, "links": [], "liveNow": false, "panels": [ @@ -36,6 +38,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -47,6 +52,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -90,8 +96,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "multi", @@ -126,6 +133,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -137,6 +147,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -180,8 +191,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "multi", @@ -219,6 +231,21 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "fieldConfig": { + "defaults": { + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } + } + }, + "overrides": [] + }, "gridPos": { "h": 8, "w": 6, @@ -233,6 +260,45 @@ "show": true }, "maxDataPoints": 25, + "options": { + "calculate": false, + "calculation": {}, + "cellGap": 2, + "cellValues": {}, + "color": { + "exponent": 0.5, + "fill": "#b4ff00", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Spectral", + "steps": 128 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "showValue": "never", + "tooltip": { + "show": true, + "showColorScale": false, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false, + "unit": "dtdurations" + } + }, + "pluginVersion": "10.2.6", "reverseYBuckets": false, "targets": [ { @@ -279,6 +345,21 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, + "fieldConfig": { + "defaults": { + "custom": { + "hideFrom": { + "legend": false, + "tooltip": false, + "viz": false + }, + "scaleDistribution": { + "type": "linear" + } + } + }, + "overrides": [] + }, "gridPos": { "h": 8, "w": 6, @@ -293,6 +374,45 @@ "show": true }, "maxDataPoints": 25, + "options": { + "calculate": false, + "calculation": {}, + "cellGap": 2, + "cellValues": {}, + "color": { + "exponent": 0.5, + "fill": "#b4ff00", + "mode": "scheme", + "reverse": false, + "scale": "exponential", + "scheme": "Spectral", + "steps": 128 + }, + "exemplars": { + "color": "rgba(255,0,255,0.7)" + }, + "filterValues": { + "le": 1e-9 + }, + "legend": { + "show": true + }, + "rowsFrame": { + "layout": "auto" + }, + "showValue": "never", + "tooltip": { + "show": true, + "showColorScale": false, + "yHistogram": false + }, + "yAxis": { + "axisPlacement": "left", + "reverse": false, + "unit": "dtdurations" + } + }, + "pluginVersion": "10.2.6", "reverseYBuckets": false, "targets": [ { @@ -336,6 +456,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -347,6 +470,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -391,7 +515,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -426,6 +551,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -437,6 +565,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -481,7 +610,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -528,6 +658,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -539,6 +672,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -583,7 +717,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -620,6 +755,10 @@ "type": "timeseries" }, { + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "gridPos": { "h": 1, "w": 24, @@ -627,6 +766,15 @@ "y": 16 }, "id": 10, + "targets": [ + { + "datasource": { + "type": "datasource", + "uid": "grafana" + }, + "refId": "A" + } + ], "title": "Go Runtime", "type": "row" }, @@ -641,6 +789,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -652,6 +803,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -697,7 +849,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -732,6 +885,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -743,6 +899,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -787,8 +944,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "multi", @@ -823,6 +981,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -834,6 +995,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -878,8 +1040,9 @@ "options": { "legend": { "calcs": [], - "displayMode": "hidden", - "placement": "bottom" + "displayMode": "list", + "placement": "bottom", + "showLegend": false }, "tooltip": { "mode": "multi", @@ -905,6 +1068,10 @@ }, { "collapsed": false, + "datasource": { + "type": "datasource", + "uid": "grafana" + }, "gridPos": { "h": 1, "w": 24, @@ -913,6 +1080,15 @@ }, "id": 18, "panels": [], + "targets": [ + { + "datasource": { + "type": "datasource", + "uid": "grafana" + }, + "refId": "A" + } + ], "title": "Process", "type": "row" }, @@ -927,6 +1103,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -938,6 +1117,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -983,7 +1163,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -1030,6 +1211,9 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, + "axisCenteredZero": false, + "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -1041,6 +1225,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1087,7 +1272,8 @@ "legend": { "calcs": [], "displayMode": "list", - "placement": "bottom" + "placement": "bottom", + "showLegend": true }, "tooltip": { "mode": "multi", @@ -1113,8 +1299,7 @@ } ], "refresh": "1m", - "schemaVersion": 35, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -1122,7 +1307,7 @@ "current": { "selected": false, "text": "prometheus", - "value": "prometheus" + "value": "P1809F7CD0C75ACF3" }, "hide": 0, "includeAll": false, @@ -1172,6 +1357,6 @@ "timezone": "", "title": "Concourse", "uid": "aiCGyVsnk", - "version": 4, + "version": 1, "weekStart": "" } \ No newline at end of file diff --git a/shared/dashboards/container-stats-detailed.json b/shared/dashboards/container-stats-detailed.json index 3753697d..3c97d42e 100644 --- a/shared/dashboards/container-stats-detailed.json +++ b/shared/dashboards/container-stats-detailed.json @@ -88,9 +88,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -170,9 +171,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -252,9 +254,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -298,7 +301,6 @@ }, "hiddenSeries": false, "id": 2, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -318,7 +320,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -398,7 +400,6 @@ }, "hiddenSeries": false, "id": 1, - "isNew": true, "legend": { "alignAsTable": true, "avg": true, @@ -418,7 +419,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -499,7 +500,6 @@ }, "hiddenSeries": false, "id": 3, - "isNew": true, "legend": { "avg": false, "current": false, @@ -517,7 +517,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -596,7 +596,6 @@ }, "hiddenSeries": false, "id": 4, - "isNew": true, "legend": { "avg": false, "current": false, @@ -614,7 +613,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -692,7 +691,6 @@ }, "hiddenSeries": false, "id": 8, - "isNew": true, "legend": { "avg": false, "current": false, @@ -710,7 +708,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -789,7 +787,6 @@ }, "hiddenSeries": false, "id": 9, - "isNew": true, "legend": { "avg": false, "current": false, @@ -807,7 +804,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -867,8 +864,7 @@ ], "refresh": "1m", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -876,7 +872,7 @@ "current": { "selected": false, "text": "prometheus", - "value": "prometheus" + "value": "P1809F7CD0C75ACF3" }, "hide": 0, "includeAll": false, diff --git a/shared/dashboards/node-stats-detailed.json b/shared/dashboards/node-stats-detailed.json index 0d3766e4..24e45862 100644 --- a/shared/dashboards/node-stats-detailed.json +++ b/shared/dashboards/node-stats-detailed.json @@ -121,6 +121,8 @@ "id": 20, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -130,9 +132,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -202,6 +205,8 @@ "id": 155, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -211,9 +216,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -283,6 +289,8 @@ "id": 19, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -292,9 +300,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -355,6 +364,8 @@ "id": 16, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -364,9 +375,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -447,6 +459,8 @@ "id": 21, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -456,9 +470,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -526,6 +541,8 @@ "id": 154, "links": [], "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "horizontal", "reduceOptions": { "calcs": [ @@ -535,9 +552,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "sizing": "auto" }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -612,9 +630,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -692,9 +711,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -773,9 +793,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -852,9 +873,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -929,9 +951,10 @@ "fields": "", "values": false }, - "textMode": "auto" + "textMode": "auto", + "wideLayout": true }, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -1032,7 +1055,7 @@ "alertThreshold": true }, "percentage": true, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1233,7 +1256,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1425,7 +1448,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -1542,7 +1565,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "9.4.9", + "pluginVersion": "10.2.6", "pointradius": 5, "points": false, "renderer": "flot", @@ -13964,8 +13987,7 @@ ], "refresh": "1m", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ @@ -13973,7 +13995,7 @@ "current": { "selected": false, "text": "prometheus", - "value": "prometheus" + "value": "P1809F7CD0C75ACF3" }, "hide": 0, "includeAll": false, diff --git a/shared/resolved/dashboard.json b/shared/resolved/dashboard.json index 65bedf06..22bb140f 100644 --- a/shared/resolved/dashboard.json +++ b/shared/resolved/dashboard.json @@ -38,6 +38,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -52,6 +53,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -134,6 +136,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -148,6 +151,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -232,6 +236,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -246,6 +251,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -328,6 +334,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -342,6 +349,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -426,6 +434,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -440,6 +449,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -524,6 +534,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -538,6 +549,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -620,6 +632,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -634,6 +647,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -752,6 +766,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -766,6 +781,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -919,6 +935,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -933,6 +950,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1060,6 +1078,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1074,6 +1093,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1169,6 +1189,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1183,6 +1204,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineStyle": { "fill": "solid" @@ -1268,6 +1290,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1282,6 +1305,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1376,6 +1400,7 @@ "mode": "palette-classic" }, "custom": { + "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "", @@ -1390,6 +1415,7 @@ "tooltip": false, "viz": false }, + "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1705,8 +1731,7 @@ ], "refresh": "30s", "revision": 1, - "schemaVersion": 38, - "style": "dark", + "schemaVersion": 39, "tags": [], "templating": { "list": [ From d3d5de28e10f969c52acac80d9fd05145f85032b Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Tue, 14 May 2024 22:52:00 +0100 Subject: [PATCH 3/4] [carcosa] Fix admin grafana password Whoops. Well, I guess this shows nobody is looking at my NixOS config for vulnerabilities... --- hosts/carcosa/configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/carcosa/configuration.nix b/hosts/carcosa/configuration.nix index 34c65dd0..d6981a7e 100644 --- a/hosts/carcosa/configuration.nix +++ b/hosts/carcosa/configuration.nix @@ -472,7 +472,7 @@ in # Metrics services.grafana.settings = { server.root_url = "https://grafana.carcosa.barrucadu.co.uk"; - security.admin_password = "$__file{${config.sops.secrets."services/grafana/admin_password".path}"; + security.admin_password = "$__file{${config.sops.secrets."services/grafana/admin_password".path}}"; security.secret_key = "$__file{${config.sops.secrets."services/grafana/secret_key".path}}"; }; sops.secrets."services/grafana/admin_password".owner = config.users.users.grafana.name; From c4474478abaaedc3e5034e3d34c24b6cd85d3361 Mon Sep 17 00:00:00 2001 From: Michael Walker Date: Tue, 14 May 2024 23:06:44 +0100 Subject: [PATCH 4/4] [nyarlathotep] Revise finance dashboard budget targets --- hosts/nyarlathotep/dashboards/finance.json | 193 +++------------------ 1 file changed, 27 insertions(+), 166 deletions(-) diff --git a/hosts/nyarlathotep/dashboards/finance.json b/hosts/nyarlathotep/dashboards/finance.json index b6e21d23..296f3245 100644 --- a/hosts/nyarlathotep/dashboards/finance.json +++ b/hosts/nyarlathotep/dashboards/finance.json @@ -2281,79 +2281,6 @@ "transparent": true, "type": "gauge" }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "decimals": 1, - "mappings": [], - "max": 996, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": null - }, - { - "color": "yellow", - "value": 500 - }, - { - "color": "green", - "value": 750 - } - ] - }, - "unit": "currencyGBP" - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 9, - "y": 20 - }, - "id": 42, - "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto", - "text": {} - }, - "pluginVersion": "10.2.6", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "exemplar": true, - "expr": "sum(hledger_balance{account=\"assets:investments:nsi:premium_bonds:move\"} * on(currency) hledger_fx_rate{target_currency=\"$currency\"}) by(target_currency)", - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "Move", - "transparent": true, - "type": "gauge" - }, { "datasource": { "type": "prometheus", @@ -2388,81 +2315,7 @@ "gridPos": { "h": 6, "w": 3, - "x": 12, - "y": 20 - }, - "id": 88, - "options": { - "minVizHeight": 75, - "minVizWidth": 75, - "orientation": "auto", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showThresholdLabels": false, - "showThresholdMarkers": true, - "sizing": "auto", - "text": {} - }, - "pluginVersion": "10.2.6", - "targets": [ - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "editorMode": "code", - "exemplar": true, - "expr": "sum(sum(hledger_balance{account=~\".*:saved:owlbear\"}) by (currency) * on(currency) hledger_fx_rate{target_currency=\"$currency\"}) by(target_currency)", - "interval": "", - "legendFormat": "", - "range": true, - "refId": "A" - } - ], - "title": "Owlbear", - "transparent": true, - "type": "gauge" - }, - { - "datasource": { - "type": "prometheus", - "uid": "${datasource}" - }, - "fieldConfig": { - "defaults": { - "mappings": [], - "max": 50, - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "red", - "value": null - }, - { - "color": "yellow", - "value": 25 - }, - { - "color": "green", - "value": 37.5 - } - ] - }, - "unit": "currencyGBP" - }, - "overrides": [] - }, - "gridPos": { - "h": 6, - "w": 3, - "x": 15, + "x": 9, "y": 20 }, "id": 37, @@ -2536,7 +2389,7 @@ "gridPos": { "h": 6, "w": 3, - "x": 18, + "x": 12, "y": 20 }, "id": 33, @@ -2610,7 +2463,7 @@ "gridPos": { "h": 6, "w": 3, - "x": 21, + "x": 15, "y": 20 }, "id": 38, @@ -2685,8 +2538,8 @@ "gridPos": { "h": 6, "w": 3, - "x": 0, - "y": 26 + "x": 18, + "y": 20 }, "id": 34, "options": { @@ -2759,8 +2612,8 @@ "gridPos": { "h": 6, "w": 3, - "x": 3, - "y": 26 + "x": 21, + "y": 20 }, "id": 35, "options": { @@ -2833,7 +2686,7 @@ "gridPos": { "h": 6, "w": 3, - "x": 6, + "x": 0, "y": 26 }, "id": 36, @@ -2881,7 +2734,7 @@ "fieldConfig": { "defaults": { "mappings": [], - "max": 500, + "max": 300, "min": 0, "thresholds": { "mode": "absolute", @@ -2892,11 +2745,11 @@ }, { "color": "yellow", - "value": 250 + "value": 150 }, { "color": "green", - "value": 375 + "value": 225 } ] }, @@ -2907,7 +2760,7 @@ "gridPos": { "h": 6, "w": 3, - "x": 9, + "x": 3, "y": 26 }, "id": 40, @@ -2962,7 +2815,8 @@ "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null }, { "color": "yellow", @@ -2986,6 +2840,8 @@ }, "id": 77, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -2996,9 +2852,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": { @@ -3025,21 +2882,22 @@ "fieldConfig": { "defaults": { "mappings": [], - "max": 25, + "max": 100, "min": 0, "thresholds": { "mode": "absolute", "steps": [ { - "color": "red" + "color": "red", + "value": null }, { "color": "yellow", - "value": 12.5 + "value": 50 }, { "color": "green", - "value": 18.75 + "value": 75 } ] }, @@ -3055,6 +2913,8 @@ }, "id": 76, "options": { + "minVizHeight": 75, + "minVizWidth": 75, "orientation": "auto", "reduceOptions": { "calcs": [ @@ -3065,9 +2925,10 @@ }, "showThresholdLabels": false, "showThresholdMarkers": true, + "sizing": "auto", "text": {} }, - "pluginVersion": "9.5.13", + "pluginVersion": "10.2.6", "targets": [ { "datasource": {