Merge branch 'dev' into feature/issue124

salt/top.sls

@@ -20,7 +20,7 @@ base:
     - idstools
     - pcap
     - suricata
-    - bro
+    - zeek
     - redis
     - logstash
     - filebeat
@@ -34,7 +34,7 @@ base:
     - pcap
     - suricata
     {%- if BROVER != 'SURICATA' %}
-    - bro
+    - zeek
     {%- endif %}
     - wazuh
     - filebeat
@@ -46,11 +46,13 @@ base:
   'G@role:so-eval':
     - ca
     - ssl
+    - registry
+    - master
     - common
     - sensoroni
     - firewall
-    - master
     - idstools
+    - auth
     {%- if OSQUERY != 0 %}
     - mysql
     {%- endif %}
@@ -59,7 +61,7 @@ base:
     - kibana
     - pcap
     - suricata
-    - bro
+    - zeek
     - curator
     - elastalert
     {%- if OSQUERY != 0 %}
@@ -91,6 +93,7 @@ base:
   'G@role:so-master':
     - ca
     - ssl
+    - registry
     - common
     - sensoroni
     - firewall