From 8ccdc6bf4fb9d08c66f3a6656479c3ff1c69253c Mon Sep 17 00:00:00 2001 From: laixintao Date: Mon, 8 Aug 2022 05:28:52 +0800 Subject: [PATCH] bugfix: fix vmalert navbar url. (#2949) the doc url should not be joined by `prefix` because it's an abs url. (cherry picked from commit 97abb601f2f18387b52c8ed0b158c2a34a08d15f) --- app/vmalert/tpl/header.qtpl | 9 ++- app/vmalert/tpl/header.qtpl.go | 136 ++++++++++++++++++--------------- 2 files changed, 83 insertions(+), 62 deletions(-) diff --git a/app/vmalert/tpl/header.qtpl b/app/vmalert/tpl/header.qtpl index b5714da293..acc98573dd 100644 --- a/app/vmalert/tpl/header.qtpl +++ b/app/vmalert/tpl/header.qtpl @@ -2,6 +2,7 @@ "strings" "net/http" "path" + "net/url" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" ) %} @@ -86,7 +87,11 @@ type NavItem struct { -{% endfunc %} \ No newline at end of file +{% endfunc %} diff --git a/app/vmalert/tpl/header.qtpl.go b/app/vmalert/tpl/header.qtpl.go index 6fb6b0483d..2caee4cf86 100644 --- a/app/vmalert/tpl/header.qtpl.go +++ b/app/vmalert/tpl/header.qtpl.go @@ -7,53 +7,54 @@ package tpl //line app/vmalert/tpl/header.qtpl:1 import ( "net/http" + "net/url" "path" "strings" "github.com/VictoriaMetrics/VictoriaMetrics/app/vmalert/utils" ) -//line app/vmalert/tpl/header.qtpl:9 +//line app/vmalert/tpl/header.qtpl:10 import ( qtio422016 "io" qt422016 "github.com/valyala/quicktemplate" ) -//line app/vmalert/tpl/header.qtpl:9 +//line app/vmalert/tpl/header.qtpl:10 var ( _ = qtio422016.Copy _ = qt422016.AcquireByteBuffer ) -//line app/vmalert/tpl/header.qtpl:9 +//line app/vmalert/tpl/header.qtpl:10 func StreamHeader(qw422016 *qt422016.Writer, r *http.Request, navItems []NavItem, title string) { -//line app/vmalert/tpl/header.qtpl:9 +//line app/vmalert/tpl/header.qtpl:10 qw422016.N().S(` `) -//line app/vmalert/tpl/header.qtpl:10 +//line app/vmalert/tpl/header.qtpl:11 prefix := utils.Prefix(r.URL.Path) -//line app/vmalert/tpl/header.qtpl:10 +//line app/vmalert/tpl/header.qtpl:11 qw422016.N().S(` vmalert`) -//line app/vmalert/tpl/header.qtpl:14 +//line app/vmalert/tpl/header.qtpl:15 if title != "" { -//line app/vmalert/tpl/header.qtpl:14 +//line app/vmalert/tpl/header.qtpl:15 qw422016.N().S(` - `) -//line app/vmalert/tpl/header.qtpl:14 +//line app/vmalert/tpl/header.qtpl:15 qw422016.E().S(title) -//line app/vmalert/tpl/header.qtpl:14 +//line app/vmalert/tpl/header.qtpl:15 } -//line app/vmalert/tpl/header.qtpl:14 +//line app/vmalert/tpl/header.qtpl:15 qw422016.N().S(`