diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json index 839565cd487deb84bb30687d683bdd242a65b6a2..d16c44634d0e7b3aaf252a29be103c07ca22f5f8 100644 --- a/assets/grafana/all-nodes-dashboard.json +++ b/assets/grafana/all-nodes-dashboard.json @@ -307,17 +307,26 @@ { "expr": "sum(node_memory_MemTotal) - sum(node_memory_MemFree)", "intervalFactor": 2, - "legendFormat": "free memory", + "legendFormat": "memory usage", "metric": "memo", "refId": "A", "step": 4, "target": "" + }, + { + "expr": "sum(node_memory_MemTotal)", + "intervalFactor": 2, + "legendFormat": "memory total", + "metric": "memo", + "refId": "B", + "step": 4, + "target": "" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Free memory", + "title": "Memory usage", "tooltip": { "msResolution": false, "shared": true, @@ -352,9 +361,9 @@ "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -405,15 +414,15 @@ }, "targets": [ { - "expr": "(sum(node_memory_MemFree) / sum(node_memory_MemTotal)) * 100", + "expr": "((sum(node_memory_MemTotal) - sum(node_memory_MemFree)) / sum(node_memory_MemTotal)) * 100", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "10, 20", - "title": "Free memory", + "thresholds": "80, 90", + "title": "Memory usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -493,7 +502,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_disk_bytes_read[5m]))", + "expr": "sum(rate(node_disk_bytes_read[5m]))", "hide": false, "intervalFactor": 4, "legendFormat": "read", @@ -502,14 +511,14 @@ "target": "" }, { - "expr": "sum(irate(node_disk_bytes_written[5m]))", + "expr": "sum(rate(node_disk_bytes_written[5m]))", "intervalFactor": 4, "legendFormat": "written", "refId": "B", "step": 8 }, { - "expr": "sum(irate(node_disk_io_time_ms[5m]))", + "expr": "sum(rate(node_disk_io_time_ms[5m]))", "intervalFactor": 4, "legendFormat": "io time", "refId": "C", @@ -519,7 +528,7 @@ "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Disk usage", + "title": "Disk I/O", "tooltip": { "msResolution": false, "shared": true, @@ -554,9 +563,9 @@ "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -607,15 +616,15 @@ }, "targets": [ { - "expr": "sum(node_filesystem_free{device!=\"rootfs\"}) / sum(node_filesystem_size{device!=\"rootfs\"})", + "expr": "(sum(node_filesystem_size{device!=\"rootfs\"}) - sum(node_filesystem_free{device!=\"rootfs\"})) / sum(node_filesystem_size{device!=\"rootfs\"})", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "0.10, 0.25", - "title": "Free disk space", + "thresholds": "0.75, 0.9", + "title": "Disk space usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -687,7 +696,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_network_receive_bytes{device!~\"lo\"}[5m]))", + "expr": "sum(rate(node_network_receive_bytes{device!~\"lo\"}[5m]))", "hide": false, "intervalFactor": 2, "legendFormat": "", @@ -781,7 +790,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_network_transmit_bytes{device!~\"lo\"}[5m]))", + "expr": "sum(rate(node_network_transmit_bytes{device!~\"lo\"}[5m]))", "hide": false, "intervalFactor": 2, "legendFormat": "", @@ -877,4 +886,4 @@ } ], "overwrite": true -} \ No newline at end of file +} diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json index bac1eb0d3e950180bc36a6ab965d24c2271c08bb..272d54ea17360707fcc02ee519e46ec156839c5d 100644 --- a/assets/grafana/node-dashboard.json +++ b/assets/grafana/node-dashboard.json @@ -100,7 +100,7 @@ "steppedLine": false, "targets": [ { - "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=~\"$server\"}[5m])) * 100)", + "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=\"$server\"}[5m])) * 100)", "hide": false, "intervalFactor": 10, "legendFormat": "{{cpu}}", @@ -188,7 +188,7 @@ "steppedLine": false, "targets": [ { - "expr": "node_load1{instance=~\"$server\"}", + "expr": "node_load1{instance=\"$server\"}", "intervalFactor": 4, "legendFormat": "load 1m", "refId": "A", @@ -196,7 +196,7 @@ "target": "" }, { - "expr": "node_load5{instance=~\"$server\"}", + "expr": "node_load5{instance=\"$server\"}", "intervalFactor": 4, "legendFormat": "load 5m", "refId": "B", @@ -204,7 +204,7 @@ "target": "" }, { - "expr": "node_load15{instance=~\"$server\"}", + "expr": "node_load15{instance=\"$server\"}", "intervalFactor": 4, "legendFormat": "load 15m", "refId": "C", @@ -305,19 +305,28 @@ "steppedLine": false, "targets": [ { - "expr": "node_memory_MemTotal{instance=~\"$server\"} - node_memory_MemFree{instance=~\"$server\"}", + "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}", "intervalFactor": 2, - "legendFormat": "free memory", + "legendFormat": "memory usage", "metric": "memo", "refId": "A", "step": 4, "target": "" + }, + { + "expr": "node_memory_MemTotal{instance=\"$server\"}", + "intervalFactor": 2, + "legendFormat": "memory total", + "metric": "memo", + "refId": "B", + "step": 4, + "target": "" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Free memory", + "title": "Memory usage", "tooltip": { "msResolution": false, "shared": true, @@ -352,9 +361,9 @@ "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -405,15 +414,15 @@ }, "targets": [ { - "expr": "(node_memory_MemFree{instance=~\"$server\"} / node_memory_MemTotal{instance=~\"$server\"}) * 100", + "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "10, 20", - "title": "Free memory", + "thresholds": "80, 90", + "title": "Memory usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -493,7 +502,7 @@ "steppedLine": false, "targets": [ { - "expr": "sum by (instance) (irate(node_disk_bytes_read{instance=~\"$server\"}[5m]))", + "expr": "sum by (instance) (rate(node_disk_bytes_read{instance=\"$server\"}[2m]))", "hide": false, "intervalFactor": 4, "legendFormat": "read", @@ -502,14 +511,14 @@ "target": "" }, { - "expr": "sum by (instance) (irate(node_disk_bytes_written{instance=~\"$server\"}[5m]))", + "expr": "sum by (instance) (rate(node_disk_bytes_written{instance=\"$server\"}[2m]))", "intervalFactor": 4, "legendFormat": "written", "refId": "B", "step": 8 }, { - "expr": "sum by (instance) (irate(node_disk_io_time_ms{instance=~\"$server\"}[5m]))", + "expr": "sum by (instance) (rate(node_disk_io_time_ms{instance=\"$server\"}[2m]))", "intervalFactor": 4, "legendFormat": "io time", "refId": "C", @@ -519,7 +528,7 @@ "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Disk usage", + "title": "Disk I/O", "tooltip": { "msResolution": false, "shared": true, @@ -554,9 +563,9 @@ "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -607,15 +616,15 @@ }, "targets": [ { - "expr": "sum(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"}) / sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})", + "expr": "(sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"}) - sum(node_filesystem_free{device!=\"rootfs\",instance=\"$server\"})) / sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"})", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "0.10, 0.25", - "title": "Free disk space", + "thresholds": "0.75, 0.9", + "title": "Disk space usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -687,7 +696,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_network_receive_bytes{instance=~\"$server\",device!~\"lo\"}[5m])", + "expr": "rate(node_network_receive_bytes{instance=\"$server\",device!~\"lo\"}[5m])", "hide": false, "intervalFactor": 2, "legendFormat": "{{device}}", @@ -781,7 +790,7 @@ "steppedLine": false, "targets": [ { - "expr": "irate(node_network_transmit_bytes{instance=~\"$server\",device!~\"lo\"}[5m])", + "expr": "rate(node_network_transmit_bytes{instance=\"$server\",device!~\"lo\"}[5m])", "hide": false, "intervalFactor": 2, "legendFormat": "{{device}}", @@ -890,4 +899,4 @@ } ], "overwrite": true -} \ No newline at end of file +} diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml index db41fd6060d9cf740061eb27577de0c8389caa0a..4e3dfcb229a5dc16017dffb003a80412e66617f3 100644 --- a/manifests/grafana/grafana-cm.yaml +++ b/manifests/grafana/grafana-cm.yaml @@ -1,6 +1,6 @@ apiVersion: v1 data: - all-nodes-dashboard.json: |- + all-nodes-dashboard.json: | { "dashboard": { "__inputs": [ @@ -310,17 +310,26 @@ data: { "expr": "sum(node_memory_MemTotal) - sum(node_memory_MemFree)", "intervalFactor": 2, - "legendFormat": "free memory", + "legendFormat": "memory usage", "metric": "memo", "refId": "A", "step": 4, "target": "" + }, + { + "expr": "sum(node_memory_MemTotal)", + "intervalFactor": 2, + "legendFormat": "memory total", + "metric": "memo", + "refId": "B", + "step": 4, + "target": "" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Free memory", + "title": "Memory usage", "tooltip": { "msResolution": false, "shared": true, @@ -355,9 +364,9 @@ data: "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -408,15 +417,15 @@ data: }, "targets": [ { - "expr": "(sum(node_memory_MemFree) / sum(node_memory_MemTotal)) * 100", + "expr": "((sum(node_memory_MemTotal) - sum(node_memory_MemFree)) / sum(node_memory_MemTotal)) * 100", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "10, 20", - "title": "Free memory", + "thresholds": "80, 90", + "title": "Memory usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -496,7 +505,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_disk_bytes_read[5m]))", + "expr": "sum(rate(node_disk_bytes_read[5m]))", "hide": false, "intervalFactor": 4, "legendFormat": "read", @@ -505,14 +514,14 @@ data: "target": "" }, { - "expr": "sum(irate(node_disk_bytes_written[5m]))", + "expr": "sum(rate(node_disk_bytes_written[5m]))", "intervalFactor": 4, "legendFormat": "written", "refId": "B", "step": 8 }, { - "expr": "sum(irate(node_disk_io_time_ms[5m]))", + "expr": "sum(rate(node_disk_io_time_ms[5m]))", "intervalFactor": 4, "legendFormat": "io time", "refId": "C", @@ -522,7 +531,7 @@ data: "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Disk usage", + "title": "Disk I/O", "tooltip": { "msResolution": false, "shared": true, @@ -557,9 +566,9 @@ data: "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -610,15 +619,15 @@ data: }, "targets": [ { - "expr": "sum(node_filesystem_free{device!=\"rootfs\"}) / sum(node_filesystem_size{device!=\"rootfs\"})", + "expr": "(sum(node_filesystem_size{device!=\"rootfs\"}) - sum(node_filesystem_free{device!=\"rootfs\"})) / sum(node_filesystem_size{device!=\"rootfs\"})", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "0.10, 0.25", - "title": "Free disk space", + "thresholds": "0.75, 0.9", + "title": "Disk space usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -690,7 +699,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_network_receive_bytes{device!~\"lo\"}[5m]))", + "expr": "sum(rate(node_network_receive_bytes{device!~\"lo\"}[5m]))", "hide": false, "intervalFactor": 2, "legendFormat": "", @@ -784,7 +793,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(irate(node_network_transmit_bytes{device!~\"lo\"}[5m]))", + "expr": "sum(rate(node_network_transmit_bytes{device!~\"lo\"}[5m]))", "hide": false, "intervalFactor": 2, "legendFormat": "", @@ -2109,7 +2118,7 @@ data: ], "overwrite": true } - node-dashboard.json: |- + node-dashboard.json: | { "dashboard": { "__inputs": [ @@ -2212,7 +2221,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=~\"$server\"}[5m])) * 100)", + "expr": "100 - (avg by (cpu) (irate(node_cpu{mode=\"idle\", instance=\"$server\"}[5m])) * 100)", "hide": false, "intervalFactor": 10, "legendFormat": "{{cpu}}", @@ -2300,7 +2309,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "node_load1{instance=~\"$server\"}", + "expr": "node_load1{instance=\"$server\"}", "intervalFactor": 4, "legendFormat": "load 1m", "refId": "A", @@ -2308,7 +2317,7 @@ data: "target": "" }, { - "expr": "node_load5{instance=~\"$server\"}", + "expr": "node_load5{instance=\"$server\"}", "intervalFactor": 4, "legendFormat": "load 5m", "refId": "B", @@ -2316,7 +2325,7 @@ data: "target": "" }, { - "expr": "node_load15{instance=~\"$server\"}", + "expr": "node_load15{instance=\"$server\"}", "intervalFactor": 4, "legendFormat": "load 15m", "refId": "C", @@ -2417,19 +2426,28 @@ data: "steppedLine": false, "targets": [ { - "expr": "node_memory_MemTotal{instance=~\"$server\"} - node_memory_MemFree{instance=~\"$server\"}", + "expr": "node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}", "intervalFactor": 2, - "legendFormat": "free memory", + "legendFormat": "memory usage", "metric": "memo", "refId": "A", "step": 4, "target": "" + }, + { + "expr": "node_memory_MemTotal{instance=\"$server\"}", + "intervalFactor": 2, + "legendFormat": "memory total", + "metric": "memo", + "refId": "B", + "step": 4, + "target": "" } ], "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Free memory", + "title": "Memory usage", "tooltip": { "msResolution": false, "shared": true, @@ -2464,9 +2482,9 @@ data: "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -2517,15 +2535,15 @@ data: }, "targets": [ { - "expr": "(node_memory_MemFree{instance=~\"$server\"} / node_memory_MemTotal{instance=~\"$server\"}) * 100", + "expr": "((node_memory_MemTotal{instance=\"$server\"} - node_memory_MemFree{instance=\"$server\"}) / node_memory_MemTotal{instance=\"$server\"}) * 100", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "10, 20", - "title": "Free memory", + "thresholds": "80, 90", + "title": "Memory usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -2605,7 +2623,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum by (instance) (irate(node_disk_bytes_read{instance=~\"$server\"}[5m]))", + "expr": "sum by (instance) (rate(node_disk_bytes_read{instance=\"$server\"}[2m]))", "hide": false, "intervalFactor": 4, "legendFormat": "read", @@ -2614,14 +2632,14 @@ data: "target": "" }, { - "expr": "sum by (instance) (irate(node_disk_bytes_written{instance=~\"$server\"}[5m]))", + "expr": "sum by (instance) (rate(node_disk_bytes_written{instance=\"$server\"}[2m]))", "intervalFactor": 4, "legendFormat": "written", "refId": "B", "step": 8 }, { - "expr": "sum by (instance) (irate(node_disk_io_time_ms{instance=~\"$server\"}[5m]))", + "expr": "sum by (instance) (rate(node_disk_io_time_ms{instance=\"$server\"}[2m]))", "intervalFactor": 4, "legendFormat": "io time", "refId": "C", @@ -2631,7 +2649,7 @@ data: "thresholds": [], "timeFrom": null, "timeShift": null, - "title": "Disk usage", + "title": "Disk I/O", "tooltip": { "msResolution": false, "shared": true, @@ -2666,9 +2684,9 @@ data: "colorBackground": false, "colorValue": false, "colors": [ - "rgba(245, 54, 54, 0.9)", + "rgba(50, 172, 45, 0.97)", "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "rgba(245, 54, 54, 0.9)" ], "datasource": "${DS_PROMETHEUS}", "editable": true, @@ -2719,15 +2737,15 @@ data: }, "targets": [ { - "expr": "sum(node_filesystem_free{device!=\"rootfs\",instance=~\"$server\"}) / sum(node_filesystem_size{device!=\"rootfs\",instance=~\"$server\"})", + "expr": "(sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"}) - sum(node_filesystem_free{device!=\"rootfs\",instance=\"$server\"})) / sum(node_filesystem_size{device!=\"rootfs\",instance=\"$server\"})", "intervalFactor": 2, "refId": "A", "step": 60, "target": "" } ], - "thresholds": "0.10, 0.25", - "title": "Free disk space", + "thresholds": "0.75, 0.9", + "title": "Disk space usage", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -2799,7 +2817,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "irate(node_network_receive_bytes{instance=~\"$server\",device!~\"lo\"}[5m])", + "expr": "rate(node_network_receive_bytes{instance=\"$server\",device!~\"lo\"}[5m])", "hide": false, "intervalFactor": 2, "legendFormat": "{{device}}", @@ -2893,7 +2911,7 @@ data: "steppedLine": false, "targets": [ { - "expr": "irate(node_network_transmit_bytes{instance=~\"$server\",device!~\"lo\"}[5m])", + "expr": "rate(node_network_transmit_bytes{instance=\"$server\",device!~\"lo\"}[5m])", "hide": false, "intervalFactor": 2, "legendFormat": "{{device}}", diff --git a/manifests/grafana/grafana-depl.yaml b/manifests/grafana/grafana-depl.yaml index 25d2d209d9c0c4aef6fa9b8384bf8c14f14e946c..5a70df49b2e641d6e83539663aecbcac495ea25e 100644 --- a/manifests/grafana/grafana-depl.yaml +++ b/manifests/grafana/grafana-depl.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: grafana - image: grafana/grafana:3.1.1 + image: grafana/grafana:4.1.1 env: - name: GF_AUTH_BASIC_ENABLED value: "true" @@ -54,4 +54,3 @@ spec: - name: grafana-dashboards configMap: name: grafana-dashboards -