[21/50] [abbrv] storm git commit: Adding nimbus summary info to zookeeper.

[bo...@apache.org]

http://git-wip-us.apache.org/repos/asf/storm/blob/4502bffb/storm-core/src/storm.thrift
----------------------------------------------------------------------
diff --git a/storm-core/src/storm.thrift b/storm-core/src/storm.thrift
index 3c49d39..4445dac 100644
--- a/storm-core/src/storm.thrift
+++ b/storm-core/src/storm.thrift
@@ -156,10 +156,18 @@ struct SupervisorSummary {
   5: required string supervisor_id;
 }
 
+struct NimbusSummary {
+  1: required string host;
+  2: required i32 port;
+  3: required i32 uptime_secs;
+  4: required bool isLeader;
+  5: required string version;
+}
+
 struct ClusterSummary {
   1: required list<SupervisorSummary> supervisors;
-  2: required i32 nimbus_uptime_secs;
   3: required list<TopologySummary> topologies;
+  4: required list<NimbusSummary> nimbuses;
 }
 
 struct ErrorInfo {

http://git-wip-us.apache.org/repos/asf/storm/blob/4502bffb/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html
index 0a4fdf3..eb4581a 100644
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@ -24,11 +24,6 @@
         </span>
       </th>
       <th>
-        <span class="tip right" title="The duration the current Nimbus instance has been running. (Note that the storm cluster may have been deployed and available for a much longer period than the current Nimbus process has been running.)">
-          Nimbus uptime
-        </span>
-      </th>
-      <th>
         <span class="tip above" title="The number of nodes in the cluster currently.">
           Supervisors
       </span>
@@ -63,7 +58,6 @@
   <tbody>
     <tr>
       <td>{{stormVersion}}</td>
-      <td>{{nimbusUptime}}</td>
       <td>{{supervisors}}</td>
       <td>{{slotsUsed}}</td>
       <td>{{slotsFree}}</td>
@@ -80,19 +74,19 @@
         <thead>
         <tr>
             <th>
-                    <span class="tip right" title="nimbus host name.">
-                        Host
-                    </span>
+                <span class="tip right" title="nimbus host name.">Host</span>
             </th>
             <th>
-        <span class="tip above" title="Nimbus Thrift port number.">
-          Port
-        </span>
+                <span class="tip above" title="Nimbus Thrift port number.">Port</span>
             </th>
             <th>
-        <span class="tip above" title="True if this host is leader, false otherwise.">
-          IsLeader
-        </span>
+                <span class="tip above" title="True if this host is leader, false otherwise.">IsLeader</span>
+            </th>
+            <th>
+                <span class="tip left" title="Storm version that this nimbus host is running.">Version</span>
+            </th>
+            <th>
+                <span class="tip left" title="Number of seconds this nimbus host has been running the nimbus process.">UpTime Seconds</span>
             </th>
         </tr>
         </thead>
@@ -102,6 +96,8 @@
             <td>{{host}}</td>
             <td><a href="{{nimbusLogLink}}">{{port}}</a></td>
             <td>{{isLeader}}</td>
+            <td>{{version}}</td>
+            <td>{{nimbusUpTime}}</td>
         </tr>
         {{/nimbuses}}
         </tbody>