Merge pull request #9876 from Security-Onion-Solutions/master

Master to Dev

HOTFIX

@@ -0,0 +1 @@
+20230301

VERIFY_ISO.md

@@ -1,18 +1,18 @@
-### 2.3.220-20230224 ISO image built on 2023/02/24
+### 2.3.220-20230301 ISO image built on 2023/03/01
 
 
 
 ### Download and Verify
 
-2.3.220-20230224 ISO image:  
+2.3.220-20230301 ISO image:  
-https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230224.iso
+https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230301.iso
 
-MD5: 74CDCE07BC5787567E07C1CAC64DC381  
+MD5: 76870CF09FF27893574FC104F9AC6642  
-SHA1: 8DA0E8541C46CBDCFA0FB9B60F3C95D027D4BB37  
+SHA1: CBF5B407C5982CA40C7660FE5CD9E3C6C551D280  
-SHA256: E5EDB011693AC33C40CAB483400F72FAF9615053867FD9C80DDD1AACAD9100B3 
+SHA256: 0719D441DF8B77266CE16F5FA182BF0680567BE7AD0AE36979D4FE8E0953F094 
 
 Signature for ISO image:  
-https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230224.iso.sig
+https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230301.iso.sig
 
 Signing key:  
 https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS  
@@ -26,22 +26,22 @@ wget https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/ma
 
 Download the signature file for the ISO:  
 ```
-wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230224.iso.sig
+wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230301.iso.sig
 ```
 
 Download the ISO image:  
 ```
-wget https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230224.iso
+wget https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230301.iso
 ```
 
 Verify the downloaded ISO image using the signature file:  
 ```
-gpg --verify securityonion-2.3.220-20230224.iso.sig securityonion-2.3.220-20230224.iso
+gpg --verify securityonion-2.3.220-20230301.iso.sig securityonion-2.3.220-20230301.iso
 ```
 
 The output should show "Good signature" and the Primary key fingerprint should match what's shown below:
 ```
-gpg: Signature made Fri 24 Feb 2023 02:32:08 PM EST using RSA key ID FE507013
+gpg: Signature made Wed 01 Mar 2023 03:50:25 PM EST using RSA key ID FE507013
 gpg: Good signature from "Security Onion Solutions, LLC <info@securityonionsolutions.com>"
 gpg: WARNING: This key is not certified with a trusted signature!
 gpg:          There is no indication that the signature belongs to the owner.

salt/curator/files/curator.yml

@@ -14,22 +14,25 @@
 ---
 # Remember, leave a key empty if there is no value.  None will be a string,
 # not a Python "NoneType"
+elasticsearch:
   client:
     hosts:
-    - {{elasticsearch}}
+      - https://{{elasticsearch}}:9200
-  port: 9200
+    cloud_id:
+    ca_certs:
+    client_cert:
+    client_key:
+    verify_certs: False
+    request_timeout: 30
+  other_settings:
+    api_key:
+      id:
+      api_key:
+    master_only: False
 {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %}
     username: "{{ ES_USER }}"
     password: "{{ ES_PASS }}"
 {%- endif %}
-  url_prefix:
-  use_ssl: True
-  certificate:
-  client_cert:
-  client_key:
-  ssl_no_validate: True
-  timeout: 30
-  master_only: False
 
 logging:
   loglevel: INFO

salt/curator/init.sls

@@ -139,6 +139,8 @@ so-curator:
       - file: actionconfs
       - file: curconf
       - file: curlogdir
+    - watch:
+      - file: curconf
   {% else %}
     - force: True
   {% endif %}