From 191def686bb4be412e19796dca7952f83a7e5dcd Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 22 Jul 2021 15:02:06 -0400 Subject: [PATCH] add packet loss panels --- salt/grafana/defaults.yaml | 10 +- .../stenographer_packet_loss_graph.json.jinja | 111 ++++++++++++------ .../suricata_packet_loss_graph.json.jinja | 99 +++++++++++----- .../panels/zeek_packet_loss_graph.json.jinja | 66 ++++++++--- 4 files changed, 204 insertions(+), 82 deletions(-) diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index f9fb4ee30..c89559bc7 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -147,12 +147,14 @@ grafana: y: 113 h: 8 w: 12 + hideTrend: true stenographer_packet_loss_graph: gridPos: x: 12 y: 121 h: 8 - w: 12 + w: 1 + hideTrend: true row_cpu: gridPos: @@ -208,6 +210,7 @@ grafana: templating: list: - servername_standalone + - role - containers - manint - monint @@ -642,6 +645,7 @@ grafana: templating: list: - servername_manager + - role - containers - manint - monint @@ -971,6 +975,7 @@ grafana: templating: list: - servername_managersearch + - role - containers - manint - monint @@ -1300,6 +1305,7 @@ grafana: templating: list: - servername_sensor + - role - containers - manint - monint @@ -1651,6 +1657,7 @@ grafana: templating: list: - servername_searchnode + - role - containers - manint - monint @@ -1936,6 +1943,7 @@ grafana: templating: list: - servername_heavynode + - role - containers - manint - monint diff --git a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja index 53d539a4d..5b540262d 100644 --- a/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/stenographer_packet_loss_graph.json.jinja @@ -1,11 +1,6 @@ { "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "cacheTimeout": null, "dashLength": 10, - "dashes": false, "datasource": "InfluxDB", "fieldConfig": { "defaults": { @@ -13,24 +8,22 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "x": {{ PANELS.stenographer_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.stenographer_packet_loss_graph.gridPos.y }}, "w": {{ PANELS.stenographer_packet_loss_graph.gridPos.w }}, "h": {{ PANELS.stenographer_packet_loss_graph.gridPos.h }} }, - "hiddenSeries": false, "id": 19, + "interval": "30s", "legend": { "alignAsTable": true, "avg": true, "current": true, "hideEmpty": true, - "max": true, + "max": false, "min": false, - "rightSide": false, + "rightSide": true, "show": true, "sort": "current", "sortDesc": true, @@ -40,14 +33,13 @@ "lines": true, "linewidth": 1, "links": [], + "maxDataPoints": 750, "nullPointMode": "connected", "options": { "alertThreshold": true }, - "percentage": false, "pluginVersion": "7.5.4", "pointradius": 2, - "points": false, "renderer": "flot", "seriesOverrides": [ { @@ -55,15 +47,14 @@ "dashLength": 4, "dashes": true, "fill": 0, - "linewidth": 4 + "linewidth": 4, + "$$hashKey": "object:2274" } ], "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { - "alias": "Loss Current", + "alias": "Current $tag_host $tag_role", "dsType": "influxdb", "groupBy": [ { @@ -72,6 +63,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, { "params": [ "null" @@ -87,27 +90,33 @@ "select": [ [ { + "type": "field", "params": [ "drop" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] } ] ], "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "role", + "operator": "=~", + "value": "/^$role$/" } ] }, { - "alias": "Loss Trend", + "alias": "Trend $tag_host $tag_role", "dsType": "influxdb", "groupBy": [ { @@ -116,6 +125,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, { "params": [ "null" @@ -123,7 +144,7 @@ "type": "fill" } ], - "hide": false, + "hide": {{ PANELS.stenographer_packet_loss_graph.get('hideTrend', false)|json }},, "measurement": "stenodrop", "orderByTime": "ASC", "policy": "so_long_term", @@ -132,34 +153,38 @@ "select": [ [ { + "type": "field", "params": [ "mean_drop" - ], - "type": "field" + ] }, { - "params": [], - "type": "last" + "type": "mean", + "params": [] } ] ], "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "role", + "operator": "=~", + "value": "/^$role$/" } ] } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Stenographer Packet Loss", "tooltip": { "shared": true, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -178,7 +203,8 @@ "logBase": 1, "max": null, "min": 0, - "show": true + "show": true, + "$$hashKey": "object:2287" }, { "format": "short", @@ -186,11 +212,24 @@ "logBase": 1, "max": null, "min": null, - "show": false + "show": false, + "$$hashKey": "object:2288" } ], "yaxis": { "align": false, "alignLevel": null - } + }, + "bars": false, + "cacheTimeout": null, + "dashes": false, + "fill": 0, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja index 42ba5fefb..e9ec68e31 100644 --- a/salt/grafana/panels/suricata_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/suricata_packet_loss_graph.json.jinja @@ -1,11 +1,6 @@ { "aliasColors": {}, - "bars": false, - "maxDataPoints": 750, - "interval": "30s", - "cacheTimeout": null, "dashLength": 10, - "dashes": false, "datasource": "InfluxDB", "fieldConfig": { "defaults": { @@ -13,24 +8,22 @@ }, "overrides": [] }, - "fill": 1, - "fillGradient": 0, "gridPos": { "x": {{ PANELS.suricata_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.suricata_packet_loss_graph.gridPos.y }}, "w": {{ PANELS.suricata_packet_loss_graph.gridPos.w }}, "h": {{ PANELS.suricata_packet_loss_graph.gridPos.h }} }, - "hiddenSeries": false, "id": 21, + "interval": "30s", "legend": { "alignAsTable": true, "avg": true, "current": true, "hideEmpty": true, - "max": true, + "max": false, "min": false, - "rightSide": false, + "rightSide": true, "show": true, "sort": "current", "sortDesc": true, @@ -40,14 +33,13 @@ "lines": true, "linewidth": 1, "links": [], + "maxDataPoints": 750, "nullPointMode": "connected", "options": { "alertThreshold": true }, - "percentage": false, "pluginVersion": "7.5.4", "pointradius": 2, - "points": false, "renderer": "flot", "seriesOverrides": [ { @@ -55,15 +47,14 @@ "dashLength": 4, "dashes": true, "fill": 0, - "linewidth": 4 + "linewidth": 4, + "$$hashKey": "object:1059" } ], "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { - "alias": "Loss Current", + "alias": "Current $tag_host $tag_role", "dsType": "influxdb", "groupBy": [ { @@ -72,6 +63,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, { "params": [ "null" @@ -94,7 +97,7 @@ }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ @@ -107,13 +110,19 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "role", + "operator": "=~", + "value": "/^$role$/" } ] }, { - "alias": "Loss Trend", + "alias": "Trend $tag_host $tag_role", "dsType": "influxdb", "groupBy": [ { @@ -122,6 +131,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, { "params": [ "null" @@ -129,7 +150,7 @@ "type": "fill" } ], - "hide": false, + "hide": {{ PANELS.suricata_packet_loss_graph.get('hideTrend', false)|json }}, "measurement": "suridrop", "orderByTime": "ASC", "policy": "so_long_term", @@ -145,7 +166,7 @@ }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ @@ -158,20 +179,24 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "role", + "operator": "=~", + "value": "/^$role$/" } ] } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Suricata Packet Loss", "tooltip": { "shared": true, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -189,7 +214,8 @@ "logBase": 1, "max": null, "min": 0, - "show": true + "show": true, + "$$hashKey": "object:1072" }, { "format": "short", @@ -197,11 +223,24 @@ "logBase": 1, "max": null, "min": null, - "show": false + "show": false, + "$$hashKey": "object:1073" } ], "yaxis": { "align": false, "alignLevel": null - } + }, + "bars": false, + "cacheTimeout": null, + "dashes": false, + "fill": 0, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, + "timeFrom": null, + "timeShift": null } diff --git a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja index 95df0ce3a..89d1d57f1 100644 --- a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja @@ -8,7 +8,6 @@ }, "overrides": [] }, - "fill": 1, "gridPos": { "x": {{ PANELS.zeek_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.zeek_packet_loss_graph.gridPos.y }}, @@ -22,9 +21,9 @@ "avg": true, "current": true, "hideEmpty": true, - "max": true, + "max": false, "min": false, - "rightSide": false, + "rightSide": true, "show": true, "sort": "current", "sortDesc": true, @@ -44,18 +43,18 @@ "renderer": "flot", "seriesOverrides": [ { + "$$hashKey": "object:314", "alias": "/Trend/", "dashLength": 4, "dashes": true, "fill": 0, - "linewidth": 4, - "$$hashKey": "object:314" + "linewidth": 4 } ], "spaceLength": 10, "targets": [ { - "alias": "Loss Current", + "alias": "Current $tag_host $tag_role", "dsType": "influxdb", "groupBy": [ { @@ -64,6 +63,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, { "params": [ "null" @@ -86,7 +97,7 @@ }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ @@ -101,11 +112,17 @@ "key": "host", "operator": "=~", "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "role", + "operator": "=~", + "value": "/^$role$/" } ] }, { - "alias": "Loss Trend", + "alias": "Trend $tag_host $tag_role", "dsType": "influxdb", "groupBy": [ { @@ -114,6 +131,18 @@ ], "type": "time" }, + { + "type": "tag", + "params": [ + "host" + ] + }, + { + "type": "tag", + "params": [ + "role" + ] + }, { "params": [ "null" @@ -121,7 +150,7 @@ "type": "fill" } ], - "hide": {{ PANELS.zeek_packet_loss_graph.get('hideTrend', false) }}, + "hide": {{ PANELS.zeek_packet_loss_graph.get('hideTrend', false)|json }}, "measurement": "zeekdrop", "orderByTime": "ASC", "policy": "so_long_term", @@ -137,7 +166,7 @@ }, { "params": [], - "type": "last" + "type": "mean" }, { "params": [ @@ -152,6 +181,12 @@ "key": "host", "operator": "=~", "value": "/^$servername$/" + }, + { + "condition": "AND", + "key": "role", + "operator": "=~", + "value": "/^$role$/" } ] } @@ -161,7 +196,7 @@ "title": "Zeek Packet Loss", "tooltip": { "shared": true, - "sort": 0, + "sort": 2, "value_type": "individual" }, "type": "graph", @@ -174,23 +209,23 @@ }, "yaxes": [ { + "$$hashKey": "object:327", "decimals": null, "format": "percent", "label": null, "logBase": 1, "max": null, "min": 0, - "show": true, - "$$hashKey": "object:327" + "show": true }, { + "$$hashKey": "object:328", "format": "short", "label": null, "logBase": 1, "max": null, "min": null, - "show": false, - "$$hashKey": "object:328" + "show": false } ], "yaxis": { @@ -200,6 +235,7 @@ "bars": false, "cacheTimeout": null, "dashes": false, + "fill": 0, "fillGradient": 0, "hiddenSeries": false, "percentage": false,