You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2019/08/05 19:03:16 UTC

[knox] branch master updated: KNOX-1964 - YARN v1 UI - ContainerLogs link broken for Running Jobs

This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new eb6d3c5  KNOX-1964 - YARN v1 UI - ContainerLogs link broken for Running Jobs
eb6d3c5 is described below

commit eb6d3c5533bdc2b0b9d25fb47af961fdd2bc9051
Author: Prabhu Joseph <pj...@cloudera.com>
AuthorDate: Mon Aug 5 20:32:37 2019 +0530

    KNOX-1964 - YARN v1 UI - ContainerLogs link broken for Running Jobs
    
    Signed-off-by: Kevin Risden <kr...@apache.org>
---
 .../src/main/resources/services/yarnui/2.7.0/rewrite.xml      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 ad6337a..434c9c3 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
@@ -77,9 +77,15 @@
 <rule dir="IN" name="YARNUI/yarn/inbound/nodemanager/node2" pattern="*://*:*/**/yarn/nodemanager/node?{scheme}?{host}?{port}">
     <rewrite template="{scheme}://{host}:{port}/node"/>
 </rule>
+<rule dir="IN" name="YARNUI/yarn/inbound/containerlogs1" pattern="*://*:*/**/yarn/nodemanager/node/containerlogs/{**}?{**}?{scheme}?{host}?{port}">
+    <rewrite template="{scheme}://{host}:{port}/node/containerlogs/{**}?{**}"/>
+</rule>
 <rule dir="IN" name="YARNUI/yarn/inbound/nodemanager/containerlogs/container" pattern="*://*:*/**/yarn/nodemanager/node/containerlogs/{**}?{scheme}?{host}?{port}">
     <rewrite template="{scheme}://{host}:{port}/node/containerlogs/{**}"/>
 </rule>
+<rule dir="IN" name="YARNUI/yarn/inbound/nodemanager/node3" pattern="*://*:*/**/yarn/nodemanager/node/{**}?{scheme}?{host}?{port}">
+    <rewrite template="{scheme}://{host}:{port}/node/{**}"/>
+</rule>
 <rule dir="IN" name="YARNUI/yarn/inbound/resourcemanager/home" pattern="*://*:*/**/yarn/resourcemanager?{scheme}?{host}?{port}">
     <rewrite template="{scheme}://{host}:{port}/cluster"/>
 </rule>
@@ -124,7 +130,10 @@
     <rewrite template="{$frontend[url]}/yarn/cluster/scheduler?{**}"/>
 </rule>
 <rule dir="OUT" name="YARNUI/yarn/outbound/node" pattern="/node/{**}">
-    <rewrite template="{$frontend[url]}/yarn/nodemanager/node/{**}"/>
+    <rewrite template="{$frontend[url]}/yarn/nodemanager/node/{**}?scheme={$inboundurl[scheme]}?host={$inboundurl[host]}?port={$inboundurl[port]}"/>
+</rule>
+<rule dir="OUT" name="YARNUI/yarn/outbound/node4" pattern="/node/containerlogs/{**}?{start}">
+    <rewrite template="{$frontend[url]}/yarn/nodemanager/node/containerlogs/{**}?{start}?scheme={$inboundurl[scheme]}?host={$inboundurl[host]}?port={$inboundurl[port]}"/>
 </rule>
 <rule dir="OUT" name="YARNUI/yarn/outbound/cluster/app" pattern="*://*:*/cluster/app/{**}">
     <rewrite template="{$frontend[url]}/yarn/cluster/app/{**}"/>