AMBARI-3944. Service Check tasks are shown incorrectly. (Mikhail Bayuk via akovalenko)

ambari-web/app/messages.js

@@ -959,7 +959,7 @@ Em.I18n.translations = {
   'services.service.summary.historyServer': 'History Server Web UI',
   'services.service.actions.run.rebalancer':'Run Rebalancer',
   'services.service.actions.run.compaction':'Run Compaction',
-  'services.service.actions.run.smoke':'Run Smoke Test',
+  'services.service.actions.run.smoke':'Run {0} Service Check',
   'services.service.actions.reassign.master':'Move {0}',
   'services.service.actions.reassign.master.hive':'Move HiveServer2, WebHCat Server, MySQL Server',
   'services.service.actions.manage_configuration_groups':'Manage Configuration Groups...',

ambari-web/app/utils/ajax.js

@@ -82,7 +82,7 @@ var urls = {
         'type': 'POST',
         data: JSON.stringify({
           RequestInfo: {
-            "context": data.displayName + " Smoke Test",
+            "context": data.displayName + " Service Check",
             "command" : data.actionName,
             "service_name" : data.serviceName
           }
@@ -1438,4 +1438,4 @@ if ($.mocho) {
   });
 }
 
-App.ajax = ajax.create({});
+App.ajax = ajax.create({});

ambari-web/app/utils/helper.js

@@ -228,13 +228,13 @@ App.format = {
       case 'NAMENODE':
         return 'NameNode';
       case 'NAMENODE_SERVICE_CHECK':
-        return 'NameNode Check';
+        return 'NameNode Service Check';
       case 'DATANODE':
         return 'DataNode';
       case 'JOURNALNODE':
         return 'JournalNode';
       case 'HDFS_SERVICE_CHECK':
-        return 'HDFS Check';
+        return 'HDFS Service Check';
       case 'SECONDARY_NAMENODE':
         return 'SNameNode';
       case 'HDFS_CLIENT':
@@ -274,15 +274,15 @@ App.format = {
       case 'HADOOP_CLIENT':
         return 'Hadoop Client';
       case 'JOBTRACKER_SERVICE_CHECK':
-        return 'JobTracker Check';
+        return 'JobTracker Service Check';
       case 'MAPREDUCE_SERVICE_CHECK':
-        return 'MapReduce Check';
+        return 'MapReduce Service Check';
       case 'ZOOKEEPER_SERVICE_CHECK':
-        return 'ZooKeeper Check';
+        return 'ZooKeeper Service Check';
       case 'ZOOKEEPER_QUORUM_SERVICE_CHECK':
-        return 'ZK Quorum Check';
+        return 'ZK Quorum Service Check';
       case  'HBASE_SERVICE_CHECK':
-        return 'HBase Check';
+        return 'HBase Service Check';
       case 'MYSQL_SERVER':
         return 'MySQL Server';
       case 'HIVE_SERVER':
@@ -292,33 +292,33 @@ App.format = {
       case 'HIVE_CLIENT':
         return 'Hive Client';
       case 'HIVE_SERVICE_CHECK':
-        return 'Hive Check';
+        return 'Hive Service Check';
       case 'HCAT':
         return 'HCat';
       case 'HCAT_SERVICE_CHECK':
-        return 'HCat Check';
+        return 'HCat Service Check';
       case 'OOZIE_CLIENT':
         return 'Oozie Client';
       case 'OOZIE_SERVER':
         return 'Oozie Server';
       case 'OOZIE_SERVICE_CHECK':
-        return 'Oozie Check';
+        return 'Oozie Service Check';
       case 'PIG':
         return 'Pig';
       case 'PIG_SERVICE_CHECK':
-        return 'Pig Check';
+        return 'Pig Service Check';
       case 'MAPREDUCE2_SERVICE_CHECK':
-        return 'MapReduce2 Check';
+        return 'MapReduce2 Service Check';
       case 'YARN_SERVICE_CHECK':
-        return 'YARN Check';
+        return 'YARN Service Check';
       case 'SQOOP':
         return 'Sqoop';
       case 'SQOOP_SERVICE_CHECK':
-        return 'Sqoop Check';
+        return 'Sqoop Service Check';
       case 'WEBHCAT_SERVER':
         return 'WebHCat Server';
       case 'WEBHCAT_SERVICE_CHECK':
-        return 'WebHCat Check';
+        return 'WebHCat Service Check';
       case 'NAGIOS_SERVER':
         return 'Nagios Server';
       case 'GANGLIA_SERVER':
@@ -326,9 +326,9 @@ App.format = {
       case 'GANGLIA_MONITOR':
         return 'Ganglia Monitor';
       case 'GMOND_SERVICE_CHECK':
-        return 'Gmond Check';
+        return 'Gmond Service Check';
       case 'GMETAD_SERVICE_CHECK':
-        return 'Gmetad Check';
+        return 'Gmetad Service Check';
       case 'DECOMMISSION_DATANODE':
         return 'Update Exclude File';
       case 'HUE_SERVER':

ambari-web/app/utils/host_progress_popup.js

@@ -338,10 +338,13 @@ App.HostPopup = Em.Object.create({
                   delete existTaskMap[newTask.Tasks.id];
                 } else {
                   // create new
+                  var command_string = (newTask.Tasks.command.toLowerCase() != 'service_check')
+                    ?  newTask.Tasks.command.toLowerCase()
+                    : '';
                   var taskInfo = Ember.Object.create({
                     id: newTask.Tasks.id,
                     hostName: newHostInfo.publicName,
-                    command: newTask.Tasks.command.toLowerCase(),
+                    command: command_string,
                     status: App.format.taskStatus(newTask.Tasks.status),
                     role: App.format.role(newTask.Tasks.role),
                     stderr: newTask.Tasks.stderr,
@@ -363,10 +366,13 @@ App.HostPopup = Em.Object.create({
               // Tasks have changed
               var tasksArr = [];
               newTasks.forEach(function (newTask) {
+                var command_string = (newTask.Tasks.command.toLowerCase() != 'service_check')
+                  ?  newTask.Tasks.command.toLowerCase()
+                  : '';
                 var taskInfo = Ember.Object.create({
                   id: newTask.Tasks.id,
                   hostName: newHostInfo.publicName,
-                  command: newTask.Tasks.command.toLowerCase(),
+                  command: command_string,
                   status: App.format.taskStatus(newTask.Tasks.status),
                   role: App.format.role(newTask.Tasks.role),
                   stderr: newTask.Tasks.stderr,
@@ -411,10 +417,13 @@ App.HostPopup = Em.Object.create({
             hostInfo.set('barWidth', "width:" + hostProgress + "%;");
 
             tasks.forEach(function (_task) {
+              var command_string = ( _task.Tasks.command.toLowerCase() != 'service_check')
+                ?  _task.Tasks.command.toLowerCase()
+                : '';
               var taskInfo = Ember.Object.create({
                 id: _task.Tasks.id,
                 hostName: _host.publicName,
-                command: _task.Tasks.command.toLowerCase(),
+                command: command_string,
                 status: App.format.taskStatus(_task.Tasks.status),
                 role: App.format.role(_task.Tasks.role),
                 stderr: _task.Tasks.stderr,

ambari-web/app/views/main/service/item.js

@@ -42,7 +42,7 @@ App.MainServiceItemView = Em.View.extend({
           })
         }
       default:
-        options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke'), disabled:disabled});
+        options.push({action: 'runSmokeTest', 'label': Em.I18n.t('services.service.actions.run.smoke').format(service.get('serviceName')), disabled:disabled});
     }
     return options;
   }.property('controller.content', 'controller.isStopDisabled'),