mgr/dashboard: add monitor listing

Signed-off-by: Rubab Syed<rubab.syed21@gmail.com>

diff --git a/src/pybind/mgr/dashboard/base.html b/src/pybind/mgr/dashboard/base.html
index 742327079fcff7fc31cfb28a8f744022c9d3a715..32638f2f56f2372958e3dfa96d31050406e1a936 100644 (file)
--- a/src/pybind/mgr/dashboard/base.html
+++ b/src/pybind/mgr/dashboard/base.html
@@ -346,7 +346,7 @@ Failed to load data from server <a href="javascript:window.location.reload(true)
             <i class="fa fa-heartbeat" rv-style="health_status | health_color"></i>
             <span>Cluster health</span></a>
         </li>
-        <li class="treeview{%if path_info.startswith(('/server', '/osd'))%} active{%endif%}">
+        <li class="treeview{%if path_info.startswith(('/server', '/osd', '/monitor'))%} active{%endif%}">
           <a href="#"><i class="fa fa-server"></i> <span>Cluster</span>
             <span class="pull-right-container">
               <i class="fa fa-angle-left pull-right"></i>
@@ -359,6 +359,9 @@ Failed to load data from server <a href="javascript:window.location.reload(true)
             <li>
                 <a href="{{ url_prefix }}/osd">OSDs</a>
             </li>
+           <li>
+                <a href="{{ url_prefix }}/monitors">Monitors</a>
+            </li>
           </ul>
         </li>
         <li class="treeview{%if path_info.startswith('/rbd')%} active{%endif%}">

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index e141d54bf3254fe85b9f88fdf8a964e8de39ef30..40a018af66d9594c6c4a0ca4c1519b1aaa1d28ba 100644 (file)
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -66,7 +66,6 @@ def get_prefixed_url(url):
     return global_instance().url_prefix + url
 
 
-
 class StandbyModule(MgrStandbyModule):
     def serve(self):
         server_addr = self.get_localized_config('server_addr', '::')
@@ -768,6 +767,48 @@ class Module(MgrModule):
                     content_data=json.dumps(self._servers(), indent=2)
                 )
 
