Update changelog with changes in PR 16254 (#16405) (#16416)

* Update changelog with changes in PR 16254 * Fix: duplicate entry * Fix: renamed metricset (cherry picked from commit 9143662)
elastic · Feb 19, 2020 · 31e058a · 31e058a
1 parent 6f502d4
commit 31e058a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -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*
 

diff --git a/metricbeat/module/ceph/_meta/config-mgr.yml b/metricbeat/module/ceph/_meta/config-mgr.yml
@@ -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

diff --git a/metricbeat/modules.d/ceph-mgr.yml.disabled b/metricbeat/modules.d/ceph-mgr.yml.disabled
@@ -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