Merge branch 'dev' into 'master' (c7edd921) · Commits · REDMIC Project / Metric / Grafana

deploy/config/dashboards/swarmprom-nodes.json

+50 −7

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		"annotations": {
		"list": [
		{
		"$$hashKey": "object:13",
		"builtIn": 1,
		"datasource": "-- Grafana --",
		"enable": true,
		@@ -16,8 +17,7 @@
		"editable": true,
		"gnetId": null,
		"graphTooltip": 0,
		"id": 1,
		"iteration": 1572441148643,
		"iteration": 1592915838091,
		"links": [],
		"panels": [
		{
		@@ -369,12 +369,14 @@
		"datasource": null,
		"decimals": 2,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 0,
		"y": 4
		},
		"hiddenSeries": false,
		"id": 13,
		"legend": {
		"alignAsTable": true,
		@@ -393,6 +395,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -413,6 +418,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "System Load by Node",
		"tooltip": {
		@@ -459,12 +465,14 @@
		"datasource": null,
		"decimals": 2,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 12,
		"y": 4
		},
		"hiddenSeries": false,
		"id": 14,
		"legend": {
		"alignAsTable": true,
		@@ -483,6 +491,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null as zero",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -503,6 +514,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "CPU Usage by Node",
		"tooltip": {
		@@ -1022,8 +1034,9 @@
		"tableColumn": "",
		"targets": [
		{
		"expr": "sum(node_filesystem_size_bytes{mountpoint=\"/rootfs\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
		"expr": "sum(node_filesystem_size_bytes{mountpoint=\"/\"} * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
		"format": "time_series",
		"interval": "",
		"intervalFactor": 2,
		"legendFormat": "",
		"refId": "A",
		@@ -1106,8 +1119,9 @@
		"tableColumn": "",
		"targets": [
		{
		"expr": "sum((node_filesystem_free_bytes{mountpoint=\"/rootfs\"} / node_filesystem_size_bytes{mountpoint=\"/rootfs\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
		"expr": "sum((node_filesystem_free_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
		"format": "time_series",
		"interval": "",
		"intervalFactor": 2,
		"legendFormat": "",
		"refId": "A",
		@@ -1134,12 +1148,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 15
		},
		"hiddenSeries": false,
		"id": 15,
		"legend": {
		"alignAsTable": true,
		@@ -1156,6 +1172,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1184,6 +1203,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Memory usage by Node",
		"tooltip": {
		@@ -1229,12 +1249,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 22
		},
		"hiddenSeries": false,
		"id": 21,
		"legend": {
		"alignAsTable": true,
		@@ -1251,6 +1273,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1271,6 +1296,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Swap memory usage by Node",
		"tooltip": {
		@@ -1317,12 +1343,14 @@
		"datasource": null,
		"decimals": 2,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 29
		},
		"hiddenSeries": false,
		"id": 16,
		"legend": {
		"alignAsTable": true,
		@@ -1339,6 +1367,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null as zero",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1367,6 +1398,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Disk I/O by Node",
		"tooltip": {
		@@ -1884,12 +1916,14 @@
		"styles": [
		{
		"alias": "Time",
		"align": "auto",
		"dateFormat": "YYYY-MM-DD HH:mm:ss",
		"pattern": "Time",
		"type": "date"
		},
		{
		"alias": "",
		"align": "auto",
		"colorMode": null,
		"colors": [
		"rgba(245, 54, 54, 0.9)",
		@@ -1919,7 +1953,7 @@
		}
		],
		"refresh": "30s",
		"schemaVersion": 16,
		"schemaVersion": 22,
		"style": "dark",
		"tags": [
		"swarmprom"
		@@ -1929,12 +1963,15 @@
		{
		"allValue": ".+",
		"current": {
		"selected": false,
		"text": "All",
		"value": "$__all"
		},
		"datasource": "Prometheus",
		"definition": "",
		"hide": 0,
		"includeAll": true,
		"index": -1,
		"label": "Swarm Node",
		"multi": false,
		"name": "node_id",
		@@ -1946,9 +1983,11 @@
		"sort": 0,
		"tagValuesQuery": "label_values({node_id=\"$tag\"},node_name)",
		"tags": [
		"ip-172-31-4-159",
		"ip-172-31-8-83",
		"ip-172-31-22-254",
		"ip-172-31-24-218",
		"ip-172-31-40-112",
		"ip-172-31-35-201",
		"ip-172-31-37-172"
		],
		"tagsQuery": "label_values(node_meta, node_name)",
		@@ -1960,6 +1999,7 @@
		"auto_count": 30,
		"auto_min": "30s",
		"current": {
		"selected": false,
		"text": "auto",
		"value": "$__auto_interval_interval"
		},
		@@ -2062,5 +2102,8 @@
		"timezone": "",
		"title": "Docker Swarm Nodes",
		"uid": "BPlb-Sgik",
		"version": 4
		"variables": {
		"list": []
		},
		"version": 1
		}

deploy/config/dashboards/swarmprom-services.json

+90 −6

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@
		"annotations": {
		"list": [
		{
		"$$hashKey": "object:13",
		"builtIn": 1,
		"datasource": "-- Grafana --",
		"enable": true,
		@@ -16,8 +17,7 @@
		"editable": true,
		"gnetId": null,
		"graphTooltip": 0,
		"id": 3,
		"iteration": 1572441011744,
		"iteration": 1592916638139,
		"links": [],
		"panels": [
		{
		@@ -367,12 +367,14 @@
		"datasource": null,
		"decimals": 0,
		"fill": 5,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 0,
		"y": 4
		},
		"hiddenSeries": false,
		"id": 12,
		"legend": {
		"alignAsTable": true,
		@@ -393,6 +395,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -413,6 +418,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Service Tasks",
		"tooltip": {
		@@ -459,12 +465,14 @@
		"datasource": null,
		"decimals": 0,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 12,
		"y": 4
		},
		"hiddenSeries": false,
		"id": 32,
		"legend": {
		"alignAsTable": true,
		@@ -485,6 +493,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -513,6 +524,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Health Checks",
		"tooltip": {
		@@ -559,12 +571,14 @@
		"datasource": null,
		"decimals": 2,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 20,
		"x": 0,
		"y": 11
		},
		"hiddenSeries": false,
		"id": 22,
		"legend": {
		"alignAsTable": true,
		@@ -585,6 +599,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -605,6 +622,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "CPU usage by Service",
		"tooltip": {
		@@ -737,12 +755,14 @@
		"datasource": null,
		"decimals": 2,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 18
		},
		"hiddenSeries": false,
		"id": 33,
		"legend": {
		"alignAsTable": true,
		@@ -763,6 +783,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null as zero",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -783,6 +806,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "CPU usage by Container (top 10)",
		"tooltip": {
		@@ -828,12 +852,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 20,
		"x": 0,
		"y": 25
		},
		"hiddenSeries": false,
		"id": 24,
		"legend": {
		"alignAsTable": true,
		@@ -852,6 +878,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -880,6 +909,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Memory usage by Service",
		"tooltip": {
		@@ -1007,12 +1037,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 32
		},
		"hiddenSeries": false,
		"id": 34,
		"legend": {
		"alignAsTable": true,
		@@ -1033,6 +1065,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1053,6 +1088,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Memory usage by Container (top 10)",
		"tooltip": {
		@@ -1098,12 +1134,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 39
		},
		"hiddenSeries": false,
		"id": 17,
		"legend": {
		"alignAsTable": true,
		@@ -1122,6 +1160,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1142,6 +1183,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Network received by Service",
		"tooltip": {
		@@ -1187,12 +1229,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 24,
		"x": 0,
		"y": 46
		},
		"hiddenSeries": false,
		"id": 25,
		"legend": {
		"alignAsTable": true,
		@@ -1211,6 +1255,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1232,6 +1279,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Network transmitted by Service",
		"tooltip": {
		@@ -1277,12 +1325,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 10,
		"x": 0,
		"y": 53
		},
		"hiddenSeries": false,
		"id": 31,
		"legend": {
		"avg": true,
		@@ -1297,6 +1347,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1325,6 +1378,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Cluster Network Traffic",
		"tooltip": {
		@@ -1370,12 +1424,14 @@
		"dashes": false,
		"datasource": null,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 10,
		"x": 10,
		"y": 53
		},
		"hiddenSeries": false,
		"id": 26,
		"legend": {
		"alignAsTable": false,
		@@ -1392,6 +1448,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1420,6 +1479,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Cluster IOPS",
		"tooltip": {
		@@ -1519,8 +1579,9 @@
		"tableColumn": "",
		"targets": [
		{
		"expr": "sum((node_filesystem_free_bytes{mountpoint=\"/rootfs\"} / node_filesystem_size_bytes{mountpoint=\"/rootfs\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
		"expr": "sum((node_filesystem_free_bytes{mountpoint=\"/\"} / node_filesystem_size_bytes{mountpoint=\"/\"}) * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"} * 100) / count(node_meta * on(instance) group_left(node_name) node_meta{node_id=~\"$node_id\"})",
		"format": "time_series",
		"interval": "",
		"intervalFactor": 2,
		"legendFormat": "",
		"refId": "A",
		@@ -1548,12 +1609,14 @@
		"datasource": null,
		"decimals": 0,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 0,
		"y": 60
		},
		"hiddenSeries": false,
		"id": 29,
		"legend": {
		"alignAsTable": true,
		@@ -1574,6 +1637,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1594,6 +1660,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Docker Daemon Container Actions",
		"tooltip": {
		@@ -1640,12 +1707,14 @@
		"datasource": null,
		"decimals": 0,
		"fill": 1,
		"fillGradient": 0,
		"gridPos": {
		"h": 7,
		"w": 12,
		"x": 12,
		"y": 60
		},
		"hiddenSeries": false,
		"id": 30,
		"legend": {
		"alignAsTable": true,
		@@ -1666,6 +1735,9 @@
		"linewidth": 1,
		"links": [],
		"nullPointMode": "null",
		"options": {
		"dataLinks": []
		},
		"percentage": false,
		"pointradius": 5,
		"points": false,
		@@ -1686,6 +1758,7 @@
		],
		"thresholds": [],
		"timeFrom": null,
		"timeRegions": [],
		"timeShift": null,
		"title": "Docker Daemon Network Actions",
		"tooltip": {
		@@ -1753,12 +1826,14 @@
		"styles": [
		{
		"alias": "Time",
		"align": "auto",
		"dateFormat": "YYYY-MM-DD HH:mm:ss",
		"pattern": "Time",
		"type": "date"
		},
		{
		"alias": "",
		"align": "auto",
		"colorMode": null,
		"colors": [
		"rgba(245, 54, 54, 0.9)",
		@@ -1789,7 +1864,7 @@
		}
		],
		"refresh": "30s",
		"schemaVersion": 16,
		"schemaVersion": 22,
		"style": "dark",
		"tags": [
		"swarmprom"
		@@ -1799,12 +1874,15 @@
		{
		"allValue": ".+",
		"current": {
		"selected": false,
		"text": "All",
		"value": "$__all"
		},
		"datasource": "Prometheus",
		"definition": "",
		"hide": 0,
		"includeAll": true,
		"index": -1,
		"label": "Swarm Node",
		"multi": false,
		"name": "node_id",
		@@ -1816,9 +1894,11 @@
		"sort": 0,
		"tagValuesQuery": "label_values({node_id=\"$tag\"},node_name)",
		"tags": [
		"ip-172-31-4-159",
		"ip-172-31-8-83",
		"ip-172-31-22-254",
		"ip-172-31-24-218",
		"ip-172-31-40-112",
		"ip-172-31-35-201",
		"ip-172-31-37-172"
		],
		"tagsQuery": "label_values(node_meta, node_name)",
		@@ -1830,6 +1910,7 @@
		"auto_count": 30,
		"auto_min": "30s",
		"current": {
		"selected": false,
		"text": "auto",
		"value": "$__auto_interval_interval"
		},
		@@ -1932,5 +2013,8 @@
		"timezone": "",
		"title": "Docker Swarm Services",
		"uid": "zr_baSRmk",
		"version": 4
		"variables": {
		"list": []
		},
		"version": 1
		}