Skip to content
Closed
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
589 changes: 589 additions & 0 deletions cmd/agent/dist/conf.d/kubelet.d/conf.yaml.default

Large diffs are not rendered by default.

581 changes: 581 additions & 0 deletions cmd/agent/dist/conf.d/kubelet.d/conf.yaml.example

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cmd/agent/dist/core_checks.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ AGENT_CORECHECKS = [
"go_expvar",
"io",
"jmx",
"kubelet",

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Keep the invoke core-check list in sync

Adding kubelet only to the Bazel list makes Bazel packages pick up kubelet.d, but tasks/core_checks.py still omits it. The dda inv agent.build path copies conf.d directories from that Python list in tasks/agent.py, so non-Bazel Agent builds will not include the new kubelet.d default and therefore will not auto-schedule the Go kubelet check after the Python check is removed. Mirror this entry in tasks/core_checks.py.

Useful? React with 👍 / 👎.

"kubernetes_apiserver",
"load",
"memory",
Expand Down
1 change: 0 additions & 1 deletion pkg/collector/corechecks/containers/kubelet/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ go_library(
"//pkg/collector/corechecks/containers/kubelet/provider/probe",
"//pkg/collector/corechecks/containers/kubelet/provider/slis",
"//pkg/collector/corechecks/containers/kubelet/provider/summary",
"//pkg/config/setup",
"//pkg/util/kubernetes/kubelet",
"//pkg/util/log",
"//pkg/util/option",
Expand Down
7 changes: 0 additions & 7 deletions pkg/collector/corechecks/containers/kubelet/kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
package kubelet

import (
"fmt"

"github.com/DataDog/datadog-agent/comp/core/autodiscovery/integration"
tagger "github.com/DataDog/datadog-agent/comp/core/tagger/def"
telemetry "github.com/DataDog/datadog-agent/comp/core/telemetry/def"
Expand All @@ -29,7 +27,6 @@ import (
"github.com/DataDog/datadog-agent/pkg/collector/corechecks/containers/kubelet/provider/probe"
"github.com/DataDog/datadog-agent/pkg/collector/corechecks/containers/kubelet/provider/slis"
"github.com/DataDog/datadog-agent/pkg/collector/corechecks/containers/kubelet/provider/summary"
pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
"github.com/DataDog/datadog-agent/pkg/util/kubernetes/kubelet"
"github.com/DataDog/datadog-agent/pkg/util/log"
"github.com/DataDog/datadog-agent/pkg/util/option"
Expand Down Expand Up @@ -119,10 +116,6 @@ func Factory(store workloadmeta.Component, filterStore workloadfilter.Component,

// Configure configures the check
func (k *KubeletCheck) Configure(senderManager sender.SenderManager, _ uint64, config, initConfig integration.Data, source string, provider string) error {
if !pkgconfigsetup.Datadog().GetBool("kubelet_core_check_enabled") {
return fmt.Errorf("%w: kubelet core check is disabled", check.ErrSkipCheckInstance)
}

err := k.CommonConfigure(senderManager, initConfig, config, source, provider)
if err != nil {
return err
Expand Down
4 changes: 0 additions & 4 deletions pkg/config/schema/yaml/core_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9250,10 +9250,6 @@ properties:
type: integer
default: 0
comment: not exposed yet. In seconds. 0 means use workloadmeta default
kubelet_core_check_enabled:
node_type: setting
type: boolean
default: true
kubelet_use_api_server:
node_type: setting
type: boolean
Expand Down
1 change: 0 additions & 1 deletion pkg/config/setup/common_settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -2157,7 +2157,6 @@ func kubernetes(config pkgconfigmodel.Setup) {
config.BindEnvAndSetDefault("kubernetes_https_kubelet_port", 10250)

config.BindEnvAndSetDefault("kubelet_tls_verify", true)
config.BindEnvAndSetDefault("kubelet_core_check_enabled", true)
config.BindEnvAndSetDefault("collect_kubernetes_events", false)
config.BindEnvAndSetDefault("kubernetes_events_source_detection.enabled", false)
config.BindEnvAndSetDefault("kubelet_client_ca", "")
Expand Down
2 changes: 1 addition & 1 deletion release.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"base_branch": "main",
"current_milestone": "7.83.0",
"dependencies": {
"INTEGRATIONS_CORE_VERSION": "f60732d6369f3dba70fd128ee707eee6ddd40e67",
"INTEGRATIONS_CORE_VERSION": "c73df3eeb7bf523785e202b5c4fd7d00b7e0aac7",
"INTEGRATIONS_WHEELS_STORAGE": "stable",
"JMXFETCH_HASH": "3eb735171a3e41518c4101a6aee06fee8b93092d015769c2e470eecadb4bd11b",
"JMXFETCH_VERSION": "0.52.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
upgrade:
- |
The Agent no longer bundles the legacy Python kubelet check and removes the
``kubelet_core_check_enabled`` setting. The Go kubelet core check now always
handles kubelet configurations. This affects installations that set
``kubelet_core_check_enabled: false`` to select the Python implementation;
remove that setting before upgrading.
Loading