Skip to content

Commit 8d2f73c

Browse files
clamoriniereclamoriniere
committed
run locally the make generate command
1 parent 4f09aa3 commit 8d2f73c

7 files changed

+80
-80
lines changed

‎api/datadoghq/v2alpha1/zz_generated.deepcopy.go‎

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

‎config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,6 +2382,21 @@
23822382
"additionalProperties": false,
23832383
"description": "Global settings to configure the agents",
23842384
"properties": {
2385+
"autodiscovery": {
2386+
"additionalProperties": false,
2387+
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
2388+
"properties": {
2389+
"extraIgnoreAutoConfig": {
2390+
"description": "ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.\nEntries provided here are appended to defaults set by the Operator rather than overriding them.",
2391+
"items": {
2392+
"type": "string"
2393+
},
2394+
"type": "array",
2395+
"x-kubernetes-list-type": "set"
2396+
}
2397+
},
2398+
"type": "object"
2399+
},
23852400
"checksTagCardinality": {
23862401
"description": "ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`).\nSee also: https://docs.datadoghq.com/getting_started/tagging/assigning_tags/?tab=containerizedenvironments#tags-cardinality.\nNot set by default to avoid overriding existing DD_CHECKS_TAG_CARDINALITY configurations, the default value in the Agent is low.\nRef: https://github.com/DataDog/datadog-agent/blob/856cf4a66142ce91fd4f8a278149436eb971184a/pkg/config/setup/config.go#L625.",
23872402
"type": "string"
@@ -7614,21 +7629,6 @@
76147629
],
76157630
"x-kubernetes-list-type": "map"
76167631
},
7617-
"autodiscovery": {
7618-
"additionalProperties": false,
7619-
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
7620-
"properties": {
7621-
"extraIgnoreAutoConfig": {
7622-
"description": "ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.\nEntries provided here are appended to defaults set by the Operator rather than overriding them.",
7623-
"items": {
7624-
"type": "string"
7625-
},
7626-
"type": "array",
7627-
"x-kubernetes-list-type": "set"
7628-
}
7629-
},
7630-
"type": "object"
7631-
},
76327632
"remoteConfigConfiguration": {
76337633
"additionalProperties": false,
76347634
"description": "RemoteConfigConfiguration stores the configuration received from RemoteConfig.",

‎config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,21 +2386,21 @@
23862386
"additionalProperties": false,
23872387
"description": "Global settings to configure the agents",
23882388
"properties": {
2389-
"autodiscovery": {
2390-
"additionalProperties": false,
2391-
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
2392-
"properties": {
2393-
"extraIgnoreAutoConfig": {
2394-
"description": "ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.\nEntries provided here are appended to defaults set by the Operator rather than overriding them.",
2395-
"items": {
2396-
"type": "string"
2389+
"autodiscovery": {
2390+
"additionalProperties": false,
2391+
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
2392+
"properties": {
2393+
"extraIgnoreAutoConfig": {
2394+
"description": "ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.\nEntries provided here are appended to defaults set by the Operator rather than overriding them.",
2395+
"items": {
2396+
"type": "string"
2397+
},
2398+
"type": "array",
2399+
"x-kubernetes-list-type": "set"
2400+
}
23972401
},
2398-
"type": "array",
2399-
"x-kubernetes-list-type": "set"
2400-
}
2401-
},
2402-
"type": "object"
2403-
},
2402+
"type": "object"
2403+
},
24042404
"checksTagCardinality": {
24052405
"description": "ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`).\nSee also: https://docs.datadoghq.com/getting_started/tagging/assigning_tags/?tab=containerizedenvironments#tags-cardinality.\nNot set by default to avoid overriding existing DD_CHECKS_TAG_CARDINALITY configurations, the default value in the Agent is low.\nRef: https://github.com/DataDog/datadog-agent/blob/856cf4a66142ce91fd4f8a278149436eb971184a/pkg/config/setup/config.go#L625.",
24062406
"type": "string"

‎config/crd/bases/v1/datadoghq.com_datadogagents.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2256,6 +2256,18 @@ spec:
22562256
global:
22572257
description: Global settings to configure the agents
22582258
properties:
2259+
autodiscovery:
2260+
description: Autodiscovery contains options related to the Agent Autodiscovery.
2261+
properties:
2262+
extraIgnoreAutoConfig:
2263+
description: |-
2264+
ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.
2265+
Entries provided here are appended to defaults set by the Operator rather than overriding them.
2266+
items:
2267+
type: string
2268+
type: array
2269+
x-kubernetes-list-type: set
2270+
type: object
22592271
checksTagCardinality:
22602272
description: |-
22612273
ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`).
@@ -2515,18 +2527,6 @@ spec:
25152527
x-kubernetes-list-map-keys:
25162528
- name
25172529
x-kubernetes-list-type: map
2518-
autodiscovery:
2519-
description: Autodiscovery contains options related to the Agent Autodiscovery.
2520-
properties:
2521-
extraIgnoreAutoConfig:
2522-
description: |-
2523-
ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.
2524-
Entries provided here are appended to defaults set by the Operator rather than overriding them.
2525-
items:
2526-
type: string
2527-
type: array
2528-
x-kubernetes-list-type: set
2529-
type: object
25302530
fips:
25312531
description: FIPS contains configuration used to customize the FIPS proxy sidecar.
25322532
properties:

‎config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2382,6 +2382,21 @@
23822382
"additionalProperties": false,
23832383
"description": "Global settings to configure the agents",
23842384
"properties": {
2385+
"autodiscovery": {
2386+
"additionalProperties": false,
2387+
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
2388+
"properties": {
2389+
"extraIgnoreAutoConfig": {
2390+
"description": "ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.\nEntries provided here are appended to defaults set by the Operator rather than overriding them.",
2391+
"items": {
2392+
"type": "string"
2393+
},
2394+
"type": "array",
2395+
"x-kubernetes-list-type": "set"
2396+
}
2397+
},
2398+
"type": "object"
2399+
},
23852400
"checksTagCardinality": {
23862401
"description": "ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`).\nSee also: https://docs.datadoghq.com/getting_started/tagging/assigning_tags/?tab=containerizedenvironments#tags-cardinality.\nNot set by default to avoid overriding existing DD_CHECKS_TAG_CARDINALITY configurations, the default value in the Agent is low.\nRef: https://github.com/DataDog/datadog-agent/blob/856cf4a66142ce91fd4f8a278149436eb971184a/pkg/config/setup/config.go#L625.",
23872402
"type": "string"
@@ -7679,21 +7694,6 @@
76797694
],
76807695
"x-kubernetes-list-type": "map"
76817696
},
7682-
"autodiscovery": {
7683-
"additionalProperties": false,
7684-
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
7685-
"properties": {
7686-
"extraIgnoreAutoConfig": {
7687-
"description": "ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list.\nEntries provided here are appended to defaults set by the Operator rather than overriding them.",
7688-
"items": {
7689-
"type": "string"
7690-
},
7691-
"type": "array",
7692-
"x-kubernetes-list-type": "set"
7693-
}
7694-
},
7695-
"type": "object"
7696-
},
76977697
"remoteConfigConfiguration": {
76987698
"additionalProperties": false,
76997699
"description": "RemoteConfigConfiguration stores the configuration received from RemoteConfig.",

‎docs/configuration.v2alpha1.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ spec:
187187
| features.serviceDiscovery.networkStats.enabled | Enables the Service Discovery Network Stats feature. Default: true |
188188
| features.tcpQueueLength.enabled | Enables the TCP queue length eBPF-based check. Default: false |
189189
| features.usm.enabled | Enables Universal Service Monitoring. Default: false |
190+
| global.autodiscovery.extraIgnoreAutoConfig | ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list. Entries provided here are appended to defaults set by the Operator rather than overriding them. |
190191
| global.checksTagCardinality | ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`). See also: https://docs.datadoghq.com/getting_started/tagging/assigning_tags/?tab=containerizedenvironments#tags-cardinality. Not set by default to avoid overriding existing DD_CHECKS_TAG_CARDINALITY configurations, the default value in the Agent is low. Ref: https://github.com/DataDog/datadog-agent/blob/856cf4a66142ce91fd4f8a278149436eb971184a/pkg/config/setup/config.go#L625. |
191192
| global.clusterAgentToken | ClusterAgentToken is the token for communication between the NodeAgent and ClusterAgent. |
192193
| global.clusterAgentTokenSecret.keyName | KeyName is the key of the secret to use. |
@@ -211,7 +212,6 @@ spec:
211212
| global.endpoint.credentials.appSecret.secretName | SecretName is the name of the secret. |
212213
| global.endpoint.url | URL defines the endpoint URL. |
213214
| global.env | Contains a list of environment variables that are set for all Agents. |
214-
| global.autodiscovery.extraIgnoreAutoConfig | Adds integrations to the Agent's ignored Autodiscovery list; values are appended to Operator defaults and not overridden. |
215215
| global.fips.customFIPSConfig.configData | ConfigData corresponds to the configuration file content. |
216216
| global.fips.customFIPSConfig.configMap.items | Maps a ConfigMap data `key` to a file `path` mount. |
217217
| global.fips.customFIPSConfig.configMap.name | Is the name of the ConfigMap. |

‎docs/configuration_public.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,9 @@ spec:
369369
`features.usm.enabled`
370370
: Enables Universal Service Monitoring. Default: false
371371

372+
`global.autodiscovery.extraIgnoreAutoConfig`
373+
: ExtraIgnoreAutoConfig provides a list of integrations to add to the Agent's ignore_autoconf list. Entries provided here are appended to defaults set by the Operator rather than overriding them.
374+
372375
`global.checksTagCardinality`
373376
: ChecksTagCardinality configures tag cardinality for the metrics collected by integrations (`low`, `orchestrator` or `high`). See also: https://docs.datadoghq.com/getting_started/tagging/assigning_tags/?tab=containerizedenvironments#tags-cardinality. Not set by default to avoid overriding existing DD_CHECKS_TAG_CARDINALITY configurations, the default value in the Agent is low. Ref: https://github.com/DataDog/datadog-agent/blob/856cf4a66142ce91fd4f8a278149436eb971184a/pkg/config/setup/config.go#L625.
374377

@@ -441,9 +444,6 @@ spec:
441444
`global.env`
442445
: Contains a list of environment variables that are set for all Agents.
443446

444-
`global.autodiscovery.extraIgnoreAutoConfig`
445-
: Adds integrations to the Agent's ignored Autodiscovery list; values are appended to Operator defaults and not overridden.
446-
447447
`global.fips`
448448
: FIPS contains configuration used to customize the FIPS proxy sidecar. See [link](https://github.com/DataDog/datadog-operator/blob/main/docs/configuration.v2alpha1.md) for more information.
449449

0 commit comments

Comments
 (0)