Repository: knox Updated Branches: refs/heads/master 949791158 -> 954f86658
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/954f8665 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/954f8665 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/954f8665 Branch: refs/heads/master Commit: 954f8665861c11ff300081e3ddc6a1e7094242de Parents: 9497911 Author: Larry McCay <[email protected]> Authored: Tue Jul 10 15:45:54 2018 -0400 Committer: Larry McCay <[email protected]> Committed: Tue Jul 10 15:45:54 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/954f8665/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/{**}"/>
