Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions api/datadoghq/v1alpha1/datadoginstrumentation_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ type DatadogInstrumentationCheckConfig struct {
// Integration is the Datadog integration name, for example redisdb.
Integration string `json:"integration"`

// ContainerImage identifies container image names this check applies to.
// ContainerName identifies the container name this check applies to.
// +optional
// +listType=set
ContainerImage []string `json:"containerImage,omitempty"`
ContainerName string `json:"containerName,omitempty"`

// InitConfig is the integration-specific Autodiscovery init_config payload.
// +optional
Expand Down
5 changes: 0 additions & 5 deletions api/datadoghq/v1alpha1/zz_generated.deepcopy.go

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

9 changes: 3 additions & 6 deletions bundle/manifests/datadoghq.com_datadoginstrumentations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,10 @@ spec:
description: DatadogInstrumentationCheckConfig defines an Autodiscovery
check configuration.
properties:
containerImage:
description: ContainerImage identifies container image names
containerName:
description: ContainerName identifies the container name
this check applies to.
items:
type: string
type: array
x-kubernetes-list-type: set
type: string
Comment thread
Mathew-Estafanous marked this conversation as resolved.
initConfig:
description: InitConfig is the integration-specific Autodiscovery
init_config payload.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,9 @@ spec:
items:
description: DatadogInstrumentationCheckConfig defines an Autodiscovery check configuration.
properties:
containerImage:
description: ContainerImage identifies container image names this check applies to.
items:
type: string
type: array
x-kubernetes-list-type: set
containerName:
description: ContainerName identifies the container name this check applies to.
type: string
initConfig:
description: InitConfig is the integration-specific Autodiscovery init_config payload.
type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@
"additionalProperties": false,
"description": "DatadogInstrumentationCheckConfig defines an Autodiscovery check configuration.",
"properties": {
"containerImage": {
"description": "ContainerImage identifies container image names this check applies to.",
"items": {
"type": "string"
},
"type": "array",
"x-kubernetes-list-type": "set"
"containerName": {
"description": "ContainerName identifies the container name this check applies to.",
"type": "string"
},
"initConfig": {
"description": "InitConfig is the integration-specific Autodiscovery init_config payload.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ spec:
config:
checks:
- integration: openmetrics
containerImage:
- sample-app
containerName: sample-app
initConfig: {}
instances:
- openmetrics_endpoint: "http://%%host%%:8080/metrics"
Expand Down
Loading