diff --git a/app/vmui/packages/vmui/public/favicon.ico b/app/vmui/packages/vmui/public/favicon.ico deleted file mode 100644 index efeb45702..000000000 Binary files a/app/vmui/packages/vmui/public/favicon.ico and /dev/null differ diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index f878ccfbf..86acc5609 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -104,6 +104,7 @@ The sandbox cluster installation is running under the constant load generated by * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly parse `ca`, `cert` and `key` options at `tls_config` section inside [http client settings](https://docs.victoriametrics.com/sd_configs.html#http-api-client-options). Previously string values couldn't be parsed for these options, since the parser was mistakenly expecting a list of `uint8` values instead. * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly drop samples if `-streamAggr.dropInput` command-line flag is set and `-remoteWrite.streamAggr.config` contains an empty file. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5207). * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): do not print redundant error logs when failed to scrape consul or nomad target. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5239). +* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): generate proper link to the main page and to `favicon.ico` at http pages served by `vmagent` such as `/targets` or `/service-discovery` when `vmagent` sits behind an http proxy with custom http path prefixes. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5306). * BUGFIX: [vmstorage](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): prevent deleted series to be searchable via `/api/v1/series` API if they were re-ingested with staleness markers. This situation could happen if user deletes the series from the target and from VM, and then vmagent sends stale markers for absent series. Thanks to @ilyatrefilov for the [issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5069) and [pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5174). * BUGFIX: [vmstorage](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): log warning about switching to ReadOnly mode only on state change. Before, vmstorage would log this warning every 1s. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5159) for details. * BUGFIX: [vmauth](https://docs.victoriametrics.com/vmauth.html): show browser authorization window for unauthorized requests to unsupported paths if the `unauthorized_user` section is specified. This allows properly authorizing the user. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5236) for details. diff --git a/lib/htmlcomponents/components.qtpl b/lib/htmlcomponents/components.qtpl index 63fc8fed7..8e803c219 100644 --- a/lib/htmlcomponents/components.qtpl +++ b/lib/htmlcomponents/components.qtpl @@ -5,13 +5,14 @@ + {% endfunc %} // Navbar writes navigation bar for /targets-like pages {% func Navbar() %}
- + VictoriaMetrics diff --git a/lib/htmlcomponents/components.qtpl.go b/lib/htmlcomponents/components.qtpl.go index ca3cbac70..0742685b0 100644 --- a/lib/htmlcomponents/components.qtpl.go +++ b/lib/htmlcomponents/components.qtpl.go @@ -22,106 +22,106 @@ var ( //line lib/htmlcomponents/components.qtpl:4 func StreamCommonHeader(qw422016 *qt422016.Writer) { //line lib/htmlcomponents/components.qtpl:4 - qw422016.N().S(``) -//line lib/htmlcomponents/components.qtpl:8 + qw422016.N().S(``) +//line lib/htmlcomponents/components.qtpl:9 } -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 func WriteCommonHeader(qq422016 qtio422016.Writer) { -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 qw422016 := qt422016.AcquireWriter(qq422016) -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 StreamCommonHeader(qw422016) -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 qt422016.ReleaseWriter(qw422016) -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 } -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 func CommonHeader() string { -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 qb422016 := qt422016.AcquireByteBuffer() -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 WriteCommonHeader(qb422016) -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 qs422016 := string(qb422016.B) -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 qt422016.ReleaseByteBuffer(qb422016) -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 return qs422016 -//line lib/htmlcomponents/components.qtpl:8 +//line lib/htmlcomponents/components.qtpl:9 } // Navbar writes navigation bar for /targets-like pages -//line lib/htmlcomponents/components.qtpl:11 +//line lib/htmlcomponents/components.qtpl:12 func StreamNavbar(qw422016 *qt422016.Writer) { -//line lib/htmlcomponents/components.qtpl:11 - qw422016.N().S(`
VictoriaMetrics
`) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:12 + qw422016.N().S(`
VictoriaMetrics
`) +//line lib/htmlcomponents/components.qtpl:21 } -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 func WriteNavbar(qq422016 qtio422016.Writer) { -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 qw422016 := qt422016.AcquireWriter(qq422016) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 StreamNavbar(qw422016) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 qt422016.ReleaseWriter(qw422016) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 } -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 func Navbar() string { -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 qb422016 := qt422016.AcquireByteBuffer() -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 WriteNavbar(qb422016) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 qs422016 := string(qb422016.B) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 qt422016.ReleaseByteBuffer(qb422016) -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 return qs422016 -//line lib/htmlcomponents/components.qtpl:20 +//line lib/htmlcomponents/components.qtpl:21 } // ErrorNotification writes the given err as error notification -//line lib/htmlcomponents/components.qtpl:23 +//line lib/htmlcomponents/components.qtpl:24 func StreamErrorNotification(qw422016 *qt422016.Writer, err error) { -//line lib/htmlcomponents/components.qtpl:23 +//line lib/htmlcomponents/components.qtpl:24 qw422016.N().S(``) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 } -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 func WriteErrorNotification(qq422016 qtio422016.Writer, err error) { -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 qw422016 := qt422016.AcquireWriter(qq422016) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 StreamErrorNotification(qw422016, err) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 qt422016.ReleaseWriter(qw422016) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 } -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 func ErrorNotification(err error) string { -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 qb422016 := qt422016.AcquireByteBuffer() -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 WriteErrorNotification(qb422016, err) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 qs422016 := string(qb422016.B) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 qt422016.ReleaseByteBuffer(qb422016) -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 return qs422016 -//line lib/htmlcomponents/components.qtpl:31 +//line lib/htmlcomponents/components.qtpl:32 } diff --git a/app/vmselect/vmui/favicon.ico b/lib/httpserver/favicon.ico similarity index 100% rename from app/vmselect/vmui/favicon.ico rename to lib/httpserver/favicon.ico diff --git a/lib/httpserver/httpserver.go b/lib/httpserver/httpserver.go index 0b8cd5fbf..27ba674bc 100644 --- a/lib/httpserver/httpserver.go +++ b/lib/httpserver/httpserver.go @@ -3,6 +3,7 @@ package httpserver import ( "context" "crypto/tls" + _ "embed" "errors" "flag" "fmt" @@ -259,6 +260,12 @@ func handlerWrapper(s *server, w http.ResponseWriter, r *http.Request, rh Reques h.Set("Connection", "close") } path := r.URL.Path + if strings.HasSuffix(path, "/favicon.ico") { + w.Header().Set("Cache-Control", "max-age=3600") + faviconRequests.Inc() + w.Write(faviconData) + return + } prefix := GetPathPrefix() if prefix != "" { // Trim -http.pathPrefix from path @@ -306,10 +313,6 @@ func handlerWrapper(s *server, w http.ResponseWriter, r *http.Request, rh Reques } w.WriteHeader(status) return - case "/favicon.ico": - faviconRequests.Inc() - w.WriteHeader(http.StatusNoContent) - return case "/metrics": metricsRequests.Inc() if !CheckAuthFlag(w, r, *metricsAuthKey, "metricsAuthKey") { @@ -446,7 +449,7 @@ var ( pprofTraceRequests = metrics.NewCounter(`vm_http_requests_total{path="/debug/pprof/trace"}`) pprofMutexRequests = metrics.NewCounter(`vm_http_requests_total{path="/debug/pprof/mutex"}`) pprofDefaultRequests = metrics.NewCounter(`vm_http_requests_total{path="/debug/pprof/default"}`) - faviconRequests = metrics.NewCounter(`vm_http_requests_total{path="/favicon.ico"}`) + faviconRequests = metrics.NewCounter(`vm_http_requests_total{path="*/favicon.ico"}`) authBasicRequestErrors = metrics.NewCounter(`vm_http_request_errors_total{path="*", reason="wrong_basic_auth"}`) authKeyRequestErrors = metrics.NewCounter(`vm_http_request_errors_total{path="*", reason="wrong_auth_key"}`) @@ -455,6 +458,9 @@ var ( requestsTotal = metrics.NewCounter(`vm_http_requests_all_total`) ) +//go:embed favicon.ico +var faviconData []byte + // GetQuotedRemoteAddr returns quoted remote address. func GetQuotedRemoteAddr(r *http.Request) string { remoteAddr := r.RemoteAddr