Adding upstream version 1.47.0.upstream/1.47.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 52 insertions, 11 deletions

diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/README.md b/src/go/plugin/go.d/modules/cockroachdb/README.md
index a8130f262..a8130f262 120000
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/README.md
+++ b/src/go/plugin/go.d/modules/cockroachdb/README.md
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/charts.go b/src/go/plugin/go.d/modules/cockroachdb/charts.go
index d615ef23c..2adfc5f9d 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/charts.go
+++ b/src/go/plugin/go.d/modules/cockroachdb/charts.go
@@ -2,7 +2,7 @@
 
 package cockroachdb
 
-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/cockroachdb/cockroachdb.go b/src/go/plugin/go.d/modules/cockroachdb/cockroachdb.go
index c07f22ef1..32d13fa78 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/cockroachdb.go
+++ b/src/go/plugin/go.d/modules/cockroachdb/cockroachdb.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/prometheus"
-	"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/prometheus"
+	"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/cockroachdb/cockroachdb_test.go b/src/go/plugin/go.d/modules/cockroachdb/cockroachdb_test.go
index b8abc1a4a..886b65fab 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/cockroachdb_test.go
+++ b/src/go/plugin/go.d/modules/cockroachdb/cockroachdb_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/cockroachdb/collect.go b/src/go/plugin/go.d/modules/cockroachdb/collect.go
index 1636a14d6..9ba255132 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/collect.go
+++ b/src/go/plugin/go.d/modules/cockroachdb/collect.go
@@ -5,8 +5,8 @@ package cockroachdb
 import (
 	"errors"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/prometheus"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/stm"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm"
 )
 
 func validCockroachDBMetrics(scraped prometheus.Series) bool {
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/config_schema.json b/src/go/plugin/go.d/modules/cockroachdb/config_schema.json
index e045b5916..51b94f6a6 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/config_schema.json
+++ b/src/go/plugin/go.d/modules/cockroachdb/config_schema.json
@@ -167,6 +167,12 @@
     "timeout": {
       "ui:help": "Accepts decimals for precise control (e.g., type 1.5 for 1.5 seconds)."
     },
+    "username": {
+      "ui:widget": "password"
+    },
+    "proxy_username": {
+      "ui:widget": "password"
+    },
     "password": {
       "ui:widget": "password"
     },
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/init.go b/src/go/plugin/go.d/modules/cockroachdb/init.go
index fbe635a83..7558e9952 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/init.go
+++ b/src/go/plugin/go.d/modules/cockroachdb/init.go
@@ -4,9 +4,9 @@ package cockroachdb
 
 import (
 	"errors"
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/web"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web"
 
-	"github.com/netdata/netdata/go/go.d.plugin/pkg/prometheus"
+	"github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/prometheus"
 )
 
 func (c *CockroachDB) validateConfig() error {
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/integrations/cockroachdb.md b/src/go/plugin/go.d/modules/cockroachdb/integrations/cockroachdb.md
index e9dc1a28e..52e27a87e 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/integrations/cockroachdb.md
+++ b/src/go/plugin/go.d/modules/cockroachdb/integrations/cockroachdb.md
@@ -1,6 +1,6 @@
 <!--startmeta
-custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/cockroachdb/README.md"
-meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/cockroachdb/metadata.yaml"
+custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/cockroachdb/README.md"
+meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/cockroachdb/metadata.yaml"
 sidebar_label: "CockroachDB"
 learn_status: "Published"
 learn_rel_path: "Collecting Metrics/Databases"
@@ -263,6 +263,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 `cockroachdb` 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.
 
@@ -285,4 +287,37 @@ should give you clues as to why the collector isn't working.
   ./go.d.plugin -d -m cockroachdb
   ```
 
+### Getting Logs
+
+If you're encountering problems with the `cockroachdb` 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 cockroachdb
+```
+
+#### 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 cockroachdb /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 cockroachdb
+```
+
 
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/metadata.yaml b/src/go/plugin/go.d/modules/cockroachdb/metadata.yaml
index 522f200ac..522f200ac 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/metadata.yaml
+++ b/src/go/plugin/go.d/modules/cockroachdb/metadata.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/metrics.go b/src/go/plugin/go.d/modules/cockroachdb/metrics.go
index fabd25499..fabd25499 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/metrics.go
+++ b/src/go/plugin/go.d/modules/cockroachdb/metrics.go
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/config.json b/src/go/plugin/go.d/modules/cockroachdb/testdata/config.json
index 984c3ed6e..984c3ed6e 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/config.json
+++ b/src/go/plugin/go.d/modules/cockroachdb/testdata/config.json
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/config.yaml b/src/go/plugin/go.d/modules/cockroachdb/testdata/config.yaml
index 8558b61cc..8558b61cc 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/config.yaml
+++ b/src/go/plugin/go.d/modules/cockroachdb/testdata/config.yaml
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/metrics.txt b/src/go/plugin/go.d/modules/cockroachdb/testdata/metrics.txt
index ca537e101..ca537e101 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/metrics.txt
+++ b/src/go/plugin/go.d/modules/cockroachdb/testdata/metrics.txt
diff --git a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/non_cockroachdb.txt b/src/go/plugin/go.d/modules/cockroachdb/testdata/non_cockroachdb.txt
index f5f0ae082..f5f0ae082 100644
--- a/src/go/collectors/go.d.plugin/modules/cockroachdb/testdata/non_cockroachdb.txt
+++ b/src/go/plugin/go.d/modules/cockroachdb/testdata/non_cockroachdb.txt