From ad651dbea46c7e023036e2a79fd2f6e853e5fd36 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 4 Feb 2020 17:21:13 -0500 Subject: [PATCH] fix grafana for zeek --- salt/common/grafana/grafana_dashboards/eval/eval.json | 4 ++-- .../grafana/grafana_dashboards/forward_nodes/sensor.json | 4 ++-- salt/common/telegraf/scripts/broloss.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salt/common/grafana/grafana_dashboards/eval/eval.json b/salt/common/grafana/grafana_dashboards/eval/eval.json index 8dd5532d1..069226d3c 100644 --- a/salt/common/grafana/grafana_dashboards/eval/eval.json +++ b/salt/common/grafana/grafana_dashboards/eval/eval.json @@ -1395,7 +1395,7 @@ "condition": "AND", "key": "container_name", "operator": "=", - "value": "so-bro" + "value": "so-zeek" } ] } @@ -1913,7 +1913,7 @@ "condition": "AND", "key": "container_name", "operator": "=", - "value": "so-bro" + "value": "so-zeek" } ] } diff --git a/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json b/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json index 83a1fc9e6..8e35246eb 100644 --- a/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json +++ b/salt/common/grafana/grafana_dashboards/forward_nodes/sensor.json @@ -1396,7 +1396,7 @@ "condition": "AND", "key": "container_name", "operator": "=", - "value": "so-bro" + "value": "so-zeek" } ] } @@ -1901,7 +1901,7 @@ "condition": "AND", "key": "container_name", "operator": "=", - "value": "so-bro" + "value": "so-zeek" } ] } diff --git a/salt/common/telegraf/scripts/broloss.sh b/salt/common/telegraf/scripts/broloss.sh index a7bec4dc1..9fcf2d527 100644 --- a/salt/common/telegraf/scripts/broloss.sh +++ b/salt/common/telegraf/scripts/broloss.sh @@ -1,7 +1,7 @@ #!/bin/bash -BROLOG=$(tac /host/nsm/bro/logs/packetloss.log | head -2) -declare RESULT=($BROLOG) +ZEEKLOG=$(tac /host/nsm/zeek/logs/packetloss.log | head -2) +declare RESULT=($ZEEKLOG) CURRENTDROP=${RESULT[3]} PASTDROP=${RESULT[9]} DROPPED=$(($CURRENTDROP - $PASTDROP))