Skip to content

Commit

Permalink
Release Metricbeat memcached module as GA (elastic#10199)
Browse files Browse the repository at this point in the history
(cherry picked from commit d62f369)
  • Loading branch information
ruflin committed Jan 21, 2019
1 parent 107130a commit 208d97e
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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 Memcached module as GA. {pull}10199[10199]

*Packetbeat*

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/memcached.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-module-memcached]]
== Memcached module

beta[]

This is the Memcached module. These metricsets were tested with Memcached version 1.4.35.

The default metricset is `stats`.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/memcached/stats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-metricset-memcached-stats]]
=== Memcached stats metricset

beta[]

include::../../../module/memcached/stats/_meta/docs.asciidoc[]


Expand Down
8 changes: 8 additions & 0 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,19 @@ This file is generated! See scripts/docs_collector.py
|<<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[]
<<<<<<< HEAD
|<<metricbeat-module-logstash,Logstash>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.2+| .2+| |<<metricbeat-metricset-logstash-node,node>> beta[]
|<<metricbeat-metricset-logstash-node_stats,node_stats>> beta[]
|<<metricbeat-module-memcached,Memcached>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-memcached-stats,stats>> 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>>
|<<metricbeat-module-memcached,Memcached>> |image:./images/icon-no.png[No prebuilt dashboards] |
.1+| .1+| |<<metricbeat-metricset-memcached-stats,stats>>
>>>>>>> d62f36953... Release Metricbeat memcached module as GA (#10199)
|<<metricbeat-module-mongodb,MongoDB>> |image:./images/icon-yes.png[Prebuilt dashboards are available] |
.5+| .5+| |<<metricbeat-metricset-mongodb-collstats,collstats>>
|<<metricbeat-metricset-mongodb-dbstats,dbstats>>
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/memcached/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
description: >
Memcached module
short_config: false
release: beta
release: ga
fields:
- name: memcached
type: group
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/memcached/fields.go

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

2 changes: 1 addition & 1 deletion metricbeat/module/memcached/stats/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
stats
release: beta
release: ga
fields:
- name: pid
type: long
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/memcached/stats/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
"strings"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/libbeat/common/cfgwarn"
"github.com/elastic/beats/metricbeat/mb"
)

Expand All @@ -38,8 +37,6 @@ type MetricSet struct {
}

func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Beta("The memcached stats metricset is beta")

return &MetricSet{
BaseMetricSet: base,
}, nil
Expand Down

0 comments on commit 208d97e

Please sign in to comment.