From cd68c7cc6942970285dce04775e80f75a5d55afa Mon Sep 17 00:00:00 2001
From: Rohith Sharma K S <rohithsharmaks@apache.org>
Date: Wed, 9 May 2018 12:17:04 +0530
Subject: [PATCH] YARN-8260. [UI2] Per-application tracking URL is no longer
 available in YARN UI2. Contributed by Sunil G.

---
 .../hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js     | 2 ++
 .../src/main/webapp/app/serializers/yarn-app-timeline.js      | 4 +++-
 .../src/main/webapp/app/serializers/yarn-app.js               | 4 +++-
 .../hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
index fcc84904612..8f4a8993b78 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app.js
@@ -53,6 +53,8 @@ export default DS.Model.extend({
   remainingTimeoutInSeconds: DS.attr("number"),
   applicationExpiryTime: DS.attr("string"),
   resourceRequests: DS.attr("array"),
+  trackingUI: DS.attr("string"),
+  trackingUrl: DS.attr("string"),
 
   isFailed: function() {
     return this.get("finalStatus") === "FAILED";
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
index 0496d7749a3..36a1c7b48ee 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app-timeline.js
@@ -61,7 +61,9 @@ export default DS.JSONAPISerializer.extend({
         numAMContainerPreempted: 0,
         clusterUsagePercentage: 0,
         queueUsagePercentage: 0,
-        currentAppAttemptId: payload.info.YARN_APPLICATION_LATEST_APP_ATTEMPT
+        currentAppAttemptId: payload.info.YARN_APPLICATION_LATEST_APP_ATTEMPT,
+        trackingUI : '',
+        trackingUrl : ''
       }
     };
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
index b21c52a0113..36d1260c6a4 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/serializers/yarn-app.js
@@ -69,7 +69,9 @@ export default DS.JSONAPISerializer.extend({
           queueUsagePercentage: payload.queueUsagePercentage,
           currentAppAttemptId: payload.currentAppAttemptId,
           remainingTimeoutInSeconds: timeoutInSecs,
-          applicationExpiryTime: appExpiryTime
+          applicationExpiryTime: appExpiryTime,
+          trackingUI : payload.trackingUI,
+          trackingUrl : payload.trackingUrl
         }
       };
 
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
index 156f83c42e4..aac93c09383 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/templates/yarn-app.hbs
@@ -116,6 +116,9 @@
             <span title="Queue" class="yarn-tooltip"><i class="glyphicon glyphicon-tasks glyphicon-gray" />{{model.app.queue}}</span>
           </div>
           <div>Priority {{model.app.priority}}</div>
+          {{#if model.app.trackingUrl}}
+            <div><a href="{{model.app.trackingUrl}}" target="_blank">{{model.app.trackingUI}}</a></div>
+          {{/if}}
         </div>
       </div>
     </div>