diff --git a/receiver/k8sclusterreceiver/README.md b/receiver/k8sclusterreceiver/README.md index a342ea2bada0..1bb79c3dd513 100644 --- a/receiver/k8sclusterreceiver/README.md +++ b/receiver/k8sclusterreceiver/README.md @@ -67,7 +67,7 @@ The following allocatable resource types are available. - storage - `metrics`: Allows to enable/disable metrics. - `resource_attributes`: Allows to enable/disable resource attributes. -- `ignore_deprecated_resource` (default = `false`): Whether to ignore deprecated Kubernetes API resources. If set to true, +- `ignore_deprecated_resources` (default = `false`): Whether to ignore deprecated Kubernetes API resources. If set to true, the receiver will not collect metrics for deprecated resources. This setting is useful for clusters that have deprecated resources that are not used anymore and are causing errors or warnings in the logs. @@ -84,7 +84,7 @@ Example: resource_attributes: container.id: enabled: false - ignore_deprecated_resource: true + ignore_deprecated_resources: true ``` The full list of settings exposed for this receiver are documented [here](./config.go) diff --git a/receiver/k8sclusterreceiver/config.go b/receiver/k8sclusterreceiver/config.go index 624312e9c259..9455b71ec9d0 100644 --- a/receiver/k8sclusterreceiver/config.go +++ b/receiver/k8sclusterreceiver/config.go @@ -41,7 +41,7 @@ type Config struct { metadata.MetricsBuilderConfig `mapstructure:",squash"` // Whether to ignore deprecated resources or not. - IgnoreDeprecatedResource bool `mapstructure:"ignore_deprecated_resource"` + IgnoreDeprecatedResources bool `mapstructure:"ignore_deprecated_resources"` } func (cfg *Config) Validate() error { diff --git a/receiver/k8sclusterreceiver/factory.go b/receiver/k8sclusterreceiver/factory.go index b757b0115d9c..63c988d668ad 100644 --- a/receiver/k8sclusterreceiver/factory.go +++ b/receiver/k8sclusterreceiver/factory.go @@ -23,7 +23,7 @@ const ( defaultCollectionInterval = 10 * time.Second defaultDistribution = distributionKubernetes defaultMetadataCollectionInterval = 5 * time.Minute - defaultIgnoreDeprecatedResource = false + defaultIgnoreDeprecatedResources = false ) var defaultNodeConditionsToReport = []string{"Ready"} @@ -38,7 +38,7 @@ func createDefaultConfig() component.Config { }, MetadataCollectionInterval: defaultMetadataCollectionInterval, MetricsBuilderConfig: metadata.DefaultMetricsBuilderConfig(), - IgnoreDeprecatedResource: defaultIgnoreDeprecatedResource, + IgnoreDeprecatedResources: defaultIgnoreDeprecatedResources, } } diff --git a/receiver/k8sclusterreceiver/testdata/config.yaml b/receiver/k8sclusterreceiver/testdata/config.yaml index dbf4000df237..1acd1da6c82d 100644 --- a/receiver/k8sclusterreceiver/testdata/config.yaml +++ b/receiver/k8sclusterreceiver/testdata/config.yaml @@ -5,7 +5,7 @@ k8s_cluster/all_settings: allocatable_types_to_report: [ "cpu","memory" ] metadata_exporters: [ nop ] metadata_collection_interval: 30m - ignore_deprecated_resource: false + ignore_deprecated_resources: false k8s_cluster/partial_settings: collection_interval: 30s distribution: openshift diff --git a/receiver/k8sclusterreceiver/watcher.go b/receiver/k8sclusterreceiver/watcher.go index 0f0474976d8e..88bb262ced44 100644 --- a/receiver/k8sclusterreceiver/watcher.go +++ b/receiver/k8sclusterreceiver/watcher.go @@ -140,7 +140,7 @@ func (rw *resourceWatcher) prepareSharedInformerFactory() error { "Job": {gvk.Job}, } - if !rw.config.IgnoreDeprecatedResource { + if !rw.config.IgnoreDeprecatedResources { supportedKinds["CronJob"] = []schema.GroupVersionKind{gvk.CronJob, gvk.CronJobBeta} supportedKinds["HorizontalPodAutoscaler"] = []schema.GroupVersionKind{gvk.HorizontalPodAutoscaler, gvk.HorizontalPodAutoscalerBeta} } else {