From d39c204579caf020aaf9c82fabdd40abca3a5f31 Mon Sep 17 00:00:00 2001 From: Ilya Mashchenko Date: Fri, 29 Mar 2024 14:29:13 +0200 Subject: [PATCH] go.d: don't create jobs with unknown module (#17289) --- src/go/collectors/go.d.plugin/agent/jobmgr/manager.go | 2 +- .../collectors/go.d.plugin/config/go.d/sd/net_listeners.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/manager.go b/src/go/collectors/go.d.plugin/agent/jobmgr/manager.go index e3876cf4ac7621..f4d55fcf6d6f30 100644 --- a/src/go/collectors/go.d.plugin/agent/jobmgr/manager.go +++ b/src/go/collectors/go.d.plugin/agent/jobmgr/manager.go @@ -152,7 +152,7 @@ func (m *Manager) run() { } func (m *Manager) addConfig(cfg confgroup.Config) { - if cfg.Module() == "" { + if _, ok := m.Modules.Lookup(cfg.Module()); !ok { return } diff --git a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf b/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf index be5b302890ea58..7f3c93f768da9c 100644 --- a/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf +++ b/src/go/collectors/go.d.plugin/config/go.d/sd/net_listeners.conf @@ -238,7 +238,7 @@ compose: url: http://{{.Address}}/jmx - selector: "kubelet" template: | - module: kubelet + module: k8s_kubelet name: local {{- if eq .Port "10255" }} url: http://{{.Address}}/metrics @@ -248,7 +248,7 @@ compose: {{- end }} - selector: "kubeproxy" template: | - module: kubeproxy + module: k8s_kubeproxy name: local url: http://{{.Address}}/metrics - selector: "lighttpd"