diff --git a/packages/php_fpm/changelog.yml b/packages/php_fpm/changelog.yml index 2b4a77737b6..99257c27747 100644 --- a/packages/php_fpm/changelog.yml +++ b/packages/php_fpm/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "0.6.1" + changes: + - description: Add metric_type for pool and process data streams. + type: enhancement + link: https://github.com/elastic/integrations/pull/7527 - version: "0.6.0" changes: - description: Add service.address field and update dashboard. diff --git a/packages/php_fpm/data_stream/pool/fields/fields.yml b/packages/php_fpm/data_stream/pool/fields/fields.yml index dd415d25df1..c0956a8ecfd 100644 --- a/packages/php_fpm/data_stream/pool/fields/fields.yml +++ b/packages/php_fpm/data_stream/pool/fields/fields.yml @@ -49,6 +49,7 @@ - name: children_reached.max type: long description: Has the maximum number of processes ever been reached? If so the displayed value is 1 otherwise the value is 0. + metric_type: gauge - name: count type: long description: The current total number of processes. @@ -69,4 +70,3 @@ - name: start_time type: long description: The date/time that the process pool was last started. - metric_type: counter diff --git a/packages/php_fpm/data_stream/process/fields/fields.yml b/packages/php_fpm/data_stream/process/fields/fields.yml index ec64f1ebbe3..2f4b4e981b2 100644 --- a/packages/php_fpm/data_stream/process/fields/fields.yml +++ b/packages/php_fpm/data_stream/process/fields/fields.yml @@ -31,6 +31,7 @@ type: long description: The maximum amount of memory consumed by the last request. This will be 0 if the process is not Idle because the calculation is done when the request processing is complete. metric_type: gauge + unit: byte - name: script type: keyword description: The full path of the script executed by the last request. This will be '-' if not applicable (eg. status page requests). diff --git a/packages/php_fpm/docs/README.md b/packages/php_fpm/docs/README.md index 0188d7202ca..9a891af8f14 100644 --- a/packages/php_fpm/docs/README.md +++ b/packages/php_fpm/docs/README.md @@ -243,12 +243,12 @@ An example event for `pool` looks as following: | php_fpm.pool.process_manager.type | The process manager type - static, dynamic or ondemand. | keyword | | | | php_fpm.pool.processes.active.count | The number of processes that are currently processing requests. | long | | gauge | | php_fpm.pool.processes.active.max | The maximum number of concurrently active processes. | long | | gauge | -| php_fpm.pool.processes.children_reached.max | Has the maximum number of processes ever been reached? If so the displayed value is 1 otherwise the value is 0. | long | | | +| php_fpm.pool.processes.children_reached.max | Has the maximum number of processes ever been reached? If so the displayed value is 1 otherwise the value is 0. | long | | gauge | | php_fpm.pool.processes.count | The current total number of processes. | long | | gauge | | php_fpm.pool.processes.idle | The number of processes that are currently idle (waiting for requests). | long | | gauge | | php_fpm.pool.slow_requests | The total number of requests that have hit the configured request_slowlog_timeout. | long | | counter | | php_fpm.pool.start_since | The time in seconds since the process pool was last started. | long | s | counter | -| php_fpm.pool.start_time | The date/time that the process pool was last started. | long | | counter | +| php_fpm.pool.start_time | The date/time that the process pool was last started. | long | | | | service.address | Address where data about this service was collected from. This should be a URI, network address (ipv4:port or [ipv6]:port) or a resource path (sockets). | keyword | | | | tags | List of keywords used to tag each event. | keyword | | | @@ -373,7 +373,7 @@ An example event for `process` looks as following: | php_fpm.process.request.count | The total number of requests served. | long | | counter | | php_fpm.process.request.duration | The duration in microseconds of the requests. | long | micros | gauge | | php_fpm.process.request.last.cpu.pct | The %cpu of the last request. This will be 0 if the process is not Idle because the calculation is done when the request processing is complete. | long | percent | gauge | -| php_fpm.process.request.last.memory | The maximum amount of memory consumed by the last request. This will be 0 if the process is not Idle because the calculation is done when the request processing is complete. | long | | gauge | +| php_fpm.process.request.last.memory | The maximum amount of memory consumed by the last request. This will be 0 if the process is not Idle because the calculation is done when the request processing is complete. | long | byte | gauge | | php_fpm.process.script | The full path of the script executed by the last request. This will be '-' if not applicable (eg. status page requests). | keyword | | | | php_fpm.process.start_since | The number of seconds since the process started. | long | s | counter | | php_fpm.process.start_time | The date/time at which the process started. | long | | | diff --git a/packages/php_fpm/manifest.yml b/packages/php_fpm/manifest.yml index 62e094c009e..b8f1f09d3f0 100644 --- a/packages/php_fpm/manifest.yml +++ b/packages/php_fpm/manifest.yml @@ -1,7 +1,7 @@ format_version: 2.0.0 name: php_fpm title: PHP-FPM -version: "0.6.0" +version: "0.6.1" description: This Elastic integration collects metrics from PHP-FPM. type: integration categories: