(impala) branch master updated: IMPALA-13196: Fully qualify urls in www/query_timeline

[michaelsmith]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new e419545c1 IMPALA-13196: Fully qualify urls in www/query_timeline
e419545c1 is described below

commit e419545c1c2b6fa0b6d23643d3b2eb0faa4dce52
Author: zhangyifan27 <chinazhangyi...@163.com>
AuthorDate: Fri Jul 5 13:40:13 2024 +0800

    IMPALA-13196: Fully qualify urls in www/query_timeline
    
    This patch fixes some links in www/query_timeline with adding
    {{ __common__.host-url }} prefix to fully qualify urls when
    Knox proxying is being used.
    
    Testing:
      - Ran in a cluster and manually checked the query_timeline page
    works as expected.
    
    Change-Id: I4a701f37cf257a0b11a027c9c598645ca0c997f3
    Reviewed-on: http://gerrit.cloudera.org:8080/21564
    Reviewed-by: Quanlong Huang <huangquanl...@gmail.com>
    Tested-by: Impala Public Jenkins <impala-public-jenk...@cloudera.com>
---
 www/query_timeline.tmpl | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/www/query_timeline.tmpl b/www/query_timeline.tmpl
index bc475b795..216715b7b 100644
--- a/www/query_timeline.tmpl
+++ b/www/query_timeline.tmpl
@@ -60,11 +60,11 @@ g.plan_node:active {
 }
 
 #hor_zoomout {
-  background-image: url("www/icons/horizontal_zoomout.png");
+  background-image: url("{{ __common__.host-url 
}}/www/icons/horizontal_zoomout.png");
 }
 
 #hor_zoomin {
-  background-image: url("www/icons/horizontal_zoomin.png");
+  background-image: url("{{ __common__.host-url 
}}/www/icons/horizontal_zoomin.png");
 }
 
 #hor_zoomout, #hor_zoomin{
@@ -139,7 +139,7 @@ g.plan_node:active {
     </div>
   </div>
   <div id="host_utilization_wrapper">
-    <img id="host_utilization_resize_bar" src="www/icons/drag_handle.png" 
draggable="false"/>
+    <img id="host_utilization_resize_bar" src="{{ __common__.host-url 
}}/www/icons/drag_handle.png" draggable="false"/>
     <input id="host_utilization_close_btn" class="btn btn-primary btn-sm" 
type="button"
         value="X" data-dismiss="modal"/>
     <div id="host_utilization_diagram">
@@ -148,7 +148,7 @@ g.plan_node:active {
     </div>
   </div>
   <div id="fragment_metrics_wrapper">
-    <img id="fragment_metrics_resize_bar" src="www/icons/drag_handle.png" 
draggable="false"/>
+    <img id="fragment_metrics_resize_bar" src="{{ __common__.host-url 
}}/www/icons/drag_handle.png" draggable="false"/>
     <input id="fragment_metrics_close_btn" class="btn btn-primary btn-sm" 
type="button"
         value="X" data-dismiss="modal"/>
     <div id="fragment_metrics_diagram">
@@ -164,16 +164,16 @@ g.plan_node:active {
 $("#plan-timing-tab").addClass("active");
 
 import {renderTimingDiagram, collectFragmentEventsFromProfile, ntics, 
set_ntics} from
-    "./www/scripts/query_timeline/fragment_diagram.js";
+    "{{ __common__.host-url }}/www/scripts/query_timeline/fragment_diagram.js";
 import {collectUtilizationFromProfile, toogleUtilizationVisibility,
     destroyUtilizationChart}
-    from "./www/scripts/query_timeline/host_utilization_diagram.js";
+    from "{{ __common__.host-url 
}}/www/scripts/query_timeline/host_utilization_diagram.js";
 import {collectFragmentMetricsFromProfile, closeFragmentMetricsChart} from
-    "./www/scripts/query_timeline/fragment_metrics_diagram.js";
+    "{{ __common__.host-url 
}}/www/scripts/query_timeline/fragment_metrics_diagram.js";
 import {profile, set_profile, maxts, set_maxts, diagram_width, 
set_diagram_width,
     border_stroke_width, resizeHorizontalAll}
-    from "./www/scripts/query_timeline/global_members.js";
-import {inflateParseJSON} from "./www/scripts/compression_util.js";
+    from "{{ __common__.host-url 
}}/www/scripts/query_timeline/global_members.js";
+import {inflateParseJSON} from "{{ __common__.host-url 
}}/www/scripts/compression_util.js";
 
 var chart_export_style;
 var last_maxts;