48 files changed, 120 insertions, 31 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/README.md b/src/go/plugin/go.d/modules/mysql/README.md
index edf116dee..edf116dee 120000
--- a/src/go/collectors/go.d.plugin/modules/mysql/README.md
+++ b/src/go/plugin/go.d/modules/mysql/README.md
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/charts.go b/src/go/plugin/go.d/modules/mysql/charts.go
index 054e4e01d..bb5089114 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/charts.go
+++ b/src/go/plugin/go.d/modules/mysql/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/mysql/collect.go b/src/go/plugin/go.d/modules/mysql/collect.go
index 5f28cd139..5f28cd139 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect.go
+++ b/src/go/plugin/go.d/modules/mysql/collect.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/collect_global_status.go b/src/go/plugin/go.d/modules/mysql/collect_global_status.go
index c6dff9e93..c6dff9e93 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect_global_status.go
+++ b/src/go/plugin/go.d/modules/mysql/collect_global_status.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/collect_global_vars.go b/src/go/plugin/go.d/modules/mysql/collect_global_vars.go
index ae6278088..ae6278088 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect_global_vars.go
+++ b/src/go/plugin/go.d/modules/mysql/collect_global_vars.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/collect_process_list.go b/src/go/plugin/go.d/modules/mysql/collect_process_list.go
index 08c08c6d5..08c08c6d5 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect_process_list.go
+++ b/src/go/plugin/go.d/modules/mysql/collect_process_list.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/collect_slave_status.go b/src/go/plugin/go.d/modules/mysql/collect_slave_status.go
index 37d4bf59b..37d4bf59b 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect_slave_status.go
+++ b/src/go/plugin/go.d/modules/mysql/collect_slave_status.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/collect_user_statistics.go b/src/go/plugin/go.d/modules/mysql/collect_user_statistics.go
index b00703a46..b00703a46 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect_user_statistics.go
+++ b/src/go/plugin/go.d/modules/mysql/collect_user_statistics.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/collect_version.go b/src/go/plugin/go.d/modules/mysql/collect_version.go
index b85922e2c..b85922e2c 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/collect_version.go
+++ b/src/go/plugin/go.d/modules/mysql/collect_version.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/config_schema.json b/src/go/plugin/go.d/modules/mysql/config_schema.json
index 20bb265c0..20bb265c0 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/config_schema.json
+++ b/src/go/plugin/go.d/modules/mysql/config_schema.json
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/disable_logging.go b/src/go/plugin/go.d/modules/mysql/disable_logging.go
index 3a2eea6a1..3a2eea6a1 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/disable_logging.go
+++ b/src/go/plugin/go.d/modules/mysql/disable_logging.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/integrations/mariadb.md b/src/go/plugin/go.d/modules/mysql/integrations/mariadb.md
index 8bd6b151c..b10e84b2a 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/integrations/mariadb.md
+++ b/src/go/plugin/go.d/modules/mysql/integrations/mariadb.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/mysql/integrations/mariadb.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/mysql/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/mysql/integrations/mariadb.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/mysql/metadata.yaml"
 sidebar_label: "MariaDB"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/Databases"
@@ -45,12 +45,8 @@ This collector supports collecting metrics from multiple instances of this integ
 
 #### Auto-Detection
 
-By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP and UNIX sockets:
+By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP sockets:
 
-- /var/run/mysqld/mysqld.sock
-- /var/run/mysqld/mysql.sock
-- /var/lib/mysql/mysql.sock
-- /tmp/mysql.sock
 - 127.0.0.1:3306
 - "[::1]:3306"
 
@@ -345,6 +341,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 `mysql` 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.
 
@@ -367,4 +365,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m mysql
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `mysql` 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 mysql
+```
+
+#### 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 mysql /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 mysql
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/integrations/mysql.md b/src/go/plugin/go.d/modules/mysql/integrations/mysql.md
index 0acf6f881..f4f8a423a 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/integrations/mysql.md
+++ b/src/go/plugin/go.d/modules/mysql/integrations/mysql.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/mysql/integrations/mysql.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/mysql/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/mysql/integrations/mysql.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/mysql/metadata.yaml"
 sidebar_label: "MySQL"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/Databases"
@@ -45,12 +45,8 @@ This collector supports collecting metrics from multiple instances of this integ
 
 #### Auto-Detection
 
-By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP and UNIX sockets:
+By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP sockets:
 
-- /var/run/mysqld/mysqld.sock
-- /var/run/mysqld/mysql.sock
-- /var/lib/mysql/mysql.sock
-- /tmp/mysql.sock
 - 127.0.0.1:3306
 - "[::1]:3306"
 
@@ -345,6 +341,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 `mysql` 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.
 
@@ -367,4 +365,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m mysql
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `mysql` 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 mysql
+```
+
+#### 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 mysql /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 mysql
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/integrations/percona_mysql.md b/src/go/plugin/go.d/modules/mysql/integrations/percona_mysql.md
index 1ea2ab21f..2c967e229 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/integrations/percona_mysql.md
+++ b/src/go/plugin/go.d/modules/mysql/integrations/percona_mysql.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/mysql/integrations/percona_mysql.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/mysql/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/mysql/integrations/percona_mysql.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/mysql/metadata.yaml"
 sidebar_label: "Percona MySQL"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/Databases"
@@ -45,12 +45,8 @@ This collector supports collecting metrics from multiple instances of this integ
 
 #### Auto-Detection
 
-By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP and UNIX sockets:
+By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP sockets:
 
-- /var/run/mysqld/mysqld.sock
-- /var/run/mysqld/mysql.sock
-- /var/lib/mysql/mysql.sock
-- /tmp/mysql.sock
 - 127.0.0.1:3306
 - "[::1]:3306"
 
