From c7c3d004ca2d42ca4139210a642464198dcb9aaa Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 15 Dec 2020 14:01:19 -0500
Subject: [PATCH] [fix] More helix -> helixsensor

---
 pillar/top.sls                          | 4 ++--
 salt/common/tools/sbin/soup             | 4 ++--
 salt/suricata/suricata_config.map.jinja | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pillar/top.sls b/pillar/top.sls
index 627fed80b..a795e03c1 100644
--- a/pillar/top.sls
+++ b/pillar/top.sls
@@ -3,7 +3,7 @@ base:
     - patch.needs_restarting
     - logrotate
 
-  '*_eval or *_helix or *_heavynode or *_sensor or *_standalone or *_import':
+  '*_eval or *_helixsensor or *_heavynode or *_sensor or *_standalone or *_import':
     - match: compound
     - zeek
 
@@ -62,7 +62,7 @@ base:
     - global
     - minions.{{ grains.id }}
 
-  '*_helix':
+  '*_helixsensor':
     - fireeye
     - zeeklogs
     - logstash
diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index e399780d5..d874c6e31 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -585,9 +585,9 @@ if [ "$UPGRADESALT" == "1" ]; then
   echo ""
   echo "Upgrading Salt on the remaining Security Onion nodes from $INSTALLEDSALTVERSION to $NEWSALTVERSION."
   if [ $is_airgap -eq 0 ]; then
-    salt -C 'not *_eval and not *_helix and not *_manager and not *_managersearch and not *_standalone' cmd.run "yum clean all"
+    salt -C 'not *_eval and not *_helixsensor and not *_manager and not *_managersearch and not *_standalone' cmd.run "yum clean all"
   fi
-  salt -C 'not *_eval and not *_helix and not *_manager and not *_managersearch and not *_standalone' -b $BATCHSIZE state.apply salt.minion queue=True
+  salt -C 'not *_eval and not *_helixsensor and not *_manager and not *_managersearch and not *_standalone' -b $BATCHSIZE state.apply salt.minion queue=True
   echo ""
 fi
 
diff --git a/salt/suricata/suricata_config.map.jinja b/salt/suricata/suricata_config.map.jinja
index d8669c231..8c11901d0 100644
--- a/salt/suricata/suricata_config.map.jinja
+++ b/salt/suricata/suricata_config.map.jinja
@@ -20,7 +20,7 @@ HOME_NET: "[{{salt['pillar.get']('global:hnmanager', '')}}]"
     '*_eval': {
       'default-packet-size': salt['pillar.get']('sensor:mtu', 1500) + hardware_header,
     },
-    '*_helix': {
+    '*_helixsensor': {
       'default-packet-size': salt['pillar.get']('sensor:mtu', 9000) + hardware_header,
     },
     '*': {