From 412e8eeccbc216c2d3488f34a5e6e1efbe3be843 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 17 Dec 2020 18:05:25 -0500
Subject: [PATCH 1/4] tell dc to use 4 decimal spot for suriloss calc

---
 salt/telegraf/scripts/suriloss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/telegraf/scripts/suriloss.sh b/salt/telegraf/scripts/suriloss.sh
index cc2cff94c..7ef8de2ee 100644
--- a/salt/telegraf/scripts/suriloss.sh
+++ b/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

From 6448ddc31afeae46db102c49910283df2d78fa28 Mon Sep 17 00:00:00 2001
From: TOoSmOotH <mike.reeves@securityonionsolutions.com>
Date: Thu, 17 Dec 2020 20:08:21 -0500
Subject: [PATCH 2/4] Allow SNs to resolve the ES master

---
 salt/elasticsearch/init.sls | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 300921807..c72e4ce26 100644
--- a/salt/elasticsearch/init.sls
+++ b/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 salt['pillar.get']('nodestab', {}) %}
-        {% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
-      - "{{ SN.split('_')|first }}:{{ SNDATA.ip }}"
-        {% endfor %}
+      - extra_hosts: 
+      {% if ismanager %}
+      - {{ grains.host }}:{{ NODEIP }}
+        {% if salt['pillar.get']('nodestab', {}) %}
+          {% for SN, SNDATA in salt['pillar.get']('nodestab', {}).items() %}
+      - {{ SN.split('_')|first }}:{{ SNDATA.ip }}
+          {% endfor %}
+        {% endif %}
+      {% else %}
+      - {{ MANAGER }}:{{ MANAGERIP }}
       {% endif %}
     - environment:
       {% if TRUECLUSTER is sameas false or (TRUECLUSTER is sameas true and not salt['pillar.get']('nodestab', {})) %}

From 39425c1ba801f654b869fc18e6fe7c3475fe1cd0 Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Thu, 17 Dec 2020 20:15:56 -0500
Subject: [PATCH 3/4] Fix extra extrahosts

---
 salt/elasticsearch/init.sls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index c72e4ce26..0f9284161 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -193,7 +193,6 @@ so-elasticsearch:
     - name: so-elasticsearch
     - user: elasticsearch
     - extra_hosts: 
-      - extra_hosts: 
       {% if ismanager %}
       - {{ grains.host }}:{{ NODEIP }}
         {% if salt['pillar.get']('nodestab', {}) %}

From 575098e368ad74ce0090b77687272324ed79a0da Mon Sep 17 00:00:00 2001
From: Mike Reeves <luke@geekempire.com>
Date: Thu, 17 Dec 2020 20:23:38 -0500
Subject: [PATCH 4/4] Update init.sls

---
 salt/elasticsearch/init.sls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 0f9284161..2d83f9882 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -201,6 +201,7 @@ so-elasticsearch:
           {% endfor %}
         {% endif %}
       {% else %}
+      - {{ grains.host }}:{{ NODEIP }}
       - {{ MANAGER }}:{{ MANAGERIP }}
       {% endif %}
     - environment: