From 7ba84c9016d0c31f8e4524468a287e5d712a2e43 Mon Sep 17 00:00:00 2001
From: Corey Ogburn <corey.ogburn@securityonionsolutions.com>
Date: Thu, 29 Jan 2026 15:54:03 -0700
Subject: [PATCH] Organized, Annotated

Settling on the final shape of the new config values.
---
 salt/soc/defaults.yaml | 10 ++++++++--
 salt/soc/soc_soc.yaml  | 27 ++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml
index 86c003ca6..2fb21f89e 100644
--- a/salt/soc/defaults.yaml
+++ b/salt/soc/defaults.yaml
@@ -1494,10 +1494,16 @@ soc:
                 branch: main
                 folder: securityonion-normalized
         assistant:
-          apiUrl: https://onionai.securityonion.net
-          healthTimeoutSeconds: 3
           systemPromptAddendum: ""
           systemPromptAddendumMaxLength: 50000
+          adapters:
+            securityonion_ai_cloud:
+              apiUrl: https://onionai.securityonion.net
+              healthTimeoutSeconds: 5
+            gemini:
+              apiKey: ""
+              serviceAccountJSON: ""
+              serviceAccountLocation: ""
         salt:
           queueDir: /opt/sensoroni/queue
           timeoutMs: 45000
diff --git a/salt/soc/soc_soc.yaml b/salt/soc/soc_soc.yaml
index a9b09b813..8fbcf05f8 100644
--- a/salt/soc/soc_soc.yaml
+++ b/salt/soc/soc_soc.yaml
@@ -650,13 +650,6 @@ soc:
                 label: Folder
             airgap: *pbRepos
         assistant:
-          apiUrl:
-            description: The URL of the AI gateway.
-            global: True
-          healthTimeoutSeconds:
-            description: Timeout in seconds for the Onion AI health check.
-            global: True
-            advanced: True
           systemPromptAddendum:
             description: Additional context to provide to the AI assistant about this SOC deployment. This can include information about your environment, policies, or any other relevant details that can help the AI provide more accurate and tailored assistance. Long prompts may be shortened.
             global: True
@@ -666,6 +659,26 @@ soc:
             description: Maximum length of the system prompt addendum. Longer prompts will be truncated.
             global: True
             advanced: True
+          adapters:
+            securityonion_ai_cloud:
+              apiUrl:
+                description: The URL of the AI gateway.
+                global: True
+              healthTimeoutSeconds:
+                description: Timeout in seconds for the Onion AI health check.
+                global: True
+                advanced: True
+            gemini:
+              apiKey:
+                description: A Google API key generated in Google AI Studio or the Google Cloud Console.
+                global: True
+              serviceAccountJSON:
+                description: The JSON file contents holding the credentials for a Google Service Account. Uses Vertex AI.
+                global: True
+                multiline: True
+              serviceAccountLocation:
+                description: The location of your project in Google Cloud. Example: us-central1
+                global: True
       client:
         assistant:
           enabled: