Skip to content

Add spec.feature.autodiscovery.extra_ignore_autoconfig in DatadogAgent #2299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clamoriniere wants to merge 1 commit into
base: main
Choose a base branch
from
+483 −1
Open

Add spec.feature.autodiscovery.extra_ignore_autoconfig in DatadogAgent #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ README.md @DataDog/documentation @DataDog/container-ecosystems
/internal/controller/datadogagent/feature/admissioncontroller/* @DataDog/container-platform
/internal/controller/datadogagent/feature/prometheusscrape/* @DataDog/container-platform
/internal/controller/datadogagent/feature/clusterchecks/* @DataDog/container-platform
internal/controller/datadogagent/feature/autodiscovery/* @DataDog/container-platform
/internal/controller/datadogagent/feature/kubernetesstatecore/* @DataDog/container-integrations
/internal/controller/datadogagent/feature/helmcheck/* @DataDog/container-integrations
/internal/controller/datadogagent/feature/autoscaling/* @DataDog/container-autoscaling
Expand Down
14 changes: 14 additions & 0 deletions api/datadoghq/v2alpha1/datadogagent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ type DatadogFeatures struct {
// GPU monitoring
GPU *GPUFeatureConfig `json:"gpu,omitempty"`

// Autodiscovery contains options related to the Agent Autodiscovery.
// +optional
Autodiscovery *AutodiscoveryConfig `json:"autodiscovery,omitempty"`

// Cluster-level features

// EventCollection configuration.
Expand Down Expand Up @@ -1728,6 +1732,16 @@ type GlobalConfig struct {
SecretBackend *SecretBackendConfig `json:"secretBackend,omitempty"`
}

// AutodiscoveryConfig contains options related to Agent Autodiscovery behavior.
// +k8s:openapi-gen=true
type AutodiscoveryConfig struct {
// 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.
// +optional
// +listType=set
ExtraIgnoreAutoConfig []string `json:"extraIgnoreAutoConfig,omitempty"`
}

// DatadogCredentials is a generic structure that holds credentials to access Datadog.
// +k8s:openapi-gen=true
type DatadogCredentials struct {
Expand Down
25 changes: 25 additions & 0 deletions api/datadoghq/v2alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 41 additions & 1 deletion api/datadoghq/v2alpha1/zz_generated.openapi.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentinternals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,18 @@ spec:
type: boolean
type: object
type: object
autodiscovery:
description: Autodiscovery contains options related to the Agent Autodiscovery.
properties:
extraIgnoreAutoConfig:
description: |-
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.
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
autoscaling:
description: Autoscaling configuration.
properties:
Expand Down Expand Up @@ -8970,6 +8982,18 @@ spec:
type: boolean
type: object
type: object
autodiscovery:
description: Autodiscovery contains options related to the Agent Autodiscovery.
properties:
extraIgnoreAutoConfig:
description: |-
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.
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
autoscaling:
description: Autoscaling configuration.
properties:
Expand Down
30 changes: 30 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentinternals_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1028,6 +1028,21 @@
},
"type": "object"
},
"autodiscovery": {
"additionalProperties": false,
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
"properties": {
"extraIgnoreAutoConfig": {
"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.",
"items": {
"type": "string"
},
"type": "array",
"x-kubernetes-list-type": "set"
}
},
"type": "object"
},
"autoscaling": {
"additionalProperties": false,
"description": "Autoscaling configuration.",
Expand Down Expand Up @@ -8812,6 +8827,21 @@
},
"type": "object"
},
"autodiscovery": {
"additionalProperties": false,
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
"properties": {
"extraIgnoreAutoConfig": {
"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.",
"items": {
"type": "string"
},
"type": "array",
"x-kubernetes-list-type": "set"
}
},
"type": "object"
},
"autoscaling": {
"additionalProperties": false,
"description": "Autoscaling configuration.",
Expand Down
12 changes: 12 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentprofiles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,18 @@ spec:
type: boolean
type: object
type: object
autodiscovery:
description: Autodiscovery contains options related to the Agent Autodiscovery.
properties:
extraIgnoreAutoConfig:
description: |-
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.
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
autoscaling:
description: Autoscaling configuration.
properties:
Expand Down
15 changes: 15 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagentprofiles_v1alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,21 @@
},
"type": "object"
},
"autodiscovery": {
"additionalProperties": false,
"description": "Autodiscovery contains options related to the Agent Autodiscovery.",
"properties": {
"extraIgnoreAutoConfig": {
"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.",
"items": {
"type": "string"
},
"type": "array",
"x-kubernetes-list-type": "set"
}
},
"type": "object"
},
"autoscaling": {
"additionalProperties": false,
"description": "Autoscaling configuration.",
Expand Down
24 changes: 24 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,18 @@ spec:
type: boolean
type: object
type: object
autodiscovery:
description: Autodiscovery contains options related to the Agent Autodiscovery.
properties:
extraIgnoreAutoConfig:
description: |-
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.
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
autoscaling:
description: Autoscaling configuration.
properties:
Expand Down Expand Up @@ -9020,6 +9032,18 @@ spec:
type: boolean
type: object
type: object
autodiscovery:
description: Autodiscovery contains options related to the Agent Autodiscovery.
properties:
extraIgnoreAutoConfig:
description: |-
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.
items:
type: string
type: array
x-kubernetes-list-type: set
type: object
autoscaling:
description: Autoscaling configuration.
properties:
Expand Down
Loading
Loading