Skip to content
Snippets Groups Projects
Commit f7fb2209 authored by Florian Sesser's avatar Florian Sesser
Browse files

Merge branch '24.dashboard-scales' into 'develop' 

Monitoring dashboards: Rethink scales

Closes privatestorageops#24

See merge request !189
parents 5bafeb63 aae078c6
No related branches found
No related tags found
2 merge requests!228merge develop into production,!189Monitoring dashboards: Rethink scales
Pipeline #1238 passed
Stage: build
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
nixos/modules/monitoring/server/grafana-dashboards/resources-overview.json
+ 51
− 55
View file @ f7fb2209
...@@ -41,7 +41,7 @@ ...@@ -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)", "description": "Some of our software runs in a single thread, so this shows max CPU per core (instead of averaged over all cores)",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -68,11 +68,10 @@ ...@@ -68,11 +68,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -173,8 +172,8 @@ ...@@ -173,8 +172,8 @@
"datasource": null, "datasource": null,
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {}, "displayName": "${__field.labels.instance}",
"displayName": "${__field.labels.instance}" "links": []
}, },
"overrides": [ "overrides": [
{ {
...@@ -213,11 +212,10 @@ ...@@ -213,11 +212,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -241,7 +239,7 @@ ...@@ -241,7 +239,7 @@
"line": true, "line": true,
"op": "gt", "op": "gt",
"value": 1, "value": 1,
"yaxis": "left" "visible": true
} }
], ],
"timeFrom": null, "timeFrom": null,
...@@ -328,7 +326,7 @@ ...@@ -328,7 +326,7 @@
"description": "How much RAM is in use? Relative to available system memory.", "description": "How much RAM is in use? Relative to available system memory.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -356,11 +354,10 @@ ...@@ -356,11 +354,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -384,7 +381,7 @@ ...@@ -384,7 +381,7 @@
"line": true, "line": true,
"op": "gt", "op": "gt",
"value": 0.8, "value": 0.8,
"yaxis": "left" "visible": true
} }
], ],
"timeFrom": null, "timeFrom": null,
...@@ -448,10 +445,10 @@ ...@@ -448,10 +445,10 @@
"dashLength": 10, "dashLength": 10,
"dashes": false, "dashes": false,
"datasource": null, "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": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -478,11 +475,10 @@ ...@@ -478,11 +475,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -492,14 +488,14 @@ ...@@ -492,14 +488,14 @@
"steppedLine": false, "steppedLine": false,
"targets": [ "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": "", "interval": "",
"intervalFactor": 4, "intervalFactor": 4,
"legendFormat": "{{instance}} out", "legendFormat": "{{instance}} out",
"refId": "A" "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": "", "interval": "",
"intervalFactor": 4, "intervalFactor": 4,
"legendFormat": "{{instance}} in", "legendFormat": "{{instance}} in",
...@@ -510,7 +506,7 @@ ...@@ -510,7 +506,7 @@
"timeFrom": null, "timeFrom": null,
"timeRegions": [], "timeRegions": [],
"timeShift": null, "timeShift": null,
"title": "Throughput %", "title": "Throughput",
"tooltip": { "tooltip": {
"shared": false, "shared": false,
"sort": 2, "sort": 2,
...@@ -527,15 +523,17 @@ ...@@ -527,15 +523,17 @@
}, },
"yaxes": [ "yaxes": [
{ {
"$$hashKey": "object:226",
"decimals": null, "decimals": null,
"format": "percentunit", "format": "bps",
"label": null, "label": null,
"logBase": 1, "logBase": 1,
"max": "1", "max": null,
"min": "-1", "min": null,
"show": true "show": true
}, },
{ {
"$$hashKey": "object:227",
"format": "short", "format": "short",
"label": null, "label": null,
"logBase": 1, "logBase": 1,
...@@ -558,7 +556,7 @@ ...@@ -558,7 +556,7 @@
"description": "Packet and error count. Positive values mean transmit, negative receive.", "description": "Packet and error count. Positive values mean transmit, negative receive.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -585,11 +583,10 @@ ...@@ -585,11 +583,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -602,28 +599,28 @@ ...@@ -602,28 +599,28 @@
"expr": "- rate(node_network_receive_packets_total{device!~\"lo|monitoringvpn\"}[5m])", "expr": "- rate(node_network_receive_packets_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "", "interval": "",
"intervalFactor": 4, "intervalFactor": 4,
"legendFormat": "{{instance}} {{device}}", "legendFormat": "{{instance}} in",
"refId": "A" "refId": "A"
}, },
{ {
"expr": "- rate(node_network_receive_errs_total{device!~\"lo|monitoringvpn\"}[5m])", "expr": "- rate(node_network_receive_errs_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "", "interval": "",
"intervalFactor": 4, "intervalFactor": 4,
"legendFormat": "{{instance}} {{device}}", "legendFormat": "{{instance}} in err",
"refId": "B" "refId": "B"
}, },
{ {
"expr": "rate(node_network_transmit_packets_total{device!~\"lo|monitoringvpn\"}[5m])", "expr": "rate(node_network_transmit_packets_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "", "interval": "",
"intervalFactor": 4, "intervalFactor": 4,
"legendFormat": "{{instance}} {{device}}", "legendFormat": "{{instance}} out",
"refId": "C" "refId": "C"
}, },
{ {
"expr": "rate(node_network_transmit_errs_total{device!~\"lo|monitoringvpn\"}[5m])", "expr": "rate(node_network_transmit_errs_total{device!~\"lo|monitoringvpn\"}[5m])",
"interval": "", "interval": "",
"intervalFactor": 4, "intervalFactor": 4,
"legendFormat": "{{instance}} {{device}}", "legendFormat": "{{instance}} out err",
"refId": "D" "refId": "D"
} }
], ],
...@@ -647,7 +644,7 @@ ...@@ -647,7 +644,7 @@
}, },
"yaxes": [ "yaxes": [
{ {
"format": "short", "format": "pps",
"label": null, "label": null,
"logBase": 1, "logBase": 1,
"max": null, "max": null,
...@@ -781,7 +778,7 @@ ...@@ -781,7 +778,7 @@
"description": "Network errors, drops etc. Should all be 0.", "description": "Network errors, drops etc. Should all be 0.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -808,11 +805,10 @@ ...@@ -808,11 +805,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -852,7 +848,8 @@ ...@@ -852,7 +848,8 @@
"fill": true, "fill": true,
"line": true, "line": true,
"op": "gt", "op": "gt",
"value": 10 "value": 10,
"visible": true
} }
], ],
"timeFrom": null, "timeFrom": null,
...@@ -953,7 +950,7 @@ ...@@ -953,7 +950,7 @@
"description": "Watch filesystems filling up. Shows only mounts over 10 % of available bytes used.", "description": "Watch filesystems filling up. Shows only mounts over 10 % of available bytes used.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {}, "links": [],
"unit": "percentunit" "unit": "percentunit"
}, },
"overrides": [] "overrides": []
...@@ -981,11 +978,10 @@ ...@@ -981,11 +978,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null", "nullPointMode": "null",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -1012,7 +1008,7 @@ ...@@ -1012,7 +1008,7 @@
"line": true, "line": true,
"op": "gt", "op": "gt",
"value": 0.8, "value": 0.8,
"yaxis": "left" "visible": true
} }
], ],
"timeFrom": null, "timeFrom": null,
...@@ -1035,6 +1031,7 @@ ...@@ -1035,6 +1031,7 @@
}, },
"yaxes": [ "yaxes": [
{ {
"$$hashKey": "object:131",
"format": "percentunit", "format": "percentunit",
"label": null, "label": null,
"logBase": 1, "logBase": 1,
...@@ -1043,6 +1040,7 @@ ...@@ -1043,6 +1040,7 @@
"show": true "show": true
}, },
{ {
"$$hashKey": "object:132",
"format": "short", "format": "short",
"label": null, "label": null,
"logBase": 1, "logBase": 1,
...@@ -1065,7 +1063,7 @@ ...@@ -1065,7 +1063,7 @@
"description": "Input Output Operations per second. Positive values mean read, negative write.", "description": "Input Output Operations per second. Positive values mean read, negative write.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -1092,11 +1090,10 @@ ...@@ -1092,11 +1090,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -1170,7 +1167,7 @@ ...@@ -1170,7 +1167,7 @@
"description": "Max average storage latency per node. Positive values mean read, negative write.", "description": "Max average storage latency per node. Positive values mean read, negative write.",
"fieldConfig": { "fieldConfig": {
"defaults": { "defaults": {
"custom": {} "links": []
}, },
"overrides": [] "overrides": []
}, },
...@@ -1197,11 +1194,10 @@ ...@@ -1197,11 +1194,10 @@
"linewidth": 1, "linewidth": 1,
"nullPointMode": "null as zero", "nullPointMode": "null as zero",
"options": { "options": {
"alertThreshold": true, "alertThreshold": true
"dataLinks": []
}, },
"percentage": false, "percentage": false,
"pluginVersion": "7.3.5", "pluginVersion": "7.5.10",
"pointradius": 2, "pointradius": 2,
"points": false, "points": false,
"renderer": "flot", "renderer": "flot",
...@@ -1268,14 +1264,14 @@ ...@@ -1268,14 +1264,14 @@
} }
], ],
"refresh": "30s", "refresh": "30s",
"schemaVersion": 20, "schemaVersion": 27,
"style": "dark", "style": "dark",
"tags": [], "tags": [],
"templating": { "templating": {
"list": [] "list": []
}, },
"time": { "time": {
"from": "now-1h", "from": "now-3h",
"to": "now" "to": "now"
}, },
"timepicker": {}, "timepicker": {},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment