From d10c2b4cb988467dc4b5b7cf4ff26b980d2a3d1d Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 23 Feb 2019 12:49:09 -0800 Subject: [PATCH] Update Grafana from v6.0.0-beta2 to v6.0.0-beta3 * Update Grafana dashboards --- CHANGES.md | 2 +- addons/grafana/dashboards.yaml | 208 ++++++++++++++++++++++++++++++--- addons/grafana/deployment.yaml | 2 +- 3 files changed, 195 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c475641e..f10ce1e2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -28,7 +28,7 @@ Notable changes between versions. * Add `pod` name label to metrics discovered via service endpoints * Rename `kubernetes_namespace` label to `namespace` * Improve Grafana and dashboards ([#403](https://github.com/poseidon/typhoon/pull/403), [#404](https://github.com/poseidon/typhoon/pull/404)) - * Upgrade Grafana from v5.4.3 to 6.0.0-beta2 + * Upgrade Grafana from v5.4.3 to 6.0.0-beta3 * Enable Grafana [Explore](http://docs.grafana.org/guides/whats-new-in-v6-0/#explore) UI as a Viewer (inspect/edit without saving) * Raise nginx-ingress liveness/readiness timeout to 5 seconds * Remove nginx-ingess default-backend ([#401](https://github.com/poseidon/typhoon/pull/401)) diff --git a/addons/grafana/dashboards.yaml b/addons/grafana/dashboards.yaml index 181b288b..a6c5cc60 100644 --- a/addons/grafana/dashboards.yaml +++ b/addons/grafana/dashboards.yaml @@ -4045,7 +4045,7 @@ data: }, "yaxes": [ { - "format": "decbytes", + "format": "bytes", "label": null, "logBase": 1, "max": null, @@ -4133,7 +4133,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Requests", @@ -4151,7 +4151,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Requests %", @@ -4187,7 +4187,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Limits %", @@ -4833,7 +4833,7 @@ data: ], "timeFrom": null, "timeShift": null, - "title": "Memory Usage", + "title": "Memory Usage (w/o cache)", "tooltip": { "shared": true, "sort": 0, @@ -4851,7 +4851,7 @@ data: }, "yaxes": [ { - "format": "decbytes", + "format": "bytes", "label": null, "logBase": 1, "max": null, @@ -4939,7 +4939,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Requests", @@ -4957,7 +4957,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Requests %", @@ -4993,7 +4993,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Limits %", @@ -5013,6 +5013,60 @@ data: "type": "number", "unit": "percentunit" }, + { + "alias": "Memory Usage (RSS)", + "colorMode": null, + "colors": [ + + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #F", + "thresholds": [ + + ], + "type": "number", + "unit": "bytes" + }, + { + "alias": "Memory Usage (Cache)", + "colorMode": null, + "colors": [ + + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #G", + "thresholds": [ + + ], + "type": "number", + "unit": "bytes" + }, + { + "alias": "Memory Usage (Swap", + "colorMode": null, + "colors": [ + + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #H", + "thresholds": [ + + ], + "type": "number", + "unit": "bytes" + }, { "alias": "Pod", "colorMode": null, @@ -5092,6 +5146,33 @@ data: "legendFormat": "", "refId": "E", "step": 10 + }, + { + "expr": "sum(label_replace(container_memory_rss{namespace=\"$namespace\",container_name!=\"\"}, \"pod\", \"$1\", \"pod_name\", \"(.*)\")) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "F", + "step": 10 + }, + { + "expr": "sum(label_replace(container_memory_cache{namespace=\"$namespace\",container_name!=\"\"}, \"pod\", \"$1\", \"pod_name\", \"(.*)\")) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "G", + "step": 10 + }, + { + "expr": "sum(label_replace(container_memory_swap{namespace=\"$namespace\",container_name!=\"\"}, \"pod\", \"$1\", \"pod_name\", \"(.*)\")) by (pod)", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "H", + "step": 10 } ], "thresholds": [ @@ -5653,10 +5734,26 @@ data: "steppedLine": false, "targets": [ { - "expr": "sum(container_memory_usage_bytes{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)", + "expr": "sum(container_memory_rss{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)", "format": "time_series", "intervalFactor": 2, - "legendFormat": "{{container_name}}", + "legendFormat": "{{container_name}} (RSS)", + "legendLink": null, + "step": 10 + }, + { + "expr": "sum(container_memory_cache{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{container_name}} (Cache)", + "legendLink": null, + "step": 10 + }, + { + "expr": "sum(container_memory_swap{namespace=\"$namespace\", pod_name=\"$pod\", container_name!=\"POD\", container_name!=\"\"}) by (container_name)", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{container_name}} (Swap)", "legendLink": null, "step": 10 } @@ -5684,7 +5781,7 @@ data: }, "yaxes": [ { - "format": "short", + "format": "bytes", "label": null, "logBase": 1, "max": null, @@ -5772,7 +5869,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Requests", @@ -5790,7 +5887,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Requests %", @@ -5826,7 +5923,7 @@ data: ], "type": "number", - "unit": "decbytes" + "unit": "bytes" }, { "alias": "Memory Limits %", @@ -5846,6 +5943,60 @@ data: "type": "number", "unit": "percentunit" }, + { + "alias": "Memory Usage (RSS)", + "colorMode": null, + "colors": [ + + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #F", + "thresholds": [ + + ], + "type": "number", + "unit": "bytes" + }, + { + "alias": "Memory Usage (Cache)", + "colorMode": null, + "colors": [ + + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #G", + "thresholds": [ + + ], + "type": "number", + "unit": "bytes" + }, + { + "alias": "Memory Usage (Swap", + "colorMode": null, + "colors": [ + + ], + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "decimals": 2, + "link": false, + "linkTooltip": "Drill down", + "linkUrl": "", + "pattern": "Value #H", + "thresholds": [ + + ], + "type": "number", + "unit": "bytes" + }, { "alias": "Container", "colorMode": null, @@ -5925,6 +6076,33 @@ data: "legendFormat": "", "refId": "E", "step": 10 + }, + { + "expr": "sum(label_replace(container_memory_rss{namespace=\"$namespace\", pod_name=\"$pod\", container_name != \"\", container_name != \"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "F", + "step": 10 + }, + { + "expr": "sum(label_replace(container_memory_cache{namespace=\"$namespace\", pod_name=\"$pod\", container_name != \"\", container_name != \"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "G", + "step": 10 + }, + { + "expr": "sum(label_replace(container_memory_swap{namespace=\"$namespace\", pod_name=\"$pod\", container_name != \"\", container_name != \"POD\"}, \"container\", \"$1\", \"container_name\", \"(.*)\")) by (container)", + "format": "table", + "instant": true, + "intervalFactor": 2, + "legendFormat": "", + "refId": "H", + "step": 10 } ], "thresholds": [ diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml index cfe9d608..5c5998f0 100644 --- a/addons/grafana/deployment.yaml +++ b/addons/grafana/deployment.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: grafana - image: grafana/grafana:6.0.0-beta2 + image: grafana/grafana:6.0.0-beta3 env: - name: GF_PATHS_CONFIG value: "/etc/grafana/custom.ini"