From 237885e0d2f57525d5c1655c00db0c0ff1956680 Mon Sep 17 00:00:00 2001 From: Aliaksandr Valialkin <valyala@victoriametrics.com> Date: Fri, 5 Nov 2021 20:04:09 +0200 Subject: [PATCH] docs/vmalert.md: document the addition of -defaultTenant.prometheus and -defaultTenant.graphite command-line options to enterprise version of vmalert --- app/vmalert/README.md | 3 +++ docs/CHANGELOG.md | 1 + docs/vmalert.md | 3 +++ 3 files changed, 7 insertions(+) diff --git a/app/vmalert/README.md b/app/vmalert/README.md index 4496ff44b2..e5577b1606 100644 --- a/app/vmalert/README.md +++ b/app/vmalert/README.md @@ -226,6 +226,9 @@ If `-clusterMode` is enabled, then `-datasource.url`, `-remoteRead.url` and `-re contain only the hostname without tenant id. For example: `-datasource.url=http://vmselect:8481`. `vmalert` automatically adds the specified tenant to urls per each recording rule in this case. +If `-clusterMode` is enabled and the `tenant` in a particular group is missing, then the tenant value +is obtained from `-defaultTenant.prometheus` or `-defaultTenant.graphite` depending on the `type` of the group. + The enterprise version of vmalert is available in `vmutils-*-enterprise.tar.gz` files at [release page](https://github.com/VictoriaMetrics/VictoriaMetrics/releases) and in `*-enterprise` tags at [Docker Hub](https://hub.docker.com/r/victoriametrics/vmalert/tags). diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0c4cd19834..90084f240e 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -7,6 +7,7 @@ sort: 15 ## tip * FEATURE: vmalert: allow groups with empty rules list like Prometheus does. See [this pull request](https://github.com/VictoriaMetrics/VictoriaMetrics/pull/1742). +* FEATURE: vmalert: allow groups with default `tenant` in `-clusterMode`. Default `tenant` values can be specified via `-defaultTenant.prometheus` and `-defaultTenant.graphite`. See [these docs](https://docs.victoriametrics.com/vmalert.html#multitenancy). * FEATURE: vmagent: add `collapse` and `expand` buttons per each group of targets with the same `job_name` at `http://vmagent:8429/targets` page. * FEATURE: automatically detect timestamp precision (ns, us, ms or s) for the data ingested into VictoriaMetrics via [InfluxDB line protocol](https://docs.victoriametrics.com/#how-to-send-data-from-influxdb-compatible-agents-such-as-telegraf). * FEATURE: vmagent: add ability to protect `/config` page with auth key via `-configAuthKey` command-line flag. This page may contain sensitive config information, so it may be good to restrict access to this page. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/1764). diff --git a/docs/vmalert.md b/docs/vmalert.md index 4d9d13a587..281388ee89 100644 --- a/docs/vmalert.md +++ b/docs/vmalert.md @@ -230,6 +230,9 @@ If `-clusterMode` is enabled, then `-datasource.url`, `-remoteRead.url` and `-re contain only the hostname without tenant id. For example: `-datasource.url=http://vmselect:8481`. `vmalert` automatically adds the specified tenant to urls per each recording rule in this case. +If `-clusterMode` is enabled and the `tenant` in a particular group is missing, then the tenant value +is obtained from `-defaultTenant.prometheus` or `-defaultTenant.graphite` depending on the `type` of the group. + The enterprise version of vmalert is available in `vmutils-*-enterprise.tar.gz` files at [release page](https://github.com/VictoriaMetrics/VictoriaMetrics/releases) and in `*-enterprise` tags at [Docker Hub](https://hub.docker.com/r/victoriametrics/vmalert/tags).