From ae62d56ff2580f6f7e16a7c915844a4316f4c95a Mon Sep 17 00:00:00 2001
From: guoxiaolong <guo.xiaolong1@zte.com.cn>
Date: Thu, 3 Aug 2017 11:00:26 +0800
Subject: [PATCH] [SPARK-21620]Add metrics url in spark web ui.

---
 .../org/apache/spark/deploy/master/ui/MasterPage.scala      | 6 ++++++
 .../org/apache/spark/deploy/worker/ui/WorkerPage.scala      | 1 +
 2 files changed, 7 insertions(+)

diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
index bc0bf6a1d9700..0303cb0cde386 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -101,6 +101,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
           <div class="span12">
             <ul class="unstyled">
               <li><strong>URL:</strong> {state.uri}</li>
+              <li><strong><a href="/metrics/master/json/">Master Metrics</a></strong></li>
               {
                 state.restUri.map { uri =>
                   <li>
@@ -210,9 +211,14 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
         <a href="#" onclick={confirm} class="kill-link">(kill)</a>
       </form>
     }
+    val appMetrics = if (!app.isFinished) {
+      <a class="kill-link" href={UIUtils.makeHref(parent.master.reverseProxy,
+        app.id, app.desc.appUiUrl) + "/metrics/json/jmx/"}>(App Metrics)</a>
+    }
     <tr>
       <td>
         <a href={"app?appId=" + app.id}>{app.id}</a>
+        {appMetrics}
         {killLink}
       </td>
       <td>
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
index ea39b0dce0a41..a2cfa25490bf3 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
@@ -66,6 +66,7 @@ private[ui] class WorkerPage(parent: WorkerWebUI) extends WebUIPage("") {
             <li><strong>
               Master URL:</strong> {workerState.masterUrl}
             </li>
+            <li><strong><a href="/metrics/json/jmx">Master Metrics</a></strong></li>
             <li><strong>Cores:</strong> {workerState.cores} ({workerState.coresUsed} Used)</li>
             <li><strong>Memory:</strong> {Utils.megabytesToString(workerState.memory)}
               ({Utils.megabytesToString(workerState.memoryUsed)} Used)</li>