Merge pull request #12171 from Security-Onion-Solutions/2.4/dev

Merge 2.4 dev

salt/manager/tools/sbin/soup

@@ -563,7 +563,9 @@ up_to_2.4.30() {
 }
 
 up_to_2.4.40() {
-  echo "Nothing to do for 2.4.40"
+  echo "Removing old ATT&CK Navigator Layers..."
+  rm -f /opt/so/conf/navigator/layers/enterprise-attack.json
+  rm -f /opt/so/conf/navigator/layers/nav_layer_playbook.json
 
   INSTALLEDVERSION=2.4.40
 }
@@ -985,16 +987,6 @@ main() {
     salt-call state.apply salt.minion -l info queue=True
     echo ""
 
-    # Only regenerate osquery packages if Fleet is enabled
-    FLEET_MANAGER=$(lookup_pillar fleet_manager)
-    FLEET_NODE=$(lookup_pillar fleet_node)
-    if [[ "$FLEET_MANAGER" == "True" || "$FLEET_NODE" == "True" ]]; then
-      echo ""
-      echo "Regenerating Osquery Packages.... This will take several minutes."
-      salt-call state.apply fleet.event_gen-packages -l info queue=True
-      echo ""
-    fi
-
     enable_highstate
 
     echo ""