From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 16 Jul 2021 14:35:45 +0000 (-0700)
Subject: Merge pull request #41660 from p-se/octopus-fix-missing-prom-alerts
X-Git-Tag: v15.2.14~36
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04d652ed5a9133059b00ced25a51174c3e5ef8fe;p=ceph.git

Merge pull request #41660 from p-se/octopus-fix-missing-prom-alerts

octopus: mgr/cephadm: fix prometheus alerts

Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

04d652ed5a9133059b00ced25a51174c3e5ef8fe