diff --git a/salt/grafana/defaults.yaml b/salt/grafana/defaults.yaml index bb406e672..f9fb4ee30 100644 --- a/salt/grafana/defaults.yaml +++ b/salt/grafana/defaults.yaml @@ -140,6 +140,7 @@ grafana: y: 105 h: 8 w: 24 + hideTrend: true suricata_packet_loss_graph: gridPos: x: 0 diff --git a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja b/salt/grafana/panels/zeek_packet_loss_graph.json.jinja index b8d9f67ef..56ac95630 100644 --- a/salt/grafana/panels/zeek_packet_loss_graph.json.jinja +++ b/salt/grafana/panels/zeek_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": { @@ -14,15 +9,14 @@ "overrides": [] }, "fill": 1, - "fillGradient": 0, "gridPos": { "x": {{ PANELS.zeek_packet_loss_graph.gridPos.x }}, "y": {{ PANELS.zeek_packet_loss_graph.gridPos.y }}, "w": {{ PANELS.zeek_packet_loss_graph.gridPos.w }}, "h": {{ PANELS.zeek_packet_loss_graph.gridPos.h }} }, - "hiddenSeries": false, "id": 2022, + "interval": "30s", "legend": { "alignAsTable": true, "avg": true, @@ -40,14 +34,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,12 +48,11 @@ "dashLength": 4, "dashes": true, "fill": 0, - "linewidth": 4 + "linewidth": 4, + "$$hashKey": "object:314" } ], "spaceLength": 10, - "stack": false, - "steppedLine": false, "targets": [ { "alias": "Loss Current", @@ -107,8 +99,8 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] }, @@ -129,7 +121,7 @@ "type": "fill" } ], - "hide": false, + "hide": {% PANELS.zeek_packet_loss_graph.get('hideTrend', false) %}, "measurement": "zeekdrop", "orderByTime": "ASC", "policy": "so_long_term", @@ -158,16 +150,14 @@ "tags": [ { "key": "host", - "operator": "=", - "value": "$servername" + "operator": "=~", + "value": "/^$servername$/" } ] } ], "thresholds": [], - "timeFrom": null, "timeRegions": [], - "timeShift": null, "title": "Zeek Packet Loss", "tooltip": { "shared": true, @@ -190,7 +180,8 @@ "logBase": 1, "max": null, "min": 0, - "show": true + "show": true, + "$$hashKey": "object:327" }, { "format": "short", @@ -198,11 +189,23 @@ "logBase": 1, "max": null, "min": null, - "show": false + "show": false, + "$$hashKey": "object:328" } ], "yaxis": { "align": false, "alignLevel": null - } + }, + "bars": false, + "cacheTimeout": null, + "dashes": false, + "fillGradient": 0, + "hiddenSeries": false, + "percentage": false, + "points": false, + "stack": false, + "steppedLine": false, + "timeFrom": null, + "timeShift": null }