Merge branch 'dev' of https://github.com/Security-Onion-Solutions/securityonion into dev

salt/docker_clean/init.sls

@@ -1,6 +1,6 @@
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
 {% set MANAGER = salt['grains.get']('master') %}
-{% set OLDVERSIONS = ['2.0.0-rc.1','2.0.1-rc.1','2.0.2-rc.1','2.0.3-rc.1','2.1.0-rc.2','2.2.0-rc.3','2.3.0']%}
+{% set OLDVERSIONS = ['2.0.0-rc.1','2.0.1-rc.1','2.0.2-rc.1','2.0.3-rc.1','2.1.0-rc.2','2.2.0-rc.3','2.3.0','2.3.1']%}
 
 {% for VERSION in OLDVERSIONS %}
 remove_images_{{ VERSION }}:

salt/playbook/init.sls

@@ -17,15 +17,14 @@ include:
   - mysql
   
 create_playbookdbuser:
-  module.run:
-    - mysql.user_create:
-      - user: playbookdbuser
-      - password: {{ PLAYBOOKPASS }}
-      - host: {{ DNET }}/255.255.255.0
-      - connection_host: {{ MAINIP }}
-      - connection_port: 3306
-      - connection_user: root
-      - connection_pass: {{ MYSQLPASS }}
+  mysql_user.present:
+    - name: playbookdbuser
+    - password: {{ PLAYBOOKPASS }}
+    - host: {{ DNET }}/255.255.255.0
+    - connection_host: {{ MAINIP }}
+    - connection_port: 3306
+    - connection_user: root
+    - connection_pass: {{ MYSQLPASS }}
 
 query_playbookdbuser_grants:
   mysql_query.run:

salt/salt/master.defaults.yaml

@@ -2,4 +2,4 @@
 # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions
 salt:
   master:
-    version: 3002.1
+    version: 3002.2

salt/salt/minion.defaults.yaml

@@ -2,5 +2,5 @@
 # When updating the salt version, also update the version in securityonion-builds/images/iso-task/Dockerfile and saltify function in so-functions
 salt:
   minion:
-    version: 3002.1
+    version: 3002.2
     check_threshold: 3600 # in seconds, threshold used for so-salt-minion-check. any value less than 600 seconds may cause a lot of salt-minion restarts since the job to touch the file occurs every 5-8 minutes by default

salt/soc/files/soc/changes.json

@@ -12,7 +12,7 @@
 		{ "summary": "Resolved issue with Navigator layer(s) not loading correctly." },
 		{ "summary": "Wazuh authd is now started by default on port 1515/tcp." },
 		{ "summary": "Wazuh API default credentials are now removed after setup. Scripts have been added for API user management." },
-		{ "summary": "Upgraded Salt to 3002.1 due to CVEs." },
+		{ "summary": "Upgraded Salt to 3002.2 due to CVEs." },
 		{ "summary": "If salt-minion is unable to apply states after the defined threshold, we assume salt-minion is in a bad state and the salt-minion service will be restarted." },
 		{ "summary": "Fixed bug that prevented mysql from installing for Fleet if Playbook wasn't also installed." },
 		{ "summary": "<code>so-status</code> will now show STARTING or WAIT_START, instead of ERROR, if <code>so-status</code> is run before a salt highstate has started or finished for the first time after system startup" },