From 86ce17c4554f595aeeccf55d60687f71913ba2bd Mon Sep 17 00:00:00 2001 From: CarlosEDP Date: Mon, 4 Feb 2019 18:22:43 -0200 Subject: [PATCH] Updated dashboard alert --- .../kubernetes-cluster-dashboard.json | 25 +++++++++++------ manifests/grafana-dashboardDefinitions.yaml | 27 +++++++++++++------ 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/grafana-dashboards/kubernetes-cluster-dashboard.json b/grafana-dashboards/kubernetes-cluster-dashboard.json index 797dd38..da58dbb 100644 --- a/grafana-dashboards/kubernetes-cluster-dashboard.json +++ b/grafana-dashboards/kubernetes-cluster-dashboard.json @@ -16,7 +16,7 @@ "editable": true, "gnetId": 162, "graphTooltip": 1, - "id": 12, + "id": 13, "links": [], "panels": [ { @@ -379,7 +379,7 @@ { "evaluator": { "params": [ - 3500000000 + 0.85 ], "type": "gt" }, @@ -388,19 +388,20 @@ }, "query": { "params": [ - "A", - "4m", + "B", + "5m", "now" ] }, "reducer": { "params": [], - "type": "avg" + "type": "max" }, "type": "query" } ], "executionErrorState": "alerting", + "for": "0m", "frequency": "60s", "handler": 1, "name": "Memory Usage alert", @@ -448,6 +449,13 @@ "intervalFactor": 2, "legendFormat": "{{ instance }}", "refId": "A" + }, + { + "expr": "(node_memory_MemTotal_bytes - (node_memory_MemFree_bytes+node_memory_Buffers_bytes+node_memory_Cached_bytes))/node_memory_MemTotal_bytes", + "format": "time_series", + "hide": true, + "intervalFactor": 1, + "refId": "B" } ], "thresholds": [ @@ -456,7 +464,7 @@ "fill": true, "line": true, "op": "gt", - "value": 3500000000 + "value": 0.85 } ], "timeFrom": null, @@ -705,6 +713,7 @@ }, { "dashboardFilter": "", + "dashboardTags": [], "folderId": null, "gridPos": { "h": 9, @@ -1666,6 +1675,6 @@ }, "timezone": "browser", "title": "Kubernetes cluster monitoring (via Prometheus)", - "uid": "82pBZCmRk", - "version": 2 + "uid": "82pBZCmRkasd", + "version": 1 } \ No newline at end of file diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index 1aec137..305d84d 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -4913,7 +4913,7 @@ items: "editable": true, "gnetId": 162, "graphTooltip": 1, - "id": 12, + "id": 13, "links": [ ], @@ -5296,7 +5296,7 @@ items: { "evaluator": { "params": [ - 3500000000 + 0.84999999999999998 ], "type": "gt" }, @@ -5305,8 +5305,8 @@ items: }, "query": { "params": [ - "A", - "4m", + "B", + "5m", "now" ] }, @@ -5314,12 +5314,13 @@ items: "params": [ ], - "type": "avg" + "type": "max" }, "type": "query" } ], "executionErrorState": "alerting", + "for": "0m", "frequency": "60s", "handler": 1, "name": "Memory Usage alert", @@ -5375,6 +5376,13 @@ items: "intervalFactor": 2, "legendFormat": "{{ instance }}", "refId": "A" + }, + { + "expr": "(node_memory_MemTotal_bytes - (node_memory_MemFree_bytes+node_memory_Buffers_bytes+node_memory_Cached_bytes))/node_memory_MemTotal_bytes", + "format": "time_series", + "hide": true, + "intervalFactor": 1, + "refId": "B" } ], "thresholds": [ @@ -5383,7 +5391,7 @@ items: "fill": true, "line": true, "op": "gt", - "value": 3500000000 + "value": 0.84999999999999998 } ], "timeFrom": null, @@ -5658,6 +5666,9 @@ items: }, { "dashboardFilter": "", + "dashboardTags": [ + + ], "folderId": null, "gridPos": { "h": 9, @@ -6727,8 +6738,8 @@ items: }, "timezone": "browser", "title": "Kubernetes cluster monitoring (via Prometheus)", - "uid": "82pBZCmRk", - "version": 2 + "uid": "82pBZCmRkasd", + "version": 1 } kind: ConfigMap metadata: