Merge "Display zuul version from zuul/status"

modules/openstack_project/files/zuul/status.html

@@ -133,6 +133,9 @@ td.tree {
 #graph-container img:first-of-type {
     margin-left: 0px;
 }
+#zuul_info_container {
+    margin-top: 12px;
+}
 a:link {
     color: #204A87;
 }
@@ -346,6 +349,14 @@ $("#graph-container").append($(new Image()).addClass('graph').graphite({
       </script>
     </div>
 
+    <div class="container" id="zuul_info_container">
+        <h2>Zuul info</h2>
+        <p>
+            Zuul version:
+            <span id="zuul-version"></span>
+        </p>
+    </div>
+
     <script type="text/javascript">footer();</script>
   </BODY>
 </html>

modules/openstack_project/files/zuul/status.js

@@ -415,10 +415,18 @@ function clean_changes_lists() {
     window.zuul_collapsed_exceptions = new_collapsed_exceptions;
 }
 
+function update_zuul_info(data) {
+    if ('zuul_version' in data) {
+        $('#zuul-version').text(data['zuul_version']);
+    }
+}
+
 function update() {
     var html = '';
 
     $.getJSON('http://zuul.openstack.org/status.json', function(data) {
+        update_zuul_info(data);
+
         if ('message' in data) {
             $("#message").attr('class', 'alertbox');
             $("#message").html(data['message']);
@@ -440,7 +448,6 @@ function update() {
             data['trigger_event_queue']['length']);
         $("#result_event_queue_length").html(
             data['result_event_queue']['length']);
-
     });
 
     clean_changes_lists();