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-1580 - YARN v1 UI - Scheduler - Dump scheduler logs link broken
Date Fri, 09 Nov 2018 17:41:16 GMT
Repository: knox
Updated Branches:
  refs/heads/v1.2.0 7adb881c6 -> d6de31cac


KNOX-1580 - YARN v1 UI - Scheduler - Dump scheduler logs link broken


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

Branch: refs/heads/v1.2.0
Commit: d6de31cacf9db95eb1bab8a723c87cfd3e3656a4
Parents: 7adb881
Author: Kevin Risden <krisden@apache.org>
Authored: Fri Nov 9 09:56:59 2018 -0500
Committer: Kevin Risden <krisden@apache.org>
Committed: Fri Nov 9 12:40:48 2018 -0500

----------------------------------------------------------------------
 .../src/main/resources/services/yarnui/2.7.0/rewrite.xml  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/d6de31ca/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 865da45..c4dba47 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
@@ -23,8 +23,8 @@
      e.g. http://host.com:8088
 -->
 
-<rule dir="IN" name="YARNUI/yarn/inbound/ws" pattern="*://*:*/**/yarn/ws/v1/cluster/apps/{**}">
-    <rewrite template="{$serviceUrl[YARNUI]}/ws/v1/cluster/apps/{**}"/>
+<rule dir="IN" name="YARNUI/yarn/inbound/ws" pattern="*://*:*/**/yarn/ws/v1/{**}">
+    <rewrite template="{$serviceUrl[YARNUI]}/ws/v1/{**}"/>
 </rule>
 <rule dir="IN" name="YARNUI/yarn/inbound/root" pattern="*://*:*/**/yarn/">
     <rewrite template="{$serviceUrl[YARNUI]}/cluster"/>
@@ -214,6 +214,7 @@
 <filter name="YARNUI/yarn/outbound/filter/cluster">
     <content type="*/html">
         <apply path="(https?://[^/':,]+:[\d]+)?/ws/v1/cluster/apps/application" rule="YARNUI/yarn/outbound/apps/cluster1"/>
+        <apply path="/ws/v1/.*" rule="YARNUI/yarn/outbound/ws1"/>
         <apply path="https?://[^/':,]+:[\d]+/cluster/scheduler.*" rule="YARNUI/yarn/outbound/scheduler1"/>
         <apply path="/cluster/scheduler.*" rule="YARNUI/yarn/outbound/scheduler2"/>
         <apply path="(https?://[^/':,]+:[\d]+)?/cluster/app/application" rule="YARNUI/yarn/outbound/cluster/app/application"/>
@@ -241,11 +242,16 @@
 <rule dir="OUT" name="YARNUI/yarn/outbound/apps/cluster1">
     <rewrite template="{$frontend[url]}/yarn/ws/v1/cluster/apps/application"/>
 </rule>
+<rule dir="OUT" name="YARNUI/yarn/outbound/ws1">
+    <match pattern="/ws/v1/{**}"/>
+    <rewrite template="{$frontend[url]}/yarn/ws/v1/{**}"/>
+</rule>
 
 <rule dir="OUT" name="YARNUI/yarn/outbound/cluster/app/application">
     <rewrite template="{$frontend[url]}/yarn/cluster/app/application"/>
 </rule>
 
+
 <rule dir="OUT" name="YARNUI/yarn/outbound/apps/history">
     <match pattern="*://*:*/proxy/{**}"/>
     <rewrite template="{$frontend[url]}/yarn/proxy/{**}"/>


Mime
View raw message