emit authority_host only when auth_type is client_secret

kaiyan-sheng · kaiyan-sheng · commit 0d52a0992697 · 2026-02-19T00:34:07.000-07:00
diff --git a/packages/azure/data_stream/activitylogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/activitylogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/application_gateway/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/application_gateway/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/auditlogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/auditlogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/eventhub/agent/stream/stream.yml.hbs b/packages/azure/data_stream/eventhub/agent/stream/stream.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/events/agent/stream/stream.yml.hbs b/packages/azure/data_stream/events/agent/stream/stream.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/firewall_logs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/firewall_logs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/graphactivitylogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/graphactivitylogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container}}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/identity_protection/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/identity_protection/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/platformlogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/platformlogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/provisioning/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/provisioning/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/signinlogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/signinlogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure/data_stream/springcloudlogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure/data_stream/springcloudlogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_ai_foundry/data_stream/logs/agent/stream/azure-eventhub.yml.hbs b/packages/azure_ai_foundry/data_stream/logs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_app_service/data_stream/app_service_logs/agent/stream/azure-eventhub.yml.hbs b/packages/azure_app_service/data_stream/app_service_logs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_frontdoor/data_stream/access/agent/stream/azure-eventhub.yml.hbs b/packages/azure_frontdoor/data_stream/access/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_frontdoor/data_stream/waf/agent/stream/azure-eventhub.yml.hbs b/packages/azure_frontdoor/data_stream/waf/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_functions/data_stream/functionapplogs/agent/stream/azure-eventhub.yml.hbs b/packages/azure_functions/data_stream/functionapplogs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_logs/agent/input/input.yml.hbs b/packages/azure_logs/agent/input/input.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/azure_openai/data_stream/logs/agent/stream/azure-eventhub.yml.hbs b/packages/azure_openai/data_stream/logs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container }}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/github/data_stream/audit/agent/stream/azure-eventhub.yml.hbs b/packages/github/data_stream/audit/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if storage_account_container}}
 storage_account_container: {{storage_account_container}}
 {{else}}
diff --git a/packages/kubernetes/data_stream/audit_logs/agent/stream/azure-eventhub.yml.hbs b/packages/kubernetes/data_stream/audit_logs/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if eventhub}}
 eventhub: {{eventhub}}
 {{/if}}
diff --git a/packages/m365_defender/data_stream/event/agent/stream/azure-eventhub.yml.hbs b/packages/m365_defender/data_stream/event/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if eventhub}}
 eventhub: {{eventhub}}
 {{/if}}
diff --git a/packages/microsoft_defender_cloud/_dev/build/docs/README.md b/packages/microsoft_defender_cloud/_dev/build/docs/README.md
@@ -77,7 +77,7 @@ Elastic Agent must be installed. For more details, check the Elastic Agent [inst
         - Configure **Client ID**, **Client Secret** and **Tenant ID**. Configure either **Subscription ID** or **Management Group Name** as the scope.
     * To **Collect logs from Azure Event Hub**, you'll need to:
 
-        - Choose **Authentication type**: **Connection String** (default) or **Client Secret** (Microsoft Entra ID). For Connection String: configure **Azure Event Hub**, **Connection String**, **Storage Account**, and **storage_account_key**. For Client Secret: configure **Tenant ID**, **Client ID**, **Client Secret**, **Event Hub namespace**, and **Storage Account** (no storage key). For client secret setup and required RBAC roles (Azure Event Hubs Data Receiver, Storage Blob Data Contributor), see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
+        - Choose **Authentication type**: **Connection String** (default) or **Client Secret** (Microsoft Entra ID). For Connection String: configure **Azure Event Hub**, **Connection String**, **Storage Account**, and **storage_account_key**. For Client Secret: configure **Azure Event Hub**, **Consumer Group**, **Tenant ID**, **Client ID**, **Client Secret**, **Event Hub namespace**, and **Storage Account** (no storage key). For client secret setup and required RBAC roles (Azure Event Hubs Data Receiver, Storage Blob Data Contributor), see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
 
 6. Select **Save and continue** to save the integration.
 
diff --git a/packages/microsoft_defender_cloud/data_stream/event/agent/stream/azure-eventhub.yml.hbs b/packages/microsoft_defender_cloud/data_stream/event/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if eventhub}}
 eventhub: {{eventhub}}
 {{/if}}
diff --git a/packages/microsoft_defender_cloud/docs/README.md b/packages/microsoft_defender_cloud/docs/README.md
@@ -77,7 +77,7 @@ Elastic Agent must be installed. For more details, check the Elastic Agent [inst
         - Configure **Client ID**, **Client Secret** and **Tenant ID**. Configure either **Subscription ID** or **Management Group Name** as the scope.
     * To **Collect logs from Azure Event Hub**, you'll need to:
 
-        - Choose **Authentication type**: **Connection String** (default) or **Client Secret** (Microsoft Entra ID). For Connection String: configure **Azure Event Hub**, **Connection String**, **Storage Account**, and **storage_account_key**. For Client Secret: configure **Tenant ID**, **Client ID**, **Client Secret**, **Event Hub namespace**, and **Storage Account** (no storage key). For client secret setup and required RBAC roles (Azure Event Hubs Data Receiver, Storage Blob Data Contributor), see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
+        - Choose **Authentication type**: **Connection String** (default) or **Client Secret** (Microsoft Entra ID). For Connection String: configure **Azure Event Hub**, **Connection String**, **Storage Account**, and **storage_account_key**. For Client Secret: configure **Azure Event Hub**, **Consumer Group**, **Tenant ID**, **Client ID**, **Client Secret**, **Event Hub namespace**, and **Storage Account** (no storage key). For client secret setup and required RBAC roles (Azure Event Hubs Data Receiver, Storage Blob Data Contributor), see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
 
 6. Select **Save and continue** to save the integration.
 
diff --git a/packages/microsoft_sentinel/_dev/build/docs/README.md b/packages/microsoft_sentinel/_dev/build/docs/README.md
@@ -58,7 +58,7 @@ For Rest API, this module has been tested against the **2024-03-01** version.
 3. Select the **Microsoft Sentinel** integration and add it.
 4. Add all the required integration configuration parameters:
    - **REST API input type:** URL, Login URL, Client ID, Client Secret, Tenant Id, Resource Group Name, Subscription ID, Workspace Name, Interval, and Initial Interval.
-   - **Azure Event Hub input type:** Authentication type (Connection String or Client Secret). For **Connection String**: Consumer Group, Connection String, Storage Account, and Storage Account Key. For **Client Secret**: Tenant ID, Client ID, Client Secret, Event Hub namespace, plus Storage Account (and optional container). For client secret setup and required RBAC roles, see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
+   - **Azure Event Hub input type:** Authentication type (Connection String or Client Secret). For **Connection String**: Consumer Group, Connection String, Storage Account, and Storage Account Key. For **Client Secret**: Azure Event Hub, Consumer Group, Tenant ID, Client ID, Client Secret, Event Hub namespace, plus Storage Account (and optional container). For client secret setup and required RBAC roles, see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
 5. Save the integration.
 
 ## Logs reference
diff --git a/packages/microsoft_sentinel/data_stream/event/agent/stream/azure-eventhub.yml.hbs b/packages/microsoft_sentinel/data_stream/event/agent/stream/azure-eventhub.yml.hbs
@@ -16,9 +16,11 @@ client_id: {{client_id}}
 {{#if client_secret}}
 client_secret: {{client_secret}}
 {{/if}}
+{{#contains "client_secret" auth_type}}
 {{#if authority_host}}
 authority_host: {{authority_host}}
 {{/if}}
+{{/contains}}
 {{#if eventhub}}
 eventhub: {{eventhub}}
 {{/if}}
diff --git a/packages/microsoft_sentinel/docs/README.md b/packages/microsoft_sentinel/docs/README.md
@@ -58,7 +58,7 @@ For Rest API, this module has been tested against the **2024-03-01** version.
 3. Select the **Microsoft Sentinel** integration and add it.
 4. Add all the required integration configuration parameters:
    - **REST API input type:** URL, Login URL, Client ID, Client Secret, Tenant Id, Resource Group Name, Subscription ID, Workspace Name, Interval, and Initial Interval.
-   - **Azure Event Hub input type:** Authentication type (Connection String or Client Secret). For **Connection String**: Consumer Group, Connection String, Storage Account, and Storage Account Key. For **Client Secret**: Tenant ID, Client ID, Client Secret, Event Hub namespace, plus Storage Account (and optional container). For client secret setup and required RBAC roles, see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
+   - **Azure Event Hub input type:** Authentication type (Connection String or Client Secret). For **Connection String**: Consumer Group, Connection String, Storage Account, and Storage Account Key. For **Client Secret**: Azure Event Hub, Consumer Group, Tenant ID, Client ID, Client Secret, Event Hub namespace, plus Storage Account (and optional container). For client secret setup and required RBAC roles, see the [Azure Logs integration](https://docs.elastic.co/integrations/azure) or [Filebeat azure-eventhub input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-azure-eventhub.html) documentation.
 5. Save the integration.
 
 ## Logs reference
