Cherry-pick elastic#10164 to 6.x: Make uswgi Metricbeat module GA (el…

…astic#10214) (cherry picked from commit f6ed58c)
ruflin · Jan 21, 2019 · 289e59d · 289e59d
1 parent 0e6189c
commit 289e59d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -165,6 +165,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Add DeDot for kubernetes labels and annotations. {issue}9860[9860] {pull}9939[9939]
 - Release Ceph module as GA. {pull}10202[10202]
 - Release traefik Metricbeat module as GA. {pull}10166[10166]
+- Release uswgi Metricbeat module GA. {pull}10164[10164]
 - 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]

diff --git a/metricbeat/docs/modules/uwsgi.asciidoc b/metricbeat/docs/modules/uwsgi.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-uwsgi]]
 == uwsgi module
 
-beta[]
-
 This is the uwsgi module. By default collects the `stats` metricset, using
 http://uwsgi-docs.readthedocs.io/en/latest/StatsServer.html[StatsServer].
 

diff --git a/metricbeat/docs/modules/uwsgi/status.asciidoc b/metricbeat/docs/modules/uwsgi/status.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-uwsgi-status]]
 === uwsgi status metricset
 
-beta[]
-
 include::../../../module/uwsgi/status/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -139,8 +139,8 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-system-uptime,uptime>>   
 |<<metricbeat-module-traefik,traefik>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-traefik-health,health>>   
-|<<metricbeat-module-uwsgi,uwsgi>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.1+| .1+|  |<<metricbeat-metricset-uwsgi-status,status>> beta[]  
+|<<metricbeat-module-uwsgi,uwsgi>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
+.1+| .1+|  |<<metricbeat-metricset-uwsgi-status,status>>   
 |<<metricbeat-module-vsphere,vSphere>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .3+| .3+|  |<<metricbeat-metricset-vsphere-datastore,datastore>> beta[]  
 |<<metricbeat-metricset-vsphere-host,host>> beta[]  

diff --git a/metricbeat/module/uwsgi/_meta/fields.yml b/metricbeat/module/uwsgi/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "uwsgi"
   description: >
     uwsgi module
-  release: beta
+  release: ga
   fields:
     - name: uwsgi
       type: group

diff --git a/metricbeat/module/uwsgi/fields.go b/metricbeat/module/uwsgi/fields.go
diff --git a/metricbeat/module/uwsgi/status/_meta/fields.yml b/metricbeat/module/uwsgi/status/_meta/fields.yml
@@ -1,6 +1,6 @@
 - name: status
   type: group
-  release: beta
+  release: ga
   description: >
     uwsgi.status metricset fields
   fields:

diff --git a/metricbeat/module/uwsgi/status/status.go b/metricbeat/module/uwsgi/status/status.go
@@ -26,7 +26,6 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 
 	"github.com/elastic/beats/libbeat/common"
@@ -48,7 +47,6 @@ type MetricSet struct {
 
 // New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The uWSGI status metricset is beta")
 	return &MetricSet{BaseMetricSet: base}, nil
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py @@
     [[metricbeat-metricset-uwsgi-status]]
     === uwsgi status metricset
-    beta[]
     include::../../../module/uwsgi/status/_meta/docs.asciidoc[]
@@ Expand Down @@