From 813ef7d81ad031a95f18b0d45d40d6bf13b8893c Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 29 Jun 2021 20:23:27 -0400 Subject: [PATCH] new eval dashboard with trends --- salt/grafana/dashboards/eval/eval.json | 1900 ++++++++++++++++++++++-- 1 file changed, 1758 insertions(+), 142 deletions(-) diff --git a/salt/grafana/dashboards/eval/eval.json b/salt/grafana/dashboards/eval/eval.json index 1b67267a5..aa1588a07 100644 --- a/salt/grafana/dashboards/eval/eval.json +++ b/salt/grafana/dashboards/eval/eval.json @@ -16,14 +16,13 @@ "editable": true, "gnetId": 2381, "graphTooltip": 0, - "id": 3, + "id": 6, "links": [], "panels": [ { "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "decimals": 2, "mappings": [], "thresholds": { @@ -58,9 +57,10 @@ "fields": "", "values": false }, + "text": {}, "textMode": "auto" }, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "targets": [ { "groupBy": [ @@ -119,37 +119,7 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [], - "mappings": [ - { - "id": 0, - "op": "=", - "text": "N/A", - "type": 1, - "value": "null" - } - ], - "max": 100, - "min": 0, - "nullValueMode": "connected", - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "rgba(50, 172, 45, 0.97)", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 60 - }, - { - "color": "rgba(245, 54, 54, 0.9)", - "value": 80 - } - ] - }, "unit": "percent" }, "overrides": [] @@ -181,16 +151,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -244,6 +223,63 @@ "value": "cpu-total" } ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_idle" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "* -1 + 100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] } ], "thresholds": [], @@ -289,13 +325,12 @@ }, { "aliasColors": {}, - "bars": true, + "bars": false, "dashLength": 10, "dashes": false, "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -319,23 +354,32 @@ "total": false, "values": false }, - "lines": false, + "lines": true, "linewidth": 1, - "nullPointMode": "null", + "nullPointMode": "connected", "options": { "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": true, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Loss Current", "groupBy": [ { "params": [ @@ -376,6 +420,50 @@ "value": "{{ SERVERNAME }}" } ] + }, + { + "alias": "Loss Trend", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": true, + "measurement": "zeekcaptureloss", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_loss" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] } ], "thresholds": [], @@ -429,7 +517,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -461,16 +548,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Loss Current", "dsType": "influxdb", "groupBy": [ { @@ -518,6 +614,57 @@ "value": "{{ SERVERNAME }}" } ] + }, + { + "alias": "Loss Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "zeekdrop", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_drop" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "* 100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] } ], "thresholds": [], @@ -571,7 +718,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -603,16 +749,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Loss Current", "dsType": "influxdb", "groupBy": [ { @@ -660,6 +815,57 @@ "value": "{{ SERVERNAME }}" } ] + }, + { + "alias": "Loss Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "suridrop", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_drop" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + }, + { + "params": [ + "* 100" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] } ], "thresholds": [], @@ -712,7 +918,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -744,16 +949,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Loss Current", "dsType": "influxdb", "groupBy": [ { @@ -795,6 +1009,51 @@ "value": "{{ SERVERNAME }}" } ] + }, + { + "alias": "Loss Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "stenodrop", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_drop" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] } ], "thresholds": [], @@ -846,9 +1105,7 @@ "dashes": false, "datasource": "InfluxDB", "fieldConfig": { - "defaults": { - "custom": {} - }, + "defaults": {}, "overrides": [] }, "fill": 1, @@ -877,17 +1134,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Usage", + "alias": "Usage Current", "groupBy": [ { "params": [ @@ -934,6 +1199,56 @@ "value": "/" } ] + }, + { + "alias": "Usage Trend", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "disk", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_used_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "path", + "operator": "=", + "value": "/" + } + ] } ], "thresholds": [], @@ -985,9 +1300,7 @@ "dashes": false, "datasource": "InfluxDB", "fieldConfig": { - "defaults": { - "custom": {} - }, + "defaults": {}, "overrides": [] }, "fill": 1, @@ -1016,17 +1329,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Usage", + "alias": "Usage Current", "groupBy": [ { "params": [ @@ -1074,6 +1395,57 @@ "value": "/nsm" } ] + }, + { + "alias": "Usage Trend", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "disk", + "orderByTime": "ASC", + "policy": "so_long_term", + "queryType": "randomWalk", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_used_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "path", + "operator": "=", + "value": "/nsm" + } + ] } ], "thresholds": [], @@ -1127,7 +1499,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -1159,16 +1530,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -1203,7 +1583,64 @@ }, { "params": [ - " / {{ CPUS }}" + " /{{ CPUS }}" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-elasticsearch" + } + ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + " /{{ CPUS }}" ], "type": "math" } @@ -1274,7 +1711,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -1306,16 +1742,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -1350,7 +1795,64 @@ }, { "params": [ - " / {{ CPUS }}" + " /{{ CPUS }}" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-zeek" + } + ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + " /{{ CPUS }}" ], "type": "math" } @@ -1421,7 +1923,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -1453,16 +1954,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -1497,7 +2007,64 @@ }, { "params": [ - " / {{ CPUS }}" + " /{{ CPUS }}" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-suricata" + } + ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + " /{{ CPUS }}" ], "type": "math" } @@ -1568,7 +2135,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -1600,16 +2166,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -1644,7 +2219,64 @@ }, { "params": [ - " / {{ CPUS }}" + " /{{ CPUS }}" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-steno" + } + ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_percent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + " /{{ CPUS }}" ], "type": "math" } @@ -1725,7 +2357,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -1759,17 +2390,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashes": true, + "fill": 0, + "linewidth": 4, + "spaceLength": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "System", + "alias": "System Current", "dsType": "influxdb", "groupBy": [ { @@ -1819,7 +2458,7 @@ ] }, { - "alias": "User", + "alias": "User Current", "dsType": "influxdb", "groupBy": [ { @@ -1869,7 +2508,7 @@ ] }, { - "alias": "Nice", + "alias": "Nice Current", "dsType": "influxdb", "groupBy": [ { @@ -1919,7 +2558,7 @@ ] }, { - "alias": "Interrupt", + "alias": "Interrupt Current", "dsType": "influxdb", "groupBy": [ { @@ -1969,7 +2608,7 @@ ] }, { - "alias": "Wait", + "alias": "Wait Current", "dsType": "influxdb", "groupBy": [ { @@ -2067,6 +2706,312 @@ "value": "cpu-total" } ] + }, + { + "alias": "System Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "G", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_system" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + }, + { + "alias": "User Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "H", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_user" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + }, + { + "alias": "Nice Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "I", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_nice" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + }, + { + "alias": "Interrupt Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "J", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_irq" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + }, + { + "alias": "Wait Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "K", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_iowait" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] + }, + { + "alias": "SoftIRQ Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "cpu", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "L", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage_softirq" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "cpu", + "operator": "=", + "value": "cpu-total" + } + ] } ], "thresholds": [], @@ -2119,7 +3064,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -2150,16 +3094,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "groupBy": [ { "params": [ @@ -2206,6 +3159,56 @@ "value": "so-elasticsearch" } ] + }, + { + "alias": "Usage Trend", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_mem", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-elasticsearch" + } + ] } ], "thresholds": [], @@ -2259,7 +3262,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -2291,16 +3293,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -2348,6 +3359,57 @@ "value": "so-zeek" } ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_mem", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-zeek" + } + ] } ], "thresholds": [], @@ -2400,7 +3462,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -2432,16 +3493,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -2489,6 +3559,57 @@ "value": "so-suricata" } ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_mem", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-suricata" + } + ] } ], "thresholds": [], @@ -2541,7 +3662,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -2573,16 +3693,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { + "alias": "Usage Current", "dsType": "influxdb", "groupBy": [ { @@ -2630,6 +3759,57 @@ "value": "so-steno" } ] + }, + { + "alias": "Usage Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "docker_container_mem", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_usage" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "container_name", + "operator": "=", + "value": "so-steno" + } + ] } ], "thresholds": [], @@ -2687,9 +3867,7 @@ "editable": true, "error": false, "fieldConfig": { - "defaults": { - "custom": {} - }, + "defaults": {}, "overrides": [] }, "format": "none", @@ -2808,7 +3986,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -2840,7 +4017,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 2, "points": false, "renderer": "flot", @@ -2938,7 +4115,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -2975,9 +4151,10 @@ "fields": "", "values": false }, + "text": {}, "textMode": "auto" }, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "targets": [ { "groupBy": [ @@ -3032,7 +4209,6 @@ "datasource": "InfluxDB", "fieldConfig": { "defaults": { - "custom": {}, "decimals": 2, "mappings": [ { @@ -3045,7 +4221,6 @@ ], "max": 1209600, "min": 0, - "nullValueMode": "connected", "thresholds": { "mode": "absolute", "steps": [ @@ -3085,9 +4260,10 @@ "values": false }, "showThresholdLabels": false, - "showThresholdMarkers": true + "showThresholdMarkers": true, + "text": {} }, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "targets": [ { "dsType": "influxdb", @@ -3153,7 +4329,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -3187,14 +4362,17 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", "seriesOverrides": [ { - "alias": "#cpu", - "fill": 0 + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 } ], "spaceLength": 10, @@ -3202,7 +4380,7 @@ "steppedLine": false, "targets": [ { - "alias": "#cpu", + "alias": "#cpu Current", "groupBy": [ { "params": [ @@ -3245,7 +4423,7 @@ ] }, { - "alias": "1 Minute Average", + "alias": "1 Minute Average Current", "dsType": "influxdb", "groupBy": [ { @@ -3289,7 +4467,7 @@ ] }, { - "alias": "5 Minute Average", + "alias": "5 Minute Average Current", "dsType": "influxdb", "groupBy": [ { @@ -3333,7 +4511,7 @@ ] }, { - "alias": "15 Minute Average", + "alias": "15 Minute Average Current", "dsType": "influxdb", "groupBy": [ { @@ -3375,6 +4553,185 @@ "value": "{{ SERVERNAME }}" } ] + }, + { + "alias": "#cpu Trend", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "E", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_n_cpus" + ], + "type": "field" + }, + { + "params": [], + "type": "last" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] + }, + { + "alias": "1 Minute Average Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "F", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_load1" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] + }, + { + "alias": "5 Minute Average Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "G", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_load5" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] + }, + { + "alias": "15 Minute Average Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "system", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "H", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_load15" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] } ], "thresholds": [], @@ -3435,7 +4792,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -3471,7 +4827,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -3709,7 +5065,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -3743,17 +5098,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Inbound", + "alias": "Inbound Current", "dsType": "influxdb", "groupBy": [ { @@ -3772,7 +5135,7 @@ "measurement": "net", "orderByTime": "ASC", "policy": "default", - "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -3815,6 +5178,71 @@ "value": "{{ MONINT }}" } ] + }, + { + "alias": "Inbound Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "net", + "orderByTime": "ASC", + "policy": "so_long_term", + "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_bytes_recv" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=", + "value": "{{ MONINT }}" + } + ] } ], "thresholds": [], @@ -3872,7 +5300,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -3906,7 +5333,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -4098,7 +5525,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -4131,7 +5557,7 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", @@ -4293,7 +5719,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -4327,17 +5752,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Inbound", + "alias": "Inbound Current", "dsType": "influxdb", "groupBy": [ { @@ -4356,7 +5789,7 @@ "measurement": "net", "orderByTime": "ASC", "policy": "default", - "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "A", "resultFormat": "time_series", @@ -4401,7 +5834,7 @@ ] }, { - "alias": "Outbound", + "alias": "Outbound Current", "dsType": "influxdb", "groupBy": [ { @@ -4420,7 +5853,7 @@ "measurement": "net", "orderByTime": "ASC", "policy": "default", - "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = 'eth0' AND $timeFilter GROUP BY time($__interval) fill(null)", + "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($__interval) fill(null)", "rawQuery": false, "refId": "B", "resultFormat": "time_series", @@ -4463,6 +5896,136 @@ "value": "{{ MANINT }}" } ] + }, + { + "alias": "Inbound Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "net", + "orderByTime": "ASC", + "policy": "so_long_term", + "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_recv\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "C", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_bytes_recv" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=", + "value": "{{ MANINT }}" + } + ] + }, + { + "alias": "Outbound Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "net", + "orderByTime": "ASC", + "policy": "so_long_term", + "query": "SELECT 8 * non_negative_derivative(mean(\"bytes_sent\"),1s) FROM \"net\" WHERE \"host\" = 'JumpHost' AND \"interface\" = '{{ MANINT }}' AND $timeFilter GROUP BY time($__interval) fill(null)", + "rawQuery": false, + "refId": "D", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_bytes_sent" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + }, + { + "params": [ + "1s" + ], + "type": "non_negative_derivative" + }, + { + "params": [ + "*8" + ], + "type": "math" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + }, + { + "condition": "AND", + "key": "interface", + "operator": "=", + "value": "{{ MANINT }}" + } + ] } ], "thresholds": [], @@ -4517,7 +6080,6 @@ "error": false, "fieldConfig": { "defaults": { - "custom": {}, "links": [] }, "overrides": [] @@ -4551,17 +6113,25 @@ "alertThreshold": true }, "percentage": false, - "pluginVersion": "7.3.4", + "pluginVersion": "7.5.4", "pointradius": 5, "points": false, "renderer": "flot", - "seriesOverrides": [], + "seriesOverrides": [ + { + "alias": "/Trend/", + "dashLength": 4, + "dashes": true, + "fill": 0, + "linewidth": 4 + } + ], "spaceLength": 10, "stack": false, "steppedLine": false, "targets": [ { - "alias": "Threads", + "alias": "Threads Current", "dsType": "influxdb", "groupBy": [ { @@ -4578,6 +6148,7 @@ } ], "measurement": "processes", + "orderByTime": "ASC", "policy": "default", "refId": "A", "resultFormat": "time_series", @@ -4602,6 +6173,51 @@ "value": "{{ SERVERNAME }}" } ] + }, + { + "alias": "Threads Trend", + "dsType": "influxdb", + "groupBy": [ + { + "params": [ + "$__interval" + ], + "type": "time" + }, + { + "params": [ + "null" + ], + "type": "fill" + } + ], + "hide": false, + "measurement": "processes", + "orderByTime": "ASC", + "policy": "so_long_term", + "refId": "B", + "resultFormat": "time_series", + "select": [ + [ + { + "params": [ + "mean_total_threads" + ], + "type": "field" + }, + { + "params": [], + "type": "mean" + } + ] + ], + "tags": [ + { + "key": "host", + "operator": "=", + "value": "{{ SERVERNAME }}" + } + ] } ], "thresholds": [], @@ -4648,7 +6264,7 @@ } ], "refresh": "30s", - "schemaVersion": 26, + "schemaVersion": 27, "style": "dark", "tags": [], "templating": { @@ -4685,5 +6301,5 @@ "timezone": "browser", "title": "Evaluation Mode - {{ SERVERNAME }} Overview", "uid": "{{ UID }}", - "version": 1 -} \ No newline at end of file + "version": 10 +}