Skip to content

[CONTP-1569] Add KSM CollectSecretMetrics and CollectConfigMaps to CRD #2948

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
zhuminyi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[CONTP-1569] Add KSM CollectSecretMetrics and CollectConfigMaps to CRD #2948

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
12 changes: 12 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 @@ -955,6 +955,18 @@ type KubeStateMetricsCoreFeatureConfig struct {
// +optional
// +listType=atomic
CollectCrMetrics []Resource `json:"collectCrMetrics,omitempty"`

// CollectSecretMetrics enables collection of metrics on Secrets.
// When false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.
// Default: true
// +optional
CollectSecretMetrics *bool `json:"collectSecretMetrics,omitempty"`
Comment thread
zhuminyi marked this conversation as resolved.

// CollectConfigMaps enables collection of metrics on ConfigMaps.
// When false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.
// Default: true
// +optional
CollectConfigMaps *bool `json:"collectConfigMaps,omitempty"`
}

// Resource configures a custom resource for metric generation.
Expand Down
10 changes: 10 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.

14 changes: 14 additions & 0 deletions 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.

4 changes: 2 additions & 2 deletions cmd/yaml-mapper/mapper/mapping_datadog_helm_to_datadogagent_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,10 @@ datadog.hostVolumeMountPropagation: ""
datadog.ignoreAutoConfig: ""
datadog.kubeStateMetricsCore.annotationsAsTags: ""
datadog.kubeStateMetricsCore.collectApiServicesMetrics: ""
datadog.kubeStateMetricsCore.collectConfigMaps: ""
datadog.kubeStateMetricsCore.collectConfigMaps: spec.features.kubeStateMetricsCore.collectConfigMaps
datadog.kubeStateMetricsCore.collectCrMetrics: ""
datadog.kubeStateMetricsCore.collectCrdMetrics: ""
datadog.kubeStateMetricsCore.collectSecretMetrics: ""
datadog.kubeStateMetricsCore.collectSecretMetrics: spec.features.kubeStateMetricsCore.collectSecretMetrics
datadog.kubeStateMetricsCore.collectVpaMetrics: ""
datadog.kubeStateMetricsCore.enabled: spec.features.kubeStateMetricsCore.enabled
datadog.kubeStateMetricsCore.ignoreLegacyKSMCheck: ""
Expand Down
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 @@ -1698,6 +1698,12 @@ spec:
kubeStateMetricsCore:
description: KubeStateMetricsCore check configuration.
properties:
collectConfigMaps:
description: |-
CollectConfigMaps enables collection of metrics on ConfigMaps.
When false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.
Default: true
type: boolean
collectCrMetrics:
description: |-
`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.
Expand Down Expand Up @@ -1855,6 +1861,12 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
collectSecretMetrics:
description: |-
CollectSecretMetrics enables collection of metrics on Secrets.
When false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.
Default: true
type: boolean
conf:
description: |-
Conf overrides the configuration for the default Kubernetes State Metrics Core check.
Expand Down Expand Up @@ -10390,6 +10402,12 @@ spec:
kubeStateMetricsCore:
description: KubeStateMetricsCore check configuration.
properties:
collectConfigMaps:
description: |-
CollectConfigMaps enables collection of metrics on ConfigMaps.
When false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.
Default: true
type: boolean
collectCrMetrics:
description: |-
`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.
Expand Down Expand Up @@ -10547,6 +10565,12 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
collectSecretMetrics:
description: |-
CollectSecretMetrics enables collection of metrics on Secrets.
When false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.
Default: true
type: boolean
conf:
description: |-
Conf overrides the configuration for the default Kubernetes State Metrics Core check.
Expand Down
16 changes: 16 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 @@ -1705,6 +1705,10 @@
"additionalProperties": false,
"description": "KubeStateMetricsCore check configuration.",
"properties": {
"collectConfigMaps": {
"description": "CollectConfigMaps enables collection of metrics on ConfigMaps.\nWhen false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.\nDefault: true",
"type": "boolean"
},
"collectCrMetrics": {
"description": "`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.\n\nThe datadog agent uses the same logic as upstream `kube-state-metrics`. So is its configuration.\nThe exact structure and existing fields of each item in this list can be found in:\nhttps://github.com/kubernetes/kube-state-metrics/blob/main/docs/metrics/extend/customresourcestate-metrics.md",
"items": {
Expand Down Expand Up @@ -1923,6 +1927,10 @@
"type": "array",
"x-kubernetes-list-type": "atomic"
},
"collectSecretMetrics": {
"description": "CollectSecretMetrics enables collection of metrics on Secrets.\nWhen false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.\nDefault: true",
"type": "boolean"
},
"conf": {
"additionalProperties": false,
"description": "Conf overrides the configuration for the default Kubernetes State Metrics Core check.\nThis must point to a ConfigMap containing a valid cluster check configuration.",
Expand Down Expand Up @@ -10124,6 +10132,10 @@
"additionalProperties": false,
"description": "KubeStateMetricsCore check configuration.",
"properties": {
"collectConfigMaps": {
"description": "CollectConfigMaps enables collection of metrics on ConfigMaps.\nWhen false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.\nDefault: true",
"type": "boolean"
},
"collectCrMetrics": {
"description": "`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.\n\nThe datadog agent uses the same logic as upstream `kube-state-metrics`. So is its configuration.\nThe exact structure and existing fields of each item in this list can be found in:\nhttps://github.com/kubernetes/kube-state-metrics/blob/main/docs/metrics/extend/customresourcestate-metrics.md",
"items": {
Expand Down Expand Up @@ -10342,6 +10354,10 @@
"type": "array",
"x-kubernetes-list-type": "atomic"
},
"collectSecretMetrics": {
"description": "CollectSecretMetrics enables collection of metrics on Secrets.\nWhen false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.\nDefault: true",
"type": "boolean"
},
"conf": {
"additionalProperties": false,
"description": "Conf overrides the configuration for the default Kubernetes State Metrics Core check.\nThis must point to a ConfigMap containing a valid cluster check 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 @@ -1698,6 +1698,12 @@ spec:
kubeStateMetricsCore:
description: KubeStateMetricsCore check configuration.
properties:
collectConfigMaps:
description: |-
CollectConfigMaps enables collection of metrics on ConfigMaps.
When false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.
Default: true
type: boolean
collectCrMetrics:
description: |-
`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.
Expand Down Expand Up @@ -1855,6 +1861,12 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
collectSecretMetrics:
description: |-
CollectSecretMetrics enables collection of metrics on Secrets.
When false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.
Default: true
type: boolean
conf:
description: |-
Conf overrides the configuration for the default Kubernetes State Metrics Core check.
Expand Down
8 changes: 8 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 @@ -1709,6 +1709,10 @@
"additionalProperties": false,
"description": "KubeStateMetricsCore check configuration.",
"properties": {
"collectConfigMaps": {
"description": "CollectConfigMaps enables collection of metrics on ConfigMaps.\nWhen false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.\nDefault: true",
"type": "boolean"
},
"collectCrMetrics": {
"description": "`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.\n\nThe datadog agent uses the same logic as upstream `kube-state-metrics`. So is its configuration.\nThe exact structure and existing fields of each item in this list can be found in:\nhttps://github.com/kubernetes/kube-state-metrics/blob/main/docs/metrics/extend/customresourcestate-metrics.md",
"items": {
Expand Down Expand Up @@ -1927,6 +1931,10 @@
"type": "array",
"x-kubernetes-list-type": "atomic"
},
"collectSecretMetrics": {
"description": "CollectSecretMetrics enables collection of metrics on Secrets.\nWhen false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.\nDefault: true",
"type": "boolean"
},
"conf": {
"additionalProperties": false,
"description": "Conf overrides the configuration for the default Kubernetes State Metrics Core check.\nThis must point to a ConfigMap containing a valid cluster check 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 @@ -1702,6 +1702,12 @@ spec:
kubeStateMetricsCore:
description: KubeStateMetricsCore check configuration.
properties:
collectConfigMaps:
description: |-
CollectConfigMaps enables collection of metrics on ConfigMaps.
When false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.
Default: true
type: boolean
collectCrMetrics:
description: |-
`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.
Expand Down Expand Up @@ -1859,6 +1865,12 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
collectSecretMetrics:
description: |-
CollectSecretMetrics enables collection of metrics on Secrets.
When false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.
Default: true
type: boolean
conf:
description: |-
Conf overrides the configuration for the default Kubernetes State Metrics Core check.
Expand Down Expand Up @@ -10461,6 +10473,12 @@ spec:
kubeStateMetricsCore:
description: KubeStateMetricsCore check configuration.
properties:
collectConfigMaps:
description: |-
CollectConfigMaps enables collection of metrics on ConfigMaps.
When false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.
Default: true
type: boolean
collectCrMetrics:
description: |-
`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.
Expand Down Expand Up @@ -10618,6 +10636,12 @@ spec:
type: object
type: array
x-kubernetes-list-type: atomic
collectSecretMetrics:
description: |-
CollectSecretMetrics enables collection of metrics on Secrets.
When false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.
Default: true
type: boolean
conf:
description: |-
Conf overrides the configuration for the default Kubernetes State Metrics Core check.
Expand Down
16 changes: 16 additions & 0 deletions config/crd/bases/v1/datadoghq.com_datadogagents_v2alpha1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,6 +1705,10 @@
"additionalProperties": false,
"description": "KubeStateMetricsCore check configuration.",
"properties": {
"collectConfigMaps": {
"description": "CollectConfigMaps enables collection of metrics on ConfigMaps.\nWhen false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.\nDefault: true",
"type": "boolean"
},
"collectCrMetrics": {
"description": "`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.\n\nThe datadog agent uses the same logic as upstream `kube-state-metrics`. So is its configuration.\nThe exact structure and existing fields of each item in this list can be found in:\nhttps://github.com/kubernetes/kube-state-metrics/blob/main/docs/metrics/extend/customresourcestate-metrics.md",
"items": {
Expand Down Expand Up @@ -1923,6 +1927,10 @@
"type": "array",
"x-kubernetes-list-type": "atomic"
},
"collectSecretMetrics": {
"description": "CollectSecretMetrics enables collection of metrics on Secrets.\nWhen false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.\nDefault: true",
"type": "boolean"
},
"conf": {
"additionalProperties": false,
"description": "Conf overrides the configuration for the default Kubernetes State Metrics Core check.\nThis must point to a ConfigMap containing a valid cluster check configuration.",
Expand Down Expand Up @@ -10212,6 +10220,10 @@
"additionalProperties": false,
"description": "KubeStateMetricsCore check configuration.",
"properties": {
"collectConfigMaps": {
"description": "CollectConfigMaps enables collection of metrics on ConfigMaps.\nWhen false, the `configmaps` collector and the RBAC permission to list/watch ConfigMaps are omitted.\nDefault: true",
"type": "boolean"
},
"collectCrMetrics": {
"description": "`CollectCrMetrics` defines custom resources for the kube-state-metrics core check to collect.\n\nThe datadog agent uses the same logic as upstream `kube-state-metrics`. So is its configuration.\nThe exact structure and existing fields of each item in this list can be found in:\nhttps://github.com/kubernetes/kube-state-metrics/blob/main/docs/metrics/extend/customresourcestate-metrics.md",
"items": {
Expand Down Expand Up @@ -10430,6 +10442,10 @@
"type": "array",
"x-kubernetes-list-type": "atomic"
},
"collectSecretMetrics": {
"description": "CollectSecretMetrics enables collection of metrics on Secrets.\nWhen false, the `secrets` collector and the RBAC permission to list/watch Secrets are omitted.\nDefault: true",
"type": "boolean"
},
"conf": {
"additionalProperties": false,
"description": "Conf overrides the configuration for the default Kubernetes State Metrics Core check.\nThis must point to a ConfigMap containing a valid cluster check configuration.",
Expand Down
Loading
Loading