From a99a05ea232ba5f9d5a46fd41f93a9acdbb195c8 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin Date: Sun, 1 Oct 2023 20:52:25 +0200 Subject: [PATCH] app/vmagent: follow-up for cfef8147503158571cae03058f640ede45800471 - Properly handle /insert/multitenant/api/put url for opentsdb handler at vmagent - Document that the bug has been introduced in v1.93.2 at docs/CHANGELOG.md - Add a link to multitenant url docs in bugfix description Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5061 Updates https://github.com/VictoriaMetrics/VictoriaMetrics/issues/4910 --- app/vmagent/main.go | 2 +- docs/CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/vmagent/main.go b/app/vmagent/main.go index 51fc5cf6b..27db29f99 100644 --- a/app/vmagent/main.go +++ b/app/vmagent/main.go @@ -208,7 +208,7 @@ func getAuthTokenFromPath(path string) (*auth.Token, error) { if p.Suffix != "opentsdb/api/put" { return nil, fmt.Errorf("unsupported path requested: %q; expecting 'opentsdb/api/put'", p.Suffix) } - return auth.NewToken(p.AuthToken) + return auth.NewTokenPossibleMultitenant(p.AuthToken) } func requestHandler(w http.ResponseWriter, r *http.Request) bool { diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index d0aabbe7c..4f85b7d43 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -15,7 +15,7 @@ The following `tip` changes can be tested by building VictoriaMetrics components * BUGFIX: [vmbackup](https://docs.victoriametrics.com/vmbackup.html): properly copy `appliedRetention.txt` files inside `<-storageDataPath>/{data}` folders during [incremental backups](https://docs.victoriametrics.com/vmbackup.html#incremental-backups). Previously the new `appliedRetention.txt` could be skipped during incremental backups, which could lead to increased load on storage after restoring from backup. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5005). * BUGFIX: [vmagent](https://docs.victoriametrics.com/vmagent.html): suppress `context canceled` error messages in logs when `vmagent` is reloading service discovery config. This error could appear starting from [v1.93.5](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.5). See [this PR](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/5048). * BUGFIX: [MetricsQL](https://docs.victoriametrics.com/MetricsQL.html): allow passing [median_over_time](https://docs.victoriametrics.com/MetricsQL.html#median_over_time) to [aggr_over_time](https://docs.victoriametrics.com/MetricsQL.html#aggr_over_time). See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5034). -* BUGFIX: [vminsert](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): fixed ingestion via multitenant url for opentsdbhttp. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5061). +* BUGFIX: [vminsert](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html): fix ingestion via [multitenant url](https://docs.victoriametrics.com/Cluster-VictoriaMetrics.html#multitenancy-via-labels) for opentsdbhttp. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5061). The bug has been introduced in [v1.93.2](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.2). ## [v1.93.5](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.93.5)