From e00874199741fdf9f9e638179b66833c5b63e11a Mon Sep 17 00:00:00 2001 From: Jonathan Chauncey Date: Mon, 24 Oct 2016 17:28:55 -0400 Subject: [PATCH] chore(grafana): Update dashboards for new telegraf Tags for data collected by the kubernetes changed after the plguin was merged. So we needed to update the dashboards. This PR also removes the kubernetes_health dashboard since we no longer capture those metrics with the new kubernetes telegraf plugin. --- .../api/dashboards/deis_component_health.json | 644 ++++----- .../grafana/api/dashboards/deis_router.json | 6 +- .../share/grafana/api/dashboards/influx.json | 158 +-- .../api/dashboards/kubernetes_health.json | 1230 ----------------- .../grafana/api/dashboards/nsq_health.json | 166 +-- .../share/grafana/api/dashboards/redis.json | 166 +-- 6 files changed, 570 insertions(+), 1800 deletions(-) delete mode 100644 grafana/rootfs/usr/share/grafana/api/dashboards/kubernetes_health.json diff --git a/grafana/rootfs/usr/share/grafana/api/dashboards/deis_component_health.json b/grafana/rootfs/usr/share/grafana/api/dashboards/deis_component_health.json index 304c3f4..78f1f16 100644 --- a/grafana/rootfs/usr/share/grafana/api/dashboards/deis_component_health.json +++ b/grafana/rootfs/usr/share/grafana/api/dashboards/deis_component_health.json @@ -30,6 +30,7 @@ "threshold2Color": "rgba(234, 112, 112, 0.22)" }, "id": 31, + "interval": "", "isNew": true, "legend": { "avg": false, @@ -83,26 +84,26 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "sum", - "params": [] + "params": [], + "type": "sum" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], @@ -145,8 +146,7 @@ "min": null, "show": true } - ], - "interval": "" + ] }, { "aliasColors": {}, @@ -215,20 +215,20 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "sum", - "params": [] + "params": [], + "type": "sum" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], @@ -284,7 +284,7 @@ { "aliasColors": {}, "bars": false, - "datasource": null, + "datasource": "influxdb-datasource", "editable": true, "error": false, "fill": 1, @@ -320,7 +320,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -331,7 +331,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -350,32 +350,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-controller" } @@ -453,7 +453,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -464,7 +464,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -482,26 +482,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-controller" } @@ -588,7 +588,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -599,7 +599,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -617,32 +617,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-builder" } @@ -720,7 +720,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -731,7 +731,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -749,26 +749,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ "10" - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-builder" } @@ -855,7 +855,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -866,7 +866,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -884,32 +884,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-database" } @@ -986,7 +986,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -997,7 +997,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1015,26 +1015,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-database" } @@ -1121,7 +1121,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1132,7 +1132,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1150,32 +1150,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger-fluentd" } @@ -1252,7 +1252,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1263,7 +1263,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1281,26 +1281,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger-fluentd" } @@ -1387,7 +1387,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1398,7 +1398,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1416,32 +1416,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-grafana" } @@ -1518,7 +1518,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1529,7 +1529,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1547,26 +1547,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-grafana" } @@ -1653,7 +1653,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1664,7 +1664,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1682,32 +1682,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-influxdb" } @@ -1784,7 +1784,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1795,7 +1795,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1813,26 +1813,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-influxdb" } @@ -1919,7 +1919,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -1930,7 +1930,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -1948,32 +1948,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger" } @@ -2050,7 +2050,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2061,7 +2061,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2079,26 +2079,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger" } @@ -2185,7 +2185,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2196,7 +2196,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2214,32 +2214,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-minio" } @@ -2316,7 +2316,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2327,7 +2327,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2345,26 +2345,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-minio" } @@ -2451,7 +2451,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2462,7 +2462,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2480,32 +2480,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-nsqd" } @@ -2582,7 +2582,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2593,7 +2593,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2611,26 +2611,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-nsqd" } @@ -2717,7 +2717,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2728,7 +2728,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2746,32 +2746,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger-redis" } @@ -2848,7 +2848,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2859,7 +2859,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -2877,26 +2877,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger-redis" } @@ -2983,7 +2983,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -2994,7 +2994,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3012,32 +3012,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-registry" } @@ -3114,7 +3114,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -3125,7 +3125,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3143,26 +3143,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-registry" } @@ -3249,7 +3249,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -3260,7 +3260,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3278,32 +3278,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-registry-proxy" } @@ -3380,7 +3380,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -3391,7 +3391,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3409,26 +3409,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-registry-proxy" } @@ -3515,7 +3515,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -3526,7 +3526,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3544,32 +3544,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-router" } @@ -3646,7 +3646,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -3657,7 +3657,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3675,26 +3675,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-router" } @@ -3781,7 +3781,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "", "dsType": "influxdb", "groupBy": [ { @@ -3792,7 +3792,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3810,32 +3810,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-telegraf" } @@ -3923,7 +3923,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -3941,26 +3941,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-telegraf" } @@ -4047,7 +4047,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -4058,7 +4058,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -4076,32 +4076,32 @@ "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-workflow-manager" } @@ -4144,6 +4144,7 @@ "aliasColors": {}, "bars": false, "datasource": null, + "decimals": 2, "editable": true, "error": false, "fill": 1, @@ -4156,14 +4157,14 @@ "id": 18, "isNew": true, "legend": { + "alignAsTable": false, "avg": false, "current": false, "max": false, "min": false, "show": false, "total": false, - "values": false, - "alignAsTable": false + "values": false }, "lines": true, "linewidth": 2, @@ -4179,7 +4180,7 @@ "steppedLine": false, "targets": [ { - "alias": "$tag_pod", + "alias": "$tag_pod_name", "dsType": "influxdb", "groupBy": [ { @@ -4190,7 +4191,7 @@ }, { "params": [ - "pod" + "pod_name" ], "type": "tag" }, @@ -4208,26 +4209,26 @@ "select": [ [ { - "type": "field", "params": [ "memory_usage_bytes" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "moving_average", "params": [ 10 - ] + ], + "type": "moving_average" } ] ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-workflow-manager" } @@ -4264,8 +4265,7 @@ "min": null, "show": true } - ], - "decimals": 2 + ] } ], "showTitle": true, @@ -4273,7 +4273,7 @@ } ], "time": { - "from": "now-3h", + "from": "now-5m", "to": "now" }, "timepicker": { @@ -4309,7 +4309,7 @@ }, "refresh": "5s", "schemaVersion": 12, - "version": 1, + "version": 0, "links": [], "gnetId": null } diff --git a/grafana/rootfs/usr/share/grafana/api/dashboards/deis_router.json b/grafana/rootfs/usr/share/grafana/api/dashboards/deis_router.json index 1e0abb0..9b01463 100644 --- a/grafana/rootfs/usr/share/grafana/api/dashboards/deis_router.json +++ b/grafana/rootfs/usr/share/grafana/api/dashboards/deis_router.json @@ -1,5 +1,5 @@ { - "dashboard": { + "dashboard":{ "id": null, "title": "Deis Router", "tags": [ @@ -109,7 +109,7 @@ ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-router" } @@ -228,7 +228,7 @@ ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-router" } diff --git a/grafana/rootfs/usr/share/grafana/api/dashboards/influx.json b/grafana/rootfs/usr/share/grafana/api/dashboards/influx.json index 2bab948..048780c 100644 --- a/grafana/rootfs/usr/share/grafana/api/dashboards/influx.json +++ b/grafana/rootfs/usr/share/grafana/api/dashboards/influx.json @@ -40,6 +40,17 @@ "interval": null, "isNew": true, "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -47,6 +58,13 @@ "postfixFontSize": "50%", "prefix": "", "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], "span": 6, "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", @@ -104,25 +122,7 @@ "value": "null" } ], - "valueName": "avg", - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "rangeMaps": [ - { - "from": "null", - "to": "null", - "text": "N/A" - } - ], - "mappingType": 1 + "valueName": "avg" }, { "cacheTimeout": null, @@ -148,6 +148,17 @@ "interval": null, "isNew": true, "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -155,6 +166,13 @@ "postfixFontSize": "50%", "prefix": "", "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], "span": 6, "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", @@ -212,25 +230,7 @@ "value": "null" } ], - "valueName": "avg", - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "rangeMaps": [ - { - "from": "null", - "to": "null", - "text": "N/A" - } - ], - "mappingType": 1 + "valueName": "avg" } ], "title": "New row" @@ -264,6 +264,17 @@ "interval": null, "isNew": true, "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -271,6 +282,13 @@ "postfixFontSize": "50%", "prefix": "", "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], "span": 6, "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", @@ -315,7 +333,7 @@ ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-monitor-influxdb" } @@ -333,25 +351,7 @@ "value": "null" } ], - "valueName": "current", - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "rangeMaps": [ - { - "from": "null", - "to": "null", - "text": "N/A" - } - ], - "mappingType": 1 + "valueName": "current" }, { "cacheTimeout": null, @@ -377,6 +377,17 @@ "interval": null, "isNew": true, "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, @@ -384,6 +395,13 @@ "postfixFontSize": "50%", "prefix": "", "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], "span": 6, "sparkline": { "fillColor": "rgba(31, 118, 189, 0.18)", @@ -440,25 +458,7 @@ "value": "null" } ], - "valueName": "current", - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "rangeMaps": [ - { - "from": "null", - "to": "null", - "text": "N/A" - } - ], - "mappingType": 1 + "valueName": "current" } ], "title": "New row" @@ -626,8 +626,8 @@ "tooltip": { "msResolution": false, "shared": true, - "value_type": "cumulative", - "sort": 0 + "sort": 0, + "value_type": "cumulative" }, "type": "graph", "xaxis": { diff --git a/grafana/rootfs/usr/share/grafana/api/dashboards/kubernetes_health.json b/grafana/rootfs/usr/share/grafana/api/dashboards/kubernetes_health.json deleted file mode 100644 index 286c1e1..0000000 --- a/grafana/rootfs/usr/share/grafana/api/dashboards/kubernetes_health.json +++ /dev/null @@ -1,1230 +0,0 @@ -{ - "dashboard": { - "id": null, - "title": "Kubernetes Health", - "tags": ["deis"], - "originalTitle": "Kubernetes Health", - "style": "dark", - "timezone": "browser", - "editable": true, - "hideControls": false, - "sharedCrosshair": false, - "rows": [ - { - "title": "New row", - "height": "100px", - "editable": true, - "collapse": false, - "panels": [ - { - "title": "Pod Memory Usage", - "error": false, - "span": 6, - "editable": true, - "type": "singlestat", - "isNew": true, - "id": 11, - "targets": [ - { - "policy": "default", - "dsType": "influxdb", - "resultFormat": "time_series", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$interval" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "gauge" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "refId": "A", - "measurement": "container_memory_usage_bytes" - } - ], - "links": [], - "datasource": null, - "maxDataPoints": 100, - "interval": null, - "cacheTimeout": null, - "format": "bytes", - "prefix": "", - "postfix": "", - "nullText": null, - "valueMaps": [ - { - "value": "null", - "op": "=", - "text": "N/A" - } - ], - "nullPointMode": "connected", - "valueName": "current", - "prefixFontSize": "50%", - "valueFontSize": "200%", - "postfixFontSize": "50%", - "thresholds": "", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "sparkline": { - "show": true, - "full": false, - "lineColor": "rgb(31, 120, 193)", - "fillColor": "rgba(31, 118, 189, 0.18)" - }, - "gauge": { - "show": false, - "minValue": 0, - "maxValue": 100, - "thresholdMarkers": true, - "thresholdLabels": false - } - }, - { - "cacheTimeout": null, - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "datasource": null, - "editable": true, - "error": false, - "format": "none", - "gauge": { - "maxValue": 100, - "minValue": 0, - "show": false, - "thresholdLabels": false, - "thresholdMarkers": true - }, - "id": 10, - "interval": null, - "isNew": true, - "links": [], - "maxDataPoints": 100, - "nullPointMode": "connected", - "nullText": null, - "postfix": "", - "postfixFontSize": "50%", - "prefix": "", - "prefixFontSize": "50%", - "span": 6, - "sparkline": { - "fillColor": "rgba(31, 118, 189, 0.18)", - "full": false, - "lineColor": "rgb(31, 120, 193)", - "show": false - }, - "targets": [ - { - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_running_pod_count", - "policy": "default", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "gauge" - ], - "type": "field" - }, - { - "params": [], - "type": "sum" - } - ] - ], - "tags": [] - } - ], - "thresholds": "", - "title": "Running Pods", - "type": "singlestat", - "valueFontSize": "200%", - "valueMaps": [ - { - "op": "=", - "text": "N/A", - "value": "null" - } - ], - "valueName": "avg" - } - ] - }, - { - "collapse": false, - "editable": true, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 4, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Average", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_docker_operations_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.5\") FROM \"kubelet_docker_operations_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "90th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_docker_operations_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.9\") FROM \"kubelet_docker_operations_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.9" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "99th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_docker_operations_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.99\") FROM \"kubelet_docker_operations_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.99" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Docker Latency", - "tooltip": { - "msResolution": true, - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ - { - "format": "µs", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 1, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Average", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "apiserver_request_latencies_summary", - "policy": "default", - "query": "SELECT last(\"0.5\") FROM \"apiserver_request_latencies_summary\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "90th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "apiserver_request_latencies_summary", - "policy": "default", - "query": "SELECT last(\"0.9\") FROM \"apiserver_request_latencies_summary\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.9" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "99th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "apiserver_request_latencies_summary", - "policy": "default", - "query": "SELECT last(\"0.99\") FROM \"apiserver_request_latencies_summary\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "rawQuery": false, - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.99" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Kubernetes API Latency", - "tooltip": { - "msResolution": true, - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ - { - "format": "ns", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - } - ], - "title": "New row" - }, - { - "collapse": false, - "editable": true, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 9, - "isNew": true, - "legend": { - "avg": false, - "current": false, - "max": false, - "min": false, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "$tag_host", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "host" - ], - "type": "tag" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "http_requests_total", - "policy": "default", - "query": "SELECT non_negative_derivative(last(\"counter\"), 1s) FROM \"http_requests_total\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "counter" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - }, - { - "params": [ - "1s" - ], - "type": "non_negative_derivative" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "http requests", - "tooltip": { - "msResolution": false, - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ - { - "format": "ops", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - }, - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 7, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Average", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_pod_worker_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.5\") FROM \"kubelet_pod_worker_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "90th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_pod_worker_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.9\") FROM \"kubelet_pod_worker_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.9" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "99th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_pod_worker_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.99\") FROM \"kubelet_pod_worker_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.99" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Kubelet Pod Worker Latency", - "tooltip": { - "msResolution": true, - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ - { - "format": "µs", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - } - ], - "repeat": "host", - "showTitle": false, - "title": "Row" - }, - { - "collapse": false, - "editable": true, - "height": "250px", - "panels": [ - { - "aliasColors": {}, - "bars": false, - "datasource": null, - "editable": true, - "error": false, - "fill": 1, - "grid": { - "threshold1": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2": null, - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "id": 3, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": false, - "current": false, - "max": false, - "min": false, - "rightSide": true, - "show": false, - "total": false, - "values": false - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "span": 6, - "stack": false, - "steppedLine": false, - "targets": [ - { - "alias": "Average", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_container_manager_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.5\") FROM \"kubelet_container_manager_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "A", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.5" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "90th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_container_manager_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.9\") FROM \"kubelet_container_manager_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "B", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.9" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - }, - { - "alias": "99th", - "dsType": "influxdb", - "groupBy": [ - { - "params": [ - "$interval" - ], - "type": "time" - }, - { - "params": [ - "null" - ], - "type": "fill" - } - ], - "measurement": "kubelet_container_manager_latency_microseconds", - "policy": "default", - "query": "SELECT last(\"0.99\") FROM \"kubelet_container_manager_latency_microseconds\" WHERE $timeFilter GROUP BY time($interval), \"host\" fill(null)", - "refId": "C", - "resultFormat": "time_series", - "select": [ - [ - { - "params": [ - "0.99" - ], - "type": "field" - }, - { - "params": [], - "type": "last" - } - ] - ], - "tags": [] - } - ], - "timeFrom": null, - "timeShift": null, - "title": "Container Manager Latency", - "tooltip": { - "msResolution": true, - "shared": true, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "show": true - }, - "yaxes": [ - { - "format": "µs", - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ] - }, - { - "title": "API Resource API Latency", - "error": false, - "span": 6, - "editable": true, - "type": "graph", - "isNew": true, - "id": 12, - "targets": [ - { - "policy": "default", - "dsType": "influxdb", - "resultFormat": "time_series", - "tags": [], - "groupBy": [ - { - "type": "time", - "params": [ - "$interval" - ] - }, - { - "type": "tag", - "params": [ - "resource" - ] - }, - { - "type": "fill", - "params": [ - "null" - ] - } - ], - "select": [ - [ - { - "type": "field", - "params": [ - "0.5" - ] - }, - { - "type": "last", - "params": [] - } - ] - ], - "refId": "A", - "measurement": "apiserver_request_latencies_summary" - } - ], - "datasource": null, - "renderer": "flot", - "yaxes": [ - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "ns" - }, - { - "label": null, - "show": true, - "logBase": 1, - "min": null, - "max": null, - "format": "short" - } - ], - "xaxis": { - "show": true - }, - "grid": { - "threshold1": null, - "threshold2": null, - "threshold1Color": "rgba(216, 200, 27, 0.27)", - "threshold2Color": "rgba(234, 112, 112, 0.22)" - }, - "lines": true, - "fill": 1, - "linewidth": 2, - "points": false, - "pointradius": 5, - "bars": false, - "stack": false, - "percentage": false, - "legend": { - "show": false, - "values": false, - "min": false, - "max": false, - "current": false, - "total": false, - "avg": false - }, - "nullPointMode": "connected", - "steppedLine": false, - "tooltip": { - "value_type": "cumulative", - "shared": true, - "msResolution": true - }, - "timeFrom": null, - "timeShift": null, - "aliasColors": {}, - "seriesOverrides": [], - "links": [] - } - ], - "repeat": "host", - "title": "New row" - } - ], - "time": { - "from": "now-5m", - "to": "now" - }, - "timepicker": { - "now": true, - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "templating": { - "list": [] - }, - "annotations": { - "list": [] - }, - "refresh": "5s", - "schemaVersion": 12, - "version": 0, - "links": [] - } -} diff --git a/grafana/rootfs/usr/share/grafana/api/dashboards/nsq_health.json b/grafana/rootfs/usr/share/grafana/api/dashboards/nsq_health.json index 20199d4..cffb83c 100644 --- a/grafana/rootfs/usr/share/grafana/api/dashboards/nsq_health.json +++ b/grafana/rootfs/usr/share/grafana/api/dashboards/nsq_health.json @@ -17,123 +17,123 @@ "height": "200px", "panels": [ { - "title": "CPU Usage (Millicores)", - "error": false, - "span": 6, + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": null, "editable": true, - "type": "singlestat", - "isNew": true, + "error": false, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 9, + "interval": null, + "isNew": true, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "span": 6, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, "targets": [ { - "policy": "default", "dsType": "influxdb", - "resultFormat": "time_series", - "tags": [ - { - "key": "name", - "operator": "=", - "value": "deis-nsqd" - } - ], "groupBy": [ { - "type": "time", "params": [ "$interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "measurement": "kubernetes_pod_container", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], - "refId": "A", - "measurement": "kubernetes_pod_container" + "tags": [ + { + "key": "container_name", + "operator": "=", + "value": "deis-nsqd" + } + ] } ], - "links": [], - "datasource": null, - "maxDataPoints": 100, - "interval": null, - "cacheTimeout": null, - "format": "none", - "prefix": "", - "postfix": "", - "nullText": null, + "thresholds": "", + "title": "CPU Usage (Millicores)", + "type": "singlestat", + "valueFontSize": "200%", "valueMaps": [ { - "value": "null", "op": "=", - "text": "N/A" - } - ], - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "rangeMaps": [ - { - "from": "null", - "to": "null", - "text": "N/A" + "text": "N/A", + "value": "null" } ], - "mappingType": 1, - "nullPointMode": "connected", - "valueName": "avg", - "prefixFontSize": "50%", - "valueFontSize": "200%", - "postfixFontSize": "50%", - "thresholds": "", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "sparkline": { - "show": true, - "full": false, - "lineColor": "rgb(31, 120, 193)", - "fillColor": "rgba(31, 118, 189, 0.18)" - }, - "gauge": { - "show": false, - "minValue": 0, - "maxValue": 100, - "thresholdMarkers": true, - "thresholdLabels": false - } + "valueName": "avg" }, { "cacheTimeout": null, @@ -234,7 +234,7 @@ ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-nsqd" } @@ -798,7 +798,7 @@ }, "refresh": "5s", "schemaVersion": 12, - "version": 3, + "version": 1, "links": [], "gnetId": null } diff --git a/grafana/rootfs/usr/share/grafana/api/dashboards/redis.json b/grafana/rootfs/usr/share/grafana/api/dashboards/redis.json index 89209e4..c743c98 100644 --- a/grafana/rootfs/usr/share/grafana/api/dashboards/redis.json +++ b/grafana/rootfs/usr/share/grafana/api/dashboards/redis.json @@ -17,123 +17,123 @@ "height": "200px", "panels": [ { - "title": "CPU Usage (Millicores)", - "error": false, - "span": 6, + "cacheTimeout": null, + "colorBackground": false, + "colorValue": false, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "datasource": null, "editable": true, - "type": "singlestat", - "isNew": true, + "error": false, + "format": "none", + "gauge": { + "maxValue": 100, + "minValue": 0, + "show": false, + "thresholdLabels": false, + "thresholdMarkers": true + }, "id": 6, + "interval": null, + "isNew": true, + "links": [], + "mappingType": 1, + "mappingTypes": [ + { + "name": "value to text", + "value": 1 + }, + { + "name": "range to text", + "value": 2 + } + ], + "maxDataPoints": 100, + "nullPointMode": "connected", + "nullText": null, + "postfix": "", + "postfixFontSize": "50%", + "prefix": "", + "prefixFontSize": "50%", + "rangeMaps": [ + { + "from": "null", + "text": "N/A", + "to": "null" + } + ], + "span": 6, + "sparkline": { + "fillColor": "rgba(31, 118, 189, 0.18)", + "full": false, + "lineColor": "rgb(31, 120, 193)", + "show": true + }, "targets": [ { - "policy": "default", "dsType": "influxdb", - "resultFormat": "time_series", - "tags": [ - { - "key": "name", - "operator": "=", - "value": "deis-logger-redis" - } - ], "groupBy": [ { - "type": "time", "params": [ "$interval" - ] + ], + "type": "time" }, { - "type": "fill", "params": [ "null" - ] + ], + "type": "fill" } ], + "measurement": "kubernetes_pod_container", + "policy": "default", + "refId": "A", + "resultFormat": "time_series", "select": [ [ { - "type": "field", "params": [ "cpu_usage_nanocores" - ] + ], + "type": "field" }, { - "type": "last", - "params": [] + "params": [], + "type": "last" }, { - "type": "math", "params": [ " / 1000000" - ] + ], + "type": "math" } ] ], - "refId": "A", - "measurement": "kubernetes_pod_container" + "tags": [ + { + "key": "container_name", + "operator": "=", + "value": "deis-logger-redis" + } + ] } ], - "links": [], - "datasource": null, - "maxDataPoints": 100, - "interval": null, - "cacheTimeout": null, - "format": "none", - "prefix": "", - "postfix": "", - "nullText": null, + "thresholds": "", + "title": "CPU Usage (Millicores)", + "type": "singlestat", + "valueFontSize": "200%", "valueMaps": [ { - "value": "null", "op": "=", - "text": "N/A" - } - ], - "mappingTypes": [ - { - "name": "value to text", - "value": 1 - }, - { - "name": "range to text", - "value": 2 - } - ], - "rangeMaps": [ - { - "from": "null", - "to": "null", - "text": "N/A" + "text": "N/A", + "value": "null" } ], - "mappingType": 1, - "nullPointMode": "connected", - "valueName": "avg", - "prefixFontSize": "50%", - "valueFontSize": "200%", - "postfixFontSize": "50%", - "thresholds": "", - "colorBackground": false, - "colorValue": false, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], - "sparkline": { - "show": true, - "full": false, - "lineColor": "rgb(31, 120, 193)", - "fillColor": "rgba(31, 118, 189, 0.18)" - }, - "gauge": { - "show": false, - "minValue": 0, - "maxValue": 100, - "thresholdMarkers": true, - "thresholdLabels": false - } + "valueName": "avg" }, { "cacheTimeout": null, @@ -228,7 +228,7 @@ ], "tags": [ { - "key": "name", + "key": "container_name", "operator": "=", "value": "deis-logger-redis" } @@ -511,7 +511,7 @@ }, "refresh": "5s", "schemaVersion": 12, - "version": 2, + "version": 1, "links": [], "gnetId": null }