From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 6 Apr 2018 15:59:07 +0000 (-0700)
Subject: Merge pull request #20642 from b-ranto/wip-mgr-prom-luminous
X-Git-Tag: v12.2.5~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ccdca76fd4565153b9e4f1859915d04049b23ddc;p=ceph.git

Merge pull request #20642 from b-ranto/wip-mgr-prom-luminous

[luminous] Backport recent prometheus exporter changes

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: John Spray <john.spray@redhat.com>
---

ccdca76fd4565153b9e4f1859915d04049b23ddc