From 027929bb6dbef4701b1a8f9baaa22246a875613f Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 16 Dec 2020 17:59:54 -0500 Subject: [PATCH] fix eval grafana dashboard --- salt/grafana/dashboards/eval/eval.json | 268 +++++++++++-------------- 1 file changed, 118 insertions(+), 150 deletions(-) diff --git a/salt/grafana/dashboards/eval/eval.json b/salt/grafana/dashboards/eval/eval.json index b965ea248..cc4298bb2 100644 --- a/salt/grafana/dashboards/eval/eval.json +++ b/salt/grafana/dashboards/eval/eval.json @@ -16,7 +16,7 @@ "editable": true, "gnetId": 2381, "graphTooltip": 0, - "iteration": 1608156396988, + "id": 3, "links": [], "panels": [ { @@ -57,9 +57,10 @@ ], "fields": "", "values": false - } + }, + "textMode": "auto" }, - "pluginVersion": "7.0.5", + "pluginVersion": "7.3.4", "targets": [ { "groupBy": [ @@ -119,6 +120,7 @@ "fieldConfig": { "defaults": { "custom": {}, + "links": [], "mappings": [ { "id": 0, @@ -176,10 +178,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.0.5", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -264,7 +266,6 @@ }, "yaxes": [ { - "$$hashKey": "object:177", "format": "percent", "label": "Usage", "logBase": 1, @@ -273,7 +274,6 @@ "show": true }, { - "$$hashKey": "object:178", "format": "short", "label": null, "logBase": 1, @@ -295,7 +295,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -322,9 +323,10 @@ "linewidth": 1, "nullPointMode": "null", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": true, "renderer": "flot", @@ -396,7 +398,6 @@ }, "yaxes": [ { - "$$hashKey": "object:198", "decimals": 1, "format": "percent", "label": "", @@ -406,7 +407,6 @@ "show": true }, { - "$$hashKey": "object:199", "format": "short", "label": null, "logBase": 1, @@ -429,7 +429,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -457,10 +458,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "6.6.2", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -570,7 +571,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -598,9 +600,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -709,7 +712,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -737,10 +741,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "6.6.2", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -838,43 +842,12 @@ { "aliasColors": {}, "bars": false, - "cacheTimeout": null, "dashLength": 10, "dashes": false, "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "max": "67551000000", - "min": 0, - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": "54040800000.0" - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": "60795900000.0" - } - ] - }, - "unit": "bytes" + "custom": {} }, "overrides": [] }, @@ -887,25 +860,24 @@ "y": 5 }, "hiddenSeries": false, - "id": 12, + "id": 75, "legend": { "avg": false, "current": false, "max": false, "min": false, - "show": false, + "show": true, "total": false, "values": false }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.0.5", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -915,7 +887,7 @@ "steppedLine": false, "targets": [ { - "dsType": "influxdb", + "alias": "Usage", "groupBy": [ { "params": [ @@ -984,17 +956,15 @@ }, "yaxes": [ { - "$$hashKey": "object:316", "decimals": 2, "format": "percent", - "label": "Usage", + "label": null, "logBase": 1, "max": null, "min": null, "show": true }, { - "$$hashKey": "object:317", "format": "short", "label": null, "logBase": 1, @@ -1011,43 +981,12 @@ { "aliasColors": {}, "bars": false, - "cacheTimeout": null, "dashLength": 10, "dashes": false, "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, - "mappings": [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "max": "131114444000", - "min": 0, - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": "104891555200.0" - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": "118002999600.0" - } - ] - }, - "unit": "bytes" + "custom": {} }, "overrides": [] }, @@ -1060,7 +999,7 @@ "y": 5 }, "hiddenSeries": false, - "id": 31, + "id": 77, "legend": { "avg": false, "current": false, @@ -1072,13 +1011,12 @@ }, "lines": true, "linewidth": 1, - "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.0.5", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1088,7 +1026,7 @@ "steppedLine": false, "targets": [ { - "dsType": "influxdb", + "alias": "Usage", "groupBy": [ { "params": [ @@ -1106,6 +1044,7 @@ "measurement": "disk", "orderByTime": "ASC", "policy": "default", + "queryType": "randomWalk", "refId": "A", "resultFormat": "time_series", "select": [ @@ -1157,23 +1096,21 @@ }, "yaxes": [ { - "$$hashKey": "object:442", "decimals": 2, "format": "percent", - "label": "Usage", + "label": null, "logBase": 1, "max": null, "min": null, "show": true }, { - "$$hashKey": "object:443", "format": "short", "label": null, "logBase": 1, "max": null, "min": null, - "show": true + "show": false } ], "yaxis": { @@ -1190,7 +1127,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1218,10 +1156,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "6.6.2", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1265,7 +1203,7 @@ }, { "params": [ - " / 16" + " / {{ CPUS }}" ], "type": "math" } @@ -1336,7 +1274,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1364,9 +1303,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1410,7 +1350,7 @@ }, { "params": [ - " / 16" + " / {{ CPUS }}" ], "type": "math" } @@ -1481,7 +1421,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1509,9 +1450,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1555,7 +1497,7 @@ }, { "params": [ - " / 16" + " / {{ CPUS }}" ], "type": "math" } @@ -1626,7 +1568,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1654,9 +1597,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -1700,7 +1644,7 @@ }, { "params": [ - " / 16" + " / {{ CPUS }}" ], "type": "math" } @@ -1781,7 +1725,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -1811,9 +1756,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -2173,7 +2119,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2200,9 +2147,10 @@ "linewidth": 1, "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -2280,7 +2228,6 @@ }, "yaxes": [ { - "$$hashKey": "object:147", "decimals": 1, "format": "decbytes", "label": "", @@ -2290,7 +2237,6 @@ "show": true }, { - "$$hashKey": "object:148", "format": "short", "label": null, "logBase": 1, @@ -2313,7 +2259,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2341,10 +2288,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, - "pluginVersion": "6.6.2", + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -2453,7 +2400,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2481,9 +2429,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -2592,7 +2541,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2620,9 +2570,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -2857,7 +2808,8 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -2885,9 +2837,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -3021,9 +2974,10 @@ ], "fields": "", "values": false - } + }, + "textMode": "auto" }, - "pluginVersion": "7.0.5", + "pluginVersion": "7.3.4", "targets": [ { "groupBy": [ @@ -3133,7 +3087,7 @@ "showThresholdLabels": false, "showThresholdMarkers": true }, - "pluginVersion": "7.0.5", + "pluginVersion": "7.3.4", "targets": [ { "dsType": "influxdb", @@ -3199,7 +3153,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -3229,9 +3184,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -3479,7 +3435,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -3511,9 +3468,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -3751,7 +3709,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -3781,9 +3740,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -3852,7 +3812,7 @@ "condition": "AND", "key": "interface", "operator": "=", - "value": "bond0" + "value": "{{ MONINT }}" } ] } @@ -3912,7 +3872,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -3942,9 +3903,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -4136,7 +4098,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -4165,9 +4128,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -4329,7 +4293,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -4359,9 +4324,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -4430,7 +4396,7 @@ "condition": "AND", "key": "interface", "operator": "=", - "value": "eth0" + "value": "{{ MANINT }}" } ] }, @@ -4494,7 +4460,7 @@ "condition": "AND", "key": "interface", "operator": "=", - "value": "eth0" + "value": "{{ MANINT }}" } ] } @@ -4551,7 +4517,8 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {} + "custom": {}, + "links": [] }, "overrides": [] }, @@ -4581,9 +4548,10 @@ "links": [], "nullPointMode": "connected", "options": { - "dataLinks": [] + "alertThreshold": true }, "percentage": false, + "pluginVersion": "7.3.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -4680,7 +4648,7 @@ } ], "refresh": "30s", - "schemaVersion": 25, + "schemaVersion": 26, "style": "dark", "tags": [], "templating": {