azkaban-aplcache

Add UI colors for FAILED_SUCCEEDED (#1483) FAILED_SUCCEEDED

9/19/2017 6:16:56 PM

Details

diff --git a/azkaban-web-server/src/main/less/azkaban-graph.less b/azkaban-web-server/src/main/less/azkaban-graph.less
index ce93658..29af355 100644
--- a/azkaban-web-server/src/main/less/azkaban-graph.less
+++ b/azkaban-web-server/src/main/less/azkaban-graph.less
@@ -103,6 +103,15 @@
   fill: #FFF;
 }
 
+.FAILED_SUCCEEDED > g > rect {
+  fill: #FF9999;
+  stroke: #FF9999;
+}
+
+.FAILED_SUCCEEDED > g > text {
+  fill: #FFF;
+}
+
 .FAILED_FINISHING > g > rect {
   fill: #ed9c28;
   stroke: #ed9c28;
diff --git a/azkaban-web-server/src/main/less/flow.less b/azkaban-web-server/src/main/less/flow.less
index d85d4eb..8829a14 100644
--- a/azkaban-web-server/src/main/less/flow.less
+++ b/azkaban-web-server/src/main/less/flow.less
@@ -83,6 +83,10 @@
   &.CANCELLED {
     background-color: @flow-cancelled-color;
   }
+
+  &.FAILED_SUCCEEDED {
+    background-color: @flow-failed-succeeded-color;
+  }
 }
 
 td {
@@ -141,6 +145,10 @@ td {
     &.CANCELLED {
       background-color: @flow-cancelled-color;
     }
+
+    &.FAILED_SUCCEEDED {
+      background-color: @flow-failed-succeeded-color;
+    }
   }
 }
 
@@ -173,6 +181,10 @@ td {
     color: @flow-cancelled-color;
   }
 
+  &.FAILED_SUCCEEDED {
+    color: @flow-failed-succeeded-color;
+  }
+
   &.FAILED_FINISHING {
     color: @flow-failed-finishing-color;
   }
@@ -315,6 +327,11 @@ li.tree-list-item {
       opacity: 0.5;
     }
 
+    &.FAILED_SUCCEEDED .icon {
+      background-position: 0px 0px;
+      opacity: 0.5;
+    }
+
     &.FAILED_FINISHING .icon {
       background-position: 0px 0px;
     }
diff --git a/azkaban-web-server/src/main/less/variables.less b/azkaban-web-server/src/main/less/variables.less
index ef0e827..2b7c694 100644
--- a/azkaban-web-server/src/main/less/variables.less
+++ b/azkaban-web-server/src/main/less/variables.less
@@ -6,6 +6,7 @@
 @flow-running-color: #3398cc;
 @flow-failed-finishing-color: #f19153;
 @flow-cancelled-color: #ff9999;
+@flow-failed-succeeded-color: #ff9999;
 @flow-queued-color: #009fc9;
 @flow-disabled-color: #aaa;
 @flow-default-color: #ccc;
diff --git a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/historypage.vm b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/historypage.vm
index 40ce113..752cb1f 100644
--- a/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/azkaban-web-server/src/main/resources/azkaban/webapp/servlet/velocity/historypage.vm
@@ -251,6 +251,8 @@
                     <option value=90>Skipped</option>
                     <option value=100>Disabled</option>
                     <option value=110>Queued</option>
+                    <option value=120>Failed, treated as success</option>
+                    <option value=125>Cancelled</option>
                   </select>
                 </div>
               </div>
diff --git a/azkaban-web-server/src/web/js/azkaban/util/job-status.js b/azkaban-web-server/src/web/js/azkaban/util/job-status.js
index c6c2fa0..0203d10 100644
--- a/azkaban-web-server/src/web/js/azkaban/util/job-status.js
+++ b/azkaban-web-server/src/web/js/azkaban/util/job-status.js
@@ -16,7 +16,7 @@
 
 var statusList = ["FAILED", "FAILED_FINISHING", "SUCCEEDED", "RUNNING",
   "WAITING", "KILLED", "DISABLED", "READY", "CANCELLED", "UNKNOWN", "PAUSED",
-  "SKIPPED", "QUEUED"];
+  "SKIPPED", "QUEUED", "FAILED_SUCCEEDED"];
 var statusStringMap = {
   "QUEUED": "Queued",
   "SKIPPED": "Skipped",
@@ -31,5 +31,6 @@ var statusStringMap = {
   "DISABLED": "Disabled",
   "READY": "Ready",
   "UNKNOWN": "Unknown",
-  "PAUSED": "Paused"
+  "PAUSED": "Paused",
+  "FAILED_SUCCEEDED": "Failed, treated as success"
 };