AMBARI-5179. Mirroring: each status should have appropriate status indicator. (akovalenko)

ambari-web/app/assets/data/mirroring/dataset1_definition.xml → ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_definition.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<feed xmlns="uri:falcon:feed:0.1" name="dataset1" description=""><frequency>hours(1)</frequency>
+<feed xmlns="uri:falcon:feed:0.1" name="ambari-mirroring-dataset1" description=""><frequency>hours(1)</frequency>
     <clusters>
         <cluster name="source-cluster" type="source">
             <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>

ambari-web/app/assets/data/mirroring/dataset2_definition.xml → ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_definition.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<feed xmlns="uri:falcon:feed:0.1" name="dataset2" description=""><frequency>hours(1)</frequency>
+<feed xmlns="uri:falcon:feed:0.1" name="ambari-mirroring-dataset2" description=""><frequency>hours(1)</frequency>
     <clusters>
         <cluster name="source-cluster" type="source">
             <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>

ambari-web/app/assets/data/mirroring/dataset3_definition.xml → ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_definition.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<feed xmlns="uri:falcon:feed:0.1" name="dataset3" description=""><frequency>hours(1)</frequency>
+<feed xmlns="uri:falcon:feed:0.1" name="ambari-mirroring-dataset3" description=""><frequency>hours(1)</frequency>
     <clusters>
         <cluster name="source-cluster" type="source">
             <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>

ambari-web/app/assets/data/mirroring/dataset3_instances.json → ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_instances.json

@@ -19,4 +19,4 @@
     "endTime": "2014-01-09T06:26:02Z",
     "details": ""
   }
-]}
+]}

ambari-web/app/assets/data/mirroring/feeds.xml

@@ -2,17 +2,17 @@
 <entities>
     <entity>
         <type>feed</type>
-        <name>dataset1</name>
+        <name>ambari-mirroring-dataset1</name>
         <status>RUNNING</status>
     </entity>
     <entity>
         <type>feed</type>
-        <name>dataset2</name>
+        <name>ambari-mirroring-dataset2</name>
         <status>SUSPENDED</status>
     </entity>
     <entity>
         <type>feed</type>
-        <name>dataset3</name>
+        <name>ambari-mirroring-dataset3</name>
         <status>SUBMITTED</status>
     </entity>
 </entities>

ambari-web/app/controllers/main/mirroring/jobs_controller.js

@@ -90,7 +90,7 @@ App.MainDatasetJobsController = Em.Controller.extend({
       name: 'mirroring.suspend_instance',
       sender: this,
       data: {
-        feed: this.get('content.name'),
+        feed: this.get('content.prefixedName'),
         name: event.context.get('name'),
         job: event.context,
         falconServer: App.get('falconServerURL')
@@ -109,7 +109,7 @@ App.MainDatasetJobsController = Em.Controller.extend({
       name: 'mirroring.resume_instance',
       sender: this,
       data: {
-        feed: this.get('content.name'),
+        feed: this.get('content.prefixedName'),
         name: event.context.get('name'),
         job: event.context,
         falconServer: App.get('falconServerURL')
@@ -128,7 +128,7 @@ App.MainDatasetJobsController = Em.Controller.extend({
       name: 'mirroring.kill_instance',
       sender: this,
       data: {
-        feed: this.get('content.name'),
+        feed: this.get('content.prefixedName'),
         name: event.context.get('name'),
         job: event.context,
         falconServer: App.get('falconServerURL')

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

@@ -129,9 +129,10 @@ App.MainMirroringController = Em.ArrayController.extend({
       targetCluster = clusters.cluster[1];
       sourceCluster = clusters.cluster[0];
     }
+    var datasetName = parsedData.feed['@attributes'].name.replace(App.mirroringDatasetNamePrefix, '');
     this.get('datasetsData').push(
         Ember.Object.create({
-          name: parsedData.feed['@attributes'].name.replace(App.mirroringDatasetNamePrefix, ''),
+          name: datasetName,
           status: arguments[2].status,
           sourceClusterName: sourceCluster['@attributes'].name,
           targetClusterName: targetCluster['@attributes'].name,
@@ -151,6 +152,7 @@ App.MainMirroringController = Em.ArrayController.extend({
         sender: this,
         data: {
           dataset: parsedData.feed['@attributes'].name,
+          formattedDatasetName: datasetName,
           start: sourceCluster.validity['@attributes'].start,
           end: App.router.get('mainMirroringEditDataSetController').toTZFormat(currentDate),
           falconServer: App.get('falconServerURL')
@@ -175,7 +177,7 @@ App.MainMirroringController = Em.ArrayController.extend({
       data.instances.forEach(function (instance) {
         if (instance.cluster == App.get('clusterName')) {
           datasetJobs.push({
-            dataset: opts.dataset,
+            dataset: opts.formattedDatasetName,
             id: instance.instance + '_' + opts.dataset,
             name: instance.instance,
             status: instance.status,
@@ -184,7 +186,7 @@ App.MainMirroringController = Em.ArrayController.extend({
           });
         }
       }, this);
-      datasetsData.findProperty('name', opts.dataset).set('instances', datasetJobs);
+      datasetsData.findProperty('name', opts.formattedDatasetName).set('instances', datasetJobs);
     }
     this.saveDataset();
   },

ambari-web/app/models/dataset_job.js

@@ -50,7 +50,31 @@ App.DataSetJob = DS.Model.extend({
   }.property('endDate'),
 
   healthClass: function () {
-    return this.get('status') === 'FAILED' ? 'health-status-DEAD-RED' : 'health-status-LIVE';
+    var result = 'icon-question-sign';
+    switch (this.get('status')) {
+      case 'SUCCEEDED':
+        result = 'icon-ok';
+        break;
+      case 'SUSPENDED':
+        result = 'icon-cog';
+        break;
+      case 'WAITING':
+        result = 'icon-time';
+        break;
+      case 'RUNNING':
+        result = 'icon-play';
+        break;
+      case 'KILLED':
+        result = 'icon-exclamation-sign';
+        break;
+      case 'FAILED':
+        result = 'icon-warning-sign';
+        break;
+      case 'ERROR':
+        result = 'icon-remove';
+        break;
+    }
+    return result;
   }.property('status')
 });
 

ambari-web/app/styles/application.less

@@ -4269,6 +4269,31 @@ ul.filter {
       padding: 0 15px 0 0;
     }
   }
+  .icon-play {
+    color: green;
+  }
+  .icon-ok {
+    color: green;
+  }
+  .icon-time {
+    color: orange;
+  }
+  .icon-exclamation-sign {
+    color: red;
+  }
+  .icon-remove {
+    color: red;
+  }
+  .icon-warning-sign {
+    color: red;
+  }
+  .icon-cog {
+    color: orange;
+  }
+  .icon-question-sign {
+    color: orange;
+  }
+
 }
 
 .mirroring-manage-clusters {