diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 2fe7cc6ca89..8bab169cd14 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -169,6 +169,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300] - Release traefik Metricbeat module as GA. {pull}10166[10166] - Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094] +- Release php_fpm module as GA. {pull}10198[10198] - Release Memcached module as GA. {pull}10199[10199] - Release etcd module as GA. {pull}10200[10200] - Release Ceph module as GA. {pull}10202[10202] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index d93bb79bfd7..a2fc89f0ea4 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -17644,7 +17644,6 @@ The current number of idle client connections waiting for a request. [[exported-fields-php_fpm]] == PHP_FPM fields -beta[] PHP-FPM server status metrics collected from PHP-FPM. diff --git a/metricbeat/docs/modules/php_fpm.asciidoc b/metricbeat/docs/modules/php_fpm.asciidoc index 03ec8850b18..881eb63c074 100644 --- a/metricbeat/docs/modules/php_fpm.asciidoc +++ b/metricbeat/docs/modules/php_fpm.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-php_fpm]] == PHP_FPM module -beta[] - This module periodically fetches metrics from https://php-fpm.org[PHP-FPM] servers. diff --git a/metricbeat/docs/modules/php_fpm/pool.asciidoc b/metricbeat/docs/modules/php_fpm/pool.asciidoc index a8ef44c3535..96e024a7a75 100644 --- a/metricbeat/docs/modules/php_fpm/pool.asciidoc +++ b/metricbeat/docs/modules/php_fpm/pool.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-php_fpm-pool]] === PHP_FPM pool metricset -beta[] - include::../../../module/php_fpm/pool/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/php_fpm/process.asciidoc b/metricbeat/docs/modules/php_fpm/process.asciidoc index 4bef09efaef..93cdf94cfc3 100644 --- a/metricbeat/docs/modules/php_fpm/process.asciidoc +++ b/metricbeat/docs/modules/php_fpm/process.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-php_fpm-process]] === PHP_FPM process metricset -beta[] - include::../../../module/php_fpm/process/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 280002e90e5..62d41d26599 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -107,9 +107,9 @@ This file is generated! See scripts/docs_collector.py |<> experimental[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .1+| .1+| |<> -|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | -.2+| .2+| |<> beta[] -|<> beta[] +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.2+| .2+| |<> +|<> |<> |image:./images/icon-no.png[No prebuilt dashboards] | .4+| .4+| |<> |<> diff --git a/metricbeat/module/php_fpm/_meta/fields.yml b/metricbeat/module/php_fpm/_meta/fields.yml index f96be763217..7784d1a376c 100644 --- a/metricbeat/module/php_fpm/_meta/fields.yml +++ b/metricbeat/module/php_fpm/_meta/fields.yml @@ -1,11 +1,9 @@ - key: php_fpm title: "PHP_FPM" description: > - beta[] - PHP-FPM server status metrics collected from PHP-FPM. short_config: false - release: beta + release: ga settings: ["ssl", "http"] fields: - name: php_fpm @@ -18,7 +16,6 @@ type: group description: > `pool` contains the metrics that were obtained from the PHP-FPM process pool. - release: beta fields: - name: name type: keyword diff --git a/metricbeat/module/php_fpm/fields.go b/metricbeat/module/php_fpm/fields.go index e3d93fcbca0..1a45ac03155 100644 --- a/metricbeat/module/php_fpm/fields.go +++ b/metricbeat/module/php_fpm/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "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" + return "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" } diff --git a/metricbeat/module/php_fpm/pool/_meta/fields.yml b/metricbeat/module/php_fpm/pool/_meta/fields.yml index cd996a2b8ea..500c49d78d7 100644 --- a/metricbeat/module/php_fpm/pool/_meta/fields.yml +++ b/metricbeat/module/php_fpm/pool/_meta/fields.yml @@ -3,7 +3,7 @@ description: > `pool` contains the metrics that were obtained from the PHP-FPM process pool. - release: beta + release: ga fields: - name: process_manager type: keyword diff --git a/metricbeat/module/php_fpm/pool/pool.go b/metricbeat/module/php_fpm/pool/pool.go index b9f0e4c2008..2fe4cad0a2f 100644 --- a/metricbeat/module/php_fpm/pool/pool.go +++ b/metricbeat/module/php_fpm/pool/pool.go @@ -20,7 +20,6 @@ package pool import ( "encoding/json" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/module/php_fpm" @@ -42,7 +41,6 @@ type MetricSet struct { // New create a new instance of the MetricSet func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The php_fpm pool metricset is beta") http, err := helper.NewHTTP(base) if err != nil { return nil, err diff --git a/metricbeat/module/php_fpm/process/_meta/fields.yml b/metricbeat/module/php_fpm/process/_meta/fields.yml index 4b096fa214f..284b96fd148 100644 --- a/metricbeat/module/php_fpm/process/_meta/fields.yml +++ b/metricbeat/module/php_fpm/process/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > process contains the metrics that were obtained from the PHP-FPM process. - release: beta + release: ga fields: - name: pid type: integer diff --git a/metricbeat/module/php_fpm/process/process.go b/metricbeat/module/php_fpm/process/process.go index 3df6e74c4c5..6774d91b4f9 100644 --- a/metricbeat/module/php_fpm/process/process.go +++ b/metricbeat/module/php_fpm/process/process.go @@ -20,7 +20,6 @@ package process import ( "net/url" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/helper" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/metricbeat/mb/parse" @@ -47,7 +46,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The php_fpm process metricset is beta") http, err := helper.NewHTTP(base) if err != nil { return nil, err