From: John Spray <jspray@redhat.com>
Date: Thu, 11 Jan 2018 14:27:18 +0000 (+0000)
Subject: Merge pull request #19632 from Rubab-Syed/outreachy_mgr_dashboard
X-Git-Tag: v13.0.2~550
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=53348dc6cb5c8824b5149d0dc0a48ab066f7deec;p=ceph.git

Merge pull request #19632 from Rubab-Syed/outreachy_mgr_dashboard

mgr/dashboard: Add monitor list

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

53348dc6cb5c8824b5149d0dc0a48ab066f7deec
diff --cc src/pybind/mgr/dashboard/module.py
index 9e50d2acc1a4,40a018af66d9..2e35f34edddf
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@@ -66,11 -65,7 +66,10 @@@ def recurse_refs(root, path)
  def get_prefixed_url(url):
      return global_instance().url_prefix + url
  
 +def to_sorted_array(data):
 +    assert isinstance(data, dict)
 +    return sorted(data.iteritems())
  
- 
  class StandbyModule(MgrStandbyModule):
      def serve(self):
          server_addr = self.get_localized_config('server_addr', '::')