Merge pull request #15705 from Security-Onion-Solutions/3/main

Merge pr/workflow changes back to dev
Merge pull request #15702 from Security-Onion-Solutions/3/main
2026-04-06 21:01:58 +02:00 · 2026-04-01 10:57:34 -04:00 · 2026-03-31 15:12:01 -04:00 · 2026-03-31 13:55:55 -04:00 · 2026-03-31 13:53:00 -04:00 · 2026-03-31 13:52:07 -04:00
3 changed files with 3 additions and 2 deletions
--- a/.github/DISCUSSION_TEMPLATE/3-0.yml
+++ b/.github/DISCUSSION_TEMPLATE/3-0.yml
@@ -10,6 +10,7 @@ body:
      options:
        -
        - 3.0.0
+        - 3.1.0
        - Other (please provide detail below)
    validations:
      required: true
--- a/2
+++ b/2
@@ -1 +1 @@
-3.0.0
+3.1.0
--- a/salt/zeek/soc_zeek.yaml
+++ b/salt/zeek/soc_zeek.yaml
@@ -5,7 +5,7 @@ zeek:
    helpLink: zeek
  ja4plus:
    enabled:
-      description: "Enables JA4+ fingerprinting (JA4S, JA4D, JA4H, JA4L, JA4SSH, JA4T, JA4TS, JA4X). By enabling this, you agree to the terms of the JA4+ license  [https://github.com/FoxIO-LLC/ja4/blob/main/LICENSE](https://github.com/FoxIO-LLC/ja4/blob/main/LICENSE)."
+      description: "Enables JA4+ fingerprinting (JA4S, JA4D, JA4H, JA4L, JA4SSH, JA4T, JA4TS, JA4X). By enabling this, you agree to the terms of the JA4+ license  [https://github.com/FoxIO-LLC/ja4/blob/main/LICENSE-JA4](https://github.com/FoxIO-LLC/ja4/blob/main/LICENSE-JA4)."
      forcedType: bool
      helpLink: zeek
      advanced: False
Author	SHA1	Message	Date
Jason Ertel	76f4ccf8c8	Merge pull request #15705 from Security-Onion-Solutions/3/main Merge pr/workflow changes back to dev	2026-04-01 10:57:34 -04:00
Mike Reeves	3dec6986b6	Merge pull request #15702 from Security-Onion-Solutions/3/main soup fix	2026-03-31 15:12:01 -04:00
Mike Reeves	ff45e5ebc6	Merge pull request #15699 from Security-Onion-Solutions/TOoSmOotH-patch-4 Version Bump	2026-03-31 13:55:55 -04:00
Mike Reeves	1e2b51eae6	Add version 3.1.0 to discussion template options	2026-03-31 13:53:00 -04:00
Mike Reeves	58d332ea94	Bump version from 3.0.0 to 3.1.0	2026-03-31 13:52:07 -04:00
@@ -1 +1 @@
 .0.0
 .1.0