Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #9708 to 6.x: Remove experimental tags from Ceph metricsets #9726

Merged
merged 1 commit into from
Dec 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ https://github.com/elastic/beats/compare/v6.5.0...6.x[Check the HEAD diff]
- Add `host.os.name` field to add_host_metadata processor. {issue}8948[8948] {pull}9405[9405]
- Add field `event.dataset` which is `{module}.{metricset).
- Add more TCP statuses to `socket_summary` metricset. {pull}9430[9430]
- Remove experimental tag from ceph metricsets. {pull}9708[9708]

*Packetbeat*

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules/ceph/osd_df.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-ceph-osd_df]]
=== Ceph osd_df metricset

experimental[]
beta[]

include::../../../module/ceph/osd_df/_meta/docs.asciidoc[]

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This file is generated! See scripts/docs_collector.py
|<<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>> experimental[]
|<<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-couchbase,Couchbase>> beta[] |image:./images/icon-no.png[No prebuilt dashboards] |
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/ceph/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/ceph/osd_df/_meta/fields.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- name: osd_df
type: group
release: experimental
release: beta
description: >
ceph osd disk usage information
fields:
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/ceph/osd_df/osd_df.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type MetricSet struct {
}

func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Experimental("The ceph osd_df metricset is experimental")
cfgwarn.Beta("The ceph osd_df metricset is beta")

http, err := helper.NewHTTP(base)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/ceph/pool_disk/pool_disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type MetricSet struct {
}

func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
cfgwarn.Experimental("The ceph pool_disk metricset is experimental")
cfgwarn.Beta("The ceph pool_disk metricset is beta")

http, err := helper.NewHTTP(base)
if err != nil {
Expand Down