From 038a6dc675154944bcfd82b1e327617a4cc46b4f Mon Sep 17 00:00:00 2001 From: EamonnTP Date: Thu, 5 Nov 2020 09:30:52 +0000 Subject: [PATCH] fixes fields documentation for php_fpm metricbeat module (#22332) (#22429) Co-authored-by: EamonnTP Co-authored-by: Pavlos Daoglou --- metricbeat/docs/fields.asciidoc | 4 ++-- metricbeat/module/php_fpm/fields.go | 2 +- metricbeat/module/php_fpm/process/_meta/fields.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 5b416375b5a9..9a3597a056ab 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -34408,7 +34408,7 @@ type: keyword *`php_fpm.process.last_request_cpu`*:: + -- -The max amount of memory the last request consumed (it is always 0 if the process is not in Idle state because memory calculation is done when the request processing has terminated) +The CPU percentage the last request consumed. It's always 0 if the process is not in Idle state because CPU calculation is done when the request processing has terminated type: long @@ -34418,7 +34418,7 @@ type: long *`php_fpm.process.last_request_memory`*:: + -- -The content length of the request (only with POST) (of the current request) +The max amount of memory the last request consumed. It's always 0 if the process is not in Idle state because memory calculation is done when the request processing has terminated type: integer diff --git a/metricbeat/module/php_fpm/fields.go b/metricbeat/module/php_fpm/fields.go index 1150b1490933..21813137a90d 100644 --- a/metricbeat/module/php_fpm/fields.go +++ b/metricbeat/module/php_fpm/fields.go @@ -32,5 +32,5 @@ func init() { // AssetPhpFpm returns asset data. // This is the base64 encoded gzipped contents of module/php_fpm. func AssetPhpFpm() string { - return "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" + return "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" } diff --git a/metricbeat/module/php_fpm/process/_meta/fields.yml b/metricbeat/module/php_fpm/process/_meta/fields.yml index 3965caabccec..ffc7fc141dcd 100644 --- a/metricbeat/module/php_fpm/process/_meta/fields.yml +++ b/metricbeat/module/php_fpm/process/_meta/fields.yml @@ -61,8 +61,8 @@ - name: last_request_cpu type: long description: > - The max amount of memory the last request consumed (it is always 0 if the process is not in Idle state because memory calculation is done when the request processing has terminated) + The CPU percentage the last request consumed. It's always 0 if the process is not in Idle state because CPU calculation is done when the request processing has terminated - name: last_request_memory type: integer description: > - The content length of the request (only with POST) (of the current request) + The max amount of memory the last request consumed. It's always 0 if the process is not in Idle state because memory calculation is done when the request processing has terminated