+            @cherrypy.expose
+            def monitors(self):
+                template = env.get_template("monitors.html")
+                return template.render(
+                    url_prefix = global_instance().url_prefix,
+                    ceph_version=global_instance().version,
+                    path_info=cherrypy.request.path_info,
+                    toplevel_data=json.dumps(self._toplevel_data(), indent=2),
+                    content_data=json.dumps(self._monitors(), indent=2)
+                )
+
+            @cherrypy.expose
+            @cherrypy.tools.json_out()
+            def monitors_data(self):
+                return self._monitors
+
+            def _monitors(self):
+                in_quorum, out_quorum = [], []
+
+                counters = [ 'mon.num_sessions'
+                ]
+
+                mon_status = global_instance().get_sync_object(MonStatus).data
+                for mon in mon_status["monmap"]["mons"]:
+                    mon["stats"] = {}
+                    for counter in counters:
+                        data = global_instance().get_counter("mon", mon["name"], counter)
+                        if data is not None:
+                            mon["stats"][counter.split(".")[1]] = data[counter] 
+                        else:
+                            mon["stats"][counter.split(".")[1]] = []
+                    if mon["rank"] in mon_status["quorum"]:
+                        in_quorum.append(mon)
+                    else:
+                        out_quorum.append(mon)
+                    
+                return {
+                    'mon_status': mon_status,
+                    'in_quorum' : in_quorum,
+                    'out_quorum': out_quorum,                
+                }
+            
             def _servers(self):
                 return {
                     'servers': global_instance().list_servers()

diff --git a/src/pybind/mgr/dashboard/monitors.html b/src/pybind/mgr/dashboard/monitors.html
new file mode 100644 (file)
index 0000000..40a2655
--- /dev/null
+++ b/src/pybind/mgr/dashboard/monitors.html
@@ -0,0 +1,100 @@
+
+{% extends "base.html" %}
+
+{% block content %}
+
+
+<script>
+        $(document).ready(function(){
+            // Pre-populated initial data at page load
+            var content_data = {{ content_data }};
+            var refresh = function() {
+                $.get("{{ url_prefix }}/monitors_data", function(data) {
+                    _.extend(content_data, data);
+                    $('.inlinesparkline').sparkline();
+                    setTimeout(refresh, 5000);
+                });
+            }; 
+            setTimeout(refresh, 5000);
+       
+            rivets.formatters.sparkline_data = function(time_series) {
+                result = "";
+                for (var i = 1; i < time_series.length; ++i) {
+                    var y = time_series[i][1];
+                    result += (y + ",");                 
+                }
+                return result;
+
+            };
+       
+             rivets.bind($("#content"), content_data);
+             $(".inlinesparkline").sparkline();
+         });
+</script>
+
+<!-- Page Header -->
+<section class="content-header">
+    <h1 style="font-weight:bold">
+      Monitors
+    </h1>
+</section>
+       
+<!-- Main content -->
+<section class="content text-center">
+    <div class="row">
+        <div class="col-md-4">
+           <div class="box text-left" style="font-size:13.4px">
+                <table class="table table-bordered">
+                   <tr><td><p><span style="color:yellow; font-weight:bold">Cluster ID: </span></td><td>{mon_status.monmap.fsid}</p></td></tr>
+                    <tr><td><p><span style="color:yellow; font-weight:bold">monmap modified: </span></td><td> {mon_status.monmap.modified}</p></td></tr>
+                   <tr><td><p><span style="color:yellow; font-weight:bold">monmap epoch: </span></td><td> {mon_status.monmap.epoch}</p></td></tr>
+                    <tr><td><p><span style="color:yellow; font-weight:bold">quorum con: </span></td><td> {mon_status.features.quorum_con}</p></td></tr>
+                    <tr><td><p><span style="color:yellow; font-weight:bold">quorum mon: </span></td><td> {mon_status.features.quorum_mon}</p></td></tr>
+                    <tr><td><p><span style="color:yellow; font-weight:bold">required con: </span></td><td> {mon_status.features.required_con}</p></td></tr>
+                    <tr><td><p><span style="color:yellow; font-weight:bold">required mon: </span></td><td> {mon_status.features.required_mon}</p></td></tr>
+               </table>
+           </div>
+       </div>
+        <div class="col-md-8">
+           <div class="box">
+                <h3 style="color:#00bb00;font-weight:bold">IN QUORUM</h3>
+               <div class="box-body">
+                   <table class="table table-bordered text-center">
+                       <thead>
+                           <th>Name</th>
+                           <th>Rank</th>
+                           <th>Public Addr</th>
+                           <th>Open Sessions</th>
+                       </thead>
+                       <tr rv-each-mon="in_quorum" style="font-size:15px;height:80px">
+                           <td style="font-weight:bold">{mon.name}</td>
+                           <td>{mon.rank}</td>
+                           <td>{mon.public_addr}</td>
+                           <td><span class="inlinesparkline" style="font-size:30px">{ mon.stats.num_sessions | sparkline_data }</span></td>
+                       </tr>
+                   </table>
+               </div>
+           </div>    
+       </div>
+    </div>
+    <div class="box">
+        <h3 style="color:#00bb00; font-weight:bold">NOT IN QUORUM</h3>
+       <div class="box-body">
+           <table class="table table-bordered text-center">
+               <thead>
+                   <th>Name</th>
+                   <th>Rank</th>
+                   <th>Public Addr</th>
+               </thead>
+               <tr rv-each-mon="out_quorum" class="font-size:15px;height:80px">
+                   <td style="font-weight:bold">{mon.name}</td>
+                   <td>{mon.rank}</td>
+                   <td>{mon.public_addr}</td>
+               </tr>
+           </table>
+       </div>
+    </div>
+</section>
+ 
+
+{% endblock %}