diff options
| author | Ilya Mashchenko <ilya@netdata.cloud> | 2024-06-14 16:10:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 16:10:23 +0300 |
| commit | 2d0cf8ed9a4fbad8dff06630056966bb861c30b4 (patch) | |
| tree | eded7f33ef94b6ad885ab877d31c6dfa28772f49 /src | |
| parent | 07ec0329bae904d113d49045d3cd63340abdf9c6 (diff) | |
go.d ll netlisteners add support for wildcard address (#17896)
Diffstat (limited to 'src')
2 files changed, 15 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 114368e065..bfd7a99b89 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 @@ -223,6 +223,12 @@ func (d *Discoverer) parseLocalListeners(bs []byte) ([]model.Target, error) { tgt.IPAddress = local6 } + // quick support for https://github.com/netdata/netdata/pull/17866 + // TODO: create both ipv4 and ipv6 targets? + if tgt.IPAddress == "*" { + tgt.IPAddress = local4 + } + tgt.Address = net.JoinHostPort(tgt.IPAddress, tgt.Port) hash, err := calcHash(tgt) 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 130d2376a2..a94879f091 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 @@ -22,6 +22,7 @@ func TestDiscoverer_Discover(t *testing.T) { cli.addListener("TCP|0.0.0.0|8125|/opt/netdata/usr/sbin/netdata -P /run/netdata/netdata.pid -D") cli.addListener("TCP|192.0.2.1|8125|/opt/netdata/usr/sbin/netdata -P /run/netdata/netdata.pid -D") cli.addListener("UDP|127.0.0.1|53768|/opt/netdata/usr/libexec/netdata/plugins.d/go.d.plugin 1") + cli.addListener("TCP46|*|80|/usr/sbin/httpd -k start") 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") @@ -41,6 +42,14 @@ func TestDiscoverer_Discover(t *testing.T) { Cmdline: "/usr/sbin/chronyd", }), withHash(&target{ + Protocol: "TCP46", + IPAddress: "127.0.0.1", + Port: "80", + Address: "127.0.0.1:80", + Comm: "httpd", + Cmdline: "/usr/sbin/httpd -k start", + }), + withHash(&target{ Protocol: "TCP", IPAddress: "127.0.0.1", Port: "80", |