Преглед на файлове

AMBARI-4945. Don't display the alert panel in Services > Service for client-only services such as Pig, Sqoop, and Tez (Xi Wang)

Xi Wang преди 11 години
родител
ревизия
424d429c4d
променени са 2 файла, в които са добавени 37 реда и са изтрити 23 реда
  1. 25 23
      ambari-web/app/templates/main/service/info/summary.hbs
  2. 12 0
      ambari-web/app/views/main/service/info/summary.js

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

@@ -83,37 +83,39 @@
     </div>
     </div>
   </div>
   </div>
   <div class="span6">
   <div class="span6">
-    <div class="box">
-      <div class="box-header">
-        <h4>{{t services.alerts.headingOfList}}</h4>
-        {{#if controller.isNagiosInstalled}}
-          <div class="btn-group">
-            <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a>
-          </div>
-        {{/if}}
-      </div>
-      <ul id='summary-alerts-list' class="alerts">
-        {{#if view.alertsController.isLoaded}}
-          {{#if view.alerts.length}}
-            {{#each view.alerts}}
-              {{view App.AlertItemView contentBinding="this"}}
-            {{/each}}
-          {{else}}
-            {{#if controller.isNagiosInstalled}}
+    {{#unless view.isNoAlertsService}}
+      <div class="box">
+        <div class="box-header">
+          <h4>{{t services.alerts.headingOfList}}</h4>
+          {{#if controller.isNagiosInstalled}}
+            <div class="btn-group">
+              <a class="btn" target="_blank" rel="tooltip" title="Go to Nagios" {{bindAttr href="controller.nagiosUrl"}}><i class="icon-link"></i></a>
+            </div>
+          {{/if}}
+        </div>
+        <ul id='summary-alerts-list' class="alerts">
+          {{#if view.alertsController.isLoaded}}
+            {{#if view.alerts.length}}
+              {{#each view.alerts}}
+                {{view App.AlertItemView contentBinding="this"}}
+              {{/each}}
+            {{else}}
+              {{#if controller.isNagiosInstalled}}
                 <div class="alert alert-info">
                 <div class="alert alert-info">
                   {{t services.service.info.summary.nagios.noAlerts}}
                   {{t services.service.info.summary.nagios.noAlerts}}
                 </div>
                 </div>
-            {{else}}
+              {{else}}
                 <div class="alert">
                 <div class="alert">
                   {{t services.service.info.summary.nagios.alerts}}
                   {{t services.service.info.summary.nagios.alerts}}
                 </div>
                 </div>
+              {{/if}}
             {{/if}}
             {{/if}}
+          {{else}}
+            <div class="spinner"></div>
           {{/if}}
           {{/if}}
-        {{else}}
-          <div class="spinner"></div>
-        {{/if}}
-      </ul>
-    </div>
+        </ul>
+      </div>
+    {{/unless}}
   </div>
   </div>
 </div>
 </div>
 {{#if view.serviceMetricGraphs.length}}
 {{#if view.serviceMetricGraphs.length}}

+ 12 - 0
ambari-web/app/views/main/service/info/summary.js

@@ -413,6 +413,18 @@ App.MainServiceInfoSummaryView = Em.View.extend({
     serviceName = serviceName.toLowerCase();
     serviceName = serviceName.toLowerCase();
   }.observes('serviceName'),
   }.observes('serviceName'),
 
 
+  /*
+   * Alerts panel not display for PIG, SQOOP and TEZ Service
+   */
+  isNoAlertsService: function () {
+    var serviceName = this.get('service.serviceName');
+    if (!serviceName) {
+      return false;
+    }
+    var noAlertsServices = ['PIG', 'SQOOP', 'TEZ'];
+    return noAlertsServices.indexOf(serviceName) > -1;
+  }.property(''),
+
   gangliaUrl:function () {
   gangliaUrl:function () {
     var gangliaUrl = App.router.get('clusterController.gangliaUrl');
     var gangliaUrl = App.router.get('clusterController.gangliaUrl');
     if (!gangliaUrl) return null;
     if (!gangliaUrl) return null;