From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 2 Feb 2021 16:11:27 +0000 (-0800)
Subject: Merge pull request #38333 from b-ranto/wip-prom-fixes-octopus
X-Git-Tag: v15.2.9~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0449c0ad47307c460149858b4935e1d2deccd82;p=ceph.git

Merge pull request #38333 from b-ranto/wip-prom-fixes-octopus

octopus: mgr/prometheus: Sync and backport prometheus fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

b0449c0ad47307c460149858b4935e1d2deccd82