Skip to content

Commit 90394ef

Browse files
api-clients-generation-pipeline[bot]ci.datadog-api-spec
andauthored
Update v1 and v2 GCP API specs to support monitored_resource_configs (#902)
Co-authored-by: ci.datadog-api-spec <packages@datadoghq.com>
1 parent f11cb1b commit 90394ef

12 files changed

+598
-23
lines changed

.generator/schemas/v1/openapi.yaml

Lines changed: 57 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3288,15 +3288,19 @@ components:
32883288
example: https://www.googleapis.com/robot/v1/metadata/x509/$CLIENT_EMAIL
32893289
type: string
32903290
cloud_run_revision_filters:
3291-
description: 'Limit the Cloud Run revisions that are pulled into Datadog
3292-
by using tags.
3291+
deprecated: true
3292+
description: 'List of filters to limit the Cloud Run revisions that are
3293+
pulled into Datadog by using tags.
32933294

32943295
Only Cloud Run revision resources that apply to specified filters are
3295-
imported into Datadog.'
3296+
imported into Datadog.
3297+
3298+
**Note:** This field is deprecated. Instead, use `monitored_resource_configs`
3299+
with `type=cloud_run_revision`'
32963300
example:
32973301
- $KEY:$VALUE
32983302
items:
3299-
description: Cloud Run Filters
3303+
description: Cloud Run revision filters
33003304
type: string
33013305
type: array
33023306
errors:
@@ -3309,11 +3313,16 @@ components:
33093313
type: string
33103314
type: array
33113315
host_filters:
3312-
description: 'Limit the GCE instances that are pulled into Datadog by using
3313-
tags.
3316+
deprecated: true
3317+
description: 'A comma-separated list of filters to limit the VM instances
3318+
that are pulled into Datadog by using tags.
33143319

3315-
Only hosts that match one of the defined tags are imported into Datadog.'
3316-
example: key:value,filter:example
3320+
Only VM instance resources that apply to specified filters are imported
3321+
into Datadog.
3322+
3323+
**Note:** This field is deprecated. Instead, use `monitored_resource_configs`
3324+
with `type=gce_instance`'
3325+
example: $KEY1:$VALUE1,$KEY2:$VALUE2
33173326
type: string
33183327
is_cspm_enabled:
33193328
description: 'When enabled, Datadog will activate the Cloud Security Monitoring
@@ -3334,6 +3343,15 @@ components:
33343343
account.'
33353344
example: true
33363345
type: boolean
3346+
monitored_resource_configs:
3347+
description: Configurations for GCP monitored resources.
3348+
example:
3349+
- filters:
3350+
- $KEY:$VALUE
3351+
type: gce_instance
3352+
items:
3353+
$ref: '#/components/schemas/GCPMonitoredResourceConfig'
3354+
type: array
33373355
private_key:
33383356
description: Your private key name found in your JSON service account key.
33393357
example: private_key
@@ -3366,6 +3384,37 @@ components:
33663384
items:
33673385
$ref: '#/components/schemas/GCPAccount'
33683386
type: array
3387+
GCPMonitoredResourceConfig:
3388+
description: Configuration for a GCP monitored resource.
3389+
properties:
3390+
filters:
3391+
description: 'List of filters to limit the monitored resources that are
3392+
pulled into Datadog by using tags.
3393+
3394+
Only monitored resources that apply to specified filters are imported
3395+
into Datadog.'
3396+
example:
3397+
- $KEY:$VALUE
3398+
items:
3399+
description: A monitored resource filter
3400+
type: string
3401+
type: array
3402+
type:
3403+
$ref: '#/components/schemas/GCPMonitoredResourceConfigType'
3404+
type: object
3405+
GCPMonitoredResourceConfigType:
3406+
description: The GCP monitored resource type. Only a subset of resource types
3407+
are supported.
3408+
enum:
3409+
- cloud_function
3410+
- cloud_run_revision
3411+
- gce_instance
3412+
example: gce_instance
3413+
type: string
3414+
x-enum-varnames:
3415+
- CLOUD_FUNCTION
3416+
- CLOUD_RUN_REVISION
3417+
- GCE_INSTANCE
33693418
GeomapWidgetDefinition:
33703419
description: This visualization displays a series of values by country on a
33713420
world map.

.generator/schemas/v2/openapi.yaml

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17694,6 +17694,37 @@ components:
1769417694
example: aiplatform
1769517695
type: string
1769617696
type: object
17697+
GCPMonitoredResourceConfig:
17698+
description: Configuration for a GCP monitored resource.
17699+
properties:
17700+
filters:
17701+
description: 'List of filters to limit the monitored resources that are
17702+
pulled into Datadog by using tags.
17703+
17704+
Only monitored resources that apply to specified filters are imported
17705+
into Datadog.'
17706+
example:
17707+
- $KEY:$VALUE
17708+
items:
17709+
description: A monitored resource filter
17710+
type: string
17711+
type: array
17712+
type:
17713+
$ref: '#/components/schemas/GCPMonitoredResourceConfigType'
17714+
type: object
17715+
GCPMonitoredResourceConfigType:
17716+
description: The GCP monitored resource type. Only a subset of resource types
17717+
are supported.
17718+
enum:
17719+
- cloud_function
17720+
- cloud_run_revision
17721+
- gce_instance
17722+
example: gce_instance
17723+
type: string
17724+
x-enum-varnames:
17725+
- CLOUD_FUNCTION
17726+
- CLOUD_RUN_REVISION
17727+
- GCE_INSTANCE
1769717728
GCPSTSDelegateAccount:
1769817729
description: Datadog principal service account info.
1769917730
properties:
@@ -17761,21 +17792,35 @@ components:
1776117792
example: datadog-service-account@test-project.iam.gserviceaccount.com
1776217793
type: string
1776317794
cloud_run_revision_filters:
17795+
deprecated: true
1776417796
description: 'List of filters to limit the Cloud Run revisions that are
1776517797
pulled into Datadog by using tags.
1776617798

1776717799
Only Cloud Run revision resources that apply to specified filters are
17768-
imported into Datadog.'
17800+
imported into Datadog.
17801+
17802+
**Note:** This field is deprecated. Instead, use `monitored_resource_configs`
17803+
with `type=cloud_run_revision`'
1776917804
example:
1777017805
- $KEY:$VALUE
1777117806
items:
17772-
description: Cloud Run Filters
17807+
description: Cloud Run revision filters
1777317808
type: string
1777417809
type: array
1777517810
host_filters:
17776-
description: Your Host Filters.
17811+
deprecated: true
17812+
description: 'List of filters to limit the VM instances that are pulled
17813+
into Datadog by using tags.
17814+
17815+
Only VM instance resources that apply to specified filters are imported
17816+
into Datadog.
17817+
17818+
**Note:** This field is deprecated. Instead, use `monitored_resource_configs`
17819+
with `type=gce_instance`'
17820+
example:
17821+
- $KEY:$VALUE
1777717822
items:
17778-
description: Host Filters
17823+
description: VM instance filters
1777917824
type: string
1778017825
type: array
1778117826
is_cspm_enabled:
@@ -17811,6 +17856,15 @@ components:
1781117856
items:
1781217857
$ref: '#/components/schemas/GCPMetricNamespaceConfig'
1781317858
type: array
17859+
monitored_resource_configs:
17860+
description: Configurations for GCP monitored resources.
17861+
example:
17862+
- filters:
17863+
- $KEY:$VALUE
17864+
type: gce_instance
17865+
items:
17866+
$ref: '#/components/schemas/GCPMonitoredResourceConfig'
17867+
type: array
1781417868
resource_collection_enabled:
1781517869
description: When enabled, Datadog scans for all resources in your GCP environment.
1781617870
type: boolean

src/datadogV1/model/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,10 @@ pub mod model_resource_provider_config;
784784
pub use self::model_resource_provider_config::ResourceProviderConfig;
785785
pub mod model_gcp_account;
786786
pub use self::model_gcp_account::GCPAccount;
787+
pub mod model_gcp_monitored_resource_config;
788+
pub use self::model_gcp_monitored_resource_config::GCPMonitoredResourceConfig;
789+
pub mod model_gcp_monitored_resource_config_type;
790+
pub use self::model_gcp_monitored_resource_config_type::GCPMonitoredResourceConfigType;
787791
pub mod model_pager_duty_service;
788792
pub use self::model_pager_duty_service::PagerDutyService;
789793
pub mod model_pager_duty_service_name;

0 commit comments

Comments
 (0)