From 73dfb030ddd59eeb6138e89f5bc38e035588eab6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 14:08:34 -0700 Subject: [PATCH 01/38] deployment/docker/Makefile: use alpine 3.17.3 instead of alpine 3.18.0 for certs image, since alpine 3.18.0 doesnt work for cross-platform builds --- deployment/docker/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deployment/docker/Makefile b/deployment/docker/Makefile index 6db3ac0ca..93584ea46 100644 --- a/deployment/docker/Makefile +++ b/deployment/docker/Makefile @@ -3,7 +3,12 @@ DOCKER_NAMESPACE ?= victoriametrics ROOT_IMAGE ?= alpine:3.18.0 -CERTS_IMAGE := alpine:3.18.0 + +# Use alpine:3.17.3 instead of 3.18.0 for CERTS_IMAGE +# because alpine:3.18.0 is broken for cross-platform builds +# TODO: sync it with ROOT_IMAGE when it will be fixed in the new alpine releases +CERTS_IMAGE := alpine:3.17.3 + GO_BUILDER_IMAGE := golang:1.20.4-alpine BUILDER_IMAGE := local/builder:2.0.0-$(shell echo $(GO_BUILDER_IMAGE) | tr :/ __)-1 BASE_IMAGE := local/base:1.1.4-$(shell echo $(ROOT_IMAGE) | tr :/ __)-$(shell echo $(CERTS_IMAGE) | tr :/ __) From f0ed9ab4f296db9595dd8b5a48ec4494dec6b12a Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 15:30:05 -0700 Subject: [PATCH 02/38] docs/Release-Guide.md: fix a link to sandbox environment The link became broken after https://github.com/VictoriaMetrics/ops/commit/5f9d3f9cb5d6694c7e0e62bfab739619886f654e --- docs/Release-Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Release-Guide.md b/docs/Release-Guide.md index 6428c2652..231887ef5 100644 --- a/docs/Release-Guide.md +++ b/docs/Release-Guide.md @@ -64,7 +64,7 @@ git remote add enterprise and this release contains all the needed binaries and checksums. 7. Update the release description with the [CHANGELOG](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/docs/CHANGELOG.md) for this release. 8. Remove the `draft` checkbox for the `TAG` release and manually publish it. -9. Bump version of the VictoriaMetrics cluster in the [sandbox environment](https://github.com/VictoriaMetrics/ops/blob/main/sandbox/manifests/benchmark-vm/vmcluster.yaml) +9. Bump version of the VictoriaMetrics cluster in the [sandbox environment](https://github.com/VictoriaMetrics/ops/blob/main/gcp-test/sandbox/manifests/benchmark-vm/vmcluster.yaml) by [opening and merging PR](https://github.com/VictoriaMetrics/ops/pull/58). 10. Bump VictoriaMetrics version at `deployment/docker/docker-compose.yml` and at `deployment/docker/docker-compose-cluster.yml`. @@ -140,4 +140,4 @@ Repository [https://github.com/VictoriaMetrics/victoriametrics-lts-rpm](https:// 8. Update `vmselect` version in [`vmselect.spec`](https://github.com/VictoriaMetrics/victoriametrics-lts-rpm/blob/master/vmselect.spec#L2) 9. Update `vmstorage` version in [`vmstorage.spec`](https://github.com/VictoriaMetrics/victoriametrics-lts-rpm/blob/master/vmstorage.spec#L2) 10. Update `vmsingle` version in [`vmsingle.spec`](https://github.com/VictoriaMetrics/victoriametrics-lts-rpm/blob/master/vmsingle.spec#L2) -11. Commit and push changes to the repository. This will automatically build and publish new versions of RPM packages. \ No newline at end of file +11. Commit and push changes to the repository. This will automatically build and publish new versions of RPM packages. From 9fa052c302aa152ecce844e96c5db941fa9ab6ca Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 15:34:21 -0700 Subject: [PATCH 03/38] deployment/docker: update VictoriaMetrics version from v1.90.0 to v1.91.0 in docker compose files --- deployment/docker/docker-compose-cluster.yml | 12 ++++++------ deployment/docker/docker-compose.yml | 6 +++--- .../one-click-droplet/RELEASE_GUIDE.md | 2 +- .../files/etc/update-motd.d/99-one-click | 4 ++-- .../grafana-vmgateway-openid-configuration.md | 14 +++++++------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deployment/docker/docker-compose-cluster.yml b/deployment/docker/docker-compose-cluster.yml index 2834d6b5f..4b3f709d1 100644 --- a/deployment/docker/docker-compose-cluster.yml +++ b/deployment/docker/docker-compose-cluster.yml @@ -2,7 +2,7 @@ version: '3.5' services: vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.90.0 + image: victoriametrics/vmagent:v1.91.0 depends_on: - "vminsert" ports: @@ -32,7 +32,7 @@ services: vmstorage-1: container_name: vmstorage-1 - image: victoriametrics/vmstorage:v1.90.0-cluster + image: victoriametrics/vmstorage:v1.91.0-cluster ports: - 8482 - 8400 @@ -44,7 +44,7 @@ services: restart: always vmstorage-2: container_name: vmstorage-2 - image: victoriametrics/vmstorage:v1.90.0-cluster + image: victoriametrics/vmstorage:v1.91.0-cluster ports: - 8482 - 8400 @@ -56,7 +56,7 @@ services: restart: always vminsert: container_name: vminsert - image: victoriametrics/vminsert:v1.90.0-cluster + image: victoriametrics/vminsert:v1.91.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" @@ -68,7 +68,7 @@ services: restart: always vmselect: container_name: vmselect - image: victoriametrics/vmselect:v1.90.0-cluster + image: victoriametrics/vmselect:v1.91.0-cluster depends_on: - "vmstorage-1" - "vmstorage-2" @@ -82,7 +82,7 @@ services: vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.90.0 + image: victoriametrics/vmalert:v1.91.0 depends_on: - "vmselect" ports: diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml index 66f76e727..fef488659 100644 --- a/deployment/docker/docker-compose.yml +++ b/deployment/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: vmagent: container_name: vmagent - image: victoriametrics/vmagent:v1.90.0 + image: victoriametrics/vmagent:v1.91.0 depends_on: - "victoriametrics" ports: @@ -18,7 +18,7 @@ services: restart: always victoriametrics: container_name: victoriametrics - image: victoriametrics/victoria-metrics:v1.90.0 + image: victoriametrics/victoria-metrics:v1.91.0 ports: - 8428:8428 - 8089:8089 @@ -56,7 +56,7 @@ services: restart: always vmalert: container_name: vmalert - image: victoriametrics/vmalert:v1.90.0 + image: victoriametrics/vmalert:v1.91.0 depends_on: - "victoriametrics" - "alertmanager" diff --git a/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md b/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md index 63c8a3e5c..9cb24a93b 100644 --- a/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md +++ b/deployment/marketplace/digitialocean/one-click-droplet/RELEASE_GUIDE.md @@ -8,7 +8,7 @@ 4. Set variables `DIGITALOCEAN_API_TOKEN` with `VM_VERSION` for `packer` environment and run make from example below: ```console -make release-victoria-metrics-digitalocean-oneclick-droplet DIGITALOCEAN_API_TOKEN="dop_v23_2e46f4759ceeeba0d0248" VM_VERSION="1.90.0" +make release-victoria-metrics-digitalocean-oneclick-droplet DIGITALOCEAN_API_TOKEN="dop_v23_2e46f4759ceeeba0d0248" VM_VERSION="1.91.0" ``` diff --git a/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click b/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click index e376ddba8..6f2b03fa8 100755 --- a/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click +++ b/deployment/marketplace/digitialocean/one-click-droplet/files/etc/update-motd.d/99-one-click @@ -19,8 +19,8 @@ On the server: * VictoriaMetrics is running on ports: 8428, 8089, 4242, 2003 and they are bound to the local interface. ******************************************************************************** - # This image includes 1.90.0 version of VictoriaMetrics. - # See Release notes https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.90.0 + # This image includes 1.91.0 version of VictoriaMetrics. + # See Release notes https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.91.0 # Welcome to VictoriaMetrics droplet! diff --git a/docs/guides/grafana-vmgateway-openid-configuration.md b/docs/guides/grafana-vmgateway-openid-configuration.md index 7cdd29bfc..64bc8cdae 100644 --- a/docs/guides/grafana-vmgateway-openid-configuration.md +++ b/docs/guides/grafana-vmgateway-openid-configuration.md @@ -239,27 +239,27 @@ services: - grafana_data:/var/lib/grafana/ vmsingle: - image: victoriametrics/victoria-metrics:v1.90.0 + image: victoriametrics/victoria-metrics:v1.91.0 command: - -httpListenAddr=0.0.0.0:8429 vmstorage: - image: victoriametrics/vmstorage:v1.90.0-cluster + image: victoriametrics/vmstorage:v1.91.0-cluster vminsert: - image: victoriametrics/vminsert:v1.90.0-cluster + image: victoriametrics/vminsert:v1.91.0-cluster command: - -storageNode=vmstorage:8400 - -httpListenAddr=0.0.0.0:8480 vmselect: - image: victoriametrics/vmselect:v1.90.0-cluster + image: victoriametrics/vmselect:v1.91.0-cluster command: - -storageNode=vmstorage:8401 - -httpListenAddr=0.0.0.0:8481 vmagent: - image: victoriametrics/vmagent:v1.90.0 + image: victoriametrics/vmagent:v1.91.0 volumes: - ./scrape.yaml:/etc/vmagent/config.yaml command: @@ -268,7 +268,7 @@ services: - -remoteWrite.url=http://vmsingle:8429/api/v1/write vmgateway-cluster: - image: victoriametrics/vmgateway:v1.90.0-enterprise + image: victoriametrics/vmgateway:v1.91.0-enterprise ports: - 8431:8431 command: @@ -281,7 +281,7 @@ services: - -auth.oidcDiscoveryEndpoints=http://keycloak:8080/realms/master/.well-known/openid-configuration vmgateway-single: - image: victoriametrics/vmgateway:v1.90.0-enterprise + image: victoriametrics/vmgateway:v1.91.0-enterprise ports: - 8432:8431 command: From 9e21315315c2da137e2c298e62f5f225ed99c958 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 17:50:12 -0700 Subject: [PATCH 04/38] docs/CHANGELOG.md: document v1.87.6 LTS release --- docs/CHANGELOG.md | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index acc061865..0001d4ef0 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -39,7 +39,7 @@ Released at 2023-05-18 * FEATURE: expose `process_*` metrics at `/metrics` page of all the VictoriaMetrics components under Windows OS. See [this pull request](https://github.com/VictoriaMetrics/metrics/pull/47). * FEATURE: reduce the amounts of unimportant `INFO` logging during VictoriaMetrics startup / shutdown. This should improve visibility for potentially important logs. * FEATURE: upgrade base docker image (alpine) from 3.17.3 to 3.18.0. See [alpine 3.18.0 release notes](https://www.alpinelinux.org/posts/Alpine-3.18.0-released.html). -* FEATURE: [VictoriaMetrics cluster](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): do not pullute logs with `cannot read hello: cannot read message with size 11: EOF` messages at `vmstorage` during TCP health checks performed by [Consul](https://developer.hashicorp.com/consul/docs/services/usage/checks) or [other services](https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-health-check/). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1762). +* FEATURE: [VictoriaMetrics cluster](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): do not pollute logs with `cannot read hello: cannot read message with size 11: EOF` messages at `vmstorage` during TCP health checks performed by [Consul](https://developer.hashicorp.com/consul/docs/services/usage/checks) or [other services](https://docs.nginx.com/nginx/admin-guide/load-balancer/tcp-health-check/). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1762). * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): support the ability to filter [consul_sd_configs](https://docs.victoriametrics.com/sd_configs.html#consul_sd_configs) targets in more optimal way via new `filter` option. See [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4183). * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): add support for [consulagent_sd_configs](https://docs.victoriametrics.com/sd_configs.html#consulagent_sd_configs). See [this feature request](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3953). * FEATURE: [vmagent](https://docs.victoriametrics.com/vmagent.html): emit a warning if too small value is passed to `-remoteWrite.maxDiskUsagePerURL` command-line flag. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4195). @@ -231,6 +231,33 @@ Released at 2023-02-24 * BUGFIX: properly parse timestamps in milliseconds when [ingesting data via OpenTSDB telnet put protocol](https://docs.victoriametrics.com/#sending-data-via-telnet-put-protocol). Previously timestamps in milliseconds were mistakenly multiplied by 1000. Thanks to @Droxenator for the [pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/3810). * BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): do not add extrapolated points outside the real points when using [interpolate()](https://docs.victoriametrics.com/MetricsQL.html#interpolate) function. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3816). +## [v1.87.6](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.6) + +Released at 2023-05-18 + +**v1.87.x is a line of LTS releases (e.g. long-time support). It contains important up-to-date bugfixes. +The v1.87.x line will be supported for at least 12 months since [v1.87.0](https://docs.victoriametrics.com/CHANGELOG.html#v1870) release** + +* SECURITY: upgrade Go builder from Go1.20.3 to Go1.20.4. See [the list of issues addressed in Go1.20.4](https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved). +* SECURITY: upgrade base docker image (alpine) from 3.17.3 to 3.18.0. See [alpine 3.18.0 release notes](https://www.alpinelinux.org/posts/Alpine-3.18.0-released.html). +* SECURITY: serve `/robots.txt` content to disallow indexing of the exposed instances by search engines. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4128) for details. + +* BUGFIX: reduce the probability of sudden increase in the number of small parts on systems with small number of CPU cores. +* BUGFIX: reduce the possibility of increased CPU usage when data with timestamps older than one hour is ingested into VictoriaMetrics. This reduces spikes for the graph `sum(rate(vm_slow_per_day_index_inserts_total))`. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4258). +* BUGFIX: do not ignore trailing empty field in CSV lines when [importing data in CSV format](https://docs.victoriametrics.com/#how-to-import-csv-data). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4048). +* BUGFIX: disallow `"` chars when parsing Prometheus label names, since they aren't allowed by [Prometheus text exposition format](https://github.com/prometheus/docs/blob/main/content/docs/instrumenting/exposition_formats.md#text-format-example). Previously this could result in silent incorrect parsing of incorrect Prometheus labels such as `foo{"bar"="baz"}` or `{foo:"bar",baz="aaa"}`. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4284). +* BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): fix a panic when the duration in the query contains uppercase `M` suffix. Such a suffix isn't allowed to use in durations, since it clashes with `a million` suffix, e.g. it isn't clear whether `rate(metric[5M])` means rate over 5 minutes, 5 months or 5 million seconds. See [this](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/3589) and [this](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4120) issues. +* BUGFIX: [VictoriaMetrics cluster](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): prevent from possible panic when the number of vmstorage nodes increases when [automatic vmstorage discovery](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#automatic-vmstorage-discovery) is enabled. +* BUGFIX: properly limit the number of [OpenTSDB HTTP](https://docs.victoriametrics.com/#sending-opentsdb-data-via-http-apiput-requests) concurrent requests specified via `-maxConcurrentInserts` command-line flag. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4204). Thanks to @zouxiang1993 for [the fix](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4208). +* BUGFIX: [vmalert](https://docs.victoriametrics.com/vmalert.html): properly return empty slices instead of nil for `/api/v1/rules` and `/api/v1/alerts` API handlers. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4221). +* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): add `__meta_kubernetes_endpoints_name` label for all ports discovered from endpoint. Previously, ports not matched by `Service` did not have this label. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4154) for details. Thanks to @thunderbird86 for discovering and [fixing](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4253) the issue. +* BUGFIX: fix possible infinite loop during `indexdb` rotation when `-retentionTimezoneOffset` command-line flag is set and the local timezone is not UTC. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4207). Thanks to @faceair for [the fix](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4206). +* BUGFIX: [vmauth](https://docs.victoriametrics.com/vmauth.html): do not return invalid auth credentials in http response by default, since it may be logged by client. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4188). +* BUGFIX: [alerts-health](https://github.com/VictoriaMetrics/VictoriaMetrics/blob/master/deployment/docker/alerts-health.yml): update threshold for `TooHighMemoryUsage` alert from 90% to 80%, since 90% is too high for production environments. +* BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): properly handle the `vm_promscrape_config_last_reload_successful` metric after config reload. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4260). +* BUGFIX: [stream aggregation](https://docs.victoriametrics.com/stream-aggregation.html): fix bug with duplicated labels during stream aggregation via single-node VictoriaMetrics. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4277). +* BUGFIX: [stream aggregation](https://docs.victoriametrics.com/stream-aggregation.html): suppress `series after dedup` error message in logs when `-remoteWrite.streamAggr.dedupInterval` command-line flag is set at [vmagent](https://docs.victoriametrics.com/vmgent.html) or when `-streamAggr.dedupInterval` command-line flag is set at [single-node VictoriaMetrics](https://docs.victoriametrics.com/). + ## [v1.87.5](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.87.5) Released at 2023-04-06 From 388ffec262702c95a8b72f7e125fbc78277aaea6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 19:56:24 -0700 Subject: [PATCH 05/38] docs/CHANGELOG.md: document v1.79.13 LTS release --- docs/CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0001d4ef0..6aef1fb44 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -829,6 +829,17 @@ Released at 2022-08-08 * BUGFIX: [vmui](https://docs.victoriametrics.com/#vmui): properly show date picker at `Table` tab. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2874). * BUGFIX: properly generate http redirects if `-http.pathPrefix` command-line flag is set. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/2918). +## [v1.79.13](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.79.13) + +Released at 2023-05-18 + +**v1.79.x is a line of LTS releases (e.g. long-time support). It contains important up-to-date bugfixes. +The v1.79.x line will be supported for at least 12 months since [v1.79.0](https://docs.victoriametrics.com/CHANGELOG.html#v1790) release** + +* SECURITY: upgrade Go builder from Go1.20.3 to Go1.20.4. See [the list of issues addressed in Go1.20.4](https://github.com/golang/go/issues?q=milestone%3AGo1.20.4+label%3ACherryPickApproved). +* SECURITY: upgrade base docker image (alpine) from 3.17.3 to 3.18.0. See [alpine 3.18.0 release notes](https://www.alpinelinux.org/posts/Alpine-3.18.0-released.html). +* SECURITY: serve `/robots.txt` content to disallow indexing of the exposed instances by search engines. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4128) for details. + ## [v1.79.12](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.79.12) Released at 2023-04-06 From 2b53ff774bde757a24b7a91be288f43dfd3f6bf7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 20:38:25 -0700 Subject: [PATCH 06/38] app/vmselect: log locations of sendPrometheusError() calls Previously the location inside the sendPrometheusError() was logged. This could make hard investigating error locations via `vm_log_messages_total` metric. --- app/vmselect/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/vmselect/main.go b/app/vmselect/main.go index a06e1ac35..5c0b0d57c 100644 --- a/app/vmselect/main.go +++ b/app/vmselect/main.go @@ -545,7 +545,7 @@ func isGraphiteTagsPath(path string) bool { } func sendPrometheusError(w http.ResponseWriter, r *http.Request, err error) { - logger.Warnf("error in %q: %s", httpserver.GetRequestURI(r), err) + logger.WarnfSkipframes(1, "error in %q: %s", httpserver.GetRequestURI(r), err) w.Header().Set("Content-Type", "application/json") statusCode := http.StatusUnprocessableEntity From 1f2f74e70e43be564bcd0e6c7a10385f1fcb0be6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Thu, 18 May 2023 20:48:38 -0700 Subject: [PATCH 07/38] lib/promrelabel: use monospace font at textarea for writing relabel configs on /metric-relabel-debug and /target-relabel-debug pages This simplifies visual inspection of indentation in yaml configs --- lib/promrelabel/debug.qtpl | 4 ++-- lib/promrelabel/debug.qtpl.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/promrelabel/debug.qtpl b/lib/promrelabel/debug.qtpl index 0b612a165..ba50ed85d 100644 --- a/lib/promrelabel/debug.qtpl +++ b/lib/promrelabel/debug.qtpl @@ -73,12 +73,12 @@ function submitRelabelDebugForm(e) { {% func relabelDebugFormInputs(metric, relabelConfigs string) %}
Relabel configs:
- +
Labels:
- +
{% endfunc %} diff --git a/lib/promrelabel/debug.qtpl.go b/lib/promrelabel/debug.qtpl.go index 40f29ec89..7219027c7 100644 --- a/lib/promrelabel/debug.qtpl.go +++ b/lib/promrelabel/debug.qtpl.go @@ -181,11 +181,11 @@ func RelabelDebugStepsHTML(targetURL, targetID string, dss []DebugStep, metric, //line lib/promrelabel/debug.qtpl:73 func streamrelabelDebugFormInputs(qw422016 *qt422016.Writer, metric, relabelConfigs string) { //line lib/promrelabel/debug.qtpl:73 - qw422016.N().S(`
Relabel configs:
Labels:
Labels: