diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2024-03-26 09:59:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 09:59:07 +0200 |
| commit | 661344f41e20dc803f9681178774623f50718e81 (patch) | |
| tree | b2118cde5744a3aaea884bf9eb6faa26d08cdc22 /src | |
| parent | 5ea9665d48efb228173dd97222b180357728bb81 (diff) | |
go.d: sd local-listeners: drop docker-proxy targets (#17254)
Diffstat (limited to 'src')
2 files changed, 6 insertions, 0 deletions
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go b/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go index 3ccb12731e..9897405cd2 100644 --- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go +++ b/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go @@ -213,6 +213,10 @@ func (d *Discoverer) parseLocalListeners(bs []byte) ([]model.Target, error) { Cmdline: parts[3], } + if tgt.Comm == "docker-proxy" { + continue + } + if tgt.IPAddress == "0.0.0.0" || strings.HasPrefix(tgt.IPAddress, "127") { tgt.IPAddress = local4 } else if tgt.IPAddress == "::" { diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go b/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go index c49e816ac9..c3e3dcc69a 100644 --- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go +++ b/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go @@ -23,6 +23,8 @@ func TestDiscoverer_Discover(t *testing.T) { cli.addListener("UDP|127.0.0.1|53768|/opt/netdata/usr/libexec/netdata/plugins.d/go.d.plugin 1") cli.addListener("TCP6|::|80|/usr/sbin/apache2 -k start") cli.addListener("TCP|0.0.0.0|80|/usr/sbin/apache2 -k start") + cli.addListener("TCP|0.0.0.0|8080|/usr/sbin/docker-proxy -proto tcp -host-ip 0.0.0.0 -host-port 8080 -container-ip 172.17.0.4 -container-port 80") + cli.addListener("TCP6|::|8080|/usr/sbin/docker-proxy -proto tcp -host-ip :: -host-port 8080 -container-ip 172.17.0.4 -container-port 80") time.Sleep(interval * 2) }, wantGroups: []model.TargetGroup{&targetGroup{ |