knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kris...@apache.org
Subject knox git commit: KNOX-1578 - JobHistory UI - Broken ResourceManager and NodeManager links
Date Fri, 09 Nov 2018 19:12:14 GMT
Repository: knox
Updated Branches:
  refs/heads/v1.2.0 d6de31cac -> b7248f949


KNOX-1578 - JobHistory UI - Broken ResourceManager and NodeManager links

Signed-off-by: Kevin Risden <krisden@apache.org>


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

Branch: refs/heads/v1.2.0
Commit: b7248f949e5f769208976bbc6008c22d873ba707
Parents: d6de31c
Author: Kevin Risden <krisden@apache.org>
Authored: Fri Nov 9 11:18:36 2018 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Fri Nov 9 14:12:04 2018 -0500

----------------------------------------------------------------------
 .../resources/services/jobhistoryui/2.7.0/rewrite.xml   | 12 ++----------
 .../resources/services/jobhistoryui/2.7.0/service.xml   |  3 ---
 2 files changed, 2 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/b7248f94/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
index 2a8d3e7..7bd4e88 100644
--- a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
@@ -76,20 +76,12 @@
     <rewrite template="{$serviceUrl[JOBHISTORYUI]}/ws/{**}"/>
   </rule>
 
-  <rule dir="IN" name="JOBHISTORYUI/nodelink/inbound" pattern="*://*:*/**/jobhistory/node?{scheme}?{host}?{port}">
-    <rewrite template="{scheme}://{host}:{port}/node?{scheme}?{host}?{port}"/>
-  </rule>
-
-  <rule dir="IN" name="JOBHISTORYUI/jobhistory/inbound/node" pattern="*://*:*/**/jobhistory/node?{host}&amp;{port=**}">
-    <rewrite template="http://{host}:{port=**}/node"/>
-  </rule>
-
   <!-- request out web content rewrite rules -->
 
   <!-- rewrite map reduce node manager request -->
   <!-- This maps to Nodemanager           -->
   <rule dir="OUT" name="JOBHISTORYUI/nodelink" pattern="{scheme}://{host}:{port}">
-    <rewrite template="{$frontend[scheme]}://{$frontend[address]}/gateway/nodemanagerui/node?{host}"/>
+    <rewrite template="{$frontend[url]}/yarn/nodemanager/node?{scheme}?{host}?{port}"/>
   </rule>
 
   <!-- static web resources (css, js, jpeg, etc). -->
@@ -168,6 +160,6 @@
 
   <rule dir="OUT" name="JOBHISTORYUI/jobhistory/outbound/jobs/node">
     <match pattern="{scheme}://{host}:{port}"/>
-    <rewrite template="{$frontend[url]}/jobhistory/node?{host}?{port}"/>
+    <rewrite template="{$frontend[url]}/yarn/nodemanager/node?{scheme}?{host}?{port}"/>
   </rule>
 </rules>

http://git-wip-us.apache.org/repos/asf/knox/blob/b7248f94/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
index 4185db6..4594c01 100644
--- a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
@@ -32,8 +32,5 @@
         <route path="/jobhistory/conf">
             <rewrite apply="JOBHISTORYUI/jobhistory/outbound/configuration" to="response.body"/>
         </route>
-        <route path="/jobhistory/node?**">
-            <rewrite apply="JOBHISTORYUI/jobhistory/inbound/node" to="request.url"/>
-        </route>
      </routes>
 </service>


Mime
View raw message