From 4905906b2d6af0a940c6ee0a8e758243bfde133a Mon Sep 17 00:00:00 2001 From: Harald Koch Date: Thu, 16 Jan 2025 09:52:59 -0500 Subject: [PATCH] hmm II electric boogaloo --- .../network-status/network-status.json | 101 +++++------------- 1 file changed, 24 insertions(+), 77 deletions(-) diff --git a/kubernetes/main/apps/monitoring/miscellaneous/dashboards/network-status/network-status.json b/kubernetes/main/apps/monitoring/miscellaneous/dashboards/network-status/network-status.json index c29149e2d0..730b8c055e 100644 --- a/kubernetes/main/apps/monitoring/miscellaneous/dashboards/network-status/network-status.json +++ b/kubernetes/main/apps/monitoring/miscellaneous/dashboards/network-status/network-status.json @@ -2,7 +2,7 @@ "__inputs": [ { "name": "DS_PROMETHEUS", - "label": "Prometheus", + "label": "prometheus", "description": "", "type": "datasource", "pluginId": "prometheus", @@ -32,6 +32,7 @@ "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, + "barWidthFactor": 0.6, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", @@ -110,7 +111,6 @@ } ] }, - "interval": "5s", "options": { "legend": { "calcs": [ @@ -135,7 +135,7 @@ "uid": "000000001" }, "editorMode": "code", - "expr": "8*(irate(ifHCInOctets{job='snmp-exporter-opnsense',instance='192.168.20.1',ifDescr=~'igc3|pppoe0'}[$__rate_interval]) or irate(ifInOctets{job='snmp',instance='199.85.99.1',ifDescr=~'igc3|pppoe0'}[$__rate_interval]))", + "expr": "8*(irate(ifHCInOctets{job='snmp',instance='199.85.99.1',ifDescr=~'igc3'}[$__rate_interval]) or irate(ifInOctets{job='snmp',instance='199.85.99.1',ifDescr=~'igc3'}[$__rate_interval]))", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -151,7 +151,7 @@ }, "editorMode": "code", "exemplar": true, - "expr": "-8*(irate(ifHCOutOctets{job='snmp-exporter-opnsense',instance='192.168.20.1',ifDescr=~'igc3|pppoe0'}[$__rate_interval]) or irate(ifOutOctets{job='snmp',instance='199.85.99.1',ifDescr=~'igc3|pppoe0'}[$__rate_interval]))", + "expr": "-8*(irate(ifHCOutOctets{job='snmp',instance='199.85.99.1',ifDescr=~'igc3'}[$__rate_interval]) or irate(ifOutOctets{job='snmp',instance='199.85.99.1',ifDescr=~'igc3'}[$__rate_interval]))", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -183,7 +183,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", "axisLabel": "latency", @@ -197,7 +196,6 @@ "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -271,7 +269,6 @@ } ] }, - "interval": "30s", "options": { "legend": { "calcs": [ @@ -295,9 +292,9 @@ }, "editorMode": "code", "exemplar": true, - "expr": "max_over_time(probe_icmp_duration_seconds{instance=\"phaedra.cfrq.net\",phase=\"rtt\",job=~\".*ping-wired-4$\"}[$__interval])", + "expr": "max_over_time(probe_icmp_duration_seconds{instance=\"phaedra.cfrq.net\",phase=\"rtt\",job=~\"ping6*\"}[$__interval])", "format": "time_series", - "interval": "30s", + "interval": "", "intervalFactor": 2, "legendFormat": "{{job}} RTT", "range": true, @@ -309,7 +306,7 @@ "uid": "000000001" }, "editorMode": "code", - "expr": "1-avg_over_time(probe_success{instance=\"phaedra.cfrq.net\",job=~\".*ping-wired-4$\"}[$__interval])", + "expr": "1-avg_over_time(probe_success{instance=\"phaedra.cfrq.net\",job=~\"ping6*\"}[$__interval])", "format": "time_series", "interval": "30s", "intervalFactor": 2, @@ -353,7 +350,6 @@ "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -453,7 +449,7 @@ "uid": "000000001" }, "editorMode": "code", - "expr": "max_over_time(probe_icmp_duration_seconds{instance=\"phaedra.cfrq.net\",phase=\"rtt\",job=~\".*ping-wifi.*\"}[$__interval])", + "expr": "max_over_time(probe_icmp_duration_seconds{instance=\"phaedra.cfrq.net\",phase=\"rtt\",job=~\"ping_wifi*\"}[$__interval])", "format": "time_series", "interval": "30s", "intervalFactor": 2, @@ -467,7 +463,7 @@ "uid": "000000001" }, "editorMode": "code", - "expr": "1-avg_over_time(probe_success{instance=\"phaedra.cfrq.net\",job=~\".*ping-wifi.*\"}[$__interval])", + "expr": "1-avg_over_time(probe_success{instance=\"phaedra.cfrq.net\",job=~\"ping_wifi*\"}[$__interval])", "format": "time_series", "interval": "30s", "intervalFactor": 2, @@ -548,7 +544,7 @@ "showThresholdMarkers": true, "text": {} }, - "pluginVersion": "10.1.4", + "pluginVersion": "9.4.7", "targets": [ { "datasource": { @@ -556,7 +552,7 @@ "uid": "000000001" }, "editorMode": "code", - "expr": "network_ups_tools_battery_charge{instance=\"internet\"}", + "expr": "network_ups_tools_battery_charge{instance=\"pollux\"}", "format": "time_series", "interval": "", "intervalFactor": 2, @@ -598,7 +594,6 @@ "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -699,11 +694,9 @@ "type": "prometheus", "uid": "000000001" }, - "editorMode": "code", - "expr": "network_ups_tools_battery_charge{instance=\"internet\"}", + "expr": "network_ups_tools_battery_charge{instance=\"pollux\"}", "interval": "", "legendFormat": "charge", - "range": true, "refId": "C" }, { @@ -711,11 +704,9 @@ "type": "prometheus", "uid": "000000001" }, - "editorMode": "code", - "expr": "network_ups_tools_battery_runtime{instance=\"internet\"}", + "expr": "network_ups_tools_battery_runtime{instance=\"pollux\"}", "interval": "", "legendFormat": "runtime", - "range": true, "refId": "D" } ], @@ -731,13 +722,13 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "11.1.4" + "version": "11.3.1" }, { "type": "panel", "id": "grafana-clock-panel", "name": "Clock", - "version": "2.1.7" + "version": "2.0.0" }, { "type": "datasource", @@ -773,7 +764,6 @@ "graphTooltip": 0, "id": null, "links": [], - "liveNow": false, "panels": [ { "gridPos": { @@ -822,26 +812,17 @@ "x": 0, "y": 15 }, - "height": "104px", "id": 22, "options": { "bgColor": "transparent", "clockType": "24 hour", "countdownSettings": { "endCountdownTime": "2020-12-06T15:29:49-05:00", - "endText": "00:00:00", - "invalidValueText": "invalid value", - "noValueText": "no value found", - "queryCalculation": "last", - "source": "input" + "endText": "00:00:00" }, "countupSettings": { "beginCountupTime": "2022-08-06T14:25:36-04:00", - "beginText": "00:00:00", - "invalidValueText": "invalid value", - "noValueText": "no value found", - "queryCalculation": "last", - "source": "input" + "beginText": "00:00:00" }, "dateSettings": { "dateFormat": "YYYY-MM-DD", @@ -850,14 +831,6 @@ "locale": "", "showDate": false }, - "descriptionSettings": { - "descriptionText": "", - "fontSize": "12px", - "fontWeight": "normal", - "noValueText": "no description found", - "source": "none" - }, - "fontMono": false, "mode": "time", "refresh": "sec", "timeSettings": { @@ -872,7 +845,7 @@ "zoneFormat": "offsetAbbv" } }, - "pluginVersion": "2.1.7", + "pluginVersion": "2.0.0", "title": "LOCAL", "type": "grafana-clock-panel" }, @@ -903,37 +876,23 @@ } }, { - "datasource": { - "type": "prometheus", - "uid": "${DS_PROMETHEUS}" - }, "gridPos": { "h": 3, "w": 4, "x": 0, "y": 18 }, - "height": "104px", "id": 24, - "offsetFromUtc": "0", - "offsetFromUtcMinutes": "0", "options": { + "bgColor": "", "clockType": "24 hour", "countdownSettings": { "endCountdownTime": "2020-12-06T15:29:49-05:00", - "endText": "00:00:00", - "invalidValueText": "invalid value", - "noValueText": "no value found", - "queryCalculation": "last", - "source": "input" + "endText": "00:00:00" }, "countupSettings": { "beginCountupTime": "2022-08-06T14:25:36-04:00", - "beginText": "00:00:00", - "invalidValueText": "invalid value", - "noValueText": "no value found", - "queryCalculation": "last", - "source": "input" + "beginText": "00:00:00" }, "dateSettings": { "dateFormat": "YYYY-MM-DD", @@ -942,14 +901,6 @@ "locale": "", "showDate": false }, - "descriptionSettings": { - "descriptionText": "", - "fontSize": "12px", - "fontWeight": "normal", - "noValueText": "no description found", - "source": "none" - }, - "fontMono": false, "mode": "time", "refresh": "sec", "timeSettings": { @@ -964,28 +915,24 @@ "zoneFormat": "offsetAbbv" } }, - "pluginVersion": "2.1.7", + "pluginVersion": "2.0.0", "title": "UTC", "type": "grafana-clock-panel" } ], "refresh": "30s", - "revision": 1, - "schemaVersion": 39, + "schemaVersion": 40, "tags": [], "templating": { "list": [ { "current": {}, - "hide": 0, "includeAll": false, - "multi": false, "name": "DS_PROMETHEUS", "options": [], "query": "prometheus", "refresh": 1, "regex": "", - "skipUrlSync": false, "type": "datasource" } ] @@ -998,6 +945,6 @@ "timezone": "", "title": "Network Status", "uid": "b5VdClAMz", - "version": 427, + "version": 25, "weekStart": "" }