Skip to content

Commit 08d8c23

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 230d93c of spec repo
1 parent 688019c commit 08d8c23

File tree

10 files changed

+725
-24
lines changed

10 files changed

+725
-24
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, prefer `monitored_resource_configs` with
3299+
`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, prefer `monitored_resource_configs` with
3324+
`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
@@ -17626,6 +17626,37 @@ components:
1762617626
example: aiplatform
1762717627
type: string
1762817628
type: object
17629+
GCPMonitoredResourceConfig:
17630+
description: Configuration for a GCP monitored resource.
17631+
properties:
17632+
filters:
17633+
description: 'List of filters to limit the monitored resources that are
17634+
pulled into Datadog by using tags.
17635+
17636+
Only monitored resources that apply to specified filters are imported
17637+
into Datadog.'
17638+
example:
17639+
- $KEY:$VALUE
17640+
items:
17641+
description: A monitored resource filter
17642+
type: string
17643+
type: array
17644+
type:
17645+
$ref: '#/components/schemas/GCPMonitoredResourceConfigType'
17646+
type: object
17647+
GCPMonitoredResourceConfigType:
17648+
description: The GCP monitored resource type. Only a subset of resource types
17649+
are supported.
17650+
enum:
17651+
- cloud_function
17652+
- cloud_run_revision
17653+
- gce_instance
17654+
example: gce_instance
17655+
type: string
17656+
x-enum-varnames:
17657+
- CLOUD_FUNCTION
17658+
- CLOUD_RUN_REVISION
17659+
- GCE_INSTANCE
1762917660
GCPSTSDelegateAccount:
1763017661
description: Datadog principal service account info.
1763117662
properties:
@@ -17693,21 +17724,35 @@ components:
1769317724
example: datadog-service-account@test-project.iam.gserviceaccount.com
1769417725
type: string
1769517726
cloud_run_revision_filters:
17727+
deprecated: true
1769617728
description: 'List of filters to limit the Cloud Run revisions that are
1769717729
pulled into Datadog by using tags.
1769817730

1769917731
Only Cloud Run revision resources that apply to specified filters are
17700-
imported into Datadog.'
17732+
imported into Datadog.
17733+
17734+
NOTE: this field is deprecated, prefer `monitored_resource_configs` with
17735+
`type=cloud_run_revision`'
1770117736
example:
1770217737
- $KEY:$VALUE
1770317738
items:
17704-
description: Cloud Run Filters
17739+
description: Cloud Run revision filters
1770517740
type: string
1770617741
type: array
1770717742
host_filters:
17708-
description: Your Host Filters.
17743+
deprecated: true
17744+
description: 'List of filters to limit the VM Instances that are pulled
17745+
into Datadog by using tags.
17746+
17747+
Only VM Instance resources that apply to specified filters are imported
17748+
into Datadog.
17749+
17750+
NOTE: this field is deprecated, prefer `monitored_resource_configs` with
17751+
`type=gce_instance`'
17752+
example:
17753+
- $KEY:$VALUE
1770917754
items:
17710-
description: Host Filters
17755+
description: VM Instance filters
1771117756
type: string
1771217757
type: array
1771317758
is_cspm_enabled:
@@ -17743,6 +17788,15 @@ components:
1774317788
items:
1774417789
$ref: '#/components/schemas/GCPMetricNamespaceConfig'
1774517790
type: array
17791+
monitored_resource_configs:
17792+
description: Configurations for GCP monitored resources.
17793+
example:
17794+
- filters:
17795+
- $KEY:$VALUE
17796+
type: gce_instance
17797+
items:
17798+
$ref: '#/components/schemas/GCPMonitoredResourceConfig'
17799+
type: array
1774617800
resource_collection_enabled:
1774717801
description: When enabled, Datadog scans for all resources in your GCP environment.
1774817802
type: boolean

