13 files changed, 16 insertions, 10 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/bind/README.md b/src/go/plugin/go.d/modules/bind/README.md
index 6de0078ec..90906ac21 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/README.md
+++ b/src/go/plugin/go.d/modules/bind/README.md
@@ -88,7 +88,7 @@ jobs:
 View filter syntax: [simple patterns](https://docs.netdata.cloud/libnetdata/simple_pattern/).
 
 For all available options please see
-module [configuration file](https://github.com/netdata/netdata/blob/master/src/go/collectors/go.d.plugin/config/go.d/bind.conf).
+module [configuration file](https://github.com/netdata/netdata/blob/master/src/go/plugin/go.d/config/go.d/bind.conf).
 
 ## Troubleshooting
 
diff --git a/src/go/collectors/go.d.plugin/modules/bind/bind.go b/src/go/plugin/go.d/modules/bind/bind.go
index 1bdf986cb..6087f6f74 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/bind.go
+++ b/src/go/plugin/go.d/modules/bind/bind.go
@@ -8,10 +8,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/matcher"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 )
 
 //go:embed "config_schema.json"
diff --git a/src/go/collectors/go.d.plugin/modules/bind/bind_test.go b/src/go/plugin/go.d/modules/bind/bind_test.go
index f5f492181..d1ce5c2b6 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/bind_test.go
+++ b/src/go/plugin/go.d/modules/bind/bind_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/modules/bind/charts.go b/src/go/plugin/go.d/modules/bind/charts.go
index db1833ab4..2fa868daf 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/charts.go
+++ b/src/go/plugin/go.d/modules/bind/charts.go
@@ -3,7 +3,7 @@
 package bind
 
 import (
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 )
 
 type (
diff --git a/src/go/collectors/go.d.plugin/modules/bind/collect.go b/src/go/plugin/go.d/modules/bind/collect.go
index faf5c07ca..4f38f3909 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/collect.go
+++ b/src/go/plugin/go.d/modules/bind/collect.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 )
 
 func (b *Bind) collect() (map[string]int64, error) {
diff --git a/src/go/collectors/go.d.plugin/modules/bind/config_schema.json b/src/go/plugin/go.d/modules/bind/config_schema.json
index 55aa502a6..29bb739ea 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/config_schema.json
+++ b/src/go/plugin/go.d/modules/bind/config_schema.json
@@ -167,6 +167,12 @@
     "timeout": {
       "ui:help": "Accepts decimals for precise control (e.g., type 1.5 for 1.5 seconds)."
     },
+    "username": {
+      "ui:widget": "password"
+    },
+    "proxy_username": {
+      "ui:widget": "password"
+    },
     "password": {
       "ui:widget": "password"
     },
diff --git a/src/go/collectors/go.d.plugin/modules/bind/init.go b/src/go/plugin/go.d/modules/bind/init.go
index a4b40d0a4..fe533b974 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/init.go
+++ b/src/go/plugin/go.d/modules/bind/init.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/matcher"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
 )
 
 func (b *Bind) validateConfig() error {
diff --git a/src/go/collectors/go.d.plugin/modules/bind/json_client.go b/src/go/plugin/go.d/modules/bind/json_client.go
index 46a98de3a..04eecdb04 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/json_client.go
+++ b/src/go/plugin/go.d/modules/bind/json_client.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 )
 
 type serverStats = jsonServerStats
diff --git a/src/go/collectors/go.d.plugin/modules/bind/testdata/config.json b/src/go/plugin/go.d/modules/bind/testdata/config.json
index 145df9ff4..145df9ff4 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/testdata/config.json
+++ b/src/go/plugin/go.d/modules/bind/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/bind/testdata/config.yaml b/src/go/plugin/go.d/modules/bind/testdata/config.yaml
index cc0a33b74..cc0a33b74 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/bind/testdata/config.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/bind/testdata/query-server.json b/src/go/plugin/go.d/modules/bind/testdata/query-server.json
index 885a4e28e..885a4e28e 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/testdata/query-server.json
+++ b/src/go/plugin/go.d/modules/bind/testdata/query-server.json
diff --git a/src/go/collectors/go.d.plugin/modules/bind/testdata/query-server.xml b/src/go/plugin/go.d/modules/bind/testdata/query-server.xml
index 515cdeaba..515cdeaba 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/testdata/query-server.xml
+++ b/src/go/plugin/go.d/modules/bind/testdata/query-server.xml
diff --git a/src/go/collectors/go.d.plugin/modules/bind/xml3_client.go b/src/go/plugin/go.d/modules/bind/xml3_client.go
index 8ba804ecf..c48d1af31 100644
--- a/src/go/collectors/go.d.plugin/modules/bind/xml3_client.go
+++ b/src/go/plugin/go.d/modules/bind/xml3_client.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"path"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 )
 
 type xml3Stats struct {