diff --git a/packages/azure_billing/_dev/build/docs/README.md b/packages/azure_billing/_dev/build/docs/README.md index 74aa7b886b7..18b0d1e4817 100644 --- a/packages/azure_billing/_dev/build/docs/README.md +++ b/packages/azure_billing/_dev/build/docs/README.md @@ -156,7 +156,7 @@ The settings' main section contains all the options needed to access the Azure A #### Advanced options -There are two additional advanced options: +There are a few additional advanced options: `Resource Manager Endpoint` _string_ : Optional. By default, the integration uses the Azure public environment. To override, users can provide a specific resource manager endpoint to use a different Azure environment. @@ -178,6 +178,15 @@ Examples: * `https://login.microsoftonline.com` for Azure PublicCloud * `https://login.microsoftonline.us` for Azure USGovernmentCloud +`Resource Manager Audience` _string_ +: Optional. By default, the integration uses the associated Resource Manager Audience. To override, users can provide a specific resource manager audience to use a different Azure environment. + +Examples: + +* `https://management.core.chinacloudapi.cn` for Azure ChinaCloud +* `https://management.core.windows.net` for Azure PublicCloud +* `https://management.core.usgovcloudapi.net` for Azure USGovernmentCloud + #### Data stream options The data stream has some additional options about scope and period. To learn more about the scope, read the [Scope](#scope) section. diff --git a/packages/azure_billing/changelog.yml b/packages/azure_billing/changelog.yml index 2869af69741..422e2e09490 100644 --- a/packages/azure_billing/changelog.yml +++ b/packages/azure_billing/changelog.yml @@ -1,3 +1,8 @@ +- version: 1.7.1 + changes: + - description: Add resource manager audience configuration option. + type: bugfix + link: https://github.com/elastic/integrations/pull/11582 - version: 1.7.0 changes: - description: Add processor support for billing data stream. diff --git a/packages/azure_billing/data_stream/billing/agent/stream/stream.yml.hbs b/packages/azure_billing/data_stream/billing/agent/stream/stream.yml.hbs index dba6c0ab2d8..3bf07c6d4ed 100644 --- a/packages/azure_billing/data_stream/billing/agent/stream/stream.yml.hbs +++ b/packages/azure_billing/data_stream/billing/agent/stream/stream.yml.hbs @@ -22,6 +22,9 @@ resource_manager_endpoint: {{resource_manager_endpoint}} {{#if active_directory_endpoint}} active_directory_endpoint: {{active_directory_endpoint}} {{/if}} +{{#if resource_manager_audience}} +resource_manager_audience: {{resource_manager_audience}} +{{/if}} {{#if billing_scope_department}} billing_scope_department: {{billing_scope_department}} {{/if}} diff --git a/packages/azure_billing/docs/README.md b/packages/azure_billing/docs/README.md index fcdce821272..d485bbc7018 100644 --- a/packages/azure_billing/docs/README.md +++ b/packages/azure_billing/docs/README.md @@ -156,7 +156,7 @@ The settings' main section contains all the options needed to access the Azure A #### Advanced options -There are two additional advanced options: +There are a few additional advanced options: `Resource Manager Endpoint` _string_ : Optional. By default, the integration uses the Azure public environment. To override, users can provide a specific resource manager endpoint to use a different Azure environment. @@ -178,6 +178,15 @@ Examples: * `https://login.microsoftonline.com` for Azure PublicCloud * `https://login.microsoftonline.us` for Azure USGovernmentCloud +`Resource Manager Audience` _string_ +: Optional. By default, the integration uses the associated Resource Manager Audience. To override, users can provide a specific resource manager audience to use a different Azure environment. + +Examples: + +* `https://management.core.chinacloudapi.cn` for Azure ChinaCloud +* `https://management.core.windows.net` for Azure PublicCloud +* `https://management.core.usgovcloudapi.net` for Azure USGovernmentCloud + #### Data stream options The data stream has some additional options about scope and period. To learn more about the scope, read the [Scope](#scope) section. diff --git a/packages/azure_billing/manifest.yml b/packages/azure_billing/manifest.yml index 785d1e4404a..72c9f6a38d6 100644 --- a/packages/azure_billing/manifest.yml +++ b/packages/azure_billing/manifest.yml @@ -1,6 +1,6 @@ name: azure_billing title: Azure Billing Metrics -version: "1.7.0" +version: "1.7.1" description: Collect billing metrics with Elastic Agent. type: integration icons: @@ -66,6 +66,13 @@ vars: multi: false required: false show_user: false + - name: resource_manager_audience + type: text + title: Resource Manager Audience + description: By default, the integration uses the associated Resource Manager Audience. To override, users can provide a specific resource manager audience to use a different Azure environment. + multi: false + required: false + show_user: false policy_templates: - name: billing title: Azure Billing Metrics