diff --git a/salt/bro/cron/packetloss.sh b/salt/bro/cron/packetloss.sh index 56dc7b771..22013cbc6 100644 --- a/salt/bro/cron/packetloss.sh +++ b/salt/bro/cron/packetloss.sh @@ -1,2 +1,2 @@ #!/bin/bash -/usr/bin/docker exec so-bro /opt/bro/bin/broctl netstats | awk -F '[ =]' '{RCVD += $5;DRP += $7;TTL += $9} END { print "rcvd: " RCVD, "dropped: " DRP, "total: " TTL}' >> /nsm/bro/logs/packetloss.log +/usr/bin/docker exec so-bro /opt/bro/bin/broctl netstats | awk '{print $(NF-2),$(NF-1),$NF}' | awk -F '[ =]' '{RCVD += $2;DRP += $4;TTL += $6} END { print "rcvd: " RCVD, "dropped: " DRP, "total: " TTL}' diff --git a/salt/common/tools/sbin/so-brologs b/salt/common/tools/sbin/so-bro-logs similarity index 100% rename from salt/common/tools/sbin/so-brologs rename to salt/common/tools/sbin/so-bro-logs diff --git a/salt/common/tools/sbin/so-getparsed b/salt/common/tools/sbin/so-get-parsed similarity index 100% rename from salt/common/tools/sbin/so-getparsed rename to salt/common/tools/sbin/so-get-parsed diff --git a/salt/common/tools/sbin/so-getunparsed b/salt/common/tools/sbin/so-get-unparsed similarity index 100% rename from salt/common/tools/sbin/so-getunparsed rename to salt/common/tools/sbin/so-get-unparsed diff --git a/salt/common/tools/sbin/so-listindex b/salt/common/tools/sbin/so-list-index similarity index 100% rename from salt/common/tools/sbin/so-listindex rename to salt/common/tools/sbin/so-list-index diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls index 9c6cf1906..2c06ba7a8 100644 --- a/salt/sensoroni/init.sls +++ b/salt/sensoroni/init.sls @@ -29,13 +29,13 @@ sensoronisync: so-sensoroniimage: cmd.run: - - name: docker pull --disable-content-trust=false soshybridhunter/so-sensoroni:HH1.1.0 + - name: docker pull --disable-content-trust=false soshybridhunter/so-sensoroni:HH1.1.1 so-sensoroni: docker_container.running: - require: - so-sensoroniimage - - image: soshybridhunter/so-sensoroni:HH1.1.0 + - image: soshybridhunter/so-sensoroni:HH1.1.1 - hostname: sensoroni - name: so-sensoroni - binds: