Skip to content

Commit

Permalink
[Metricbeat] Release kvm module as GA (#10279)
Browse files Browse the repository at this point in the history
A follow up issue can be found here #10217 to create docs on how to test this.
  • Loading branch information
ruflin authored Jan 24, 2019
1 parent 0b2a8eb commit 768eb59
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]

This comment has been minimized.

Copy link
@webmat

webmat Jan 24, 2019

Contributor

@ruflin Shouldn't this say "Release kvm module as GA"?

This comment has been minimized.

Copy link
@webmat

webmat Jan 24, 2019

Contributor

Never mind. I see that it's the commit message that's wrong. Saw the beta stuff below

- 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]
Expand Down
1 change: 0 additions & 1 deletion metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -12824,7 +12824,6 @@ Total inodes
[[exported-fields-kvm]]
== kvm fields
experimental[]
kvm module
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/kvm.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/kvm/dommemstat.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]

Expand Down
4 changes: 2 additions & 2 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-kubernetes-state_statefulset,state_statefulset>>
|<<metricbeat-metricset-kubernetes-system,system>>
|<<metricbeat-metricset-kubernetes-volume,volume>>
|<<metricbeat-module-kvm,kvm>> experimental[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-kvm-dommemstat,dommemstat>> experimental[]
|<<metricbeat-module-kvm,kvm>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-kvm-dommemstat,dommemstat>> beta[]
|<<metricbeat-module-logstash,Logstash>> |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-logstash-node,node>>
|<<metricbeat-metricset-logstash-node_stats,node_stats>>
Expand Down
3 changes: 1 addition & 2 deletions metricbeat/module/kvm/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
- key: kvm
title: "kvm"
release: beta
description: >
experimental[]
kvm module
fields:
- name: kvm
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/kvm/dommemstat/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
dommemstat
release: beta
fields:
- name: stat
type: group
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/kvm/dommemstat/dommemstat.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/kvm/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 768eb59

Please sign in to comment.