@@ -345,6 +341,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 `mysql` 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.
 
@@ -367,4 +365,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m mysql
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `mysql` 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 mysql
+```
+
+#### 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 mysql /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 mysql
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/metadata.yaml b/src/go/plugin/go.d/modules/mysql/metadata.yaml
index 1bc133238..6e0d1b6b7 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/metadata.yaml
+++ b/src/go/plugin/go.d/modules/mysql/metadata.yaml
@@ -47,12 +47,8 @@ modules:
       default_behavior:
         auto_detection:
           description: |
-            By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP and UNIX sockets:
-            
-            - /var/run/mysqld/mysqld.sock
-            - /var/run/mysqld/mysql.sock
-            - /var/lib/mysql/mysql.sock
-            - /tmp/mysql.sock
+            By default, it detects instances running on localhost by trying to connect as root and netdata using known MySQL TCP sockets:
+
             - 127.0.0.1:3306
             - "[::1]:3306"
         limits:
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/mycnf.go b/src/go/plugin/go.d/modules/mysql/mycnf.go
index 2069af80d..2069af80d 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/mycnf.go
+++ b/src/go/plugin/go.d/modules/mysql/mycnf.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/mycnf_test.go b/src/go/plugin/go.d/modules/mysql/mycnf_test.go
index f68680272..f68680272 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/mycnf_test.go
+++ b/src/go/plugin/go.d/modules/mysql/mycnf_test.go
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/mysql.go b/src/go/plugin/go.d/modules/mysql/mysql.go
index f970395e2..1e11de39e 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/mysql.go
+++ b/src/go/plugin/go.d/modules/mysql/mysql.go
@@ -10,8 +10,8 @@ import (
 	"sync"
 	"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"
 
 	"github.com/blang/semver/v4"
 	"github.com/go-sql-driver/mysql"
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/mysql_test.go b/src/go/plugin/go.d/modules/mysql/mysql_test.go
index da64507e4..300f8dabe 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/mysql_test.go
+++ b/src/go/plugin/go.d/modules/mysql/mysql_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/netdata/netdata/go/go.d.plugin/agent/module"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module"
 
 	"github.com/DATA-DOG/go-sqlmock"
 	"github.com/blang/semver/v4"
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/config.json b/src/go/plugin/go.d/modules/mysql/testdata/config.json
index 92a65cb5c..92a65cb5c 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/config.json
+++ b/src/go/plugin/go.d/modules/mysql/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/config.yaml b/src/go/plugin/go.d/modules/mysql/testdata/config.yaml
index 9bb474b94..9bb474b94 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/mysql/testdata/config.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt
index 8a6b691cd..8a6b691cd 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_status.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt
index 96591afdf..96591afdf 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/global_variables.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt
index a44ce5e70..a44ce5e70 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/process_list.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt
index 7a44b8b5a..7a44b8b5a 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/user_statistics.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt
index ee5e77d9a..ee5e77d9a 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4-galera-cluster/version.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt
index b117cb6c7..b117cb6c7 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_multi_source.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt
index 61428f084..61428f084 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/all_slaves_status_single_source.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/global_status.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_status.txt
index c82531c74..c82531c74 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/global_status.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_status.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/global_variables.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_variables.txt
index 96591afdf..96591afdf 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/global_variables.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/global_variables.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/process_list.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/process_list.txt
index a44ce5e70..a44ce5e70 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/process_list.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/process_list.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/user_statistics.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/user_statistics.txt
index 7a44b8b5a..7a44b8b5a 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/user_statistics.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/user_statistics.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/version.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/version.txt
index 2e7ca5b02..2e7ca5b02 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v10.8.4/version.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v10.8.4/version.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/global_status.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_status.txt
index 7c75f0619..7c75f0619 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/global_status.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_status.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/global_variables.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_variables.txt
index 5f0906eed..5f0906eed 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/global_variables.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/global_variables.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/process_list.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/process_list.txt
index a44ce5e70..a44ce5e70 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/process_list.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/process_list.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/version.txt b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/version.txt
index de684279d..de684279d 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mariadb/v5.5.64/version.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mariadb/v5.5.64/version.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/global_status.txt b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_status.txt
index a4b2f2f93..a4b2f2f93 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/global_status.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_status.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/global_variables.txt b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_variables.txt
index 02be0ae8e..02be0ae8e 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/global_variables.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/global_variables.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/process_list.txt b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/process_list.txt
index a44ce5e70..a44ce5e70 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/process_list.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/process_list.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt
index 8a5e06836..8a5e06836 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/replica_status_multi_source.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/version.txt b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/version.txt
index 5c553b1ad..5c553b1ad 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/mysql/v8.0.30/version.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/mysql/v8.0.30/version.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/global_status.txt b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_status.txt
index d7ee5741a..d7ee5741a 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/global_status.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_status.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/global_variables.txt b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_variables.txt
index 02be0ae8e..02be0ae8e 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/global_variables.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/global_variables.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/process_list.txt b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/process_list.txt
index a44ce5e70..a44ce5e70 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/process_list.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/process_list.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/user_statistics.txt b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/user_statistics.txt
index d7c206e47..d7c206e47 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/user_statistics.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/user_statistics.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/version.txt b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/version.txt
index dede361ef..dede361ef 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/percona/v8.0.29/version.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/percona/v8.0.29/version.txt
diff --git a/src/go/collectors/go.d.plugin/modules/mysql/testdata/session_variables.txt b/src/go/plugin/go.d/modules/mysql/testdata/session_variables.txt
index 358750607..358750607 100644
--- a/src/go/collectors/go.d.plugin/modules/mysql/testdata/session_variables.txt
+++ b/src/go/plugin/go.d/modules/mysql/testdata/session_variables.txt