From b481d38351e822b916d009f184b36cdb65837503 Mon Sep 17 00:00:00 2001 From: beats-jenkins Date: Fri, 18 Jan 2019 13:01:09 +0100 Subject: [PATCH 1/2] Make Traefik metricbeat module GA. --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/traefik.asciidoc | 2 -- metricbeat/docs/modules/traefik/health.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 4 ++-- metricbeat/module/traefik/_meta/fields.yml | 2 +- metricbeat/module/traefik/fields.go | 2 +- metricbeat/module/traefik/health/_meta/fields.yml | 2 +- metricbeat/module/traefik/health/health.go | 2 -- 8 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index d693c34ad9c..e4bfff2dca9 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -149,6 +149,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add more meaningful metrics to 'performance' Metricset on 'MSSQL' module {pull}10011[10011] - Rename some fields in `performance` Metricset on MSSQL module to match the updated documentation from Microsoft {pull}10074[10074] - Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300] +- Make traefik Metricbeat module GA. {pull}[] *Packetbeat* diff --git a/metricbeat/docs/modules/traefik.asciidoc b/metricbeat/docs/modules/traefik.asciidoc index 1082690d5cf..c057bececf0 100644 --- 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 index 2d22737aafa..8b55bd98e60 100644 --- 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 index abb46f8b498..3ed1b187e86 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -141,8 +141,8 @@ This file is generated! See scripts/docs_collector.py |<> |<> |<> -|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | -.1+| .1+| |<> beta[] +|<> |image:./images/icon-no.png[No prebuilt dashboards] | +.1+| .1+| |<> |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | .1+| .1+| |<> beta[] |<> 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 index 6d59279d47c..1714720645e 100644 --- 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 index eaa144bfc1d..d47c61ece26 100644 --- a/metricbeat/module/traefik/fields.go +++ b/metricbeat/module/traefik/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJy00TFv2zAUBOBdv+LgpUABu7uGAh47tCiKZjYo6iQzlkiCjzLifx9QlhxZURwjQW7ks8lP99Y48JQjBsXKHDIgmtgwx2o4WWVASdHB+GiczfEzA4D/5ykCjwxC+OCeTviBxqkShWqU1QxoGYPRkgGBDZUwR8GoMqAybErJ+7vWsKrl1JAST5456uA6P5wsMD5CSZk+PyXsqZq4vxwvKW5IUn6f34ErojKWJarg2tH4TYYXsP37C7Sld8bGyf/nNY2Ze6fmzkfTciPUV+PR3jhbzwY3+CkP/YVw1aVaYyWmGmEshNrZUhYpgeKdFS5C5iXeIfk33Dfb3q1Wphztuqt23y3mDlLKn64tGFJB4wfPZS8Gdax3/X6617/5vGR7ZFA1Lw70mzMWrdHBLa1qapOoYic77UrK5vubPFc8Ui/1eB7svqBOeIaBh8TLngMAAP//pbo7gQ==" + return "eJy00bFu2zAQBuBdT/HDS4ECdncNBTx2aFEUzWxQ1ElmLPGIO8qI3z6gLDmyojhGgtzIo3if/lvjQKccUQxV7pAB0cWGcqyGk1UGlKRWXIiOfY6fGQD8P3chdCRRQhB+OuEHGjYlCtMYb0nQUhRnNQOEGjJKOWqTAZWjptS8f2kNb1qaClLFU0iXhbswnCwgPgJJNR0/JezJNHF/OV5S3JCk+n2eAy6icZ5KVMLtaPymwwRs//4C+TKw83Hy/XVIY821U3EXomtpo2Sv2qO8YV/PGjfwqR76B8HVJVjnNaYQ4TyULPtSFylCGtgrLULmEd4h+Te8N9vdrVSmHMvdVbbvBnMHKdWfri1IUkDjD89lLwZzrHf9frrXdz4v2R5JTE0XB/rNOY/WWeGlVU1tGk3sdGe5JN18f5PHxSPZpRzPjd0XxIlAMvCQeNlzAAAA//9iMTnZ" } diff --git a/metricbeat/module/traefik/health/_meta/fields.yml b/metricbeat/module/traefik/health/_meta/fields.yml index 339e019e6ac..b56cc8abefd 100644 --- 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 index a9c58c1d539..78d04438ef5 100644 --- 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 From cc92fc2ba6f566a5e988ab43cb3c106f7f3b0b9d Mon Sep 17 00:00:00 2001 From: Jaime Soriano Pastor Date: Fri, 18 Jan 2019 14:38:11 +0100 Subject: [PATCH 2/2] Update CHANGELOG.next.asciidoc Co-Authored-By: ruflin --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e4bfff2dca9..d3b07fdbe65 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -149,7 +149,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Add more meaningful metrics to 'performance' Metricset on 'MSSQL' module {pull}10011[10011] - Rename some fields in `performance` Metricset on MSSQL module to match the updated documentation from Microsoft {pull}10074[10074] - Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300] -- Make traefik Metricbeat module GA. {pull}[] +- Release traefik Metricbeat module as GA. {pull}10166[10166] *Packetbeat*