chore(go.d/sd): rename discoverers pkgs (#19772)
Ilya Mashchenko committed
Mar 5, 2025 at 10:54 UTC
581bdd22a3fd0a93a8e04a8b7078d8c605838b40
19 files changed
+31
-31
src/go/plugin/go.d/agent/discovery/sd/discoverer/dockersd/docker.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package dockerd
3
+package dockersd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/dockersd/dockerd_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package dockerd
3
+package dockersd
4
5
import (
6
"testing"
src/go/plugin/go.d/agent/discovery/sd/discoverer/dockersd/sim_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package dockerd
3
+package dockersd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/dockersd/target.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package dockerd
3
+package dockersd
4
5
import (
6
"fmt"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/config.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"errors"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/kubernetes.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/kubernetes_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"fmt"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/pod.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/pod_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/service.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/service_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/k8ssd/sim_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package kubernetes
3
+package k8ssd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/netlistensd/ll.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package netlisteners
3
+package netlistensd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/netlistensd/netlisteners.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package netlisteners
3
+package netlistensd
4
5
import (
6
"bufio"
src/go/plugin/go.d/agent/discovery/sd/discoverer/netlistensd/netlisteners_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package netlisteners
3
+package netlistensd
4
5
import (
6
"testing"
src/go/plugin/go.d/agent/discovery/sd/discoverer/netlistensd/sim_test.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package netlisteners
3
+package netlistensd
4
5
import (
6
"context"
src/go/plugin/go.d/agent/discovery/sd/discoverer/netlistensd/target.go
renamed
+1
-1
@@ -1,6 +1,6 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
-package netlisteners
3
+package netlistensd
4
5
import (
6
"fmt"
src/go/plugin/go.d/agent/discovery/sd/pipeline/config.go
+8
-8
@@ -7,9 +7,9 @@ import (
7
"fmt"
8
9
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
10
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockerd"
11
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/kubernetes"
12
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlisteners"
10
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockersd"
11
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/k8ssd"
12
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlistensd"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/snmpsd"
14
)
15
@@ -25,11 +25,11 @@ type Config struct {
25
}
26
27
type DiscoveryConfig struct {
28
- Discoverer string `yaml:"discoverer"`
29
- NetListeners netlisteners.Config `yaml:"net_listeners"`
30
- Docker dockerd.Config `yaml:"docker"`
31
- K8s []kubernetes.Config `yaml:"k8s"`
32
- SNMP snmpsd.Config `yaml:"snmp"`
28
+ Discoverer string `yaml:"discoverer"`
29
+ NetListeners netlistensd.Config `yaml:"net_listeners"`
30
+ Docker dockersd.Config `yaml:"docker"`
31
+ K8s []k8ssd.Config `yaml:"k8s"`
32
+ SNMP snmpsd.Config `yaml:"snmp"`
33
}
34
35
type ClassifyRuleConfig struct {
src/go/plugin/go.d/agent/discovery/sd/pipeline/pipeline.go
+6
-6
@@ -11,9 +11,9 @@ import (
11
12
"github.com/netdata/netdata/go/plugins/logger"
13
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
14
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockerd"
15
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/kubernetes"
16
- "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlisteners"
14
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockersd"
15
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/k8ssd"
16
+ "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlistensd"
17
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/snmpsd"
18
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
19
"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/hostinfo"
@@ -79,7 +79,7 @@ func (p *Pipeline) registerDiscoverers(conf Config) error {
79
switch cfg.Discoverer {
80
case "net_listeners":
81
cfg.NetListeners.Source = conf.Source
82
- td, err := netlisteners.NewDiscoverer(cfg.NetListeners)
82
+ td, err := netlistensd.NewDiscoverer(cfg.NetListeners)
83
if err != nil {
84
return fmt.Errorf("failed to create '%s' discoverer: %v", cfg.Discoverer, err)
85
}
@@ -90,14 +90,14 @@ func (p *Pipeline) registerDiscoverers(conf Config) error {
90
continue
91
}
92
cfg.Docker.Source = conf.Source
93
- td, err := dockerd.NewDiscoverer(cfg.Docker)
93
+ td, err := dockersd.NewDiscoverer(cfg.Docker)
94
if err != nil {
95
return fmt.Errorf("failed to create '%s' discoverer: %v", cfg.Discoverer, err)
96
}
97
p.discoverers = append(p.discoverers, td)
98
case "k8s":
99
for _, k8sCfg := range cfg.K8s {
100
- td, err := kubernetes.NewKubeDiscoverer(k8sCfg)
100
+ td, err := k8ssd.NewKubeDiscoverer(k8sCfg)
101
if err != nil {
102
return fmt.Errorf("failed to create '%s' discoverer: %v", cfg.Discoverer, err)
103
}