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.

Sign up for GitHub

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 #16405 to 7.x: Update changelog with changes in PR 16254 #16416

Merged
merged 2 commits into from
Feb 19, 2020
Merged

Cherry-pick #16405 to 7.x: Update changelog with changes in PR 16254 #16416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d48e0d6
Update changelog with changes in PR 16254 (#16405)
mtojek Feb 19, 2020
2baca5f
Merge branch '7.x' into backport_16405_7.x
mtojek Feb 19, 2020
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.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add support for Dropwizard metrics 4.1. {pull}16332[16332]
- Add support for NATS 2.1. {pull}16317[16317]
- Improve the `haproxy` module to support metrics exposed via HTTPS. {issue}14579[14579] {pull}16333[16333]
- Add metricsets based on Ceph Manager Daemon to the `ceph` module. {issue}7723[7723] {pull}16254[16254]

*Packetbeat*

Expand Down
3 changes: 1 addition & 2 deletions metricbeat/module/ceph/_meta/config-mgr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
- module: ceph
metricsets:
- mgr_cluster_disk
- mgr_cluster_health
- mgr_osd_disk
- mgr_osd_perf
- mgr_pool_disk
# - mgr_osd_pool_stats
# - mgr_osd_tree
period: 1m
Expand Down
3 changes: 1 addition & 2 deletions metricbeat/modules.d/ceph-mgr.yml.disabled
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
- module: ceph
metricsets:
- mgr_cluster_disk
- mgr_cluster_health
- mgr_osd_disk
- mgr_osd_perf
- mgr_pool_disk
# - mgr_osd_pool_stats
# - mgr_osd_tree
period: 1m
Expand Down