Merge branch '2.4/dev' into TOoSmOotH-patch-3

Merge pull request #15298 from Security-Onion-Solutions/idstools-refactor
Fixup logic
2025-12-11 03:32:53 +01:00 · 2025-12-10 17:19:32 -05:00 · 2025-12-10 17:18:59 -05:00 · 2025-12-10 15:23:12 -05:00 · 2025-12-09 11:04:38 -05:00 · 2025-12-09 11:00:53 -05:00
2 changed files with 7 additions and 14 deletions
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -2652,26 +2652,16 @@ soc:
          thresholdColorRatioMed: 0.75
          thresholdColorRatioMax: 1
          availableModels:
-            - id: sonnet-4
-              displayName: Claude Sonnet 4
-              contextLimitSmall: 200000
-              contextLimitLarge: 1000000
-              lowBalanceColorAlert: 500000
-              enabled: true
            - id: sonnet-4.5
-              displayName: Claude Sonnet 4.5
+              displayName: Claude Sonnet 4.5 ($$$)
+              origin: USA
              contextLimitSmall: 200000
              contextLimitLarge: 1000000
              lowBalanceColorAlert: 500000
              enabled: true
-            - id: gptoss-120b
-              displayName: GPT-OSS 120B
-              contextLimitSmall: 128000
-              contextLimitLarge: 128000
-              lowBalanceColorAlert: 500000
-              enabled: true
            - id: qwen-235b
-              displayName: QWEN 235B
+              displayName: QWEN 235B ($)
+              origin: China
              contextLimitSmall: 256000
              contextLimitLarge: 256000
              lowBalanceColorAlert: 500000
--- a/salt/soc/soc_soc.yaml
+++ b/salt/soc/soc_soc.yaml
@@ -708,6 +708,9 @@ soc:
            - field: displayName
              label: Display Name
              required: True
+            - field: origin
+              label: Country of Origin for the Model Training
+              required: false
            - field: contextLimitSmall
              label: Context Limit (Small)
              forcedType: int
Author	SHA1	Message	Date
Mike Reeves	99dc72cece	Merge branch '2.4/dev' into TOoSmOotH-patch-3	2025-12-10 17:19:32 -05:00
Josh Brower	04d6cca204	Merge pull request #15298 from Security-Onion-Solutions/idstools-refactor Fixup logic	2025-12-10 17:18:59 -05:00
Josh Brower	f433de7e12	Merge pull request #15297 from Security-Onion-Solutions/idstools-refactor small fixes	2025-12-10 15:23:12 -05:00
Mike Reeves	7575218697	Merge pull request #15293 from Security-Onion-Solutions/TOoSmOotH-patch-4 Remove Claude Sonnet 4 model configuration	2025-12-09 11:04:38 -05:00
Mike Reeves	dc945dad00	Remove Claude Sonnet 4 model configuration Removed configuration for Claude Sonnet 4 model.	2025-12-09 11:00:53 -05:00
Josh Brower	ddcd74ffd2	Merge pull request #15292 from Security-Onion-Solutions/idstools-refactor Fix custom name	2025-12-09 10:12:41 -05:00
Josh Brower	f5688175b6	Merge pull request #15290 from Security-Onion-Solutions/idstools-refactor match correct custom ruleset name	2025-12-08 18:25:46 -05:00
Mike Reeves	94694d394e	Add origin field to model training configuration	2025-12-08 16:36:09 -05:00
Mike Reeves	03dd746601	Add origin field to model configurations	2025-12-08 16:34:19 -05:00
Mike Reeves	eec3373ae7	Update display name for Claude Sonnet 4	2025-12-08 16:30:50 -05:00
Mike Reeves	db45ce07ed	Modify model display names and remove GPT-OSS 120B Updated display names for models and removed GPT-OSS 120B.	2025-12-08 16:26:45 -05:00
Josh Brower	ba49765312	Merge pull request #15287 from Security-Onion-Solutions/idstools-refactor Rework ordering	2025-12-08 12:42:48 -05:00
Josh Brower	80411ab6cf	Merge pull request #15286 from Security-Onion-Solutions/idstools-refactor be more verbose	2025-12-08 10:31:39 -05:00
Josh Brower	411f28a049	Merge pull request #15284 from Security-Onion-Solutions/idstools-refactor Make sure local salt dir is created	2025-12-07 17:49:56 -05:00
Josh Brower	2dd49f6d9b	Merge pull request #15283 from Security-Onion-Solutions/idstools-refactor Fixup Airgap	2025-12-06 16:06:57 -05:00
Josh Brower	c4a70b540e	Merge pull request #15232 from Security-Onion-Solutions/idstools-refactor Idstools refactor	2025-12-05 12:58:10 -05:00