[Metricbeat] Release ceph module as GA (#10202)

elastic · Jan 21, 2019 · 4edb246 · 4edb246
1 parent 48e21af
commit 4edb246
Show file tree

Hide file tree

Showing 26 changed files with 18 additions and 54 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -169,6 +169,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add AWS EC2 module. {pull}9257[9257] {issue}9300[9300]
 - Release traefik Metricbeat module as GA. {pull}10166[10166]
 - Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094]
+- Release Ceph module as GA. {pull}10202[10202]
 - Release aerospike module as GA. {pull}10203[10203]
 
 *Packetbeat*

diff --git a/metricbeat/docs/modules/ceph.asciidoc b/metricbeat/docs/modules/ceph.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-ceph]]
 == Ceph module
 
-beta[]
-
 The Ceph module collects metrics by submitting HTTP GET requests to
 the http://docs.ceph.com/docs/master/man/8/ceph-rest-api/[ceph-rest-api]. The default metricsets are `cluster_disk`, `cluster_health`, `monitor_health`, `pool_disk`, `osd_tree`.
 

diff --git a/metricbeat/docs/modules/ceph/cluster_disk.asciidoc b/metricbeat/docs/modules/ceph/cluster_disk.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-cluster_disk]]
 === Ceph cluster_disk metricset
 
-beta[]
-
 include::../../../module/ceph/cluster_disk/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/ceph/cluster_health.asciidoc b/metricbeat/docs/modules/ceph/cluster_health.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-cluster_health]]
 === Ceph cluster_health metricset
 
-beta[]
-
 include::../../../module/ceph/cluster_health/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/ceph/cluster_status.asciidoc b/metricbeat/docs/modules/ceph/cluster_status.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-cluster_status]]
 === Ceph cluster_status metricset
 
-beta[]
-
 include::../../../module/ceph/cluster_status/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/ceph/monitor_health.asciidoc b/metricbeat/docs/modules/ceph/monitor_health.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-monitor_health]]
 === Ceph monitor_health metricset
 
-beta[]
-
 include::../../../module/ceph/monitor_health/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/ceph/osd_df.asciidoc b/metricbeat/docs/modules/ceph/osd_df.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-osd_df]]
 === Ceph osd_df metricset
 
-beta[]
-
 include::../../../module/ceph/osd_df/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/ceph/osd_tree.asciidoc b/metricbeat/docs/modules/ceph/osd_tree.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-osd_tree]]
 === Ceph osd_tree metricset
 
-beta[]
-
 include::../../../module/ceph/osd_tree/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules/ceph/pool_disk.asciidoc b/metricbeat/docs/modules/ceph/pool_disk.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-ceph-pool_disk]]
 === Ceph pool_disk metricset
 
-beta[]
-
 include::../../../module/ceph/pool_disk/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -9,14 +9,14 @@ This file is generated! See scripts/docs_collector.py
 .1+| .1+|  |<<metricbeat-metricset-aerospike-namespace,namespace>>   
 |<<metricbeat-module-apache,Apache>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-apache-status,status>>   
-|<<metricbeat-module-ceph,Ceph>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.7+| .7+|  |<<metricbeat-metricset-ceph-cluster_disk,cluster_disk>> beta[]  
-|<<metricbeat-metricset-ceph-cluster_health,cluster_health>> beta[]  
-|<<metricbeat-metricset-ceph-cluster_status,cluster_status>> beta[]  
-|<<metricbeat-metricset-ceph-monitor_health,monitor_health>> beta[]  
-|<<metricbeat-metricset-ceph-osd_df,osd_df>> beta[]  
-|<<metricbeat-metricset-ceph-osd_tree,osd_tree>> beta[]  
-|<<metricbeat-metricset-ceph-pool_disk,pool_disk>> beta[]  
+|<<metricbeat-module-ceph,Ceph>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.7+| .7+|  |<<metricbeat-metricset-ceph-cluster_disk,cluster_disk>>   
+|<<metricbeat-metricset-ceph-cluster_health,cluster_health>>   
+|<<metricbeat-metricset-ceph-cluster_status,cluster_status>>   
+|<<metricbeat-metricset-ceph-monitor_health,monitor_health>>   
+|<<metricbeat-metricset-ceph-osd_df,osd_df>>   
+|<<metricbeat-metricset-ceph-osd_tree,osd_tree>>   
+|<<metricbeat-metricset-ceph-pool_disk,pool_disk>>   
 |<<metricbeat-module-couchbase,Couchbase>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .3+| .3+|  |<<metricbeat-metricset-couchbase-bucket,bucket>> beta[]  
 |<<metricbeat-metricset-couchbase-cluster,cluster>> beta[]  

