7 files changed, 24 insertions, 24 deletions
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/cache.go b/src/go/plugin/go.d/agent/jobmgr/cache.go
index 2cef1dc89..8ea16ce96 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/cache.go
+++ b/src/go/plugin/go.d/agent/jobmgr/cache.go
@@ -6,8 +6,8 @@ import (
 	"context"
 	"sync"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 )
 
 func newDiscoveredConfigsCache() *discoveredConfigs {
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/di.go b/src/go/plugin/go.d/agent/jobmgr/di.go
index 844e10c11..466fcdf90 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/di.go
+++ b/src/go/plugin/go.d/agent/jobmgr/di.go
@@ -3,9 +3,9 @@
 package jobmgr
 
 import (
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/functions"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/vnodes"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
 )
 
 type FileLocker interface {
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/dyncfg.go b/src/go/plugin/go.d/agent/jobmgr/dyncfg.go
index 404f4bf3b..da6d67489 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/dyncfg.go
+++ b/src/go/plugin/go.d/agent/jobmgr/dyncfg.go
@@ -14,9 +14,9 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/functions"
-	"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/functions"
 
 	"gopkg.in/yaml.v2"
 )
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/manager.go b/src/go/plugin/go.d/agent/jobmgr/manager.go
index f4d55fcf6..59947be77 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/manager.go
+++ b/src/go/plugin/go.d/agent/jobmgr/manager.go
@@ -11,13 +11,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/functions"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/netdataapi"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/safewriter"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/ticker"
-	"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/functions"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/ticker"
 
 	"github.com/mattn/go-isatty"
 	"gopkg.in/yaml.v2"
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/manager_test.go b/src/go/plugin/go.d/agent/jobmgr/manager_test.go
index b41ea178f..1b55a8308 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/manager_test.go
+++ b/src/go/plugin/go.d/agent/jobmgr/manager_test.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/functions"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
 )
 
 func TestManager_Run(t *testing.T) {
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/noop.go b/src/go/plugin/go.d/agent/jobmgr/noop.go
index c64d07866..adeacf906 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/noop.go
+++ b/src/go/plugin/go.d/agent/jobmgr/noop.go
@@ -3,10 +3,10 @@
 package jobmgr
 
 import (
-	"github.com/netdata/netdata/go/go.d.plugin/agent/functions"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/functions"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/vnodes"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/vnodes"
 )
 
 type noop struct{}
diff --git a/src/go/collectors/go.d.plugin/agent/jobmgr/sim_test.go b/src/go/plugin/go.d/agent/jobmgr/sim_test.go
index fcdb9addd..9fe67175a 100644
--- a/src/go/collectors/go.d.plugin/agent/jobmgr/sim_test.go
+++ b/src/go/plugin/go.d/agent/jobmgr/sim_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/confgroup"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/netdataapi"
-	"github.com/netdata/netdata/go/go.d.plugin/agent/safewriter"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/confgroup"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/netdataapi"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/safewriter"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )