ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pallav...@apache.org
Subject ambari git commit: AMBARI-19624. Missing fields for workflow SLA (Padma Priya via pallavkul)
Date Mon, 23 Jan 2017 12:49:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk b6b43785e -> a6fd5cb04


AMBARI-19624. Missing fields for workflow SLA (Padma Priya via pallavkul)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6fd5cb0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6fd5cb0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6fd5cb0

Branch: refs/heads/trunk
Commit: a6fd5cb04e47d85a6de43b403276fd5992361745
Parents: b6b4378
Author: pallavkul <pallav.kul@gmail.com>
Authored: Mon Jan 23 18:18:33 2017 +0530
Committer: pallavkul <pallav.kul@gmail.com>
Committed: Mon Jan 23 18:18:33 2017 +0530

----------------------------------------------------------------------
 .../main/resources/ui/app/domain/actionjob_hanlder.js  |  1 +
 .../src/main/resources/ui/app/domain/mapping-utils.js  | 13 ++++++++++++-
 .../resources/ui/app/templates/components/sla-info.hbs | 12 ++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a6fd5cb0/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
index 34a9a4a..c9d9887 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
@@ -367,6 +367,7 @@ var FSActionJobHandler=ActionJobHandler.extend({
       {xml:"delete"},
       {xml:"mkdir"},
       {xml:"move"},
+	  {xml:"chmod"},
       {xml:"touchz"},
       {xml:"chgrp"}
     ];

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6fd5cb0/contrib/views/wfmanager/src/main/resources/ui/app/domain/mapping-utils.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/domain/mapping-utils.js b/contrib/views/wfmanager/src/main/resources/ui/app/domain/mapping-utils.js
index 1929ddf..b918d70 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/domain/mapping-utils.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/domain/mapping-utils.js
@@ -233,7 +233,12 @@ var SLAMapper= Ember.Object.extend({
       if (sla.alertContact){
         slaInfo[slaPrefix+":"+"alert-contact"]=sla.alertContact;
       }
-
+      if(sla.notificationMessage){
+        slaInfo[slaPrefix+":"+"notification-msg"]=sla.notificationMessage;
+      }
+      if(sla.upstreamApps){
+        slaInfo[slaPrefix+":"+"upstream-apps"]=sla.upstreamApps;
+      }
     }
     return nodeObj;
   },
@@ -248,6 +253,12 @@ var SLAMapper= Ember.Object.extend({
     if (infoJson["alert-events"] && infoJson["alert-events"].__text){
       sla.alertEvents=infoJson["alert-events"].__text;
     }
+    if (infoJson["notification-msg"] && infoJson["notification-msg"].__text){
+      sla.notificationMessage=infoJson["notification-msg"].__text;
+    }
+    if (infoJson["upstream-apps"] && infoJson["upstream-apps"].__text){
+      sla.upstreamApps=infoJson["upstream-apps"].__text;
+    }
     this.processTimePeriods(sla,infoJson,"should-start","shouldStart");
     this.processTimePeriods(sla,infoJson,"should-end","shouldEnd");
     this.processTimePeriods(sla,infoJson,"max-duration","maxDuration");

http://git-wip-us.apache.org/repos/asf/ambari/blob/a6fd5cb0/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
index 28bdf15..447bac2 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
@@ -90,5 +90,17 @@
           {{input type="text" class="form-control" name="name" value=slaInfo.alertContact
placeholder="Comma seperated Email IDs"}}
         </div>
       </div>
+      <div class="form-group">
+        <label class="control-label col-xs-2">Notification Message</label>
+        <div class="col-xs-5">
+          {{input type="text" class="form-control" name="name" value=slaInfo.notificationMessage
placeholder="Notification Message"}}
+        </div>
+      </div>
+      <div class="form-group">
+        <label class="control-label col-xs-2">Upstream Apps</label>
+        <div class="col-xs-5">
+          {{input type="text" class="form-control" name="name" value=slaInfo.upstreamApps
placeholder="Upstream Apps"}}
+        </div>
+      </div>
     </div>
   </div>


Mime
View raw message