diff --git a/metricbeat/module/ceph/_meta/fields.yml b/metricbeat/module/ceph/_meta/fields.yml
@@ -3,7 +3,7 @@
   description: >
     Ceph module
   short_config: false
-  release: beta
+  release: ga
   settings: ["ssl", "http"]
   fields:
     - name: ceph

diff --git a/metricbeat/module/ceph/cluster_disk/_meta/fields.yml b/metricbeat/module/ceph/cluster_disk/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     cluster_disk
-  release: beta
+  release: ga
   fields:
     - name: available.bytes
       type: long

diff --git a/metricbeat/module/ceph/cluster_disk/cluster_disk.go b/metricbeat/module/ceph/cluster_disk/cluster_disk.go
@@ -19,7 +19,6 @@ package cluster_disk
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph cluster_disk metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/ceph/cluster_health/_meta/fields.yml b/metricbeat/module/ceph/cluster_health/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     cluster_health
-  release: beta
+  release: ga
   fields:
     - name: overall_status
       type: keyword

diff --git a/metricbeat/module/ceph/cluster_health/cluster_health.go b/metricbeat/module/ceph/cluster_health/cluster_health.go
@@ -19,7 +19,6 @@ package cluster_health
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph cluster_health metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/ceph/cluster_status/_meta/fields.yml b/metricbeat/module/ceph/cluster_status/_meta/fields.yml
@@ -1,6 +1,6 @@
 - name: cluster_status
   type: group
-  release: beta
+  release: ga
   description: >
     cluster_status
   fields:

diff --git a/metricbeat/module/ceph/cluster_status/cluster_status.go b/metricbeat/module/ceph/cluster_status/cluster_status.go
@@ -19,7 +19,6 @@ package cluster_status
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph cluster_status metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/ceph/fields.go b/metricbeat/module/ceph/fields.go
diff --git a/metricbeat/module/ceph/monitor_health/_meta/fields.yml b/metricbeat/module/ceph/monitor_health/_meta/fields.yml
@@ -1,6 +1,6 @@
 - name: monitor_health
   type: group
-  release: beta
+  release: ga
   description: >
     monitor_health stats data
   fields:

diff --git a/metricbeat/module/ceph/monitor_health/monitor_health.go b/metricbeat/module/ceph/monitor_health/monitor_health.go
@@ -19,7 +19,6 @@ package monitor_health
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph monitor_health metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/ceph/osd_df/_meta/fields.yml b/metricbeat/module/ceph/osd_df/_meta/fields.yml
@@ -1,6 +1,6 @@
 - name: osd_df
   type: group
-  release: beta
+  release: ga
   description: >
     ceph osd disk usage information
   fields:

diff --git a/metricbeat/module/ceph/osd_df/osd_df.go b/metricbeat/module/ceph/osd_df/osd_df.go
@@ -19,7 +19,6 @@ package osd_df
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph osd_df metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/ceph/osd_tree/_meta/fields.yml b/metricbeat/module/ceph/osd_tree/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     ceph osd tree info
-  release: beta
+  release: ga
   fields:
     - name: id
       type: long

diff --git a/metricbeat/module/ceph/osd_tree/osd_tree.go b/metricbeat/module/ceph/osd_tree/osd_tree.go
@@ -19,7 +19,6 @@ package osd_tree
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph osd_tree metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/ceph/pool_disk/_meta/fields.yml b/metricbeat/module/ceph/pool_disk/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     pool_disk
-  release: beta
+  release: ga
   fields:
     - name: id
       type: long

diff --git a/metricbeat/module/ceph/pool_disk/pool_disk.go b/metricbeat/module/ceph/pool_disk/pool_disk.go
@@ -19,7 +19,6 @@ package pool_disk
 
 import (
 	"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"
@@ -50,8 +49,6 @@ type MetricSet struct {
 }
 
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The ceph pool_disk metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py @@
     [[metricbeat-metricset-ceph-cluster_disk]]
     === Ceph cluster_disk metricset
-    beta[]
     include::../../../module/ceph/cluster_disk/_meta/docs.asciidoc[]
@@ Expand Down @@