You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2018/07/10 19:42:46 UTC
knox git commit: KNOX-1315 - Spark UI urls issue: Jobs,
stdout/stderr and threadDump links (Guang Yang via lmccay)
Repository: knox
Updated Branches:
refs/heads/v1.1.0 e1334e996 -> 62b064d12
KNOX-1315 - Spark UI urls issue: Jobs, stdout/stderr and threadDump links (Guang Yang via lmccay)
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/62b064d1
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/62b064d1
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/62b064d1
Branch: refs/heads/v1.1.0
Commit: 62b064d12084d3052120313e51abd5e9d52d9558
Parents: e1334e9
Author: Larry McCay <lm...@new-host.home>
Authored: Tue Jul 10 15:42:21 2018 -0400
Committer: Larry McCay <lm...@new-host.home>
Committed: Tue Jul 10 15:42:21 2018 -0400
----------------------------------------------------------------------
.../src/main/resources/services/yarnui/2.7.0/rewrite.xml | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/62b064d1/gateway-service-definitions/src/main/resources/services/yarnui/2.7.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/yarnui/2.7.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/yarnui/2.7.0/rewrite.xml
index ff36dcf..865da45 100644
--- a/gateway-service-definitions/src/main/resources/services/yarnui/2.7.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/yarnui/2.7.0/rewrite.xml
@@ -35,8 +35,8 @@
<rule dir="IN" name="YARNUI/yarn/inbound/cluster" pattern="*://*:*/**/yarn/cluster/{**}">
<rewrite template="{$serviceUrl[YARNUI]}/cluster/{**}"/>
</rule>
-<rule dir="IN" name="YARNUI/yarn/inbound/proxy" pattern="*://*:*/**/yarn/proxy/{**}">
- <rewrite template="{$serviceUrl[YARNUI]}/proxy/{**}"/>
+<rule dir="IN" name="YARNUI/yarn/inbound/proxy" pattern="*://*:*/**/yarn/proxy/{**}?{**}">
+ <rewrite template="{$serviceUrl[YARNUI]}/proxy/{**}?{**}"/>
</rule>
<rule dir="IN" name="YARNUI/yarn/inbound/static" pattern="*://*:*/**/yarn/static/{**}">
<rewrite template="{$serviceUrl[YARNUI]}/static/{**}"/>
@@ -251,8 +251,8 @@
<rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>
</rule>
<rule dir="OUT" name="YARNUI/yarn/outbound/apps/history1">
- <match pattern="/proxy/{**}"/>
- <rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>
+ <match pattern="/proxy/{**}?{**}"/>
+ <rewrite template="{$frontend[url]}/yarn/proxy/{**}/?{**}"/>
</rule>
<rule dir="OUT" name="YARNUI/yarn/outbound/cluster/container">
@@ -283,8 +283,9 @@ by adding META refresh. So we need to rewrite META refresh to jobstory.
<rewrite template="{gateway.scheme}://{gateway.host}:{gateway.port}/gateway/nodemanagerui/node?host={host}?port={port}"/>
</rule>
-<rule dir="OUT" name="YARNUI/yarn/outbound/node/containerlogs2">
+<rule dir="OUT" name="YARNUI/yarn/outbound/node/containerlogs2" pattern="*://*:*/node/containerlogs/{**}?{**}">
<match pattern="{scheme}://{host}:{port}/node/containerlogs/{**}?{**}"/>
+ <rewrite template="{$frontend[url]}/yarn/nodemanager/node/containerlogs/{**}?{**}?{scheme}?{host}?{port}"/>
</rule>
<rule dir="OUT" name="YARNUI/yarn/outbound/proxy1" pattern="/proxy/{**}">
<rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>