Skip to content

Commit 508913f

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 924a9178 of spec repo
1 parent e0921ec commit 508913f

File tree

10 files changed

+101
-63
lines changed

10 files changed

+101
-63
lines changed

.apigentools-info

+4-4
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-17 15:50:58.597261",
8-
"spec_repo_commit": "b82d3677"
7+
"regenerated": "2024-12-17 21:45:16.361828",
8+
"spec_repo_commit": "924a9178"
99
},
1010
"v2": {
1111
"apigentools_version": "1.6.6",
12-
"regenerated": "2024-12-17 15:50:58.611708",
13-
"spec_repo_commit": "b82d3677"
12+
"regenerated": "2024-12-17 21:45:16.377405",
13+
"spec_repo_commit": "924a9178"
1414
}
1515
}
1616
}

.generator/schemas/v1/openapi.yaml

+32-23
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:

examples/v1/azure-integration/UpdateAzureHostFilters.ts

+9-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,19 @@ const params: v1.AzureIntegrationApiUpdateAzureHostFiltersRequest = {
1818
customMetricsEnabled: true,
1919
errors: ["*"],
2020
hostFilters: "key:value,filter:example",
21-
metricsConfig: {
22-
excludedResourceProviders: ["Microsoft.Sql", "Microsoft.Cdn"],
23-
},
21+
metricsEnabled: true,
22+
metricsEnabledDefault: true,
2423
newClientId: "new1c7f6-1234-5678-9101-3fcbf464test",
2524
newTenantName: "new1c44-1234-5678-9101-cc00736ftest",
2625
resourceCollectionEnabled: true,
26+
resourceProviderConfigs: [
27+
{
28+
metricsEnabled: true,
29+
namespace: "Microsoft.Compute",
30+
},
31+
],
2732
tenantName: "testc44-1234-5678-9101-cc00736ftest",
33+
usageMetricsEnabled: true,
2834
},
2935
};
3036

examples/v1/azure-integration/UpdateAzureIntegration.ts

-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ const params: v1.AzureIntegrationApiUpdateAzureIntegrationRequest = {
2121
newClientId: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d",
2222
newTenantName: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d",
2323
resourceCollectionEnabled: true,
24-
metricsConfig: {
25-
excludedResourceProviders: ["Microsoft.Sql", "Microsoft.Cdn"],
26-
},
2724
tenantName: "9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d",
2825
},
2926
};

features/v1/azure_integration.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Feature: Azure Integration
1212
@generated @skip @team:DataDog/azure-integrations
1313
Scenario: Create an Azure integration returns "Bad Request" response
1414
Given new "CreateAzureIntegration" request
15-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_config": {"excluded_resource_providers": ["Microsoft.Sql", "Microsoft.Cdn"]}, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
15+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
1616
When the request is sent
1717
Then the response status is 400 Bad Request
1818

@@ -26,7 +26,7 @@ Feature: Azure Integration
2626
@generated @skip @team:DataDog/azure-integrations
2727
Scenario: Delete an Azure integration returns "Bad Request" response
2828
Given new "DeleteAzureIntegration" request
29-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_config": {"excluded_resource_providers": ["Microsoft.Sql", "Microsoft.Cdn"]}, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
29+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
3030
When the request is sent
3131
Then the response status is 400 Bad Request
3232

@@ -53,28 +53,28 @@ Feature: Azure Integration
5353
@generated @skip @team:DataDog/azure-integrations
5454
Scenario: Update Azure integration host filters returns "Bad Request" response
5555
Given new "UpdateAzureHostFilters" request
56-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_config": {"excluded_resource_providers": ["Microsoft.Sql", "Microsoft.Cdn"]}, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
56+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
5757
When the request is sent
5858
Then the response status is 400 Bad Request
5959

6060
@generated @skip @team:DataDog/azure-integrations
6161
Scenario: Update Azure integration host filters returns "OK" response
6262
Given new "UpdateAzureHostFilters" request
63-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_config": {"excluded_resource_providers": ["Microsoft.Sql", "Microsoft.Cdn"]}, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
63+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
6464
When the request is sent
6565
Then the response status is 200 OK
6666

6767
@generated @skip @team:DataDog/azure-integrations
6868
Scenario: Update an Azure integration returns "Bad Request" response
6969
Given new "UpdateAzureIntegration" request
70-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_config": {"excluded_resource_providers": ["Microsoft.Sql", "Microsoft.Cdn"]}, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "tenant_name": "testc44-1234-5678-9101-cc00736ftest"}
70+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "testc7f6-1234-5678-9101-3fcbf464test", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "metrics_enabled": true, "metrics_enabled_default": true, "new_client_id": "new1c7f6-1234-5678-9101-3fcbf464test", "new_tenant_name": "new1c44-1234-5678-9101-cc00736ftest", "resource_collection_enabled": true, "resource_provider_configs": [{"metrics_enabled": true, "namespace": "Microsoft.Compute"}], "tenant_name": "testc44-1234-5678-9101-cc00736ftest", "usage_metrics_enabled": true}
7171
When the request is sent
7272
Then the response status is 400 Bad Request
7373

