Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev

salt/elasticsearch/init.sls

@@ -23,6 +23,7 @@
 {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
 {% set NODEIP = salt['pillar.get']('elasticsearch:mainip', '') -%}
 {% set TRUECLUSTER = salt['pillar.get']('elasticsearch:true_cluster', False) %}
+{% set MANAGERIP = salt['pillar.get']('global:managerip') %}
 
 {% if FEATURES is sameas true %}
   {% set FEATUREZ = "-features" %}
@@ -192,11 +193,16 @@ so-elasticsearch:
     - name: so-elasticsearch
     - user: elasticsearch
     - extra_hosts: 
-      - "{{ grains.host }}:{{ NODEIP }}"
+      {% if ismanager %}
-      {% if salt['pillar.get']('nodestab', {}) %}
+      - {{ grains.host }}:{{ NODEIP }}
-        {% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
+        {% if salt['pillar.get']('nodestab', {}) %}
-      - "{{ SN.split('_')|first }}:{{ SNDATA.ip }}"
+          {% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
-        {% endfor %}
+      - {{ SN.split('_')|first }}:{{ SNDATA.ip }}
+          {% endfor %}
+        {% endif %}
+      {% else %}
+      - {{ grains.host }}:{{ NODEIP }}
+      - {{ MANAGER }}:{{ MANAGERIP }}
       {% endif %}
     - environment:
       {% if TRUECLUSTER is sameas false or (TRUECLUSTER is sameas true and not salt['pillar.get']('nodestab', {})) %}

salt/telegraf/scripts/suriloss.sh

@@ -44,7 +44,7 @@ if [ $CHECKIT == 2 ]; then
     TOTALPAST=$(($PASTPACKETS + $PASTDROP))
     TOTAL=$(($TOTALCURRENT - $TOTALPAST))
 
-    LOSS=$(echo $DROPPED $TOTAL / p | dc)
+    LOSS=$(echo 4 k $DROPPED $TOTAL / p | dc)
     echo "suridrop drop=$LOSS"
   fi
 else