diff --git a/nixos/modules/monitoring/server/grafana-dashboards/resources-overview.json b/nixos/modules/monitoring/server/grafana-dashboards/resources-overview.json
index cb5bc91da7c3adbb1c9377473b053d31d53550f0..5ecbcb9b709f7093592e54f368166da064b1ae73 100644
--- a/nixos/modules/monitoring/server/grafana-dashboards/resources-overview.json
+++ b/nixos/modules/monitoring/server/grafana-dashboards/resources-overview.json
@@ -41,7 +41,7 @@
"description": "Some of our software runs in a single thread, so this shows max CPU per core (instead of averaged over all cores)",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -68,11 +68,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -173,8 +172,8 @@
"datasource": null,
"fieldConfig": {
"defaults": {
- "custom": {},
- "displayName": "${__field.labels.instance}"
+ "displayName": "${__field.labels.instance}",
+ "links": []
},
"overrides": [
{
@@ -213,11 +212,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -241,7 +239,7 @@
"line": true,
"op": "gt",
"value": 1,
- "yaxis": "left"
+ "visible": true
}
],
"timeFrom": null,
@@ -328,7 +326,7 @@
"description": "How much RAM is in use? Relative to available system memory.",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -356,11 +354,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -384,7 +381,7 @@
"line": true,
"op": "gt",
"value": 0.8,
- "yaxis": "left"
+ "visible": true
}
],
"timeFrom": null,
@@ -448,10 +445,10 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "description": "Shows most saturated network link for every node. Baseline is the reported NIC link speed - that might not be the actual limit.",
+ "description": "Shows most saturated network link for every node. Bit/s.",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -478,11 +475,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -492,14 +488,14 @@
"steppedLine": false,
"targets": [
{
- "expr": "max by (instance) (rate(node_network_transmit_bytes_total{device!~\"lo|monitoringvpn\"}[5m]) / node_network_speed_bytes)",
+ "expr": "max by (instance) (rate(node_network_transmit_bytes_total{device!~\"lo|monitoringvpn\"}[5m]) * 8)",
"interval": "",
"intervalFactor": 4,
"legendFormat": "{{instance}} out",
"refId": "A"
},
{
- "expr": "- max by (instance) (rate(node_network_receive_bytes_total{device!~\"lo|monitoringvpn\"}[5m]) / node_network_speed_bytes)",
+ "expr": "- max by (instance) (rate(node_network_receive_bytes_total{device!~\"lo|monitoringvpn\"}[5m]) * 8)",
"interval": "",
"intervalFactor": 4,
"legendFormat": "{{instance}} in",
@@ -510,7 +506,7 @@
"timeFrom": null,
"timeRegions": [],
"timeShift": null,
- "title": "Throughput %",
+ "title": "Throughput",
"tooltip": {
"shared": false,
"sort": 2,
@@ -527,15 +523,17 @@
},
"yaxes": [
{
+ "$$hashKey": "object:226",
"decimals": null,
- "format": "percentunit",
+ "format": "bps",
"label": null,
"logBase": 1,
- "max": "1",
- "min": "-1",
+ "max": null,
+ "min": null,
"show": true
},
{
+ "$$hashKey": "object:227",
"format": "short",
"label": null,
"logBase": 1,
@@ -558,7 +556,7 @@
"description": "Packet and error count. Positive values mean transmit, negative receive.",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -585,11 +583,10 @@
"linewidth": 1,
"nullPointMode": "null as zero",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -602,28 +599,28 @@
"expr": "- rate(node_network_receive_packets_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "",
"intervalFactor": 4,
- "legendFormat": "{{instance}} {{device}}",
+ "legendFormat": "{{instance}} in",
"refId": "A"
},
{
"expr": "- rate(node_network_receive_errs_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "",
"intervalFactor": 4,
- "legendFormat": "{{instance}} {{device}}",
+ "legendFormat": "{{instance}} in err",
"refId": "B"
},
{
"expr": "rate(node_network_transmit_packets_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "",
"intervalFactor": 4,
- "legendFormat": "{{instance}} {{device}}",
+ "legendFormat": "{{instance}} out",
"refId": "C"
},
{
"expr": "rate(node_network_transmit_errs_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "",
"intervalFactor": 4,
- "legendFormat": "{{instance}} {{device}}",
+ "legendFormat": "{{instance}} out err",
"refId": "D"
}
],
@@ -647,7 +644,7 @@
},
"yaxes": [
{
- "format": "short",
+ "format": "pps",
"label": null,
"logBase": 1,
"max": null,
@@ -781,7 +778,7 @@
"description": "Network errors, drops etc. Should all be 0.",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -808,11 +805,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -852,7 +848,8 @@
"fill": true,
"line": true,
"op": "gt",
- "value": 10
+ "value": 10,
+ "visible": true
}
],
"timeFrom": null,
@@ -953,7 +950,7 @@
"description": "Watch filesystems filling up. Shows only mounts over 10 % of available bytes used.",
"fieldConfig": {
"defaults": {
- "custom": {},
+ "links": [],
"unit": "percentunit"
},
"overrides": []
@@ -981,11 +978,10 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1012,7 +1008,7 @@
"line": true,
"op": "gt",
"value": 0.8,
- "yaxis": "left"
+ "visible": true
}
],
"timeFrom": null,
@@ -1035,6 +1031,7 @@
},
"yaxes": [
{
+ "$$hashKey": "object:131",
"format": "percentunit",
"label": null,
"logBase": 1,
@@ -1043,6 +1040,7 @@
"show": true
},
{
+ "$$hashKey": "object:132",
"format": "short",
"label": null,
"logBase": 1,
@@ -1065,7 +1063,7 @@
"description": "Input Output Operations per second. Positive values mean read, negative write.",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -1092,11 +1090,10 @@
"linewidth": 1,
"nullPointMode": "null as zero",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1170,7 +1167,7 @@
"description": "Max average storage latency per node. Positive values mean read, negative write.",
"fieldConfig": {
"defaults": {
- "custom": {}
+ "links": []
},
"overrides": []
},
@@ -1197,11 +1194,10 @@
"linewidth": 1,
"nullPointMode": "null as zero",
"options": {
- "alertThreshold": true,
- "dataLinks": []
+ "alertThreshold": true
},
"percentage": false,
- "pluginVersion": "7.3.5",
+ "pluginVersion": "7.5.10",
"pointradius": 2,
"points": false,
"renderer": "flot",
@@ -1268,14 +1264,14 @@
}
],
"refresh": "30s",
- "schemaVersion": 20,
+ "schemaVersion": 27,
"style": "dark",
"tags": [],
"templating": {
"list": []
},
"time": {
- "from": "now-1h",
+ "from": "now-3h",
"to": "now"
},
"timepicker": {},