AMBARI-4331. Storm: Update Service -> Summary. Show Supervisors live hosts. (Denys Buzhor via alexantonenko)

ambari-web/app/assets/data/hosts/HDP2/hc_host_status.json

@@ -207,6 +207,33 @@
             "state" : "STARTED"
           }
         },
+        {
+          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/LOGVIEWER_SERVER",
+          "HostRoles" : {
+            "cluster_name" : "perf",
+            "component_name" : "LOGVIEWER_SERVER",
+            "host_name" : "dev01.hortonworks.com",
+            "state" : "STARTED"
+          }
+        },
+        {
+          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/STORM_UI_SERVER",
+          "HostRoles" : {
+            "cluster_name" : "perf",
+            "component_name" : "STORM_UI_SERVER",
+            "host_name" : "dev01.hortonworks.com",
+            "state" : "STARTED"
+          }
+        },
+        {
+          "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/DRPC_SERVER",
+          "HostRoles" : {
+            "cluster_name" : "perf",
+            "component_name" : "DRPC_SERVER",
+            "host_name" : "dev01.hortonworks.com",
+            "state" : "STARTED"
+          }
+        },
         {
           "href" : "http://192.168.56.101:8080/api/v1/clusters/perf/hosts/dev01.hortonworks.com/host_components/SUPERVISOR",
           "HostRoles" : {

ambari-web/app/messages.js

@@ -945,6 +945,8 @@ Em.I18n.translations = {
   'services.service.summary.TrackersLive':'Trackers Live',
   'services.service.summary.RegionServersLIVE':'RegionServers Live',
   'services.service.summary.GangliaMonitorsLIVE':'Ganglia Monitors Live',
+  'services.service.summary.SuperVisorsLIVE':'SuperVisors Live',
+  'services.service.summary.SuperVisorLIVE':'SuperVisor Lives',
   'services.service.summary.nameNode':'NameNode Web UI',
   'services.service.summary.nameNodeUptime':'NameNode Uptime',
   'services.service.summary.nameNodeHeap':'NameNode Heap',
@@ -1644,6 +1646,8 @@ Em.I18n.translations = {
 
   'dashboard.services.oozie.clients':'Oozie Clients',
   'dashboard.services.oozie.client':'Oozie Client',
+  'dashboard.services.storm.supervisor': 'SuperVisor',
+  'dashboard.services.storm.supervisors': 'SuperVisors',
 
   'dashboard.services.configs.popup.stopService.header':'Stop service',
   'dashboard.services.configs.popup.stopService.body' : 'Service needs to be stopped for reconfiguration',

ambari-web/app/models/host_component.js

@@ -31,7 +31,7 @@ App.HostComponent = DS.Model.extend({
    * @returns {bool}
    */
   isClient:function () {
-    if(['PIG', 'SQOOP', 'HCAT', 'MAPREDUCE2_CLIENT'].contains(this.get('componentName'))){
+    if(['PIG', 'SQOOP', 'HCAT', 'MAPREDUCE2_CLIENT','SUPERVISOR'].contains(this.get('componentName'))){
       return true;
     }
 
@@ -101,7 +101,6 @@ App.HostComponent = DS.Model.extend({
       case 'GANGLIA_MONITOR':
       case 'NODEMANAGER':
       case 'ZKFC':
-      case 'SUPERVISOR':
         return true;
       default:
         return false;

ambari-web/app/templates.js

@@ -27,5 +27,4 @@ require('templates/main/service/info/summary/mapreduce2');
 require('templates/main/service/info/summary/hive');
 require('templates/main/service/info/summary/hue');
 require('templates/main/service/info/summary/falcon');
-require('templates/main/service/info/summary/storm');
 require('templates/main/admin/highAvailability/progress');

ambari-web/app/templates/main/service/info/summary/storm.hbs → ambari-web/app/templates/main/dashboard/service/storm.hbs

@@ -15,5 +15,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 }}
-{{!<!-- @todo create correct view after api implementing-->}}
-{{view view.sumMasterComponentView}}
+
+{{view view.parentView.sumMasterComponentView}}
+<tr>
+  <td>
+    <a href="#" {{action filterHosts view.superVisorComponents.[0]}}>
+      {{pluralize view.superVisorComponents.length singular="t:dashboard.services.storm.supervisor" plural="t:dashboard.services.storm.supervisors"}}
+    </a>
+  </td>
+  <td>
+    <span>
+      {{#view view.superVisorsLiveTextView}}
+        {{view.liveComponents}}/{{view.totalComponents}}
+      {{/view}}
+    </span> {{pluralize view.superVisorComponents.length singular="t:services.service.summary.SuperVisorLIVE" plural="t:services.service.summary.SuperVisorsLIVE"}}
+  </td>
+</tr>

ambari-web/app/templates/main/service/info/summary.hbs

@@ -66,7 +66,7 @@
               {{template "templates/main/service/info/summary/falcon"}}
             {{/if}}
             {{#if view.serviceStatus.storm}}
-              {{template "templates/main/service/info/summary/storm"}}
+              {{view App.MainDashboardServiceStormView showOnlyRows=true serviceBinding="view.service"}}
             {{/if}}
           </tbody>
         </table>

ambari-web/app/views.js

@@ -93,6 +93,7 @@ require('views/main/admin/security/add/step1');
 require('views/main/admin/security/add/step2');
 require('views/main/admin/security/add/step3');
 require('views/main/admin/security/add/step4');
+
 require('views/main/dashboard');
 require('views/main/dashboard/service');
 require('views/main/dashboard/service/hdfs');
@@ -104,6 +105,8 @@ require('views/main/dashboard/service/hive');
 require('views/main/dashboard/service/zookeeper');
 require('views/main/dashboard/service/oozie');
 require('views/main/dashboard/service/flume');
+require('views/main/dashboard/service/storm');
+
 require('views/main/dashboard/cluster_metrics/cpu');
 require('views/main/dashboard/cluster_metrics/load');
 require('views/main/dashboard/cluster_metrics/memory');

ambari-web/app/views/main/dashboard/service/storm.js

@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+var App = require('app');
+
+App.MainDashboardServiceStormView = App.MainDashboardServiceView.extend({
+  templateName: require('templates/main/dashboard/service/storm'),
+  serviceName: 'storm',
+
+  superVisorComponents: function() {
+    return this.get('service.hostComponents').filterProperty('componentName', 'SUPERVISOR');
+  }.property('service.hostComponents.@each'),
+
+  superVisorsLiveTextView: App.ComponentLiveTextView.extend({
+    liveComponents: function () {
+      return this.get('parentView.superVisorComponents').filterProperty('workStatus','STARTED').length;
+    }.property('parentView.superVisorComponents.@each.workStatus'),
+    totalComponents: function() {
+      return this.get('parentView.superVisorComponents').length;
+    }.property('parentView.superVisorComponents.length')
+  })
+});