Move In Day

salt/top.sls

@@ -1,10 +1,11 @@
+# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
+# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at 
+# https://securityonion.net/license; you may not use this file except in compliance with the
+# Elastic License 2.0.
+
+
 {% set ZEEKVER = salt['pillar.get']('global:mdengine', '') %}
-{% set WAZUH = salt['pillar.get']('global:wazuh', '0') %}
 {% set PLAYBOOK = salt['pillar.get']('manager:playbook', '0') %}
-{% set FREQSERVER = salt['pillar.get']('manager:freq', '0') %}
-{% set DOMAINSTATS = salt['pillar.get']('manager:domainstats', '0') %}
-{% set FLEETMANAGER = salt['pillar.get']('global:fleet_manager', False) %}
-{% set FLEETNODE = salt['pillar.get']('global:fleet_node', False) %}
 {% set ELASTALERT = salt['pillar.get']('elastalert:enabled', True) %}
 {% set ELASTICSEARCH = salt['pillar.get']('elasticsearch:enabled', True) %}
 {% set FILEBEAT = salt['pillar.get']('filebeat:enabled', True) %}
@@ -38,33 +39,12 @@ base:
     - motd
     - salt.minion-check
     - salt.lasthighstate
+    - docker
 
   'not *_workstation and G@saltversion:{{saltversion}}':
     - match: compound
     - common
   
-  '*_helixsensor and G@saltversion:{{saltversion}}':
-    - match: compound
-    - salt.master
-    - ca
-    - ssl
-    - registry
-    - sensoroni
-    - telegraf
-    - firewall
-    - idstools
-    - suricata.manager
-    - pcap
-    - suricata
-    - zeek
-    - redis
-    - elasticsearch
-    - logstash
-    {%- if FILEBEAT %}
-    - filebeat
-    {%- endif %}
-    - schedule
-
   '*_sensor and G@saltversion:{{saltversion}}':
     - match: compound
     - ssl
@@ -78,16 +58,10 @@ base:
     {%- if ZEEKVER != 'SURICATA' %}
     - zeek
     {%- endif %}
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if STRELKA %}
     - strelka
     {%- endif %}
     - filebeat
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
     - schedule
     - docker_clean
 
@@ -109,12 +83,7 @@ base:
     - idstools
     - suricata.manager
     - healthcheck
-    {%- if (FLEETMANAGER or FLEETNODE) or PLAYBOOK != 0 %}
     - mysql
-    {%- endif %}
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if ELASTICSEARCH %}
     - elasticsearch
     {%- endif %}
@@ -136,11 +105,6 @@ base:
     {%- if ELASTALERT %}
     - elastalert
     {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - redis
-    - fleet
-    - fleet.install_package
-    {%- endif %}
     - utility
     - schedule
     - soctopus
@@ -148,12 +112,6 @@ base:
     - playbook
     - redis
     {%- endif %}
-    {%- if FREQSERVER != 0 %}
-    - freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != 0 %}
-    - domainstats
-    {%- endif %}
     - docker_clean
     - pipeline.load
     - learn
@@ -175,12 +133,7 @@ base:
     - manager
     - idstools
     - suricata.manager
-    {%- if (FLEETMANAGER or FLEETNODE) or PLAYBOOK != 0 %}
     - mysql
-    {%- endif %}
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if ELASTICSEARCH %}
     - elasticsearch
     {%- endif %}
@@ -203,20 +156,8 @@ base:
     - curator
     - utility
     - schedule
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet
-    - fleet.install_package
-    {%- endif %}
     - soctopus
-    {%- if PLAYBOOK != 0 %}
     - playbook
-    {%- endif %}
-    {%- if FREQSERVER != 0 %}
-    - freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != 0 %}
-    - domainstats
-    {%- endif %}
     - docker_clean
     - pipeline.load
     - learn
@@ -239,12 +180,7 @@ base:
     - idstools
     - suricata.manager    
     - healthcheck
-    {%- if (FLEETMANAGER or FLEETNODE) or PLAYBOOK != 0 %}
     - mysql
-    {%- endif %}
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if ELASTICSEARCH %}
     - elasticsearch
     {%- endif %} 
@@ -272,23 +208,12 @@ base:
     {%- if ELASTALERT %}
     - elastalert
     {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet
-    - fleet.install_package
-    {%- endif %}
     - utility
     - schedule
     - soctopus
-    {%- if PLAYBOOK != 0 %}
     - playbook
-    {%- endif %}
-    {%- if FREQSERVER != 0 %}
-    - freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != 0 %}
-    - domainstats
-    {%- endif %}
     - docker_clean
+    - elastic-fleet
     - pipeline.load
     - learn
 
@@ -299,9 +224,6 @@ base:
     - nginx
     - telegraf
     - firewall
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if ELASTICSEARCH %}
     - elasticsearch
     {%- endif %}
@@ -312,9 +234,6 @@ base:
     {%- if FILEBEAT %}
     - filebeat
     {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
     - schedule
     - docker_clean
     - pipeline.load
@@ -336,12 +255,7 @@ base:
     - manager
     - idstools
     - suricata.manager
-    {%- if (FLEETMANAGER or FLEETNODE) or PLAYBOOK != 0 %}
     - mysql
-    {%- endif %}
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if ELASTICSEARCH %}
     - elasticsearch
     {%- endif %}
@@ -363,20 +277,8 @@ base:
     {%- endif %}
     - utility
     - schedule
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet
-    - fleet.install_package
-    {%- endif %}
     - soctopus
-    {%- if PLAYBOOK != 0 %}
     - playbook
-    {%- endif %}
-    {%- if FREQSERVER != 0 %}
-    - freqserver
-    {%- endif %}
-    {%- if DOMAINSTATS != 0 %}
-    - domainstats
-    {%- endif %}
     - docker_clean
     - pipeline.load
     - learn
@@ -388,9 +290,6 @@ base:
     - nginx
     - telegraf
     - firewall
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if ELASTICSEARCH %}
     - elasticsearch
     {%- endif %}
@@ -407,9 +306,6 @@ base:
     {%- if STRELKA %}
     - strelka
     {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
     - pcap
     - suricata
     {%- if ZEEKVER != 'SURICATA' %}
@@ -422,21 +318,6 @@ base:
     - docker_clean
     - pipeline.load
   
-  '*_fleet and G@saltversion:{{saltversion}}':
-    - match: compound
-    - ssl
-    - sensoroni
-    - nginx
-    - telegraf
-    - firewall
-    - mysql
-    - redis
-    - fleet
-    - fleet.install_package
-    - filebeat
-    - schedule
-    - docker_clean
-
   '*_import and G@saltversion:{{saltversion}}':
     - match: compound
     - salt.master
@@ -475,9 +356,6 @@ base:
     - sensoroni
     - telegraf
     - firewall
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
     {%- if LOGSTASH %}
     - logstash
     {%- endif %}
@@ -487,9 +365,6 @@ base:
     {%- if FILEBEAT %}
     - filebeat
     {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
     - schedule
     - docker_clean
 
@@ -499,12 +374,6 @@ base:
     - sensoroni
     - telegraf
     - firewall
-    {%- if WAZUH != 0 %}
-    - wazuh
-    {%- endif %}
-    {%- if FLEETMANAGER or FLEETNODE %}
-    - fleet.install_package
-    {%- endif %}
     - schedule
     - docker_clean
     - filebeat