From abe0f952204a8557b06b5b6df85aab9d21d0601e Mon Sep 17 00:00:00 2001 From: ruflin Date: Fri, 20 Jul 2018 14:42:35 +0200 Subject: [PATCH 1/2] Release munin and treafik module as beta. --- CHANGELOG.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 2 +- metricbeat/docs/modules/munin/node.asciidoc | 2 +- metricbeat/docs/modules/traefik.asciidoc | 2 +- metricbeat/docs/modules_list.asciidoc | 4 ++-- metricbeat/module/munin/_meta/fields.yml | 2 +- metricbeat/module/munin/fields.go | 2 +- metricbeat/module/munin/node/_meta/fields.yml | 2 +- metricbeat/module/munin/node/node.go | 2 +- metricbeat/module/traefik/_meta/fields.yml | 1 + metricbeat/module/traefik/fields.go | 2 +- metricbeat/module/traefik/health/health.go | 2 +- 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index dfef2b349e0..d048c84a7b1 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -314,6 +314,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Run Kafka integration tests on version 1.1.0 {pull}7616[7616] - Release raid and socket metricset from system module as GA. {pull}7658[7658] - Release elasticsearch module and all its metricsets as beta. {pull}7662[7662] +- Release munin and treafik module as beta. {pull}7660[7660] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 15c365785fc..31e67eedde1 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -11066,7 +11066,7 @@ The amount of time spent for commits that occurred while a write lock was held. [[exported-fields-munin]] == Munin fields -experimental[] +beta[] Munin node metrics exporter diff --git a/metricbeat/docs/modules/munin/node.asciidoc b/metricbeat/docs/modules/munin/node.asciidoc index 9e40635bd3f..a485a6a730e 100644 --- a/metricbeat/docs/modules/munin/node.asciidoc +++ b/metricbeat/docs/modules/munin/node.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-munin-node]] === Munin node metricset -experimental[] +beta[] include::../../../module/munin/node/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/traefik.asciidoc b/metricbeat/docs/modules/traefik.asciidoc index 0dfaa5d9759..1082690d5cf 100644 --- a/metricbeat/docs/modules/traefik.asciidoc +++ b/metricbeat/docs/modules/traefik.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-traefik]] == traefik module -experimental[] +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_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index d70f4b00484..b8df7c99250 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -90,7 +90,7 @@ This file is generated! See scripts/docs_collector.py |<> |<> |<> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] | -.1+| .1+| |<> experimental[] +.1+| .1+| |<> beta[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .2+| .2+| |<> experimental[] |<> @@ -128,7 +128,7 @@ This file is generated! See scripts/docs_collector.py |<> |<> |<> -|<> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] | +|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> experimental[] |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | .1+| .1+| |<> beta[] diff --git a/metricbeat/module/munin/_meta/fields.yml b/metricbeat/module/munin/_meta/fields.yml index 35912fe1a71..51772c4aa05 100644 --- a/metricbeat/module/munin/_meta/fields.yml +++ b/metricbeat/module/munin/_meta/fields.yml @@ -1,7 +1,7 @@ - key: munin title: "Munin" description: > - experimental[] + beta[] Munin node metrics exporter release: experimental diff --git a/metricbeat/module/munin/fields.go b/metricbeat/module/munin/fields.go index 3127d2e8870..9beec21ee46 100644 --- a/metricbeat/module/munin/fields.go +++ b/metricbeat/module/munin/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJxszkFqxiAUBOC9pxiyzwVc9AY9QenCxml4VJ+iL9DcvsQE+gfydg4z8s344e6RNxV1gIklekzvx3tyQGRfmlSToh5vDgD4W9kkUy2kj083stGHlkhkWpOlH7XSjM0BjYmh09+mDvgWptj9+GGGhsx/yXG2V3qsrWz1Sh44540ZlqIWRPsN0RnxtSNcnYEMK9Wu+avilDx7/wIAAP//QeFdrA==" + return "eJxsj01qxTAMhPc+xfD2uYAXvUFPULpw4mkQtWVjK9DcvtgJ/YE3K2mYEZ8WfPL0yIeKOsDEEj0er2N/OCCyb02qSVGPFwcAKy28vbs5zxy0RCLTmmwd/KqlGZsDGhNDpx8em2SqheSAD2GK3c8LCzRk/hIM2Vnpsbdy1Nt5gnFp1rAVtSDa/0F0Rqwnwp2ZkGGn2l3/S3GR/PCOF913AAAA//+0BFbI" } diff --git a/metricbeat/module/munin/node/_meta/fields.yml b/metricbeat/module/munin/node/_meta/fields.yml index dd5e036bb81..8033a27f5ac 100644 --- a/metricbeat/module/munin/node/_meta/fields.yml +++ b/metricbeat/module/munin/node/_meta/fields.yml @@ -1 +1 @@ -- release: experimental +- release: beta diff --git a/metricbeat/module/munin/node/node.go b/metricbeat/module/munin/node/node.go index 752a972c990..9fe283db0f0 100644 --- a/metricbeat/module/munin/node/node.go +++ b/metricbeat/module/munin/node/node.go @@ -49,7 +49,7 @@ 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.Experimental("The munin node metricset is experimental.") + cfgwarn.Beta("The munin node metricset is beta.") config := struct { Namespace string `config:"node.namespace" validate:"required"` diff --git a/metricbeat/module/traefik/_meta/fields.yml b/metricbeat/module/traefik/_meta/fields.yml index 80e38036c79..6d59279d47c 100644 --- a/metricbeat/module/traefik/_meta/fields.yml +++ b/metricbeat/module/traefik/_meta/fields.yml @@ -2,6 +2,7 @@ title: "traefik" description: > Traefik reverse proxy / load balancer metrics + release: beta fields: - name: traefik type: group diff --git a/metricbeat/module/traefik/fields.go b/metricbeat/module/traefik/fields.go index 6412dba7df3..db74b6b530e 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 "eJy00TFP8zAQBuA9v+JVl2/qx54BqSMDCCGYK8e+pKaJzzo7Ff33yGnauiEqFYgbfbHvyXtLbGlfIoqi2m4LINrYUonFeLIoAENBi/XRsitxXwDA66ELoR1JIHjhjz3u0LIyqFSrnCZBR1GsDgVQW2pNKIe7SzjVUT4zVdx7KtEI9348mRn7k9Gp8vE5YUOqjZvT8ZziiiTV42EOuIrKOjKohbuj8V8YJ2D1/AByxrN1Mbs/deW23kfb0f9A+qJ9NLbsmknjCjPV2/AguD5FaF2IKS5Yh0CanQmzFKHg2QWahUzDukHyMr432dK1VHKO5v4ixW+DuYGU6qnvKpIU0PGHp7KzQe2a9bCf/us3v5esdiSqoZMDw+asQ2e18NyqcluIKvZhrdlMN3a2cfVOei7EQ2P9B1nCk4w2DLbPAAAA///IQi90" + return "eJy00TGP2kAQBeDev+KJJhVJ7yISZYpEUZSr0Xr9bPawd1aza3T8+5ONAeOzOHSnm3IHZj6/WWPPY46khpXbZ0ByqWGO1fiyyoCS0aoLyYnP8TMDgP+nLpQHaiSCyssRP9CIKVGYxnhLRcukzsYMUDY0kTkKJpMBlWNTxnyYtYY3LaeGvtIxMEet0oXxZYHxEUpf0/VTwo6mSbvL85LijqSv36c9kCIZ51miUmnPxm9x3IDN31+gL4M4nyb/n7umti4k1/J7pL1pn42N+HrWuMPs62kYCKkuETofUx8XnEekFV/GRYoyBvGRi5B5WA9I/o3zZle6l8qUY6W7SfHdYB4g9fWnawtqH9D5g+eyq8Ec6u1wn+7tbz4v2RyopubFgeFyzqN1VmXpVFNbTCZ1cWulnF/sapPimXYpxFNj+wVZIlBHGwbbawAAAP//CW40lQ==" } diff --git a/metricbeat/module/traefik/health/health.go b/metricbeat/module/traefik/health/health.go index 1bd1d7b89f6..a9c58c1d539 100644 --- a/metricbeat/module/traefik/health/health.go +++ b/metricbeat/module/traefik/health/health.go @@ -51,7 +51,7 @@ type MetricSet struct { // New creates a new instance of the MetricSet. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Experimental("The traefik health metricset is experimental.") + cfgwarn.Beta("The traefik health metricset is beta.") http, err := helper.NewHTTP(base) if err != nil { return nil, err From 9f1ee07ab1e906ddef36082503cb523bb862e350 Mon Sep 17 00:00:00 2001 From: ruflin Date: Fri, 20 Jul 2018 16:28:13 +0200 Subject: [PATCH 2/2] fixes to munin module --- CHANGELOG.asciidoc | 2 +- metricbeat/docs/fields.asciidoc | 1 - metricbeat/docs/modules/munin.asciidoc | 2 +- metricbeat/docs/modules_list.asciidoc | 2 +- metricbeat/module/munin/_meta/fields.yml | 4 +--- metricbeat/module/munin/fields.go | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index d048c84a7b1..629227d4115 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -314,7 +314,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff] - Run Kafka integration tests on version 1.1.0 {pull}7616[7616] - Release raid and socket metricset from system module as GA. {pull}7658[7658] - Release elasticsearch module and all its metricsets as beta. {pull}7662[7662] -- Release munin and treafik module as beta. {pull}7660[7660] +- Release munin and traefik module as beta. {pull}7660[7660] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 31e67eedde1..650e2073ad6 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -11066,7 +11066,6 @@ The amount of time spent for commits that occurred while a write lock was held. [[exported-fields-munin]] == Munin fields -beta[] Munin node metrics exporter diff --git a/metricbeat/docs/modules/munin.asciidoc b/metricbeat/docs/modules/munin.asciidoc index 0622fe3405f..08fd4fb272a 100644 --- a/metricbeat/docs/modules/munin.asciidoc +++ b/metricbeat/docs/modules/munin.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-munin]] == Munin module -experimental[] +beta[] This is the munin module. diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index b8df7c99250..cf7d64acb3d 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -89,7 +89,7 @@ This file is generated! See scripts/docs_collector.py .3+| .3+| |<> |<> |<> -|<> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] | +|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | .2+| .2+| |<> experimental[] diff --git a/metricbeat/module/munin/_meta/fields.yml b/metricbeat/module/munin/_meta/fields.yml index 51772c4aa05..83e41a59fa9 100644 --- a/metricbeat/module/munin/_meta/fields.yml +++ b/metricbeat/module/munin/_meta/fields.yml @@ -1,10 +1,8 @@ - key: munin title: "Munin" description: > - beta[] - Munin node metrics exporter - release: experimental + release: beta fields: - name: munin type: group diff --git a/metricbeat/module/munin/fields.go b/metricbeat/module/munin/fields.go index 9beec21ee46..eb4ba984039 100644 --- a/metricbeat/module/munin/fields.go +++ b/metricbeat/module/munin/fields.go @@ -31,5 +31,5 @@ func init() { // Asset returns asset data func Asset() string { - return "eJxsj01qxTAMhPc+xfD2uYAXvUFPULpw4mkQtWVjK9DcvtgJ/YE3K2mYEZ8WfPL0yIeKOsDEEj0er2N/OCCyb02qSVGPFwcAKy28vbs5zxy0RCLTmmwd/KqlGZsDGhNDpx8em2SqheSAD2GK3c8LCzRk/hIM2Vnpsbdy1Nt5gnFp1rAVtSDa/0F0Rqwnwp2ZkGGn2l3/S3GR/PCOF913AAAA//+0BFbI" + return "eJxsjk2qhDAQhPc5ReHeC2TxbvAOEU2NNKOdkLQw3n4wBmaEqV3/FN834snDY9tV1AEmttJj+D/nwQGRdS6STZJ6/DkAaDdoisRGKzJX8JVTMRYHFK4MlR4TLTjgIVxj9a05QsPGD+2MHZkeS0l77psfyCuthjmpBdF6g1dGTAdC/2lyYaFar39bXCZ3z3cAAAD//xiKUG4=" }