12 files changed, 43 insertions, 8 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/README.md b/src/go/plugin/go.d/modules/supervisord/README.md
index a8b743484..a8b743484 120000
--- a/src/go/collectors/go.d.plugin/modules/supervisord/README.md
+++ b/src/go/plugin/go.d/modules/supervisord/README.md
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/charts.go b/src/go/plugin/go.d/modules/supervisord/charts.go
index 2c7f08f04..c0f7c9018 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/charts.go
+++ b/src/go/plugin/go.d/modules/supervisord/charts.go
@@ -5,7 +5,7 @@ package supervisord
 import (
 	"fmt"
 
-	"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/supervisord/client.go b/src/go/plugin/go.d/modules/supervisord/client.go
index da62ca21c..da62ca21c 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/client.go
+++ b/src/go/plugin/go.d/modules/supervisord/client.go
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/collect.go b/src/go/plugin/go.d/modules/supervisord/collect.go
index e04e32131..31a0d394b 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/collect.go
+++ b/src/go/plugin/go.d/modules/supervisord/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 (s *Supervisord) collect() (map[string]int64, error) {
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/config_schema.json b/src/go/plugin/go.d/modules/supervisord/config_schema.json
index 8d3c4e943..8d3c4e943 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/config_schema.json
+++ b/src/go/plugin/go.d/modules/supervisord/config_schema.json
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/init.go b/src/go/plugin/go.d/modules/supervisord/init.go
index b4cc36382..c7ccc06b5 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/init.go
+++ b/src/go/plugin/go.d/modules/supervisord/init.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 )
 
 func (s *Supervisord) verifyConfig() error {
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/integrations/supervisor.md b/src/go/plugin/go.d/modules/supervisord/integrations/supervisor.md
index 0cbb13242..ba302e4a0 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/integrations/supervisor.md
+++ b/src/go/plugin/go.d/modules/supervisord/integrations/supervisor.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/supervisord/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/supervisord/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/supervisord/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/supervisord/metadata.yaml"
 sidebar_label: "Supervisor"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/Processes and System Services"
@@ -189,6 +189,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 `supervisord` 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.
 
@@ -211,4 +213,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m supervisord
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `supervisord` 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 supervisord
+```
+
+#### 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 supervisord /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 supervisord
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/metadata.yaml b/src/go/plugin/go.d/modules/supervisord/metadata.yaml
index b5c81dd04..b5c81dd04 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/metadata.yaml
+++ b/src/go/plugin/go.d/modules/supervisord/metadata.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/supervisord.go b/src/go/plugin/go.d/modules/supervisord/supervisord.go
index 4c1bc8e84..0988cfc88 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/supervisord.go
+++ b/src/go/plugin/go.d/modules/supervisord/supervisord.go
@@ -7,8 +7,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"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/web"
 )
 
 //go:embed "config_schema.json"
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/supervisord_test.go b/src/go/plugin/go.d/modules/supervisord/supervisord_test.go
index 521811b11..7eb5df53a 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/supervisord_test.go
+++ b/src/go/plugin/go.d/modules/supervisord/supervisord_test.go
@@ -7,7 +7,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/supervisord/testdata/config.json b/src/go/plugin/go.d/modules/supervisord/testdata/config.json
index 825b0c394..825b0c394 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/testdata/config.json
+++ b/src/go/plugin/go.d/modules/supervisord/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/supervisord/testdata/config.yaml b/src/go/plugin/go.d/modules/supervisord/testdata/config.yaml
index e1a01abd7..e1a01abd7 100644
--- a/src/go/collectors/go.d.plugin/modules/supervisord/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/supervisord/testdata/config.yaml