From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 1 Apr 2019 21:46:42 +0000 (-0700)
Subject: Merge pull request #26535 from k0ste/luminous_backports3
X-Git-Tag: v12.2.12~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=841ea6b6fded6d856d8610547b887c508ba5ff90;p=ceph.git

Merge pull request #26535 from k0ste/luminous_backports3

luminous: mgr/prometheus: add interface and objectstore to osd metadata

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
---

841ea6b6fded6d856d8610547b887c508ba5ff90