diff options
Diffstat (limited to '')
l--------- | src/go/plugin/go.d/modules/docker/README.md (renamed from src/go/collectors/go.d.plugin/modules/docker/README.md) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/charts.go (renamed from src/go/collectors/go.d.plugin/modules/docker/charts.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/collect.go (renamed from src/go/collectors/go.d.plugin/modules/docker/collect.go) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/config_schema.json (renamed from src/go/collectors/go.d.plugin/modules/docker/config_schema.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/docker.go (renamed from src/go/collectors/go.d.plugin/modules/docker/docker.go) | 6 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/docker_test.go (renamed from src/go/collectors/go.d.plugin/modules/docker/docker_test.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/integrations/docker.md (renamed from src/go/collectors/go.d.plugin/modules/docker/integrations/docker.md) | 39 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/metadata.yaml (renamed from src/go/collectors/go.d.plugin/modules/docker/metadata.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/testdata/config.json (renamed from src/go/collectors/go.d.plugin/modules/docker/testdata/config.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker/testdata/config.yaml (renamed from src/go/collectors/go.d.plugin/modules/docker/testdata/config.yaml) | 0 | ||||
l--------- | src/go/plugin/go.d/modules/docker_engine/README.md (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/README.md) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/charts.go (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/charts.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/collect.go (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/collect.go) | 4 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/config_schema.json (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/config_schema.json) | 6 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/docker_engine.go (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/docker_engine.go) | 6 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/docker_engine_test.go (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/docker_engine_test.go) | 6 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/init.go (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/init.go) | 4 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/integrations/docker_engine.md (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/integrations/docker_engine.md) | 39 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/metadata.yaml (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/metadata.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/metrics.go (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/metrics.go) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/testdata/config.json (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/testdata/config.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/testdata/config.yaml (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/testdata/config.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/testdata/non-docker-engine.txt (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/testdata/non-docker-engine.txt) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/testdata/v17.05.0-ce.txt (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v17.05.0-ce.txt) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce.txt (renamed from src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v18.09.3-ce.txt) | 0 | ||||
l--------- | src/go/plugin/go.d/modules/dockerhub/README.md (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/README.md) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/apiclient.go (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/apiclient.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/charts.go (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/charts.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/collect.go (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/collect.go) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/config_schema.json (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/config_schema.json) | 6 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/dockerhub.go (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/dockerhub.go) | 4 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/dockerhub_test.go (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/dockerhub_test.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/init.go (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/init.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/integrations/docker_hub_repository.md (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/integrations/docker_hub_repository.md) | 39 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/metadata.yaml (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/metadata.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/testdata/config.json (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/testdata/config.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/testdata/config.yaml (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/testdata/config.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/testdata/repo1.txt (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo1.txt) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/testdata/repo2.txt (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo2.txt) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/dockerhub/testdata/repo3.txt (renamed from src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo3.txt) | 0 |
41 files changed, 145 insertions, 28 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/docker/README.md b/src/go/plugin/go.d/modules/docker/README.md index b4804ee06..b4804ee06 120000 --- a/src/go/collectors/go.d.plugin/modules/docker/README.md +++ b/src/go/plugin/go.d/modules/docker/README.md diff --git a/src/go/collectors/go.d.plugin/modules/docker/charts.go b/src/go/plugin/go.d/modules/docker/charts.go index 2dd26c0e3..6660dc1e4 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/charts.go +++ b/src/go/plugin/go.d/modules/docker/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/docker/collect.go b/src/go/plugin/go.d/modules/docker/collect.go index f23c58f22..f23c58f22 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/collect.go +++ b/src/go/plugin/go.d/modules/docker/collect.go diff --git a/src/go/collectors/go.d.plugin/modules/docker/config_schema.json b/src/go/plugin/go.d/modules/docker/config_schema.json index bd48c9126..bd48c9126 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/config_schema.json +++ b/src/go/plugin/go.d/modules/docker/config_schema.json diff --git a/src/go/collectors/go.d.plugin/modules/docker/docker.go b/src/go/plugin/go.d/modules/docker/docker.go index 68662fd4c..88890b9fe 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/docker.go +++ b/src/go/plugin/go.d/modules/docker/docker.go @@ -8,9 +8,9 @@ import ( "errors" "time" - "github.com/netdata/netdata/go/go.d.plugin/agent/module" - "github.com/netdata/netdata/go/go.d.plugin/pkg/dockerhost" - "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/dockerhost" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" "github.com/docker/docker/api/types" typesContainer "github.com/docker/docker/api/types/container" diff --git a/src/go/collectors/go.d.plugin/modules/docker/docker_test.go b/src/go/plugin/go.d/modules/docker/docker_test.go index 8125cd3c1..0ab894420 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/docker_test.go +++ b/src/go/plugin/go.d/modules/docker/docker_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/docker/docker/api/types" typesContainer "github.com/docker/docker/api/types/container" diff --git a/src/go/collectors/go.d.plugin/modules/docker/integrations/docker.md b/src/go/plugin/go.d/modules/docker/integrations/docker.md index 10f00c2d0..cb5452530 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/integrations/docker.md +++ b/src/go/plugin/go.d/modules/docker/integrations/docker.md @@ -1,6 +1,6 @@ <!--startmeta -custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/docker/README.md" -meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/docker/metadata.yaml" +custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/docker/README.md" +meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/docker/metadata.yaml" sidebar_label: "Docker" learn_status: "Published" learn_rel_path: "Collecting Metrics/Containers and VMs" @@ -183,6 +183,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 `docker` 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. @@ -205,4 +207,37 @@ should give you clues as to why the collector isn't working. ./go.d.plugin -d -m docker ``` +### Getting Logs + +If you're encountering problems with the `docker` 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 docker +``` + +#### 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 docker /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 docker +``` + diff --git a/src/go/collectors/go.d.plugin/modules/docker/metadata.yaml b/src/go/plugin/go.d/modules/docker/metadata.yaml index 8fc6853a9..8fc6853a9 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/metadata.yaml +++ b/src/go/plugin/go.d/modules/docker/metadata.yaml diff --git a/src/go/collectors/go.d.plugin/modules/docker/testdata/config.json b/src/go/plugin/go.d/modules/docker/testdata/config.json index 5e687448c..5e687448c 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/testdata/config.json +++ b/src/go/plugin/go.d/modules/docker/testdata/config.json diff --git a/src/go/collectors/go.d.plugin/modules/docker/testdata/config.yaml b/src/go/plugin/go.d/modules/docker/testdata/config.yaml index 2b0f32225..2b0f32225 100644 --- a/src/go/collectors/go.d.plugin/modules/docker/testdata/config.yaml +++ b/src/go/plugin/go.d/modules/docker/testdata/config.yaml diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/README.md b/src/go/plugin/go.d/modules/docker_engine/README.md index f00a4cd97..f00a4cd97 120000 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/README.md +++ b/src/go/plugin/go.d/modules/docker_engine/README.md diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/charts.go b/src/go/plugin/go.d/modules/docker_engine/charts.go index d23f6e780..8a37545ce 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/charts.go +++ b/src/go/plugin/go.d/modules/docker_engine/charts.go @@ -2,7 +2,7 @@ package docker_engine -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/docker_engine/collect.go b/src/go/plugin/go.d/modules/docker_engine/collect.go index 171d58b55..90cd49985 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/collect.go +++ b/src/go/plugin/go.d/modules/docker_engine/collect.go @@ -5,8 +5,8 @@ package docker_engine import ( "fmt" - "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 isDockerEngineMetrics(pms prometheus.Series) bool { diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/config_schema.json b/src/go/plugin/go.d/modules/docker_engine/config_schema.json index a18a8fe86..1e40bb585 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/config_schema.json +++ b/src/go/plugin/go.d/modules/docker_engine/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/docker_engine/docker_engine.go b/src/go/plugin/go.d/modules/docker_engine/docker_engine.go index ea8551236..4f50ecb43 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/docker_engine.go +++ b/src/go/plugin/go.d/modules/docker_engine/docker_engine.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/docker_engine/docker_engine_test.go b/src/go/plugin/go.d/modules/docker_engine/docker_engine_test.go index 193214274..1734f1829 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/docker_engine_test.go +++ b/src/go/plugin/go.d/modules/docker_engine/docker_engine_test.go @@ -8,9 +8,9 @@ import ( "os" "testing" - "github.com/netdata/netdata/go/go.d.plugin/agent/module" - "github.com/netdata/netdata/go/go.d.plugin/pkg/tlscfg" - "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/tlscfg" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/init.go b/src/go/plugin/go.d/modules/docker_engine/init.go index 5e06f545e..5610af9a9 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/init.go +++ b/src/go/plugin/go.d/modules/docker_engine/init.go @@ -4,9 +4,9 @@ package docker_engine 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 (de *DockerEngine) validateConfig() error { diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/integrations/docker_engine.md b/src/go/plugin/go.d/modules/docker_engine/integrations/docker_engine.md index bf1d91129..eaba917e7 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/integrations/docker_engine.md +++ b/src/go/plugin/go.d/modules/docker_engine/integrations/docker_engine.md @@ -1,6 +1,6 @@ <!--startmeta -custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/docker_engine/README.md" -meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/docker_engine/metadata.yaml" +custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/docker_engine/README.md" +meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/docker_engine/metadata.yaml" sidebar_label: "Docker Engine" learn_status: "Published" learn_rel_path: "Collecting Metrics/Containers and VMs" @@ -204,6 +204,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 `docker_engine` 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. @@ -226,4 +228,37 @@ should give you clues as to why the collector isn't working. ./go.d.plugin -d -m docker_engine ``` +### Getting Logs + +If you're encountering problems with the `docker_engine` 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 docker_engine +``` + +#### 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 docker_engine /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 docker_engine +``` + diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/metadata.yaml b/src/go/plugin/go.d/modules/docker_engine/metadata.yaml index 8f81d4e35..8f81d4e35 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/metadata.yaml +++ b/src/go/plugin/go.d/modules/docker_engine/metadata.yaml diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/metrics.go b/src/go/plugin/go.d/modules/docker_engine/metrics.go index 4c84e8398..4c84e8398 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/metrics.go +++ b/src/go/plugin/go.d/modules/docker_engine/metrics.go diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/config.json b/src/go/plugin/go.d/modules/docker_engine/testdata/config.json index 984c3ed6e..984c3ed6e 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/config.json +++ b/src/go/plugin/go.d/modules/docker_engine/testdata/config.json diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/config.yaml b/src/go/plugin/go.d/modules/docker_engine/testdata/config.yaml index 8558b61cc..8558b61cc 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/config.yaml +++ b/src/go/plugin/go.d/modules/docker_engine/testdata/config.yaml diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/non-docker-engine.txt b/src/go/plugin/go.d/modules/docker_engine/testdata/non-docker-engine.txt index e69de29bb..e69de29bb 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/non-docker-engine.txt +++ b/src/go/plugin/go.d/modules/docker_engine/testdata/non-docker-engine.txt diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v17.05.0-ce.txt b/src/go/plugin/go.d/modules/docker_engine/testdata/v17.05.0-ce.txt index 8d175a8e9..8d175a8e9 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v17.05.0-ce.txt +++ b/src/go/plugin/go.d/modules/docker_engine/testdata/v17.05.0-ce.txt diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt b/src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt index edd69abee..edd69abee 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt +++ b/src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce-swarm.txt diff --git a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v18.09.3-ce.txt b/src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce.txt index b54589210..b54589210 100644 --- a/src/go/collectors/go.d.plugin/modules/docker_engine/testdata/v18.09.3-ce.txt +++ b/src/go/plugin/go.d/modules/docker_engine/testdata/v18.09.3-ce.txt diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/README.md b/src/go/plugin/go.d/modules/dockerhub/README.md index 703add4ed..703add4ed 120000 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/README.md +++ b/src/go/plugin/go.d/modules/dockerhub/README.md diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/apiclient.go b/src/go/plugin/go.d/modules/dockerhub/apiclient.go index fa6e1c805..f0da897f8 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/apiclient.go +++ b/src/go/plugin/go.d/modules/dockerhub/apiclient.go @@ -10,7 +10,7 @@ import ( "net/url" "path" - "github.com/netdata/netdata/go/go.d.plugin/pkg/web" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" ) type repository struct { diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/charts.go b/src/go/plugin/go.d/modules/dockerhub/charts.go index 07ba8e18b..78b51eac4 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/charts.go +++ b/src/go/plugin/go.d/modules/dockerhub/charts.go @@ -5,7 +5,7 @@ package dockerhub import ( "strings" - "github.com/netdata/netdata/go/go.d.plugin/agent/module" + "github.com/netdata/netdata/go/plugins/plugin/go.d/agent/module" ) type ( diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/collect.go b/src/go/plugin/go.d/modules/dockerhub/collect.go index 211c1ea7c..211c1ea7c 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/collect.go +++ b/src/go/plugin/go.d/modules/dockerhub/collect.go diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/config_schema.json b/src/go/plugin/go.d/modules/dockerhub/config_schema.json index 47842fd9b..7998516f4 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/config_schema.json +++ b/src/go/plugin/go.d/modules/dockerhub/config_schema.json @@ -187,6 +187,12 @@ "repositories": { "ui:listFlavour": "list" }, + "username": { + "ui:widget": "password" + }, + "proxy_username": { + "ui:widget": "password" + }, "password": { "ui:widget": "password" }, diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/dockerhub.go b/src/go/plugin/go.d/modules/dockerhub/dockerhub.go index 54fcf7dce..37cf64960 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/dockerhub.go +++ b/src/go/plugin/go.d/modules/dockerhub/dockerhub.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/dockerhub/dockerhub_test.go b/src/go/plugin/go.d/modules/dockerhub/dockerhub_test.go index 7036ff7a7..5d8df4cf3 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/dockerhub_test.go +++ b/src/go/plugin/go.d/modules/dockerhub/dockerhub_test.go @@ -9,7 +9,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/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/init.go b/src/go/plugin/go.d/modules/dockerhub/init.go index 245bee1cb..7e502a5a7 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/init.go +++ b/src/go/plugin/go.d/modules/dockerhub/init.go @@ -4,7 +4,7 @@ package dockerhub import ( "errors" - "github.com/netdata/netdata/go/go.d.plugin/pkg/web" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" ) func (dh *DockerHub) validateConfig() error { diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/integrations/docker_hub_repository.md b/src/go/plugin/go.d/modules/dockerhub/integrations/docker_hub_repository.md index 2d833d3c0..72c171d6a 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/integrations/docker_hub_repository.md +++ b/src/go/plugin/go.d/modules/dockerhub/integrations/docker_hub_repository.md @@ -1,6 +1,6 @@ <!--startmeta -custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/dockerhub/README.md" -meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/dockerhub/metadata.yaml" +custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/dockerhub/README.md" +meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/dockerhub/metadata.yaml" sidebar_label: "Docker Hub repository" learn_status: "Published" learn_rel_path: "Collecting Metrics/Containers and VMs" @@ -149,6 +149,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 `dockerhub` 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. @@ -171,4 +173,37 @@ should give you clues as to why the collector isn't working. ./go.d.plugin -d -m dockerhub ``` +### Getting Logs + +If you're encountering problems with the `dockerhub` 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 dockerhub +``` + +#### 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 dockerhub /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 dockerhub +``` + diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/metadata.yaml b/src/go/plugin/go.d/modules/dockerhub/metadata.yaml index 605d6c1cb..605d6c1cb 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/metadata.yaml +++ b/src/go/plugin/go.d/modules/dockerhub/metadata.yaml diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/config.json b/src/go/plugin/go.d/modules/dockerhub/testdata/config.json index 3496e747c..3496e747c 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/config.json +++ b/src/go/plugin/go.d/modules/dockerhub/testdata/config.json diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/config.yaml b/src/go/plugin/go.d/modules/dockerhub/testdata/config.yaml index 20c4ba61b..20c4ba61b 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/config.yaml +++ b/src/go/plugin/go.d/modules/dockerhub/testdata/config.yaml diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo1.txt b/src/go/plugin/go.d/modules/dockerhub/testdata/repo1.txt index b67e2f382..b67e2f382 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo1.txt +++ b/src/go/plugin/go.d/modules/dockerhub/testdata/repo1.txt diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo2.txt b/src/go/plugin/go.d/modules/dockerhub/testdata/repo2.txt index e84ba989b..e84ba989b 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo2.txt +++ b/src/go/plugin/go.d/modules/dockerhub/testdata/repo2.txt diff --git a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo3.txt b/src/go/plugin/go.d/modules/dockerhub/testdata/repo3.txt index 1fc64a9c3..1fc64a9c3 100644 --- a/src/go/collectors/go.d.plugin/modules/dockerhub/testdata/repo3.txt +++ b/src/go/plugin/go.d/modules/dockerhub/testdata/repo3.txt |