diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index 7eba4afc6670..0ba5ac526573 100644
--- 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
index a4bd4ed78d50..548e8f32d118 100644
--- 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
index becca38143a6..b8da102d0064 100644
--- 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