Release php_fpm Metricbeat module as GA (elastic#10198)

(cherry picked from commit c5ab27e)
ruflin · Jan 21, 2019 · 5f2077c · 5f2077c
1 parent 107130a
commit 5f2077c
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 21 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -161,6 +161,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Remove experimental tag from ceph metricsets. {pull}9708[9708]
 - Add `key` metricset to the Redis module. {issue}9582[9582] {pull}9657[9657]
 - Add DeDot for kubernetes labels and annotations. {issue}9860[9860] {pull}9939[9939]
+- Release php_fpm module as GA. {pull}10198[10198]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -14479,7 +14479,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
@@ -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
@@ -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
@@ -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
@@ -102,9 +102,9 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-mysql-status,status>>   
 |<<metricbeat-module-nginx,Nginx>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-nginx-stubstatus,stubstatus>>   
-|<<metricbeat-module-php_fpm,PHP_FPM>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.2+| .2+|  |<<metricbeat-metricset-php_fpm-pool,pool>> beta[]  
-|<<metricbeat-metricset-php_fpm-process,process>> beta[]  
+|<<metricbeat-module-php_fpm,PHP_FPM>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.2+| .2+|  |<<metricbeat-metricset-php_fpm-pool,pool>>   
+|<<metricbeat-metricset-php_fpm-process,process>>   
 |<<metricbeat-module-postgresql,PostgreSQL>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .4+| .4+|  |<<metricbeat-metricset-postgresql-activity,activity>>   
 |<<metricbeat-metricset-postgresql-bgwriter,bgwriter>>   

diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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