15 files changed, 46 insertions, 11 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/README.md b/src/go/plugin/go.d/modules/zookeeper/README.md
index ae81b3714..ae81b3714 120000
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/README.md
+++ b/src/go/plugin/go.d/modules/zookeeper/README.md
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/charts.go b/src/go/plugin/go.d/modules/zookeeper/charts.go
index 2c2cf6a05..9f081a9c2 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/charts.go
+++ b/src/go/plugin/go.d/modules/zookeeper/charts.go
@@ -2,7 +2,7 @@
 
 package zookeeper
 
-import "github.com/netdata/netdata/go/go.d.plugin/agent/module"
+import "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 
 type (
 	Charts = module.Charts
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/collect.go b/src/go/plugin/go.d/modules/zookeeper/collect.go
index 86491e1b1..86491e1b1 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/collect.go
+++ b/src/go/plugin/go.d/modules/zookeeper/collect.go
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/config_schema.json b/src/go/plugin/go.d/modules/zookeeper/config_schema.json
index e07a27c29..e07a27c29 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/config_schema.json
+++ b/src/go/plugin/go.d/modules/zookeeper/config_schema.json
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/fetcher.go b/src/go/plugin/go.d/modules/zookeeper/fetcher.go
index be821e622..a6611b506 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/fetcher.go
+++ b/src/go/plugin/go.d/modules/zookeeper/fetcher.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"unsafe"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/socket"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
 )
 
 const limitReadLines = 2000
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/fetcher_test.go b/src/go/plugin/go.d/modules/zookeeper/fetcher_test.go
index dbc5174b9..d0931abb9 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/fetcher_test.go
+++ b/src/go/plugin/go.d/modules/zookeeper/fetcher_test.go
@@ -5,7 +5,7 @@ package zookeeper
 import (
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/socket"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/init.go b/src/go/plugin/go.d/modules/zookeeper/init.go
index 1910e9a0b..380f4bb33 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/init.go
+++ b/src/go/plugin/go.d/modules/zookeeper/init.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/socket"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/tlscfg"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/socket"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
 )
 
 func (z *Zookeeper) verifyConfig() error {
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/integrations/zookeeper.md b/src/go/plugin/go.d/modules/zookeeper/integrations/zookeeper.md
index 45eeb0fc9..8481ff8c8 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/integrations/zookeeper.md
+++ b/src/go/plugin/go.d/modules/zookeeper/integrations/zookeeper.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/zookeeper/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/zookeeper/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/zookeeper/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/zookeeper/metadata.yaml"
 sidebar_label: "ZooKeeper"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/Service Discovery / Registry"
@@ -190,6 +190,8 @@ jobs:
 
 ### Debug Mode
 
+**Important**: Debug mode is not supported for data collection jobs created via the UI using the Dyncfg feature.
+
 To troubleshoot issues with the `zookeeper` collector, run the `go.d.plugin` with the debug option enabled. The output
 should give you clues as to why the collector isn't working.
 
@@ -212,4 +214,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m zookeeper
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `zookeeper` collector, follow these steps to retrieve logs and identify potential issues:
+
+- **Run the command** specific to your system (systemd, non-systemd, or Docker container).
+- **Examine the output** for any warnings or error messages that might indicate issues.  These messages should provide clues about the root cause of the problem.
+
+#### System with systemd
+
+Use the following command to view logs generated since the last Netdata service restart:
+
+```bash
+journalctl _SYSTEMD_INVOCATION_ID="$(systemctl show --value --property=InvocationID netdata)" --namespace=netdata --grep zookeeper
+```
+
+#### System without systemd
+
+Locate the collector log file, typically at `/var/log/netdata/collector.log`, and use `grep` to filter for collector's name:
+
+```bash
+grep zookeeper /var/log/netdata/collector.log
+```
+
+**Note**: This method shows logs from all restarts. Focus on the **latest entries** for troubleshooting current issues.
+
+#### Docker Container
+
+If your Netdata runs in a Docker container named "netdata" (replace if different), use this command:
+
+```bash
+docker logs netdata 2>&1 | grep zookeeper
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/metadata.yaml b/src/go/plugin/go.d/modules/zookeeper/metadata.yaml
index 527a55fb4..527a55fb4 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/metadata.yaml
+++ b/src/go/plugin/go.d/modules/zookeeper/metadata.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/config.json b/src/go/plugin/go.d/modules/zookeeper/testdata/config.json
index 0cf6c4727..0cf6c4727 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/config.json
+++ b/src/go/plugin/go.d/modules/zookeeper/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/config.yaml b/src/go/plugin/go.d/modules/zookeeper/testdata/config.yaml
index 54456cc80..54456cc80 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/zookeeper/testdata/config.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/mntr.txt b/src/go/plugin/go.d/modules/zookeeper/testdata/mntr.txt
index 8e10c287d..8e10c287d 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/mntr.txt
+++ b/src/go/plugin/go.d/modules/zookeeper/testdata/mntr.txt
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/mntr_notinwhitelist.txt b/src/go/plugin/go.d/modules/zookeeper/testdata/mntr_notinwhitelist.txt
index 1fd1983b7..1fd1983b7 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/testdata/mntr_notinwhitelist.txt
+++ b/src/go/plugin/go.d/modules/zookeeper/testdata/mntr_notinwhitelist.txt
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/zookeeper.go b/src/go/plugin/go.d/modules/zookeeper/zookeeper.go
index bf2a43310..6d004a405 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/zookeeper.go
+++ b/src/go/plugin/go.d/modules/zookeeper/zookeeper.go
@@ -7,9 +7,9 @@ import (
 	"errors"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/tlscfg"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/tlscfg"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 )
 
 //go:embed "config_schema.json"
diff --git a/src/go/collectors/go.d.plugin/modules/zookeeper/zookeeper_test.go b/src/go/plugin/go.d/modules/zookeeper/zookeeper_test.go
index d33673fc3..3fc8ad5b4 100644
--- a/src/go/collectors/go.d.plugin/modules/zookeeper/zookeeper_test.go
+++ b/src/go/plugin/go.d/modules/zookeeper/zookeeper_test.go
@@ -9,7 +9,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"