You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/03/21 18:26:41 UTC
git commit: AMBARI-5179. Mirroring: each status should have
appropriate status indicator. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4e31383dc -> dce87447d
AMBARI-5179. Mirroring: each status should have appropriate status indicator. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dce87447
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dce87447
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dce87447
Branch: refs/heads/trunk
Commit: dce87447dcdbb961a0acf6a22406a24b983d28e8
Parents: 4e31383
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Fri Mar 21 19:24:44 2014 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Fri Mar 21 19:24:44 2014 +0200
----------------------------------------------------------------------
.../ambari-mirroring-dataset1_definition.xml | 23 +++++++++++
.../ambari-mirroring-dataset1_instances.json | 42 ++++++++++++++++++++
.../ambari-mirroring-dataset2_definition.xml | 23 +++++++++++
.../ambari-mirroring-dataset2_instances.json | 42 ++++++++++++++++++++
.../ambari-mirroring-dataset3_definition.xml | 23 +++++++++++
.../ambari-mirroring-dataset3_instances.json | 22 ++++++++++
.../data/mirroring/dataset1_definition.xml | 23 -----------
.../data/mirroring/dataset1_instances.json | 42 --------------------
.../data/mirroring/dataset2_definition.xml | 23 -----------
.../data/mirroring/dataset2_instances.json | 42 --------------------
.../data/mirroring/dataset3_definition.xml | 23 -----------
.../data/mirroring/dataset3_instances.json | 22 ----------
ambari-web/app/assets/data/mirroring/feeds.xml | 6 +--
.../main/mirroring/jobs_controller.js | 6 +--
.../controllers/main/mirroring_controller.js | 8 ++--
ambari-web/app/models/dataset_job.js | 26 +++++++++++-
ambari-web/app/styles/application.less | 25 ++++++++++++
17 files changed, 236 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_definition.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_definition.xml b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_definition.xml
new file mode 100644
index 0000000..5ba8a75
--- /dev/null
+++ b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_definition.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<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"/>
+ <retention action="delete" limit="days(7)"/>
+ </cluster>
+
+ <cluster name="tdk" type="target">
+ <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
+ <retention action="delete" limit="months(1)"/>
+ <locations>
+ <location type="data" path="/backup/app-logs1"/>
+ </locations>
+ </cluster>
+ </clusters>
+
+ <locations>
+ <location type="data" path="/app-logs1"/>
+ </locations>
+ <ACL permission="0755" group="users" owner="hue"/>
+ <schema provider="none" location="/none"/>
+</feed>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_instances.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_instances.json b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_instances.json
new file mode 100644
index 0000000..d2f71b1
--- /dev/null
+++ b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset1_instances.json
@@ -0,0 +1,42 @@
+{"status": "SUCCEEDED", "message": "default/STATUS\n", "requestId": "default/a7463898-4d2a-4857-866d-15fdf65da84f\n", "instances": [
+ {
+ "instance": "2013-10-24T00:00Z",
+ "status": "KILLED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000004-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-14T06:23:33Z",
+ "endTime": "2014-01-09T06:24:29Z",
+ "details": ""
+ },
+ {
+ "instance": "2013-10-24T01:00Z",
+ "status": "KILLED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000005-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:25:35Z",
+ "endTime": "2014-01-09T06:26:02Z",
+ "details": ""
+ },
+ {
+ "instance": "2013-10-24T02:00Z",
+ "status": "KILLED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000006-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:30:35Z",
+ "endTime": "2014-01-07T06:31:03Z",
+ "details": ""
+ },
+ {
+ "instance": "2013-10-24T03:00Z",
+ "status": "KILLED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000007-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:35:35Z",
+ "endTime": "2014-01-02T06:36:03Z",
+ "details": ""
+ }
+]}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_definition.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_definition.xml b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_definition.xml
new file mode 100644
index 0000000..68377fa
--- /dev/null
+++ b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_definition.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<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"/>
+ <retention action="delete" limit="days(7)"/>
+ </cluster>
+
+ <cluster name="tdk" type="target">
+ <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
+ <retention action="delete" limit="months(1)"/>
+ <locations>
+ <location type="data" path="/backup/app-logs2"/>
+ </locations>
+ </cluster>
+ </clusters>
+
+ <locations>
+ <location type="data" path="/app-logs2"/>
+ </locations>
+ <ACL permission="0755" group="users" owner="hue"/>
+ <schema provider="none" location="/none"/>
+</feed>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_instances.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_instances.json b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_instances.json
new file mode 100644
index 0000000..5405fb5
--- /dev/null
+++ b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset2_instances.json
@@ -0,0 +1,42 @@
+{"status": "SUCCEEDED", "message": "default/STATUS\n", "requestId": "default/a7463898-4d2a-4857-866d-15fdf65da84f\n", "instances": [
+ {
+ "instance": "2012-10-24T00:00Z",
+ "status": "RUNNING",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000004-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:23:33Z",
+ "endTime": "2014-01-09T06:24:29Z",
+ "details": ""
+ },
+ {
+ "instance": "2012-10-24T01:00Z",
+ "status": "SUCCEEDED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000005-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:25:35Z",
+ "endTime": "2014-01-09T06:26:02Z",
+ "details": ""
+ },
+ {
+ "instance": "2012-10-24T02:00Z",
+ "status": "FAILED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000006-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:30:35Z",
+ "endTime": "2014-01-09T06:31:03Z",
+ "details": ""
+ },
+ {
+ "instance": "2012-10-24T03:00Z",
+ "status": "SUSPENDED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000007-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:35:35Z",
+ "endTime": "2014-01-09T06:36:03Z",
+ "details": ""
+ }
+]}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_definition.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_definition.xml b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_definition.xml
new file mode 100644
index 0000000..8105c3a
--- /dev/null
+++ b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_definition.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<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"/>
+ <retention action="delete" limit="days(7)"/>
+ </cluster>
+
+ <cluster name="tdk" type="target">
+ <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
+ <retention action="delete" limit="months(1)"/>
+ <locations>
+ <location type="data" path="/backup/app-logs3"/>
+ </locations>
+ </cluster>
+ </clusters>
+
+ <locations>
+ <location type="data" path="/app-logs3"/>
+ </locations>
+ <ACL permission="0755" group="users" owner="hue"/>
+ <schema provider="none" location="/none"/>
+</feed>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_instances.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_instances.json b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_instances.json
new file mode 100644
index 0000000..70976d6
--- /dev/null
+++ b/ambari-web/app/assets/data/mirroring/ambari-mirroring-dataset3_instances.json
@@ -0,0 +1,22 @@
+{"status": "SUCCEEDED", "message": "default/STATUS\n", "requestId": "default/a7463898-4d2a-4857-866d-15fdf65da84f\n", "instances": [
+ {
+ "instance": "2014-10-24T00:00Z",
+ "status": "FAILED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000004-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:23:33Z",
+ "endTime": "2014-01-09T06:24:29Z",
+ "details": ""
+ },
+ {
+ "instance": "2014-10-24T01:00Z",
+ "status": "SUSPENDED",
+ "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000005-140108205147729-oozie-oozi-W",
+ "cluster": "tdk",
+ "sourceCluster": "mcluster",
+ "startTime": "2014-01-09T06:25:35Z",
+ "endTime": "2014-01-09T06:26:02Z",
+ "details": ""
+ }
+]}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/dataset1_definition.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/dataset1_definition.xml b/ambari-web/app/assets/data/mirroring/dataset1_definition.xml
deleted file mode 100644
index d067ee0..0000000
--- a/ambari-web/app/assets/data/mirroring/dataset1_definition.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<feed xmlns="uri:falcon:feed:0.1" name="dataset1" description=""><frequency>hours(1)</frequency>
- <clusters>
- <cluster name="source-cluster" type="source">
- <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
- <retention action="delete" limit="days(7)"/>
- </cluster>
-
- <cluster name="tdk" type="target">
- <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
- <retention action="delete" limit="months(1)"/>
- <locations>
- <location type="data" path="/backup/app-logs1"/>
- </locations>
- </cluster>
- </clusters>
-
- <locations>
- <location type="data" path="/app-logs1"/>
- </locations>
- <ACL permission="0755" group="users" owner="hue"/>
- <schema provider="none" location="/none"/>
-</feed>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/dataset1_instances.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/dataset1_instances.json b/ambari-web/app/assets/data/mirroring/dataset1_instances.json
deleted file mode 100644
index d2f71b1..0000000
--- a/ambari-web/app/assets/data/mirroring/dataset1_instances.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{"status": "SUCCEEDED", "message": "default/STATUS\n", "requestId": "default/a7463898-4d2a-4857-866d-15fdf65da84f\n", "instances": [
- {
- "instance": "2013-10-24T00:00Z",
- "status": "KILLED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000004-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-14T06:23:33Z",
- "endTime": "2014-01-09T06:24:29Z",
- "details": ""
- },
- {
- "instance": "2013-10-24T01:00Z",
- "status": "KILLED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000005-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:25:35Z",
- "endTime": "2014-01-09T06:26:02Z",
- "details": ""
- },
- {
- "instance": "2013-10-24T02:00Z",
- "status": "KILLED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000006-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:30:35Z",
- "endTime": "2014-01-07T06:31:03Z",
- "details": ""
- },
- {
- "instance": "2013-10-24T03:00Z",
- "status": "KILLED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000007-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:35:35Z",
- "endTime": "2014-01-02T06:36:03Z",
- "details": ""
- }
-]}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/dataset2_definition.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/dataset2_definition.xml b/ambari-web/app/assets/data/mirroring/dataset2_definition.xml
deleted file mode 100644
index ff0f276..0000000
--- a/ambari-web/app/assets/data/mirroring/dataset2_definition.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<feed xmlns="uri:falcon:feed:0.1" name="dataset2" description=""><frequency>hours(1)</frequency>
- <clusters>
- <cluster name="source-cluster" type="source">
- <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
- <retention action="delete" limit="days(7)"/>
- </cluster>
-
- <cluster name="tdk" type="target">
- <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
- <retention action="delete" limit="months(1)"/>
- <locations>
- <location type="data" path="/backup/app-logs2"/>
- </locations>
- </cluster>
- </clusters>
-
- <locations>
- <location type="data" path="/app-logs2"/>
- </locations>
- <ACL permission="0755" group="users" owner="hue"/>
- <schema provider="none" location="/none"/>
-</feed>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/dataset2_instances.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/dataset2_instances.json b/ambari-web/app/assets/data/mirroring/dataset2_instances.json
deleted file mode 100644
index 5405fb5..0000000
--- a/ambari-web/app/assets/data/mirroring/dataset2_instances.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{"status": "SUCCEEDED", "message": "default/STATUS\n", "requestId": "default/a7463898-4d2a-4857-866d-15fdf65da84f\n", "instances": [
- {
- "instance": "2012-10-24T00:00Z",
- "status": "RUNNING",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000004-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:23:33Z",
- "endTime": "2014-01-09T06:24:29Z",
- "details": ""
- },
- {
- "instance": "2012-10-24T01:00Z",
- "status": "SUCCEEDED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000005-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:25:35Z",
- "endTime": "2014-01-09T06:26:02Z",
- "details": ""
- },
- {
- "instance": "2012-10-24T02:00Z",
- "status": "FAILED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000006-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:30:35Z",
- "endTime": "2014-01-09T06:31:03Z",
- "details": ""
- },
- {
- "instance": "2012-10-24T03:00Z",
- "status": "SUSPENDED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000007-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:35:35Z",
- "endTime": "2014-01-09T06:36:03Z",
- "details": ""
- }
-]}
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/dataset3_definition.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/dataset3_definition.xml b/ambari-web/app/assets/data/mirroring/dataset3_definition.xml
deleted file mode 100644
index 58cde34..0000000
--- a/ambari-web/app/assets/data/mirroring/dataset3_definition.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<feed xmlns="uri:falcon:feed:0.1" name="dataset3" description=""><frequency>hours(1)</frequency>
- <clusters>
- <cluster name="source-cluster" type="source">
- <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
- <retention action="delete" limit="days(7)"/>
- </cluster>
-
- <cluster name="tdk" type="target">
- <validity end="2014-12-31T00:00Z" start="2013-10-24T00:00Z"/>
- <retention action="delete" limit="months(1)"/>
- <locations>
- <location type="data" path="/backup/app-logs3"/>
- </locations>
- </cluster>
- </clusters>
-
- <locations>
- <location type="data" path="/app-logs3"/>
- </locations>
- <ACL permission="0755" group="users" owner="hue"/>
- <schema provider="none" location="/none"/>
-</feed>
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/dataset3_instances.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/dataset3_instances.json b/ambari-web/app/assets/data/mirroring/dataset3_instances.json
deleted file mode 100644
index 60b89a2..0000000
--- a/ambari-web/app/assets/data/mirroring/dataset3_instances.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{"status": "SUCCEEDED", "message": "default/STATUS\n", "requestId": "default/a7463898-4d2a-4857-866d-15fdf65da84f\n", "instances": [
- {
- "instance": "2014-10-24T00:00Z",
- "status": "FAILED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000004-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:23:33Z",
- "endTime": "2014-01-09T06:24:29Z",
- "details": ""
- },
- {
- "instance": "2014-10-24T01:00Z",
- "status": "SUSPENDED",
- "logFile": "http://c6407.ambari.apache.org:11000/oozie?job=0000005-140108205147729-oozie-oozi-W",
- "cluster": "tdk",
- "sourceCluster": "mcluster",
- "startTime": "2014-01-09T06:25:35Z",
- "endTime": "2014-01-09T06:26:02Z",
- "details": ""
- }
-]}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/assets/data/mirroring/feeds.xml
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/mirroring/feeds.xml b/ambari-web/app/assets/data/mirroring/feeds.xml
index 403c060..9d9163e 100644
--- a/ambari-web/app/assets/data/mirroring/feeds.xml
+++ b/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>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/controllers/main/mirroring/jobs_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/mirroring/jobs_controller.js b/ambari-web/app/controllers/main/mirroring/jobs_controller.js
index b4a541c..9307a2b 100644
--- a/ambari-web/app/controllers/main/mirroring/jobs_controller.js
+++ b/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')
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/controllers/main/mirroring_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/mirroring_controller.js b/ambari-web/app/controllers/main/mirroring_controller.js
index 4d9ebaa..7e32825 100644
--- a/ambari-web/app/controllers/main/mirroring_controller.js
+++ b/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();
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/models/dataset_job.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/dataset_job.js b/ambari-web/app/models/dataset_job.js
index bbeff40..b2dbeed 100644
--- a/ambari-web/app/models/dataset_job.js
+++ b/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')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/dce87447/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 7263e14..0017e02 100644
--- a/ambari-web/app/styles/application.less
+++ b/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 {