20 files changed, 46 insertions, 11 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/README.md b/src/go/plugin/go.d/modules/openvpn_status_log/README.md
index 603c8249b..603c8249b 120000
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/README.md
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/README.md
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/charts.go b/src/go/plugin/go.d/modules/openvpn_status_log/charts.go
index cb8d7c89b..56716d294 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/charts.go
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/charts.go
@@ -5,7 +5,7 @@ package openvpn_status_log
 import (
 	"fmt"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 )
 
 var charts = module.Charts{
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/collect.go b/src/go/plugin/go.d/modules/openvpn_status_log/collect.go
index f6a442fd5..f6a442fd5 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/collect.go
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/collect.go
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/config_schema.json b/src/go/plugin/go.d/modules/openvpn_status_log/config_schema.json
index 5a31078d0..db3af2cc8 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/config_schema.json
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/config_schema.json
@@ -28,7 +28,7 @@
         "properties": {
           "includes": {
             "title": "Include",
-            "description": "Include users whose usernames match any of the specified inclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#readme).",
+            "description": "Include users whose usernames match any of the specified inclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/pkg/matcher#readme).",
             "type": [
               "array",
               "null"
@@ -41,7 +41,7 @@
           },
           "excludes": {
             "title": "Exclude",
-            "description": "Exclude users whose usernames match any of the specified exclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#readme).",
+            "description": "Exclude users whose usernames match any of the specified exclusion [patterns](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/pkg/matcher#readme).",
             "type": [
               "array",
               "null"
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/init.go b/src/go/plugin/go.d/modules/openvpn_status_log/init.go
index de75d096a..f2e6bee37 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/init.go
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/init.go
@@ -4,7 +4,7 @@ package openvpn_status_log
 
 import (
 	"errors"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/matcher"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
 )
 
 func (o *OpenVPNStatusLog) validateConfig() error {
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/integrations/openvpn_status_log.md b/src/go/plugin/go.d/modules/openvpn_status_log/integrations/openvpn_status_log.md
index fdbf54e87..9a5b56663 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/integrations/openvpn_status_log.md
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/integrations/openvpn_status_log.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/openvpn_status_log/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/openvpn_status_log/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/openvpn_status_log/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/openvpn_status_log/metadata.yaml"
 sidebar_label: "OpenVPN status log"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/VPNs"
@@ -153,6 +153,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 `openvpn_status_log` 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.
 
@@ -175,4 +177,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m openvpn_status_log
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `openvpn_status_log` 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 openvpn_status_log
+```
+
+#### 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 openvpn_status_log /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 openvpn_status_log
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/metadata.yaml b/src/go/plugin/go.d/modules/openvpn_status_log/metadata.yaml
index fbe3ff610..8636de63b 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/metadata.yaml
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/metadata.yaml
@@ -71,7 +71,7 @@ modules:
               details: |
                 Metrics of users matching the selector will be collected.
                 - Logic: (pattern1 OR pattern2) AND !(pattern3 or pattern4)
-                - Pattern syntax: [matcher](https://github.com/netdata/netdata/tree/master/src/go/collectors/go.d.plugin/pkg/matcher#supported-format).
+                - Pattern syntax: [matcher](https://github.com/netdata/netdata/tree/master/src/go/plugin/go.d/pkg/matcher#supported-format).
                 - Syntax:
                   ```yaml
                   per_user_stats:
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/openvpn.go b/src/go/plugin/go.d/modules/openvpn_status_log/openvpn.go
index 975da02f3..7b2914df9 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/openvpn.go
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/openvpn.go
@@ -6,8 +6,8 @@ import (
 	_ "embed"
 	"errors"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/matcher"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
 )
 
 //go:embed "config_schema.json"
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/openvpn_test.go b/src/go/plugin/go.d/modules/openvpn_status_log/openvpn_test.go
index 1e6071e01..f3d852d5a 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/openvpn_test.go
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/openvpn_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/matcher"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/matcher"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/parser.go b/src/go/plugin/go.d/modules/openvpn_status_log/parser.go
index c734fd5fb..c734fd5fb 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/parser.go
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/parser.go
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.json b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.json
index 078a1ae56..078a1ae56 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.json
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.yaml b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.yaml
index 1a27ab974..1a27ab974 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/config.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/empty.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/empty.txt
index e69de29bb..e69de29bb 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/empty.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/empty.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt
index 64b691fcd..64b691fcd 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/static-key.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt
index 34d7a748f..34d7a748f 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1-no-clients.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1.txt
index 0d2f33ba5..0d2f33ba5 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version1.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version1.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt
index 6d1ea1e32..6d1ea1e32 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2-no-clients.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2.txt
index d0f4ac8e3..d0f4ac8e3 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version2.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version2.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt
index 6ab671f20..6ab671f20 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3-no-clients.txt
diff --git a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3.txt b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3.txt
index 7d732042e..7d732042e 100644
--- a/src/go/collectors/go.d.plugin/modules/openvpn_status_log/testdata/v2.5.1/version3.txt
+++ b/src/go/plugin/go.d/modules/openvpn_status_log/testdata/v2.5.1/version3.txt