Skip to content

Commit 0c1ec27

Browse files
author
ci.datadog-api-spec
committed
Regenerate client from commit 9236473 of spec repo
1 parent 202ad60 commit 0c1ec27

File tree

10 files changed

+730
-29
lines changed

10 files changed

+730
-29
lines changed

.generator/schemas/v1/openapi.yaml

Lines changed: 58 additions & 9 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.
3294+
3295+
Only Cloud Run Revision resources that apply to specified filters are
3296+
imported into Datadog.
32933297

3294-
Only Cloud Run revision resources that apply to specified filters are
3295-
imported into Datadog.'
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: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17665,6 +17665,37 @@ components:
1766517665
example: aiplatform
1766617666
type: string
1766717667
type: object
17668+
GCPMonitoredResourceConfig:
17669+
description: Configuration for a GCP monitored resource.
17670+
properties:
17671+
filters:
17672+
description: 'List of filters to limit the monitored resources that are
17673+
pulled into Datadog by using tags.
17674+
17675+
Only monitored resources that apply to specified filters are imported
17676+
into Datadog.'
17677+
example:
17678+
- $KEY:$VALUE
17679+
items:
17680+
description: A monitored resource filter
17681+
type: string
17682+
type: array
17683+
type:
17684+
$ref: '#/components/schemas/GCPMonitoredResourceConfigType'
17685+
type: object
17686+
GCPMonitoredResourceConfigType:
17687+
description: The GCP monitored resource type. Only a subset of resource types
17688+
are supported.
17689+
enum:
17690+
- cloud_function
17691+
- cloud_run_revision
17692+
- gce_instance
17693+
example: gce_instance
17694+
type: string
17695+
x-enum-varnames:
17696+
- CLOUD_FUNCTION
17697+
- CLOUD_RUN_REVISION
17698+
- GCE_INSTANCE
1766817699
GCPSTSDelegateAccount:
1766917700
description: Datadog principal service account info.
1767017701
properties:
@@ -17732,21 +17763,35 @@ components:
1773217763
example: datadog-service-account@test-project.iam.gserviceaccount.com
1773317764
type: string
1773417765
cloud_run_revision_filters:
17735-
description: 'List of filters to limit the Cloud Run revisions that are
17766+
deprecated: true
17767+
description: 'List of filters to limit the Cloud Run Revisions that are
1773617768
pulled into Datadog by using tags.
1773717769

17738-
Only Cloud Run revision resources that apply to specified filters are
17739-
imported into Datadog.'
17770+
Only Cloud Run Revision resources that apply to specified filters are
17771+
imported into Datadog.
17772+
17773+
NOTE: this field is deprecated, prefer `monitored_resource_configs` with
17774+
`type=cloud_run_revision`'
1774017775
example:
1774117776
- $KEY:$VALUE
1774217777
items:
17743-
description: Cloud Run Filters
17778+
description: Cloud Run Revision filters
1774417779
type: string
1774517780
type: array
1774617781
host_filters:
17747-
description: Your Host Filters.
17782+
deprecated: true
17783+
description: 'List of filters to limit the VM Instances that are pulled
17784+
into Datadog by using tags.
17785+
17786+
Only VM Instance resources that apply to specified filters are imported
17787+
into Datadog.
17788+
17789+
NOTE: this field is deprecated, prefer `monitored_resource_configs` with
17790+
`type=gce_instance`'
17791+
example:
17792+
- $KEY:$VALUE
1774817793
items:
17749-
description: Host Filters
17794+
description: VM Instance filters
1775017795
type: string
1775117796
type: array
1775217797
is_cspm_enabled:
@@ -17782,6 +17827,15 @@ components:
1778217827
items:
1778317828
$ref: '#/components/schemas/GCPMetricNamespaceConfig'
1778417829
type: array
17830+
monitored_resource_configs:
17831+
description: Configurations for GCP monitored resources.
17832+
example:
17833+
- filters:
17834+
- $KEY:$VALUE
17835+
type: gce_instance
17836+
items:
17837+
$ref: '#/components/schemas/GCPMonitoredResourceConfig'
17838+
type: array
1778517839
resource_collection_enabled:
1778617840
description: When enabled, Datadog scans for all resources in your GCP environment.
1778717841
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)