From d48e0d6b8394d621b85f2fca7ce6a3df175ad31a Mon Sep 17 00:00:00 2001
From: Marcin Tojek <mtojek@users.noreply.github.com>
Date: Wed, 19 Feb 2020 14:24:51 +0100
Subject: [PATCH] Update changelog with changes in PR 16254 (#16405)

* Update changelog with changes in PR 16254
* Fix: duplicate entry
* Fix: renamed metricset

(cherry picked from commit 91436627547b878aa5352de20cc14e5aabd5f677)
---
 CHANGELOG.next.asciidoc                     |  1 +
 metricbeat/module/ceph/_meta/config-mgr.yml | 19 ++++++++++++++++++
 metricbeat/modules.d/ceph-mgr.yml.disabled  | 22 +++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 metricbeat/module/ceph/_meta/config-mgr.yml
 create mode 100644 metricbeat/modules.d/ceph-mgr.yml.disabled

diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
index c4cd32c43786..74cd2c2edcd7 100644
--- a/CHANGELOG.next.asciidoc
+++ b/CHANGELOG.next.asciidoc
@@ -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*
 
diff --git a/metricbeat/module/ceph/_meta/config-mgr.yml b/metricbeat/module/ceph/_meta/config-mgr.yml
new file mode 100644
index 000000000000..548e8f32d118
--- /dev/null
+++ b/metricbeat/module/ceph/_meta/config-mgr.yml
@@ -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"
diff --git a/metricbeat/modules.d/ceph-mgr.yml.disabled b/metricbeat/modules.d/ceph-mgr.yml.disabled
new file mode 100644
index 000000000000..b8da102d0064
--- /dev/null
+++ b/metricbeat/modules.d/ceph-mgr.yml.disabled
@@ -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"