From 768eb591034295d608a7901fbcebb32af953ab52 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Thu, 24 Jan 2019 13:10:37 +0100 Subject: [PATCH] [Metricbeat] Release kvm module as GA (#10279) A follow up issue can be found here https://github.com/elastic/beats/issues/10217 to create docs on how to test this. --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/fields.asciidoc | 1 - metricbeat/docs/modules/kvm.asciidoc | 2 +- metricbeat/docs/modules/kvm/dommemstat.asciidoc | 2 +- metricbeat/docs/modules_list.asciidoc | 4 ++-- metricbeat/module/kvm/_meta/fields.yml | 3 +-- metricbeat/module/kvm/dommemstat/_meta/fields.yml | 1 + metricbeat/module/kvm/dommemstat/dommemstat.go | 6 +++--- metricbeat/module/kvm/fields.go | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 95d226c6ca5..f9a3c976d98 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -212,6 +212,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Release RabbitMQ Metricbeat module GA. {pull}10165[10165] - Release Dropwizard module as GA. {pull}10240[10240] - Release Graphite module as GA. {pull}10240[10240] +- Release kvm module as beta. {pull}10279[10279] - Release http.server metricset as GA. {pull}10240[10240] - Release Nats module as GA. {pull}10281[10281] - Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222] diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index cdc921bdb89..5414f9457f2 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -12824,7 +12824,6 @@ Total inodes [[exported-fields-kvm]] == kvm fields -experimental[] kvm module diff --git a/metricbeat/docs/modules/kvm.asciidoc b/metricbeat/docs/modules/kvm.asciidoc index 0f2fbdef32f..fb10fef7810 100644 --- a/metricbeat/docs/modules/kvm.asciidoc +++ b/metricbeat/docs/modules/kvm.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-kvm]] == kvm module -experimental[] +beta[] This is the kvm module. diff --git a/metricbeat/docs/modules/kvm/dommemstat.asciidoc b/metricbeat/docs/modules/kvm/dommemstat.asciidoc index 825d2d899bd..317b2329da4 100644 --- a/metricbeat/docs/modules/kvm/dommemstat.asciidoc +++ b/metricbeat/docs/modules/kvm/dommemstat.asciidoc @@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-kvm-dommemstat]] === kvm dommemstat metricset -experimental[] +beta[] include::../../../module/kvm/dommemstat/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 235d7b1a94b..6e0d3121cab 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -83,8 +83,8 @@ This file is generated! See scripts/docs_collector.py |<> |<> |<> -|<> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] | -.1+| .1+| |<> experimental[] +|<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | +.1+| .1+| |<> beta[] |<> |image:./images/icon-no.png[No prebuilt dashboards] | .2+| .2+| |<> |<> diff --git a/metricbeat/module/kvm/_meta/fields.yml b/metricbeat/module/kvm/_meta/fields.yml index 396dfdd95f6..fd6242244a9 100644 --- a/metricbeat/module/kvm/_meta/fields.yml +++ b/metricbeat/module/kvm/_meta/fields.yml @@ -1,8 +1,7 @@ - key: kvm title: "kvm" + release: beta description: > - experimental[] - kvm module fields: - name: kvm diff --git a/metricbeat/module/kvm/dommemstat/_meta/fields.yml b/metricbeat/module/kvm/dommemstat/_meta/fields.yml index 7281ea7093d..55fe1481deb 100644 --- a/metricbeat/module/kvm/dommemstat/_meta/fields.yml +++ b/metricbeat/module/kvm/dommemstat/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > dommemstat + release: beta fields: - name: stat type: group diff --git a/metricbeat/module/kvm/dommemstat/dommemstat.go b/metricbeat/module/kvm/dommemstat/dommemstat.go index 7125ccfedc7..0d03096c468 100644 --- a/metricbeat/module/kvm/dommemstat/dommemstat.go +++ b/metricbeat/module/kvm/dommemstat/dommemstat.go @@ -22,13 +22,14 @@ import ( "net/url" "time" + "github.com/elastic/beats/libbeat/common/cfgwarn" + "github.com/pkg/errors" "github.com/digitalocean/go-libvirt" "github.com/digitalocean/go-libvirt/libvirttest" "github.com/elastic/beats/libbeat/common" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" ) @@ -65,8 +66,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 kvm dommemstat metricset is experimental.") - + cfgwarn.Beta("The kvm dommemstat metricset is beta.") u, err := url.Parse(base.HostData().URI) if err != nil { return nil, err diff --git a/metricbeat/module/kvm/fields.go b/metricbeat/module/kvm/fields.go index 6e09fb4c5b8..9b4f2e7e211 100644 --- a/metricbeat/module/kvm/fields.go +++ b/metricbeat/module/kvm/fields.go @@ -32,5 +32,5 @@ func init() { // AssetKvm returns asset data. // This is the base64 encoded gzipped contents of ../metricbeat/module/kvm. func AssetKvm() string { - return "eJyskLFuwyAQhnee4lf2vABDp659gqoDKtcIwXEWxm799lXcUCXOBXcogwcOfd/nOyLSYhFnNkANNZHFIc58MICn8b2EoQbJFk8GAOhroBKYcnXp9c2sd3FmsPgpkQE+AiU/2nVwRHZMDX4+dRnI4lRkGi43iuMWcg3ywkw8Vld/RxrzIfcy0ihb5a1487gn3tX/nBdiKYsO1luue85fZdyaIi2fUrz6YrdsU/fI1VJml6ZeS5J8+p8QzdQqwv3PdvS76mdhF/I9tbv//u7/6lzR3wEAAP//jl7YkQ==" + return "eJyskDFuwzAMRXed4iN7LqChU9ceQq3YQLBoGrLsQrcvnEZFotByh3Lw4G+//8gzBioWw8oGyCFHsjgNK58MkCiSm8ninbIzgKf5I4UpBxktXgyA7T+w+CWSAT4DRT/ba3DG6JgqeJtcJrK4JFmm2xuF9wi5B3lhJp6zy7+Rxtzl3iKN0u5Zp1V5FGogPaFDrZ95I5ZUdLDucu+zPZW4Og1UviR59YtDs8Zur6uqrC4uPZco4+V/RLSmahGel+3UH1a/CrswPlO79+/f/q+dV/R3AAAA///hct15" }