Adding upstream version 1.47.0.upstream/1.47.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

38 files changed, 64 insertions, 64 deletions

diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/conffile.go b/src/go/plugin/go.d/agent/discovery/sd/conffile.go
index 73aef1737..e08a4021b 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/conffile.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/conffile.go
@@ -6,8 +6,8 @@ import (
 	"context"
 	"os"
 
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/multipath"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
 )
 
 type confFile struct {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/docker.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/docker.go
index cca6b658e..1cea014a9 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/docker.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/docker.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/dockerhost"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/dockerhost"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 
 	"github.com/docker/docker/api/types"
 	typesContainer "github.com/docker/docker/api/types/container"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
index d325f99dd..630afb0f5 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/dockerd_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/docker/docker/api/types"
 	typesNetwork "github.com/docker/docker/api/types/network"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/sim_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/sim_test.go
index 7b0b76aba..fcdbeb894 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/sim_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/sim_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/docker/docker/api/types"
 	typesContainer "github.com/docker/docker/api/types/container"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/target.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/target.go
index 2422bc98e..2cf0575b5 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/dockerd/target.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/dockerd/target.go
@@ -5,7 +5,7 @@ package dockerd
 import (
 	"fmt"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 )
 
 type targetGroup struct {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/config.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/config.go
index 15a1e4745..15a1e4745 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/config.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/config.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/kubernetes.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/kubernetes.go
index aa153a34a..439e2b695 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/kubernetes.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/kubernetes.go
@@ -11,9 +11,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/k8sclient"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/k8sclient"
 
 	"github.com/ilyam8/hashstructure"
 	corev1 "k8s.io/api/core/v1"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/kubernetes_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/kubernetes_test.go
index 9743a0af5..ba60a47b4 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/kubernetes_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/kubernetes_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/k8sclient"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/k8sclient"
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/pod.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/pod.go
index a271e7285..617081742 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/pod.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/pod.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/pod_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/pod_test.go
index ebe92d2f6..838c2413f 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/pod_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/pod_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/service.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/service.go
index 4cfdd62f1..1d5ae7cd5 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/service.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/service.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/tools/cache"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/service_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/service_test.go
index d2e496015..c3e83e202 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/service_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/service_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/sim_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/sim_test.go
index db986b855..99bdfae54 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/kubernetes/sim_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/kubernetes/sim_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/netlisteners.go
index bfd7a99b8..6f536c49e 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/netlisteners.go
@@ -18,9 +18,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/executable"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/pkg/executable"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/ilyam8/hashstructure"
 )
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go
index a94879f09..9b3cae801 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/netlisteners_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 )
 
 func TestDiscoverer_Discover(t *testing.T) {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/sim_test.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/sim_test.go
index ad90f8278..4cb65832d 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/sim_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/sim_test.go
@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/target.go b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/target.go
index a36620f32..9d57d3cc7 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/discoverer/netlisteners/target.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/discoverer/netlisteners/target.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 )
 
 type targetGroup struct {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/discoverer.go b/src/go/plugin/go.d/agent/discovery/sd/model/discoverer.go
index 301322d32..301322d32 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/discoverer.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/model/discoverer.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/tags.go b/src/go/plugin/go.d/agent/discovery/sd/model/tags.go
index 22517d77e..22517d77e 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/tags.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/model/tags.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/tags_test.go b/src/go/plugin/go.d/agent/discovery/sd/model/tags_test.go
index 4f07bcbf6..4f07bcbf6 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/tags_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/model/tags_test.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/target.go b/src/go/plugin/go.d/agent/discovery/sd/model/target.go
index eb2bd9d51..eb2bd9d51 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/model/target.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/model/target.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/accumulator.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/accumulator.go
index a84212734..60c901492 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/accumulator.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/accumulator.go
@@ -7,8 +7,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 )
 
 func newAccumulator() *accumulator {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/classify.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/classify.go
index bd686b306..a7490d2e0 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/classify.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/classify.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 )
 
 func newTargetClassificator(cfg []ClassifyRuleConfig) (*targetClassificator, error) {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/classify_test.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/classify_test.go
index 214c96cf7..606e3411c 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/classify_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/classify_test.go
@@ -5,7 +5,7 @@ package pipeline
 import (
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/compose.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/compose.go
index de2ed21b8..80830fd6d 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/compose.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/compose.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"text/template"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"gopkg.in/yaml.v2"
 )
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/compose_test.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/compose_test.go
index fa758bcd3..1c56bf086 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/compose_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/compose_test.go
@@ -5,8 +5,8 @@ package pipeline
 import (
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/config.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/config.go
index 4dac63f0f..9df7ec59d 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/config.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/config.go
@@ -6,10 +6,10 @@ import (
 	"errors"
 	"fmt"
 
-	"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/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockerd"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/kubernetes"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlisteners"
 )
 
 type Config struct {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/funcmap.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/funcmap.go
index 8a9698b65..5ed188a54 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/funcmap.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/funcmap.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"text/template"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/matcher"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
 
 	"github.com/Masterminds/sprig/v3"
 	"github.com/bmatcuk/doublestar/v4"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/funcmap_test.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/funcmap_test.go
index 3de71ef70..3de71ef70 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/funcmap_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/funcmap_test.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/pipeline.go
index f69501c39..4d391d41e 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/pipeline.go
@@ -9,13 +9,13 @@ import (
 	"log/slog"
 	"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"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/dockerd"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/kubernetes"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/discoverer/netlisteners"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/hostinfo"
 )
 
 func New(cfg Config) (*Pipeline, error) {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline_test.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/pipeline_test.go
index 2dd53cf10..e67b6d7ce 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/pipeline_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/pipeline_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/ilyam8/hashstructure"
 	"github.com/stretchr/testify/assert"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/promport.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/promport.go
index 646e1abb1..646e1abb1 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/promport.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/promport.go
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/selector.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/selector.go
index 8bb5fb061..cdd2cf000 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/selector.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/selector.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 )
 
 type selector interface {
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/selector_test.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/selector_test.go
index a4fcf3041..bed2150e2 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/selector_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/selector_test.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/sim_test.go b/src/go/plugin/go.d/agent/discovery/sd/pipeline/sim_test.go
index 23a120751..657009478 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/pipeline/sim_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/pipeline/sim_test.go
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/model"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/model"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/sd.go b/src/go/plugin/go.d/agent/discovery/sd/sd.go
index ab84c979e..687ebfba8 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/sd.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/sd.go
@@ -8,10 +8,10 @@ import (
 	"log/slog"
 	"sync"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/pipeline"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/multipath"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/pipeline"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/multipath"
 
 	"gopkg.in/yaml.v2"
 )
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/sd_test.go b/src/go/plugin/go.d/agent/discovery/sd/sd_test.go
index 376c9f7e7..4269bfd3a 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/sd_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/sd_test.go
@@ -5,7 +5,7 @@ package sd
 import (
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/pipeline"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/pipeline"
 
 	"gopkg.in/yaml.v2"
 )
diff --git a/src/go/collectors/go.d.plugin/agent/discovery/sd/sim_test.go b/src/go/plugin/go.d/agent/discovery/sd/sim_test.go
index 7741221d1..930c40125 100644
--- a/src/go/collectors/go.d.plugin/agent/discovery/sd/sim_test.go
+++ b/src/go/plugin/go.d/agent/discovery/sd/sim_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/discovery/sd/pipeline"
-	"github.com/netdata/netdata/go/go.d.plugin/logger"
+	"github.com/netdata/netdata/go/plugins/logger"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/discovery/sd/pipeline"
 
 	"github.com/stretchr/testify/assert"
 )