diff options
Diffstat (limited to '')
l--------- | src/go/plugin/go.d/modules/phpfpm/README.md (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/README.md) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/charts.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/charts.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/client.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/client.go) | 4 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/collect.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/collect.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/config_schema.json (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/config_schema.json) | 6 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/decode.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/decode.go) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/init.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/init.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/integrations/php-fpm.md (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/integrations/php-fpm.md) | 39 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/metadata.yaml (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/metadata.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/phpfpm.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/phpfpm.go) | 4 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/phpfpm_test.go (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/phpfpm_test.go) | 2 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/config.json (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/config.yaml (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.yaml) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/status-full-no-idle.json (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full-no-idle.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/status-full.json (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/status-full.txt (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.txt) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/status.json (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.json) | 0 | ||||
-rw-r--r-- | src/go/plugin/go.d/modules/phpfpm/testdata/status.txt (renamed from src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.txt) | 0 |
18 files changed, 51 insertions, 10 deletions
diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/README.md b/src/go/plugin/go.d/modules/phpfpm/README.md index 2953ff4df..2953ff4df 120000 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/README.md +++ b/src/go/plugin/go.d/modules/phpfpm/README.md diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/charts.go b/src/go/plugin/go.d/modules/phpfpm/charts.go index 6b69d4c78..2e1e35cf3 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/charts.go +++ b/src/go/plugin/go.d/modules/phpfpm/charts.go @@ -2,7 +2,7 @@ package phpfpm -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 is an alias for module.Charts diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/client.go b/src/go/plugin/go.d/modules/phpfpm/client.go index 5d72041ed..4e8e8cec8 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/client.go +++ b/src/go/plugin/go.d/modules/phpfpm/client.go @@ -11,8 +11,8 @@ import ( "strconv" "time" - "github.com/netdata/netdata/go/go.d.plugin/logger" - "github.com/netdata/netdata/go/go.d.plugin/pkg/web" + "github.com/netdata/netdata/go/plugins/logger" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" fcgiclient "github.com/kanocz/fcgi_client" ) diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/collect.go b/src/go/plugin/go.d/modules/phpfpm/collect.go index f720252a8..08a3b9f61 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/collect.go +++ b/src/go/plugin/go.d/modules/phpfpm/collect.go @@ -5,7 +5,7 @@ package phpfpm import ( "math" - "github.com/netdata/netdata/go/go.d.plugin/pkg/stm" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/stm" ) func (p *Phpfpm) collect() (map[string]int64, error) { diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/config_schema.json b/src/go/plugin/go.d/modules/phpfpm/config_schema.json index 252d8a083..81b4005af 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/config_schema.json +++ b/src/go/plugin/go.d/modules/phpfpm/config_schema.json @@ -149,6 +149,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/phpfpm/decode.go b/src/go/plugin/go.d/modules/phpfpm/decode.go index 021e1fb4c..021e1fb4c 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/decode.go +++ b/src/go/plugin/go.d/modules/phpfpm/decode.go diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/init.go b/src/go/plugin/go.d/modules/phpfpm/init.go index 33fbc540d..5615012f0 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/init.go +++ b/src/go/plugin/go.d/modules/phpfpm/init.go @@ -7,7 +7,7 @@ import ( "fmt" "os" - "github.com/netdata/netdata/go/go.d.plugin/pkg/web" + "github.com/netdata/netdata/go/plugins/plugin/go.d/pkg/web" ) func (p *Phpfpm) initClient() (client, error) { diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/integrations/php-fpm.md b/src/go/plugin/go.d/modules/phpfpm/integrations/php-fpm.md index 33e0d7a93..1839d00d6 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/integrations/php-fpm.md +++ b/src/go/plugin/go.d/modules/phpfpm/integrations/php-fpm.md @@ -1,6 +1,6 @@ <!--startmeta -custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/phpfpm/README.md" -meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/collectors/go.d.plugin/modules/phpfpm/metadata.yaml" +custom_edit_url: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/phpfpm/README.md" +meta_yaml: "https://github.com/netdata/netdata/edit/master/src/go/plugin/go.d/modules/phpfpm/metadata.yaml" sidebar_label: "PHP-FPM" learn_status: "Published" learn_rel_path: "Collecting Metrics/Web Servers and Web Proxies" @@ -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 `phpfpm` 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 phpfpm ``` +### Getting Logs + +If you're encountering problems with the `phpfpm` 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 phpfpm +``` + +#### 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 phpfpm /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 phpfpm +``` + diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/metadata.yaml b/src/go/plugin/go.d/modules/phpfpm/metadata.yaml index 739e7b7b8..739e7b7b8 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/metadata.yaml +++ b/src/go/plugin/go.d/modules/phpfpm/metadata.yaml diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/phpfpm.go b/src/go/plugin/go.d/modules/phpfpm/phpfpm.go index bff4d06c1..76057c8f9 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/phpfpm.go +++ b/src/go/plugin/go.d/modules/phpfpm/phpfpm.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/phpfpm/phpfpm_test.go b/src/go/plugin/go.d/modules/phpfpm/phpfpm_test.go index 8b44c64af..b089c1ef8 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/phpfpm_test.go +++ b/src/go/plugin/go.d/modules/phpfpm/phpfpm_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/phpfpm/testdata/config.json b/src/go/plugin/go.d/modules/phpfpm/testdata/config.json index 458343f74..458343f74 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.json +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/config.json diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.yaml b/src/go/plugin/go.d/modules/phpfpm/testdata/config.yaml index 6c7bea094..6c7bea094 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/config.yaml +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/config.yaml diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full-no-idle.json b/src/go/plugin/go.d/modules/phpfpm/testdata/status-full-no-idle.json index e5b63accd..e5b63accd 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full-no-idle.json +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/status-full-no-idle.json diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.json b/src/go/plugin/go.d/modules/phpfpm/testdata/status-full.json index 456f6253e..456f6253e 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.json +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/status-full.json diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.txt b/src/go/plugin/go.d/modules/phpfpm/testdata/status-full.txt index a5e90987c..a5e90987c 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status-full.txt +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/status-full.txt diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.json b/src/go/plugin/go.d/modules/phpfpm/testdata/status.json index 80af3e0bc..80af3e0bc 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.json +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/status.json diff --git a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.txt b/src/go/plugin/go.d/modules/phpfpm/testdata/status.txt index 08dc158fb..08dc158fb 100644 --- a/src/go/collectors/go.d.plugin/modules/phpfpm/testdata/status.txt +++ b/src/go/plugin/go.d/modules/phpfpm/testdata/status.txt |