Make Traefik metricbeat module GA. (elastic#10166)

(cherry picked from commit 9cc0d08)
ruflin · Jan 21, 2019 · d38fee5 · d38fee5
1 parent 107130a
commit d38fee5
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 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 traefik Metricbeat module as GA. {pull}10166[10166]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/traefik.asciidoc b/metricbeat/docs/modules/traefik.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-traefik]]
 == traefik module
 
-beta[]
-
 This module periodically fetches metrics from a https://traefik.io/[Traefik]
 instance. The Traefik instance must be configured to expose it's HTTP API.
 

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -137,8 +137,8 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-system-socket,socket>>   
 |<<metricbeat-metricset-system-socket_summary,socket_summary>>   
 |<<metricbeat-metricset-system-uptime,uptime>>   
-|<<metricbeat-module-traefik,traefik>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.1+| .1+|  |<<metricbeat-metricset-traefik-health,health>> beta[]  
+|<<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-vsphere,vSphere>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  

diff --git a/metricbeat/module/traefik/_meta/fields.yml b/metricbeat/module/traefik/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "traefik"
   description: >
     Traefik reverse proxy / load balancer metrics
-  release: beta
+  release: ga
   fields:
     - name: traefik
       type: group

diff --git a/metricbeat/module/traefik/fields.go b/metricbeat/module/traefik/fields.go
diff --git a/metricbeat/module/traefik/health/_meta/fields.yml b/metricbeat/module/traefik/health/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Metrics obtained from Traefik's health API endpoint
-  release: beta
+  release: ga
   fields:
     - name: uptime.sec
       type: long

diff --git a/metricbeat/module/traefik/health/health.go b/metricbeat/module/traefik/health/health.go
@@ -21,7 +21,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/elastic/beats/libbeat/common"
-	"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"
@@ -51,7 +50,6 @@ type MetricSet struct {
 
 // New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The traefik health metricset is beta.")
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py @@
     [[metricbeat-metricset-traefik-health]]
     === traefik health metricset
-    beta[]
     include::../../../module/traefik/health/_meta/docs.asciidoc[]
@@ Expand Down @@