@cryptotaxi247 / netdata-1 / commits / 661344f41

go.d: sd local-listeners: drop docker-proxy targets (#17254)

Ilya Mashchenko committed Mar 26, 2024 at 09:59 UTC 661344f41e20dc803f9681178774623f50718e81
2 files changed +6
src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go
+4
@@ -213,6 +213,10 @@ func (d *Discoverer) parseLocalListeners(bs []byte) ([]model.Target, error) {
213 Cmdline: parts[3],
214 }
215
216 + if tgt.Comm == "docker-proxy" {
217 + continue
218 + }
219 +
220 if tgt.IPAddress == "0.0.0.0" || strings.HasPrefix(tgt.IPAddress, "127") {
221 tgt.IPAddress = local4
222 } else if tgt.IPAddress == "::" {
src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go
+2
@@ -23,6 +23,8 @@ func TestDiscoverer_Discover(t *testing.T) {
23 cli.addListener("UDP|127.0.0.1|53768|/opt/netdata/usr/libexec/netdata/plugins.d/go.d.plugin 1")
24 cli.addListener("TCP6|::|80|/usr/sbin/apache2 -k start")
25 cli.addListener("TCP|0.0.0.0|80|/usr/sbin/apache2 -k start")
26 + 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")
27 + cli.addListener("TCP6|::|8080|/usr/sbin/docker-proxy -proto tcp -host-ip :: -host-port 8080 -container-ip 172.17.0.4 -container-port 80")
28 time.Sleep(interval * 2)
29 },
30 wantGroups: []model.TargetGroup{&targetGroup{