Skip to content

Commit 2616c18

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Fix specification for Azure metric filtering (#2161)
Co-authored-by: ci.datadog-api-spec <[email protected]>
1 parent 4b0117f commit 2616c18

13 files changed

+130
-90
lines changed

.apigentools-info

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
"spec_versions": {
55
"v1": {
66
"apigentools_version": "1.6.6",
7-
"regenerated": "2024-12-18 16:21:38.215533",
8-
"spec_repo_commit": "e12aeab9"
7+
"regenerated": "2024-12-18 17:18:31.526689",
8+
"spec_repo_commit": "8cb3faac"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-12-18 16:21:38.230894",
13-
"spec_repo_commit": "e12aeab9"
12+
"regenerated": "2024-12-18 17:18:31.541350",
13+
"spec_repo_commit": "8cb3faac"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,15 @@ components:
844844
Only hosts that match one of the defined tags are imported into Datadog.'
845845
example: key:value,filter:example
846846
type: string
847-
metrics_config:
848-
$ref: '#/components/schemas/AzureAccountMetricsConfig'
847+
metrics_enabled:
848+
description: Enable Azure metrics for your organization.
849+
example: true
850+
type: boolean
851+
metrics_enabled_default:
852+
description: Enable Azure metrics for your organization for resource providers
853+
where no resource provider config is specified.
854+
example: true
855+
type: boolean
849856
new_client_id:
850857
description: Your New Azure web application ID.
851858
example: new1c7f6-1234-5678-9101-3fcbf464test
@@ -860,37 +867,26 @@ components:
860867
monitored by this app registration.
861868
example: true
862869
type: boolean
870+
resource_provider_configs:
871+
description: Configuration settings applied to resources from the specified
872+
Azure resource providers.
873+
items:
874+
$ref: '#/components/schemas/ResourceProviderConfig'
875+
type: array
863876
tenant_name:
864877
description: Your Azure Active Directory ID.
865878
example: testc44-1234-5678-9101-cc00736ftest
866879
type: string
880+
usage_metrics_enabled:
881+
description: Enable azure.usage metrics for your organization.
882+
example: true
883+
type: boolean
867884
type: object
868885
AzureAccountListResponse:
869886
description: Accounts configured for your organization.
870887
items:
871888
$ref: '#/components/schemas/AzureAccount'
872889
type: array
873-
AzureAccountMetricsConfig:
874-
description: 'Dictionary containing the key `excluded_resource_providers` which
875-
has to be a list of Microsoft Azure Resource Provider names.
876-
877-
This feature is currently being beta tested.
878-
879-
In order to enable all resource providers for metric collection, pass:
880-
881-
`metrics_config: {"excluded_resource_providers": []}` (i.e., an empty list
882-
for `excluded_resource_providers`).'
883-
properties:
884-
excluded_resource_providers:
885-
description: List of Microsoft Azure Resource Providers to exclude from
886-
metric collection.
887-
example:
888-
- Microsoft.Sql
889-
- Microsoft.Cdn
890-
items:
891-
type: string
892-
type: array
893-
type: object
894890
CancelDowntimesByScopeRequest:
895891
description: Cancel downtimes according to scope.
896892
properties:
@@ -10209,6 +10205,19 @@ components:
1020910205
- lookup_enrichment_table
1021010206
- type
1021110207
type: object
10208+
ResourceProviderConfig:
10209+
description: Configuration settings applied to resources from the specified
10210+
Azure resource provider.
10211+
properties:
10212+
metrics_enabled:
10213+
description: Collect metrics for resources from this provider.
10214+
example: true
10215+
type: boolean
10216+
namespace:
10217+
description: The provider namespace to apply this configuration to.
10218+
example: Microsoft.Compute
10219+
type: string
10220+
type: object
1021210221
ResponseMetaAttributes:
1021310222
description: Object describing meta attributes of response.
1021410223
properties:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-07-25T18:47:35.517Z
1+
2024-12-17T21:43:00.678Z

cassettes/features/v1/azure_integration/Delete-an-Azure-integration-returns-OK-response.yml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2024-07-25T18:47:35.975Z
1+
2024-12-17T21:43:01.129Z

cassettes/features/v1/azure_integration/Update-an-Azure-integration-returns-OK-response.yml

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/v1/azure-integration/UpdateAzureHostFilters.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@
1515
"*",
1616
],
1717
host_filters: "key:value,filter:example",
18-
metrics_config: DatadogAPIClient::V1::AzureAccountMetricsConfig.new({
19-
excluded_resource_providers: [
20-
"Microsoft.Sql",
21-
"Microsoft.Cdn",
22-
],
23-
}),
18+
metrics_enabled: true,
19+
metrics_enabled_default: true,
2420
new_client_id: "new1c7f6-1234-5678-9101-3fcbf464test",
2521
new_tenant_name: "new1c44-1234-5678-9101-cc00736ftest",
2622
resource_collection_enabled: true,
23+
resource_provider_configs: [
24+
DatadogAPIClient::V1::ResourceProviderConfig.new({
25+
metrics_enabled: true,
26+
namespace: "Microsoft.Compute",
27+
}),
28+
],
2729
tenant_name: "testc44-1234-5678-9101-cc00736ftest",
30+
usage_metrics_enabled: true,
2831
})
2932
p api_instance.update_azure_host_filters(body)

examples/v1/azure-integration/UpdateAzureIntegration.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
new_client_id: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d",
1919
new_tenant_name: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d",
2020
resource_collection_enabled: true,
21-
metrics_config: DatadogAPIClient::V1::AzureAccountMetricsConfig.new({
22-
excluded_resource_providers: [
23-
"Microsoft.Sql",
24-
"Microsoft.Cdn",
25-
],
26-
}),
2721
tenant_name: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d",
2822
})
2923
p api_instance.update_azure_integration(body)

0 commit comments

Comments
 (0)