Merge pull request #12463 from Security-Onion-Solutions/dev

2.3.290

.github/DISCUSSION_TEMPLATE/2-4.yml

@@ -1,20 +1,17 @@
 body:
   - type: markdown
     attributes:
-      value: >
+      value: |
         ⚠️ This category is solely for conversations related to Security Onion 2.4 ⚠️
+
+        If your organization needs more immediate, enterprise grade professional support, with one-on-one virtual meetings and screensharing, contact us via our website: https://securityonion.com/support
   - type: dropdown
     attributes:
       label: Version
       description: Which version of Security Onion 2.4.x are you asking about?
       options:
         -
-        - 2.4.0
-        - 2.4.1
-        - 2.4.2
-        - 2.4.3
-        - 2.4.4
-        - 2.4.5
+        - 2.4 Pre-release (Beta, Release Candidate)
         - 2.4.10
         - 2.4.20
         - 2.4.30
@@ -178,33 +175,16 @@ body:
   - type: textarea
     attributes:
       label: Detail
-      description: Please read the placeholder and then provide detailed information to help us help you.
-      placeholder: >-
-        STOP! Please read these guidelines in their entirety before typing!
-        
-        Community Support is considered best effort and there are no guarantees and no SLAs. If you need private, priority, or enterprise support, please consider purchasing support from Security Onion Solutions.
-        
-        Please review the Github Community Guidelines (see link on the right side of the page).
-        
-        Please be patient, courteous, and respectful. Disrespectful messages can result in being banned.
-        
-        Before posting for help, check the Help, FAQ, and other sections of the documentation (https://docs.securityonion.net/) to see if your question has already been answered there.
-        
-        Please do not tag an individual in a discussion unless that individual has already volunteered to help you in that discussion.
-        
-        When creating your discussion, please put a relevant and descriptive title in the Title field and avoid generic titles like Help. When copying text from your Security Onion deployment to the discussion, please copy as plain text when possible rather than taking a screenshot of the text. This allows others to search for and find your text.
-        
-        Avoid typing in ALL CAPS as this looks like YELLING!
-        
-        If you need to include a large section of output, please do so as an attached file or Github gist rather than including the output directly in the reply itself. 
-        
-        If you attach files, please make sure they are plain text format. No Word docs or PDFs please.
+      description: Please read our discussion guidelines at https://github.com/Security-Onion-Solutions/securityonion/discussions/1720 and then provide detailed information to help us help you.
+      placeholder: |-
+        STOP! Before typing, please read our discussion guidelines at https://github.com/Security-Onion-Solutions/securityonion/discussions/1720 in their entirety!
 
+        If your organization needs more immediate, enterprise grade professional support, with one-on-one virtual meetings and screensharing, contact us via our website: https://securityonion.com/support
     validations:
       required: true
   - type: checkboxes
     attributes:
       label: Guidelines
       options:
-        - label: I have read the above statement and can confirm my post is relevant to Security Onion 2.4.
+        - label: I have read the discussion guidelines at https://github.com/Security-Onion-Solutions/securityonion/discussions/1720 and assert that I have followed the guidelines.
           required: true

.github/workflows/lock-threads.yml

@@ -0,0 +1,42 @@
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '50 1 * * *'
+  workflow_dispatch:
+
+permissions:
+  issues: write
+  pull-requests: write
+  discussions: write
+
+concurrency:
+  group: lock-threads
+
+jobs:
+  close-threads:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v5
+        with:
+          days-before-issue-stale: -1
+          days-before-issue-close: 60
+          stale-issue-message: "This issue is stale because it has been inactive for an extended period. Stale issues convey that the issue, while important to someone, is not critical enough for the author, or other community members to work on, sponsor, or otherwise shepherd the issue through to a resolution."
+          close-issue-message: "This issue was closed because it has been stale for an extended period. It will be automatically locked in 30 days, after which no further commenting will be available."
+          days-before-pr-stale: 45
+          days-before-pr-close: 60
+          stale-pr-message: "This PR is stale because it has been inactive for an extended period. The longer a PR remains stale the more out of date with the main branch it becomes."
+          close-pr-message: "This PR was closed because it has been stale for an extended period. It will be automatically locked in 30 days. If there is still a commitment to finishing this PR re-open it before it is locked."
+
+  lock-threads:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: jertel/lock-threads@main
+        with:
+          include-discussion-currently-open: true
+          discussion-inactive-days: 90
+          issue-inactive-days: 30
+          pr-inactive-days: 30

VERIFY_ISO.md

@@ -1,18 +1,18 @@
-### 2.3.280-20231128 ISO image built on 2023/11/28
+### 2.3.290-20240229 ISO image built on 2024/02/29
 
 
 
 ### Download and Verify
 
-2.3.280-20231128 ISO image:  
-https://download.securityonion.net/file/securityonion/securityonion-2.3.280-20231128.iso
+2.3.290-20240229 ISO image:  
+https://download.securityonion.net/file/securityonion/securityonion-2.3.290-20240229.iso
 
-MD5: 0BC68BD73547B7E2FBA6F53BEC174590  
-SHA1: 1D33C565D37772FE7A3C3FE3ECB05FC1AC1EBFF1  
-SHA256: ADBD9DC9E1B266B18E0FDBDF084073EF926C565041858060D283CDAEF021EE11 
+MD5: D2A7BBDA25F311B7944A95655CC439CE  
+SHA1: BAD2A67119C6F73B6472E1A31B9C157A60A074B5  
+SHA256: FD611421C3B41BA267BA7A57B8FAFB29B0B59435D0A796D686C0D3BDD36AFF7D 
 
 Signature for ISO image:  
-https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.280-20231128.iso.sig
+https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.290-20240229.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.280-20231128.iso.sig
+wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.290-20240229.iso.sig
 ```
 
 Download the ISO image:  
 ```
-wget https://download.securityonion.net/file/securityonion/securityonion-2.3.280-20231128.iso
+wget https://download.securityonion.net/file/securityonion/securityonion-2.3.290-20240229.iso
 ```
 
 Verify the downloaded ISO image using the signature file:  
 ```
-gpg --verify securityonion-2.3.280-20231128.iso.sig securityonion-2.3.280-20231128.iso
+gpg --verify securityonion-2.3.290-20240229.iso.sig securityonion-2.3.290-20240229.iso
 ```
 
 The output should show "Good signature" and the Primary key fingerprint should match what's shown below:
 ```
-gpg: Signature made Mon 27 Nov 2023 05:09:34 PM EST using RSA key ID FE507013
+gpg: Signature made Wed 28 Feb 2024 04:11:05 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.

VERSION

@@ -1 +1 @@
-2.3.280
+2.3.290

salt/common/tools/sbin/soup

@@ -581,6 +581,7 @@ preupgrade_changes() {
     [[ "$INSTALLEDVERSION" == 2.3.250 ]] && up_to_2.3.260
     [[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270
     [[ "$INSTALLEDVERSION" == 2.3.270 ]] && up_to_2.3.280
+    [[ "$INSTALLEDVERSION" == 2.3.280 ]] && up_to_2.3.290
     
     true
 }
@@ -614,6 +615,7 @@ postupgrade_changes() {
     [[ "$POSTVERSION" == 2.3.250 ]] && post_to_2.3.260
     [[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270
     [[ "$POSTVERSION" == 2.3.270 ]] && post_to_2.3.280
+    [[ "$POSTVERSION" == 2.3.280 ]] && post_to_2.3.290
 
     true
 }
@@ -784,6 +786,10 @@ post_to_2.3.280() {
   POSTVERSION=2.3.280
 }
 
+post_to_2.3.290() {
+  echo "Nothing to do for .290"
+  POSTVERSION=2.3.290
+}
 
 stop_salt_master() {
     # kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
@@ -1155,6 +1161,11 @@ up_to_2.3.280() {
   INSTALLEDVERSION=2.3.280
 }
 
+up_to_2.3.290() {
+  echo "Upgrading to 2.3.290"
+  INSTALLEDVERSION=2.3.290
+}
+
 verify_upgradespace() {
   CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
   if [ "$CURRENTSPACE" -lt "10" ]; then