From: Sage Weil <sage@newdream.net>
Date: Wed, 11 Aug 2021 14:58:39 +0000 (-0400)
Subject: Merge PR #42682 into master
X-Git-Tag: v17.1.0~1140
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=191f1dc470a1db75d542f8e9b1e0149f7f21f4f1;p=ceph.git

Merge PR #42682 into master

* refs/pull/42682/head:
	cephadm: no need to explicitly enable prometheus module
	mgr/cephadm: enable prometheus module before deploying prometheus
	mgr/cephadm: drop daemon_id arg to CephadmService.config()
	doc/cephadm: no need to manually enable the prometheus module

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
---

191f1dc470a1db75d542f8e9b1e0149f7f21f4f1