From: John Spray <john.spray@redhat.com>
Date: Thu, 15 Jun 2017 18:58:45 +0000 (-0400)
Subject: mgr/dashboard: split out audit log messages in UI
X-Git-Tag: v12.1.0~36^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15709%2Fhead;p=ceph.git

mgr/dashboard: split out audit log messages in UI

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/pybind/mgr/dashboard/health.html b/src/pybind/mgr/dashboard/health.html
index 9e1b288895b5..e41a1e2da5e2 100644
--- a/src/pybind/mgr/dashboard/health.html
+++ b/src/pybind/mgr/dashboard/health.html
@@ -175,17 +175,39 @@
             <div class="box-header">
                 Cluster log
             </div>
-            <div class="box-body" style="font-family:monospace; background-color: #ddd; color: #333">
-                <span >
-                    <span rv-each-line="clog">
-                        { line.stamp }&nbsp;{line.priority}&nbsp;
-                        <span  rv-style="line | log_color">
-                            <span style="font-weight: bold;">
-                                { line.message }
-                            </span><br>
+            <div class="box-body">
+                <ul class="nav nav-tabs">
+                  <li class="active"><a data-toggle="tab" href="#clog">Cluster log</a></li>
+                  <li><a data-toggle="tab" href="#audit_log">Audit log</a></li>
+                </ul>
+                <div class="tab-content" style="font-family:monospace; background-color: #ddd; color: #333">
+                    <div id="clog" class="tab-pane fade in active">
+                        <span>
+                            <span rv-each-line="clog">
+                                { line.stamp }&nbsp;{line.priority}&nbsp;
+                                <span  rv-style="line | log_color">
+                                    <span style="font-weight: bold;">
+                                        { line.message }
+                                    </span><br>
+                                </span>
+                            </span>
+                        </span>
+                    </div>
+                    <div id="audit_log" class="tab-pane fade in">
+                        <span>
+                            <span rv-each-line="audit_log">
+                                { line.stamp }&nbsp;{line.priority}&nbsp;
+                                <span  rv-style="line | log_color">
+                                    <span style="font-weight: bold;">
+                                        { line.message }
+                                    </span><br>
+                                </span>
+                            </span>
                         </span>
-                    </span>
-                </span>
+
+                    </div>
+                </div>
+
             </div>
 
         </div>
@@ -209,4 +231,4 @@
 
     </section>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index ac4cf23850f4..fedf19a6ea7e 100644
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -663,6 +663,7 @@ class Module(MgrModule):
                         MonStatus).data,
                     "osd_map": osd_map,
                     "clog": list(global_instance().log_buffer),
+                    "audit_log": list(global_instance().audit_buffer),
                     "pools": pools
                 }