7474
@team:DataDog/azure-integrations
7575
Scenario: Update an Azure integration returns "OK" response
7676
Given there is a valid "azure_account" in the system
7777
And new "UpdateAzureIntegration" request
78-
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "{{ uuid }}", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "{{ uuid }}", "new_tenant_name": "{{ uuid }}", "resource_collection_enabled": true, "metrics_config": {"excluded_resource_providers": ["Microsoft.Sql", "Microsoft.Cdn"]}, "tenant_name": "{{ uuid }}"}
78+
And body with value {"app_service_plan_filters": "key:value,filter:example", "automute": true, "client_id": "{{ uuid }}", "client_secret": "TestingRh2nx664kUy5dIApvM54T4AtO", "container_app_filters": "key:value,filter:example", "cspm_enabled": true, "custom_metrics_enabled": true, "errors": ["*"], "host_filters": "key:value,filter:example", "new_client_id": "{{ uuid }}", "new_tenant_name": "{{ uuid }}", "resource_collection_enabled": true, "tenant_name": "{{ uuid }}"}
7979
When the request is sent
8080
Then the response status is 200 OK

features/v1/given.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
{
118118
"name": "body",
119119
"origin": "request",
120-
"value": "{\n \"app_service_plan_filters\": \"key:value,filter:example\",\n \"automute\": true,\n \"client_id\": \"{{ uuid }}\",\n \"client_secret\": \"TestingRh2nx664kUy5dIApvM54T4AtO\",\n \"container_app_filters\": \"key:value,filter:example\",\n \"cspm_enabled\": true,\n \"custom_metrics_enabled\": true,\n \"errors\": [\"*\"],\n \"host_filters\": \"key:value,filter:example\",\n \"new_client_id\": \"{{ uuid }}\",\n \"new_tenant_name\": \"{{ uuid }}\",\n \"resource_collection_enabled\": true,\n \"metrics_config\": {\n \"excluded_resource_providers\": [\"Microsoft.Sql\", \"Microsoft.Cdn\"]\n },\n \"tenant_name\": \"{{ uuid }}\"\n}"
120+
"value": "{\n \"app_service_plan_filters\": \"key:value,filter:example\",\n \"automute\": true,\n \"client_id\": \"{{ uuid }}\",\n \"client_secret\": \"TestingRh2nx664kUy5dIApvM54T4AtO\",\n \"container_app_filters\": \"key:value,filter:example\",\n \"cspm_enabled\": true,\n \"custom_metrics_enabled\": true,\n \"errors\": [\"*\"],\n \"host_filters\": \"key:value,filter:example\",\n \"metrics_enabled\": true,\n \"metrics_enabled_default\": true,\n \"new_client_id\": \"{{ uuid }}\",\n \"new_tenant_name\": \"{{ uuid }}\",\n \"resource_collection_enabled\": true,\n \"resource_provider_configs\": [\n {\n \"namespace\": \"Microsoft.Compute\",\n \"metrics_enabled\": false\n },\n {\n \"namespace\": \"Microsoft.Web\",\n \"metrics_enabled\": false\n }\n ],\n \"tenant_name\": \"{{ uuid }}\",\n \"usage_metrics_enabled\": true\n}"
121121
}
122122
],
123123
"step": "there is a valid \"azure_account\" in the system",

packages/datadog-api-client-v1/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,6 @@ export { AWSTagFilterCreateRequest } from "./models/AWSTagFilterCreateRequest";
374374
export { AWSTagFilterDeleteRequest } from "./models/AWSTagFilterDeleteRequest";
375375
export { AWSTagFilterListResponse } from "./models/AWSTagFilterListResponse";
376376
export { AzureAccount } from "./models/AzureAccount";
377-
export { AzureAccountMetricsConfig } from "./models/AzureAccountMetricsConfig";
378377
export { CancelDowntimesByScopeRequest } from "./models/CancelDowntimesByScopeRequest";
379378
export { CanceledDowntimesIds } from "./models/CanceledDowntimesIds";
380379
export { ChangeWidgetDefinition } from "./models/ChangeWidgetDefinition";
@@ -728,6 +727,7 @@ export { QueryValueWidgetDefinition } from "./models/QueryValueWidgetDefinition"
728727
export { QueryValueWidgetDefinitionType } from "./models/QueryValueWidgetDefinitionType";
729728
export { QueryValueWidgetRequest } from "./models/QueryValueWidgetRequest";
730729
export { ReferenceTableLogsLookupProcessor } from "./models/ReferenceTableLogsLookupProcessor";
730+
export { ResourceProviderConfig } from "./models/ResourceProviderConfig";
731731
export { ResponseMetaAttributes } from "./models/ResponseMetaAttributes";
732732
export { RunWorkflowWidgetDefinition } from "./models/RunWorkflowWidgetDefinition";
733733
export { RunWorkflowWidgetDefinitionType } from "./models/RunWorkflowWidgetDefinitionType";

0 commit comments

Comments
 (0)