Skip to content

Commit

Permalink
Update changelog with changes in PR 16254 (elastic#16405)
Browse files Browse the repository at this point in the history
* Update changelog with changes in PR 16254
* Fix: duplicate entry
* Fix: renamed metricset

(cherry picked from commit 9143662)
mtojek authored and Marcin Tojek committed Feb 19, 2020
1 parent 8da2bfe commit d48e0d6
Showing 3 changed files with 42 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
@@ -198,6 +198,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add `key/value` mode for SQL module. {issue}15770[15770] {pull]15845[15845]
- Add support for Unix socket in Memcached metricbeat module. {issue}13685[13685] {pull}15822[15822]
- Make the `system/cpu` metricset collect normalized CPU metrics by default. {issue}15618[15618] {pull}15729[15729]
- Add metricsets based on Ceph Manager Daemon to the `ceph` module. {issue}7723[7723] {pull}16254[16254]

*Packetbeat*

19 changes: 19 additions & 0 deletions metricbeat/module/ceph/_meta/config-mgr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
- module: ceph
metricsets:
- mgr_cluster_health
period: 10s
hosts: [ "https://localhost:8003" ]
#username: "user"
#password: "secret"

- module: ceph
metricsets:
- mgr_cluster_disk
- mgr_osd_perf
- mgr_pool_disk
# - mgr_osd_pool_stats
# - mgr_osd_tree
period: 1m
hosts: [ "https://localhost:8003" ]
#username: "user"
#password: "secret"
22 changes: 22 additions & 0 deletions metricbeat/modules.d/ceph-mgr.yml.disabled
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Module: ceph
# Docs: https://www.elastic.co/guide/en/beats/metricbeat/7.x/metricbeat-module-ceph.html

- module: ceph
metricsets:
- mgr_cluster_health
period: 10s
hosts: [ "https://localhost:8003" ]
#username: "user"
#password: "secret"

- module: ceph
metricsets:
- mgr_cluster_disk
- mgr_osd_perf
- mgr_pool_disk
# - mgr_osd_pool_stats
# - mgr_osd_tree
period: 1m
hosts: [ "https://localhost:8003" ]
#username: "user"
#password: "secret"

0 comments on commit d48e0d6

Please sign in to comment.