src/main/java/com/datadog/api/client/v1/model/GCPAccount.java

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
GCPAccount.JSON_PROPERTY_IS_CSPM_ENABLED,
3333
GCPAccount.JSON_PROPERTY_IS_RESOURCE_CHANGE_COLLECTION_ENABLED,
3434
GCPAccount.JSON_PROPERTY_IS_SECURITY_COMMAND_CENTER_ENABLED,
35+
GCPAccount.JSON_PROPERTY_MONITORED_RESOURCE_CONFIGS,
3536
GCPAccount.JSON_PROPERTY_PRIVATE_KEY,
3637
GCPAccount.JSON_PROPERTY_PRIVATE_KEY_ID,
3738
GCPAccount.JSON_PROPERTY_PROJECT_ID,
@@ -83,6 +84,10 @@ public class GCPAccount {
8384
"is_security_command_center_enabled";
8485
private Boolean isSecurityCommandCenterEnabled = false;
8586

87+
public static final String JSON_PROPERTY_MONITORED_RESOURCE_CONFIGS =
88+
"monitored_resource_configs";
89+
private List<GCPMonitoredResourceConfig> monitoredResourceConfigs = null;
90+
8691
public static final String JSON_PROPERTY_PRIVATE_KEY = "private_key";
8792
private String privateKey;
8893

@@ -243,18 +248,23 @@ public GCPAccount addCloudRunRevisionFiltersItem(String cloudRunRevisionFiltersI
243248
}
244249

245250
/**
246-
* Limit the Cloud Run revisions that are pulled into Datadog by using tags. Only Cloud Run
247-
* revision resources that apply to specified filters are imported into Datadog.
251+
* List of filters to limit the Cloud Run revisions that are pulled into Datadog by using tags.
252+
* Only Cloud Run revision resources that apply to specified filters are imported into Datadog.
253+
* NOTE: this field is deprecated, prefer <code>monitored_resource_configs</code> with <code>
254+
* type=cloud_run_revision</code>
248255
*
249256
* @return cloudRunRevisionFilters
257+
* @deprecated
250258
*/
259+
@Deprecated
251260
@jakarta.annotation.Nullable
252261
@JsonProperty(JSON_PROPERTY_CLOUD_RUN_REVISION_FILTERS)
253262
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
254263
public List<String> getCloudRunRevisionFilters() {
255264
return cloudRunRevisionFilters;
256265
}
257266

267+
@Deprecated
258268
public void setCloudRunRevisionFilters(List<String> cloudRunRevisionFilters) {
259269
this.cloudRunRevisionFilters = cloudRunRevisionFilters;
260270
}
@@ -294,18 +304,23 @@ public GCPAccount hostFilters(String hostFilters) {
294304
}
295305

296306
/**
297-
* Limit the GCE instances that are pulled into Datadog by using tags. Only hosts that match one
298-
* of the defined tags are imported into Datadog.
307+
* A comma-separated list of filters to limit the VM Instances that are pulled into Datadog by
308+
* using tags. Only VM Instance resources that apply to specified filters are imported into
309+
* Datadog. NOTE: this field is deprecated, prefer <code>monitored_resource_configs</code> with
310+
* <code>type=gce_instance</code>
299311
*
300312
* @return hostFilters
313+
* @deprecated
301314
*/
315+
@Deprecated
302316
@jakarta.annotation.Nullable
303317
@JsonProperty(JSON_PROPERTY_HOST_FILTERS)
304318
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
305319
public String getHostFilters() {
306320
return hostFilters;
307321
}
308322

323+
@Deprecated
309324
public void setHostFilters(String hostFilters) {
310325
this.hostFilters = hostFilters;
311326
}
@@ -375,6 +390,42 @@ public void setIsSecurityCommandCenterEnabled(Boolean isSecurityCommandCenterEna
375390
this.isSecurityCommandCenterEnabled = isSecurityCommandCenterEnabled;
376391
}
377392

393+
public GCPAccount monitoredResourceConfigs(
394+
List<GCPMonitoredResourceConfig> monitoredResourceConfigs) {
395+
this.monitoredResourceConfigs = monitoredResourceConfigs;
396+
for (GCPMonitoredResourceConfig item : monitoredResourceConfigs) {
397+
this.unparsed |= item.unparsed;
398+
}
399+
return this;
400+
}
401+
402+
public GCPAccount addMonitoredResourceConfigsItem(
403+
GCPMonitoredResourceConfig monitoredResourceConfigsItem) {
404+
if (this.monitoredResourceConfigs == null) {
405+
this.monitoredResourceConfigs = new ArrayList<>();
406+
}
407+
this.monitoredResourceConfigs.add(monitoredResourceConfigsItem);
408+
this.unparsed |= monitoredResourceConfigsItem.unparsed;
409+
return this;
410+
}
411+
412+
/**
413+
* Configurations for GCP monitored resources.
414+
*
415+
* @return monitoredResourceConfigs
416+
*/
417+
@jakarta.annotation.Nullable
418+
@JsonProperty(JSON_PROPERTY_MONITORED_RESOURCE_CONFIGS)
419+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
420+
public List<GCPMonitoredResourceConfig> getMonitoredResourceConfigs() {
421+
return monitoredResourceConfigs;
422+
}
423+
424+
public void setMonitoredResourceConfigs(
425+
List<GCPMonitoredResourceConfig> monitoredResourceConfigs) {
426+
this.monitoredResourceConfigs = monitoredResourceConfigs;
427+
}
428+
378429
public GCPAccount privateKey(String privateKey) {
379430
this.privateKey = privateKey;
380431
return this;
@@ -571,6 +622,7 @@ public boolean equals(Object o) {
571622
this.isResourceChangeCollectionEnabled, gcpAccount.isResourceChangeCollectionEnabled)
572623
&& Objects.equals(
573624
this.isSecurityCommandCenterEnabled, gcpAccount.isSecurityCommandCenterEnabled)
625+
&& Objects.equals(this.monitoredResourceConfigs, gcpAccount.monitoredResourceConfigs)
574626
&& Objects.equals(this.privateKey, gcpAccount.privateKey)
575627
&& Objects.equals(this.privateKeyId, gcpAccount.privateKeyId)
576628
&& Objects.equals(this.projectId, gcpAccount.projectId)
@@ -595,6 +647,7 @@ public int hashCode() {
595647
isCspmEnabled,
596648
isResourceChangeCollectionEnabled,
597649
isSecurityCommandCenterEnabled,
650+
monitoredResourceConfigs,
598651
privateKey,
599652
privateKeyId,
600653
projectId,
@@ -628,6 +681,9 @@ public String toString() {
628681
sb.append(" isSecurityCommandCenterEnabled: ")
629682
.append(toIndentedString(isSecurityCommandCenterEnabled))
630683
.append("\n");
684+
sb.append(" monitoredResourceConfigs: ")
685+
.append(toIndentedString(monitoredResourceConfigs))
686+
.append("\n");
631687
sb.append(" privateKey: ").append(toIndentedString(privateKey)).append("\n");
632688
sb.append(" privateKeyId: ").append(toIndentedString(privateKeyId)).append("\n");
633689
sb.append(" projectId: ").append(toIndentedString(projectId)).append("\n");

0 commit comments

Comments
 (0)