1 files changed, 15 insertions, 2 deletions
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline.go b/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline.go
index ddd55f272a..f69501c39d 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline.go
+++ b/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline.go
@@ -10,9 +10,11 @@ import (
 	"time"
 
 	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
+	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/discoverer/dockerd"
 	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/discoverer/kubernetes"
 	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/discoverer/netlisteners"
 	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/go.d.plugin/agent/hostinfo"
 	"github.com/netdata/netdata/go/go.d.plugin/logger"
 )
 
@@ -78,14 +80,25 @@ func (p *Pipeline) registerDiscoverers(conf Config) error {
 			cfg.NetListeners.Source = conf.Source
 			td, err := netlisteners.NewDiscoverer(cfg.NetListeners)
 			if err != nil {
-				return fmt.Errorf("failed to create 'net_listeners' discoverer: %v", err)
+				return fmt.Errorf("failed to create '%s' discoverer: %v", cfg.Discoverer, err)
+			}
+			p.discoverers = append(p.discoverers, td)
+		case "docker":
+			if hostinfo.IsInsideK8sCluster() {
+				p.Infof("not registering '%s' discoverer: disabled in k8s environment", cfg.Discoverer)
+				continue
+			}
+			cfg.Docker.Source = conf.Source
+			td, err := dockerd.NewDiscoverer(cfg.Docker)
+			if err != nil {
+				return fmt.Errorf("failed to create '%s' discoverer: %v", cfg.Discoverer, err)
 			}
 			p.discoverers = append(p.discoverers, td)
 		case "k8s":
 			for _, k8sCfg := range cfg.K8s {
 				td, err := kubernetes.NewKubeDiscoverer(k8sCfg)
 				if err != nil {
-					return fmt.Errorf("failed to create 'k8s' discoverer: %v", err)
+					return fmt.Errorf("failed to create '%s' discoverer: %v", cfg.Discoverer, err)
 				}
 				p.discoverers = append(p.discoverers, td)
 			}