AMBARI-4781 Suppressed alerts should be shown with a medpack icon, rather than question mark. (ababiichuk)

ambari-web/app/controllers/main/alerts_controller.js

@@ -111,7 +111,8 @@ App.MainAlertsController = Em.Controller.extend({
   statusNumberMap: {
     "OK" : "0",
     "WARNING": "1",
-    "CRITICAL": "2"
+    "CRITICAL": "2",
+    "PASSIVE": "3"
   },
 
   getAlertsSuccessCallback: function (json) {
@@ -122,7 +123,7 @@ App.MainAlertsController = Em.Controller.extend({
           title: _alert.description,
           serviceType: _alert.service_name,
           lastTime: _alert.status_time,
-          status: this.get('statusNumberMap')[_alert.status] || "3",
+          status: this.get('statusNumberMap')[_alert.status] || "4",
           message: _alert.output,
           hostName: _alert.host_name,
           lastCheck: _alert.last_status_time

ambari-web/app/messages.js

@@ -277,6 +277,7 @@ Em.I18n.translations = {
   'services.alerts.OK.timePrefix': 'OK for ',
   'services.alerts.WARN.timePrefix': 'WARN for ',
   'services.alerts.CRIT.timePrefix': 'CRIT for ',
+  'services.alerts.MAINT.timePrefix': 'MAINT for ',
   'services.alerts.UNKNOWN.timePrefix': 'UNKNOWN for ',
   'services.alerts.headingOfList': 'Alerts and Health Checks',
   'services.alerts.goToService': 'Go to Service',

ambari-web/app/models/alert.js

@@ -56,6 +56,13 @@ App.Alert = Em.Object.extend({
     return this.get('status') == '2';
   }.property('status'),
 
+  /**
+   * Used to show correct icon in UI
+   */
+  isPassive: function() {
+    return this.get('status') == '3';
+  }.property('status'),
+
   /**
    * Used to show only required alerts at the service level
    */
@@ -87,6 +94,9 @@ App.Alert = Em.Object.extend({
           prefix = this.t('services.alerts.CRIT.timePrefix');
           break;
         case "3":
+          prefix = this.t('services.alerts.MAINT.timePrefix');
+          break;
+        case "4":
           prefix = this.t('services.alerts.UNKNOWN.timePrefix');
           break;
       }

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

@@ -28,7 +28,11 @@
               {{#if isCritical}}
                   <i class="icon-remove icon-large"></i>
               {{else}}
-                  <i class="icon-question-sign icon-large"></i>
+                {{#if isPassive}}
+                    <i class="icon-medkit icon-large"></i>
+                {{else}}
+                    <i class="icon-question-sign icon-large"></i>
+                {{/if}}
               {{/if}}
 	          {{/if}}
           {{/if}}