]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #19632 from Rubab-Syed/outreachy_mgr_dashboard
authorJohn Spray <jspray@redhat.com>
Thu, 11 Jan 2018 14:27:18 +0000 (14:27 +0000)
committerGitHub <noreply@github.com>
Thu, 11 Jan 2018 14:27:18 +0000 (14:27 +0000)
mgr/dashboard: Add monitor list

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/pybind/mgr/dashboard/base.html
src/pybind/mgr/dashboard/module.py

Simple merge
index 9e50d2acc1a49f62d3f95da3f168783a874c4ac2,40a018af66d9594c6c4a0ca4c1519b1aaa1d28ba..2e35f34edddf7fae45cb96f760ceb6da845df645
@@@ -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', '::')