From 0fa026135cfed9b25ca865525171fec2c5707106 Mon Sep 17 00:00:00 2001 From: Jose Luis Lucas Date: Mon, 11 Feb 2019 15:58:00 +0100 Subject: [PATCH] Update QED and Host dashboards --- .../provisioning/dashboards/Host.json | 1145 +++++++++-------- .../provisioning/dashboards/QED.json | 41 +- 2 files changed, 599 insertions(+), 587 deletions(-) diff --git a/deploy/aws/modules/prometheus/provisioning/dashboards/Host.json b/deploy/aws/modules/prometheus/provisioning/dashboards/Host.json index 57efac32f..b15994f62 100644 --- a/deploy/aws/modules/prometheus/provisioning/dashboards/Host.json +++ b/deploy/aws/modules/prometheus/provisioning/dashboards/Host.json @@ -1,46 +1,4 @@ { - "__inputs": [ - { - "name": "Prometheus", - "label": "Prometheus", - "description": "", - "type": "datasource", - "pluginId": "prometheus", - "pluginName": "Prometheus" - } - ], - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "5.2.2" - }, - { - "type": "panel", - "id": "graph", - "name": "Graph", - "version": "5.0.0" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "singlestat", - "name": "Singlestat", - "version": "5.0.0" - }, - { - "type": "panel", - "id": "table", - "name": "Table", - "version": "5.0.0" - } - ], "annotations": { "list": [ { @@ -58,8 +16,8 @@ "editable": true, "gnetId": 179, "graphTooltip": 1, - "id": null, - "iteration": 1533037835187, + "id": 1, + "iteration": 1549891961774, "links": [], "panels": [ { @@ -143,7 +101,7 @@ } ], "thresholds": "", - "title": "Uptime", + "title": "Prometheus Uptime", "type": "singlestat", "valueFontSize": "80%", "valueMaps": [ @@ -629,10 +587,12 @@ "lineColor": "rgb(31, 120, 193)", "show": false }, - "tableColumn": "", + "tableColumn": "Value #B", "targets": [ { "expr": "sum (container_fs_limit_bytes - container_fs_usage_bytes) / sum(container_fs_limit_bytes)", + "format": "time_series", + "hide": false, "interval": "10s", "intervalFactor": 1, "metric": "", @@ -694,24 +654,23 @@ "steppedLine": false, "targets": [ { - "expr": "sum(rate(container_network_receive_bytes_total{id=\"/\"}[$interval])) by (id)", + "expr": "node_network_receive_bytes_total{device!~\"lo\"}", "format": "time_series", - "interval": "2m", - "intervalFactor": 2, - "legendFormat": "RECEIVE", - "refId": "A" + "intervalFactor": 1, + "legendFormat": "{{job}}-recv", + "refId": "C" }, { - "expr": "- sum(rate(container_network_transmit_bytes_total{id=\"/\"}[$interval])) by (id)", + "expr": "node_network_transmit_bytes_total{device!~\"lo\"}", "format": "time_series", - "interval": "2m", - "intervalFactor": 2, - "legendFormat": "TRANSMIT", - "refId": "B" + "intervalFactor": 1, + "legendFormat": "{{job}}-sent", + "refId": "D" } ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Node Network Traffic", "tooltip": { @@ -786,28 +745,43 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": true, + "stack": false, "steppedLine": false, "targets": [ { - "expr": "sum(node_memory_MemTotal_bytes) - sum(node_memory_MemAvailable_bytes)", + "expr": "node_memory_MemTotal_bytes{job=\"Qed0-HostMetrics\"}", "format": "time_series", "interval": "2m", "intervalFactor": 2, - "legendFormat": "Used Memory", + "legendFormat": "Total Memory", "refId": "B" }, { - "expr": "sum(node_memory_MemAvailable_bytes)", + "expr": "(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes{job=\"Qed0-HostMetrics\"})", "format": "time_series", "interval": "2m", "intervalFactor": 2, - "legendFormat": "Available Memory", + "legendFormat": "Used Qed0", "refId": "A" + }, + { + "expr": "(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes{job=\"Qed1-HostMetrics\"})", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "Used Qed1", + "refId": "C" + }, + { + "expr": "(node_memory_MemTotal_bytes - node_memory_MemAvailable_bytes{job=\"Qed2-HostMetrics\"})", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "Used Qed2", + "refId": "D" } ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Node Mermory", "tooltip": { @@ -829,7 +803,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -885,20 +859,43 @@ "renderer": "flot", "seriesOverrides": [], "spaceLength": 10, - "stack": true, + "stack": false, "steppedLine": false, "targets": [ { - "expr": "sum(node_filesystem_free_bytes {job=\"node-exporter\", instance=~\".*9100\", device=~\"/dev/.*\", mountpoint!=\"/var/lib/docker/aufs\"}) ", + "expr": "node_filesystem_size_bytes {job=~\"Qed0-HostMetrics\"}", "format": "time_series", - "interval": "2m", - "intervalFactor": 2, - "legendFormat": "Free Storage", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Total", + "refId": "C" + }, + { + "expr": "(node_filesystem_size_bytes - node_filesystem_avail_bytes{job=~\"Qed0-HostMetrics\"}) ", + "format": "time_series", + "interval": "", + "intervalFactor": 1, + "legendFormat": "Used-Qed0", + "refId": "B" + }, + { + "expr": "(node_filesystem_size_bytes - node_filesystem_avail_bytes{job=~\"Qed1-HostMetrics\"})", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "Used-Qed1", "refId": "A" + }, + { + "expr": "(node_filesystem_size_bytes - node_filesystem_avail_bytes{job=~\"Qed2-HostMetrics\"})", + "format": "time_series", + "intervalFactor": 1, + "legendFormat": "Used-Qed2", + "refId": "D" } ], "thresholds": [], "timeFrom": null, + "timeRegions": [], "timeShift": null, "title": "Filesystem Available", "tooltip": { @@ -921,7 +918,7 @@ "label": null, "logBase": 1, "max": null, - "min": null, + "min": "0", "show": true }, { @@ -939,7 +936,7 @@ } }, { - "collapsed": false, + "collapsed": true, "gridPos": { "h": 1, "w": 24, @@ -947,523 +944,528 @@ "y": 23 }, "id": 19, - "panels": [], - "repeat": null, - "title": "Container Performance", - "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 3, - "editable": true, - "error": false, - "fill": 0, - "grid": {}, - "gridPos": { - "h": 10, - "w": 6, - "x": 0, - "y": 24 - }, - "id": 3, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "container_cpu_load_average_10s{image!=\"\"}", - "format": "time_series", - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "{{ name }}", - "metric": "container_cpu_user_seconds_total", - "refId": "A", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Container CPU usage", - "tooltip": { - "msResolution": true, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "percentunit", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fill": 0, - "grid": {}, - "gridPos": { - "h": 10, - "w": 6, - "x": 6, - "y": 24 - }, - "id": 2, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "container_memory_max_usage_bytes{image!=\"\"}", - "format": "time_series", - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "{{ name }}", - "metric": "container_memory_usage:sort_desc", - "refId": "A", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Container Memory Usage", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - }, - { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "columns": [], - "datasource": "Prometheus", - "fontSize": "100%", - "gridPos": { - "h": 13, - "w": 10, - "x": 12, - "y": 24 - }, - "id": 23, - "links": [], - "pageSize": null, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "styles": [ - { - "alias": "Time", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "pattern": "Time", - "type": "date" - }, - { - "alias": "", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" + "panels": [ + { + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 3, + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "gridPos": { + "h": 10, + "w": 6, + "x": 0, + "y": 24 + }, + "id": 3, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "container_cpu_load_average_10s{image!=\"\"}", + "format": "time_series", + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "{{ name }}", + "metric": "container_cpu_user_seconds_total", + "refId": "A", + "step": 10 + } ], - "decimals": 2, - "pattern": "/.*/", "thresholds": [], - "type": "number", - "unit": "short" - } - ], - "targets": [ - { - "expr": "ALERTS", - "format": "table", - "intervalFactor": 1, - "refId": "A" - } - ], - "title": "Alerts", - "transform": "table", - "type": "table" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fill": 0, - "grid": {}, - "gridPos": { - "h": 14, - "w": 6, - "x": 0, - "y": 34 - }, - "id": 8, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sort_desc(sum by (name) (rate(container_network_receive_bytes_total{image!=\"\"}[1m] ) ))", - "interval": "10s", - "intervalFactor": 1, - "legendFormat": "{{ name }}", - "metric": "container_network_receive_bytes_total", - "refId": "A", - "step": 10 - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Container Network Input", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Container CPU usage", + "tooltip": { + "msResolution": true, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "percentunit", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "Prometheus", - "decimals": 2, - "editable": true, - "error": false, - "fill": 0, - "grid": {}, - "gridPos": { - "h": 14, - "w": 6, - "x": 6, - "y": 34 - }, - "id": 9, - "isNew": true, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "sort": "current", - "sortDesc": true, - "total": false, - "values": true - }, - "lines": true, - "linewidth": 2, - "links": [], - "nullPointMode": "connected", - "percentage": false, - "pointradius": 5, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sort_desc(sum by (name) (rate(container_network_transmit_bytes_total{image!=\"\"}[1m] ) ))", - "format": "time_series", - "intervalFactor": 2, - "legendFormat": "{{ name }}", - "metric": "container_network_transmit_bytes_total", - "refId": "B", - "step": 4 - } - ], - "thresholds": [], - "timeFrom": null, - "timeShift": null, - "title": "Container Network Output", - "tooltip": { - "msResolution": false, - "shared": true, - "sort": 0, - "value_type": "cumulative" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "bytes", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "gridPos": { + "h": 10, + "w": 6, + "x": 6, + "y": 24 + }, + "id": 2, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "container_memory_max_usage_bytes{image!=\"\"}", + "format": "time_series", + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "{{ name }}", + "metric": "container_memory_usage:sort_desc", + "refId": "A", + "step": 10 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Container Memory Usage", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": false - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "columns": [], - "datasource": "Prometheus", - "fontSize": "100%", - "gridPos": { - "h": 10, - "w": 10, - "x": 12, - "y": 37 - }, - "id": 30, - "links": [], - "pageSize": 10, - "scroll": true, - "showHeader": true, - "sort": { - "col": 0, - "desc": true - }, - "styles": [ - { - "alias": "Time", - "dateFormat": "YYYY-MM-DD HH:mm:ss", - "link": false, - "linkUrl": "", - "pattern": "Time", - "type": "date" + "columns": [], + "datasource": "Prometheus", + "fontSize": "100%", + "gridPos": { + "h": 13, + "w": 10, + "x": 12, + "y": 24 + }, + "id": 23, + "links": [], + "pageSize": null, + "scroll": true, + "showHeader": true, + "sort": { + "col": 0, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "pattern": "Time", + "type": "date" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 2, + "pattern": "/.*/", + "thresholds": [], + "type": "number", + "unit": "short" + } + ], + "targets": [ + { + "expr": "ALERTS", + "format": "table", + "intervalFactor": 1, + "refId": "A" + } + ], + "title": "Alerts", + "transform": "table", + "type": "table" }, { - "alias": "", - "colorMode": null, - "colors": [ - "rgba(245, 54, 54, 0.9)", - "rgba(237, 129, 40, 0.89)", - "rgba(50, 172, 45, 0.97)" - ], + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", "decimals": 2, - "pattern": "/.*/", + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "gridPos": { + "h": 14, + "w": 6, + "x": 0, + "y": 34 + }, + "id": 8, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sort_desc(sum by (name) (rate(container_network_receive_bytes_total{image!=\"\"}[1m] ) ))", + "interval": "10s", + "intervalFactor": 1, + "legendFormat": "{{ name }}", + "metric": "container_network_receive_bytes_total", + "refId": "A", + "step": 10 + } + ], "thresholds": [], - "type": "number", - "unit": "short" - } - ], - "targets": [ - { - "expr": "cadvisor_version_info", - "format": "table", - "instant": false, - "interval": "15m", - "intervalFactor": 2, - "legendFormat": "cAdvisor Version: {{cadvisorVersion}}", - "refId": "A" + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Container Network Input", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { - "expr": "prometheus_build_info", - "format": "table", - "interval": "15m", - "intervalFactor": 2, - "legendFormat": "Prometheus Version: {{version}}", - "refId": "B" + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "Prometheus", + "decimals": 2, + "editable": true, + "error": false, + "fill": 0, + "grid": {}, + "gridPos": { + "h": 14, + "w": 6, + "x": 6, + "y": 34 + }, + "id": 9, + "isNew": true, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "sort": "current", + "sortDesc": true, + "total": false, + "values": true + }, + "lines": true, + "linewidth": 2, + "links": [], + "nullPointMode": "connected", + "percentage": false, + "pointradius": 5, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sort_desc(sum by (name) (rate(container_network_transmit_bytes_total{image!=\"\"}[1m] ) ))", + "format": "time_series", + "intervalFactor": 2, + "legendFormat": "{{ name }}", + "metric": "container_network_transmit_bytes_total", + "refId": "B", + "step": 4 + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Container Network Output", + "tooltip": { + "msResolution": false, + "shared": true, + "sort": 0, + "value_type": "cumulative" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "bytes", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": false + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { - "expr": "node_exporter_build_info", - "format": "table", - "interval": "15m", - "intervalFactor": 2, - "legendFormat": "Node-Exporter Version: {{version}}", - "refId": "C" + "columns": [], + "datasource": "Prometheus", + "fontSize": "100%", + "gridPos": { + "h": 10, + "w": 10, + "x": 12, + "y": 37 + }, + "id": 30, + "links": [], + "pageSize": 10, + "scroll": true, + "showHeader": true, + "sort": { + "col": 0, + "desc": true + }, + "styles": [ + { + "alias": "Time", + "dateFormat": "YYYY-MM-DD HH:mm:ss", + "link": false, + "linkUrl": "", + "pattern": "Time", + "type": "date" + }, + { + "alias": "", + "colorMode": null, + "colors": [ + "rgba(245, 54, 54, 0.9)", + "rgba(237, 129, 40, 0.89)", + "rgba(50, 172, 45, 0.97)" + ], + "decimals": 2, + "pattern": "/.*/", + "thresholds": [], + "type": "number", + "unit": "short" + } + ], + "targets": [ + { + "expr": "cadvisor_version_info", + "format": "table", + "instant": false, + "interval": "15m", + "intervalFactor": 2, + "legendFormat": "cAdvisor Version: {{cadvisorVersion}}", + "refId": "A" + }, + { + "expr": "prometheus_build_info", + "format": "table", + "interval": "15m", + "intervalFactor": 2, + "legendFormat": "Prometheus Version: {{version}}", + "refId": "B" + }, + { + "expr": "node_exporter_build_info", + "format": "table", + "interval": "15m", + "intervalFactor": 2, + "legendFormat": "Node-Exporter Version: {{version}}", + "refId": "C" + } + ], + "title": "Running Versions", + "transform": "table", + "type": "table" } ], - "title": "Running Versions", - "transform": "table", - "type": "table" + "repeat": null, + "title": "Container Performance", + "type": "row" } ], "refresh": "10s", @@ -1542,6 +1544,7 @@ ], "query": "1m,10m,30m,1h,6h,12h,1d,7d,14d,30d", "refresh": 2, + "skipUrlSync": false, "type": "interval" } ] @@ -1578,5 +1581,5 @@ "timezone": "browser", "title": "Docker Prometheus Monitoring", "uid": "64nrElFmk", - "version": 4 + "version": 67 } \ No newline at end of file diff --git a/deploy/aws/modules/prometheus/provisioning/dashboards/QED.json b/deploy/aws/modules/prometheus/provisioning/dashboards/QED.json index 8921b1ce1..aa2b106c7 100644 --- a/deploy/aws/modules/prometheus/provisioning/dashboards/QED.json +++ b/deploy/aws/modules/prometheus/provisioning/dashboards/QED.json @@ -15,7 +15,7 @@ "editable": true, "gnetId": null, "graphTooltip": 0, - "id": 3, + "id": 2, "links": [], "panels": [ { @@ -26,7 +26,7 @@ "fill": 1, "gridPos": { "h": 5, - "w": 24, + "w": 14, "x": 0, "y": 0 }, @@ -148,10 +148,10 @@ "thresholdMarkers": true }, "gridPos": { - "h": 3, + "h": 5, "w": 5, - "x": 5, - "y": 5 + "x": 14, + "y": 0 }, "id": 4, "interval": null, @@ -227,10 +227,10 @@ "thresholdMarkers": true }, "gridPos": { - "h": 3, + "h": 5, "w": 5, - "x": 14, - "y": 5 + "x": 19, + "y": 0 }, "id": 20, "interval": null, @@ -298,7 +298,7 @@ "h": 9, "w": 8, "x": 0, - "y": 8 + "y": 5 }, "id": 2, "legend": { @@ -328,7 +328,7 @@ "format": "time_series", "interval": "", "intervalFactor": 1, - "legendFormat": "", + "legendFormat": "{{job}}", "refId": "A" } ], @@ -383,7 +383,7 @@ "h": 9, "w": 8, "x": 8, - "y": 8 + "y": 5 }, "id": 10, "legend": { @@ -412,6 +412,7 @@ "expr": "sum(rate(qed_balloon_membership_total[30s])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "A" } ], @@ -466,7 +467,7 @@ "h": 9, "w": 8, "x": 16, - "y": 8 + "y": 5 }, "id": 12, "legend": { @@ -495,6 +496,7 @@ "expr": "sum(rate(qed_balloon_incremental_total[30s])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "A" } ], @@ -549,7 +551,7 @@ "h": 9, "w": 8, "x": 0, - "y": 17 + "y": 14 }, "id": 19, "legend": { @@ -578,6 +580,7 @@ "expr": "sum(rate(qed_sender_batches_sent_total[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "A" } ], @@ -632,7 +635,7 @@ "h": 9, "w": 8, "x": 8, - "y": 17 + "y": 14 }, "id": 17, "legend": { @@ -661,18 +664,21 @@ "expr": "sum(rate(qed_monitor_batches_received_total[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "A" }, { "expr": "sum(rate(qed_auditor_batches_received_total[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "B" }, { "expr": "sum(rate(qed_publisher_batches_received_total[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "C" } ], @@ -727,7 +733,7 @@ "h": 9, "w": 8, "x": 16, - "y": 17 + "y": 14 }, "id": 18, "legend": { @@ -756,18 +762,21 @@ "expr": "sum(rate(qed_monitor_batches_process_seconds[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "A" }, { "expr": "sum(rate(qed_auditor_batches_process_seconds[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "B" }, { "expr": "sum(rate(qed_auditor_batches_process_seconds[1m])) by (job)", "format": "time_series", "intervalFactor": 1, + "legendFormat": "{{job}}", "refId": "C" } ], @@ -821,7 +830,7 @@ "list": [] }, "time": { - "from": "now-15m", + "from": "now-30m", "to": "now" }, "timepicker": {