11 files changed, 42 insertions, 7 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/README.md b/src/go/plugin/go.d/modules/ntpd/README.md
index bad92b03a..bad92b03a 120000
--- a/src/go/collectors/go.d.plugin/modules/ntpd/README.md
+++ b/src/go/plugin/go.d/modules/ntpd/README.md
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/charts.go b/src/go/plugin/go.d/modules/ntpd/charts.go
index 5726d05a3..95baea471 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/charts.go
+++ b/src/go/plugin/go.d/modules/ntpd/charts.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"
 )
 
 const (
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/client.go b/src/go/plugin/go.d/modules/ntpd/client.go
index 8e111cd76..8e111cd76 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/client.go
+++ b/src/go/plugin/go.d/modules/ntpd/client.go
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/collect.go b/src/go/plugin/go.d/modules/ntpd/collect.go
index 09553a65c..09553a65c 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/collect.go
+++ b/src/go/plugin/go.d/modules/ntpd/collect.go
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/config_schema.json b/src/go/plugin/go.d/modules/ntpd/config_schema.json
index f4d763b82..f4d763b82 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/config_schema.json
+++ b/src/go/plugin/go.d/modules/ntpd/config_schema.json
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/integrations/ntpd.md b/src/go/plugin/go.d/modules/ntpd/integrations/ntpd.md
index f75cb7875..c0094c524 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/integrations/ntpd.md
+++ b/src/go/plugin/go.d/modules/ntpd/integrations/ntpd.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/ntpd/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/ntpd/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/ntpd/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/ntpd/metadata.yaml"
 sidebar_label: "NTPd"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/System Clock and NTP"
@@ -203,6 +203,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 `ntpd` 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.
 
@@ -225,4 +227,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m ntpd
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `ntpd` 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 ntpd
+```
+
+#### 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 ntpd /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 ntpd
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/metadata.yaml b/src/go/plugin/go.d/modules/ntpd/metadata.yaml
index 46178b031..46178b031 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/metadata.yaml
+++ b/src/go/plugin/go.d/modules/ntpd/metadata.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/ntpd.go b/src/go/plugin/go.d/modules/ntpd/ntpd.go
index 062bb14fd..011624681 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/ntpd.go
+++ b/src/go/plugin/go.d/modules/ntpd/ntpd.go
@@ -8,9 +8,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/iprange"
-	"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/iprange"
+	"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/ntpd/ntpd_test.go b/src/go/plugin/go.d/modules/ntpd/ntpd_test.go
index 9435485da..99c0519c8 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/ntpd_test.go
+++ b/src/go/plugin/go.d/modules/ntpd/ntpd_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/ntpd/testdata/config.json b/src/go/plugin/go.d/modules/ntpd/testdata/config.json
index fc8d6844f..fc8d6844f 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/testdata/config.json
+++ b/src/go/plugin/go.d/modules/ntpd/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/ntpd/testdata/config.yaml b/src/go/plugin/go.d/modules/ntpd/testdata/config.yaml
index 94cee8526..94cee8526 100644
--- a/src/go/collectors/go.d.plugin/modules/ntpd/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/ntpd/testdata/config.yaml