From 520ea7c87d3b5d2a4d8360b3633786e7732258bd Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@privatestorage.io>
Date: Fri, 28 May 2021 08:58:23 +0000
Subject: [PATCH] resources-overview Dashboard: Clean up
Make everything more consistent and generally more nice.
I am a bit proud of this now.
Let's hope it holds up.
---
.../grafana-config/resources-overview.json | 110 ++++++++----------
1 file changed, 51 insertions(+), 59 deletions(-)
diff --git a/nixos/modules/monitoring/server/grafana-config/resources-overview.json b/nixos/modules/monitoring/server/grafana-config/resources-overview.json
index b379a74a..cd171d50 100644
--- a/nixos/modules/monitoring/server/grafana-config/resources-overview.json
+++ b/nixos/modules/monitoring/server/grafana-config/resources-overview.json
@@ -16,7 +16,6 @@
"editable": true,
"gnetId": null,
"graphTooltip": 0,
- "id": 4,
"links": [],
"panels": [
{
@@ -69,7 +68,8 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -96,7 +96,7 @@
"title": "Max CPU % per core per node",
"tooltip": {
"shared": true,
- "sort": 0,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -109,7 +109,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:163",
"format": "percentunit",
"label": null,
"logBase": 1,
@@ -118,7 +117,6 @@
"show": true
},
{
- "$$hashKey": "object:164",
"format": "short",
"label": null,
"logBase": 1,
@@ -215,7 +213,8 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -231,7 +230,7 @@
"expr": "node_load15",
"interval": "",
"intervalFactor": 1,
- "legendFormat": "",
+ "legendFormat": "{{instance}}",
"refId": "A"
}
],
@@ -241,7 +240,8 @@
"fill": true,
"line": true,
"op": "gt",
- "value": 1
+ "value": 1,
+ "yaxis": "left"
}
],
"timeFrom": null,
@@ -250,7 +250,7 @@
"title": "15 min load average",
"tooltip": {
"shared": true,
- "sort": 0,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -263,7 +263,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:412",
"format": "short",
"label": null,
"logBase": 1,
@@ -272,7 +271,6 @@
"show": true
},
{
- "$$hashKey": "object:413",
"format": "short",
"label": null,
"logBase": 1,
@@ -350,7 +348,6 @@
"current": false,
"max": false,
"min": false,
- "rightSide": false,
"show": false,
"total": false,
"values": false
@@ -359,7 +356,8 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -385,7 +383,8 @@
"fill": true,
"line": true,
"op": "gt",
- "value": 0.8
+ "value": 0.8,
+ "yaxis": "left"
}
],
"timeFrom": null,
@@ -394,7 +393,7 @@
"title": "RAM used %",
"tooltip": {
"shared": true,
- "sort": 0,
+ "sort": 2,
"value_type": "individual"
},
"type": "graph",
@@ -407,7 +406,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:43",
"decimals": null,
"format": "percentunit",
"label": null,
@@ -417,7 +415,6 @@
"show": true
},
{
- "$$hashKey": "object:44",
"format": "short",
"label": null,
"logBase": 1,
@@ -451,7 +448,7 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "description": "Shows most saturated network link for every node.",
+ "description": "Shows most saturated network link for every node. Baseline is the reported NIC link speed - that might not be the actual limit.",
"fieldConfig": {
"defaults": {
"custom": {}
@@ -481,7 +478,8 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -514,7 +512,7 @@
"timeShift": null,
"title": "Throughput %",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 2,
"value_type": "individual"
},
@@ -529,7 +527,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:1100",
"decimals": null,
"format": "percentunit",
"label": null,
@@ -539,7 +536,6 @@
"show": true
},
{
- "$$hashKey": "object:1101",
"format": "short",
"label": null,
"logBase": 1,
@@ -559,7 +555,7 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "description": "Packet and error count",
+ "description": "Packet and error count. Positive values mean transmit, negative receive.",
"fieldConfig": {
"defaults": {
"custom": {}
@@ -581,15 +577,16 @@
"current": false,
"max": false,
"min": false,
- "show": true,
+ "show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
- "nullPointMode": "null",
+ "nullPointMode": "null as zero",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -636,7 +633,7 @@
"timeShift": null,
"title": "Network pkt/s",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -650,7 +647,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:760",
"format": "short",
"label": null,
"logBase": 1,
@@ -659,7 +655,6 @@
"show": true
},
{
- "$$hashKey": "object:761",
"format": "short",
"label": null,
"logBase": 1,
@@ -813,7 +808,8 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -828,25 +824,25 @@
{
"expr": "node_network_transmit_errs_total\n",
"interval": "",
- "legendFormat": "",
+ "legendFormat": "{{instance}} {{device}}",
"refId": "A"
},
{
"expr": "node_network_transmit_drop_total",
"interval": "",
- "legendFormat": "",
+ "legendFormat": "{{instance}} {{device}}",
"refId": "B"
},
{
"expr": "- node_network_receive_drop_total",
"interval": "",
- "legendFormat": "",
+ "legendFormat": "{{instance}} {{device}}",
"refId": "C"
},
{
"expr": "- node_network_receive_errs_total",
"interval": "",
- "legendFormat": "",
+ "legendFormat": "{{instance}} {{device}}",
"refId": "D"
}
],
@@ -878,7 +874,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:874",
"format": "short",
"label": null,
"logBase": 1,
@@ -887,7 +882,6 @@
"show": true
},
{
- "$$hashKey": "object:875",
"format": "short",
"label": null,
"logBase": 1,
@@ -956,7 +950,7 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "description": "Watch filesystems filling up.",
+ "description": "Watch filesystems filling up. Shows only mounts over 10 % of available bytes used.",
"fieldConfig": {
"defaults": {
"custom": {},
@@ -987,7 +981,8 @@
"linewidth": 1,
"nullPointMode": "null",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -1016,7 +1011,8 @@
"fill": true,
"line": true,
"op": "gt",
- "value": 0.8
+ "value": 0.8,
+ "yaxis": "left"
}
],
"timeFrom": null,
@@ -1024,7 +1020,7 @@
"timeShift": null,
"title": "Storage usage %",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -1039,7 +1035,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:165",
"format": "percentunit",
"label": null,
"logBase": 1,
@@ -1048,7 +1043,6 @@
"show": true
},
{
- "$$hashKey": "object:166",
"format": "short",
"label": null,
"logBase": 1,
@@ -1068,7 +1062,7 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "description": "Input Output Operations per second",
+ "description": "Input Output Operations per second. Positive values mean read, negative write.",
"fieldConfig": {
"defaults": {
"custom": {}
@@ -1090,15 +1084,16 @@
"current": false,
"max": false,
"min": false,
- "show": true,
+ "show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
- "nullPointMode": "null",
+ "nullPointMode": "null as zero",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -1131,7 +1126,7 @@
"timeShift": null,
"title": "IOPS",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -1145,7 +1140,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:471",
"format": "short",
"label": null,
"logBase": 1,
@@ -1154,7 +1148,6 @@
"show": true
},
{
- "$$hashKey": "object:472",
"format": "short",
"label": null,
"logBase": 1,
@@ -1174,7 +1167,7 @@
"dashLength": 10,
"dashes": false,
"datasource": null,
- "description": "Max average storage latency per node.",
+ "description": "Max average storage latency per node. Positive values mean read, negative write.",
"fieldConfig": {
"defaults": {
"custom": {}
@@ -1196,15 +1189,16 @@
"current": false,
"max": false,
"min": false,
- "show": true,
+ "show": false,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
- "nullPointMode": "null",
+ "nullPointMode": "null as zero",
"options": {
- "alertThreshold": true
+ "alertThreshold": true,
+ "dataLinks": []
},
"percentage": false,
"pluginVersion": "7.3.5",
@@ -1217,14 +1211,14 @@
"steppedLine": false,
"targets": [
{
- "expr": "max by (instance, device) (rate(node_disk_read_time_seconds_total[5m]) / rate(node_disk_reads_completed_total[5m])) > 0",
+ "expr": "max by (instance, device) (rate(node_disk_read_time_seconds_total[5m]) / rate(node_disk_reads_completed_total[5m]))",
"interval": "",
"intervalFactor": 4,
"legendFormat": "{{instance}} R {{device}}",
"refId": "A"
},
{
- "expr": "- max by (instance, device) (rate(node_disk_write_time_seconds_total[5m]) / rate(node_disk_writes_completed_total[5m])) < 0",
+ "expr": "- max by (instance, device) (rate(node_disk_write_time_seconds_total[5m]) / rate(node_disk_writes_completed_total[5m]))",
"interval": "",
"intervalFactor": 4,
"legendFormat": "{{instance}} W {{device}}",
@@ -1237,7 +1231,7 @@
"timeShift": null,
"title": "Storage latency",
"tooltip": {
- "shared": true,
+ "shared": false,
"sort": 0,
"value_type": "individual"
},
@@ -1251,7 +1245,6 @@
},
"yaxes": [
{
- "$$hashKey": "object:211",
"format": "s",
"label": null,
"logBase": 1,
@@ -1260,7 +1253,6 @@
"show": true
},
{
- "$$hashKey": "object:212",
"format": "short",
"label": null,
"logBase": 1,
@@ -1276,7 +1268,7 @@
}
],
"refresh": "30s",
- "schemaVersion": 26,
+ "schemaVersion": 20,
"style": "dark",
"tags": [],
"templating": {
--
GitLab