diff --git a/docs/Single-server-VictoriaMetrics.md b/docs/Single-server-VictoriaMetrics.md index aa883ee196..710829972f 100644 --- a/docs/Single-server-VictoriaMetrics.md +++ b/docs/Single-server-VictoriaMetrics.md @@ -1018,6 +1018,7 @@ Consider setting the following command-line flags: with [HTTP Basic Authentication](https://en.wikipedia.org/wiki/Basic_access_authentication). * `-deleteAuthKey` for protecting `/api/v1/admin/tsdb/delete_series` endpoint. See [how to delete time series](#how-to-delete-time-series). * `-snapshotAuthKey` for protecting `/snapshot*` endpoints. See [how to work with snapshots](#how-to-work-with-snapshots). +* `-forceMergeAuthKey` for protecting `/internal/force_merge` endpoint. See [force merge docs](#forced-merge). * `-search.resetCacheAuthKey` for protecting `/internal/resetRollupResultCache` endpoint. See [backfilling](#backfilling) for more details. Explicitly set internal network interface for TCP and UDP ports for data ingestion with Graphite and OpenTSDB formats. diff --git a/docs/vmagent.md b/docs/vmagent.md index abb2e11186..d596cc59fb 100644 --- a/docs/vmagent.md +++ b/docs/vmagent.md @@ -135,7 +135,7 @@ The following scrape types in [scrape_config](https://prometheus.io/docs/prometh See [kubernetes_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config) for details. * `ec2_sd_configs` - for scraping targets in Amazon EC2. See [ec2_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#ec2_sd_config) for details. - `vmagent` doesn't support `role_arn` config param yet. + `vmagent` doesn't support `profile` config param and aws credentials file yet. * `gce_sd_configs` - for scraping targets in Google Compute Engine (GCE). See [gce_sd_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#gce_sd_config) for details. `vmagent` provides the following additional functionality for `gce_sd_config`: diff --git a/docs/vmalert.md b/docs/vmalert.md index 846245fa52..3b1df81030 100644 --- a/docs/vmalert.md +++ b/docs/vmalert.md @@ -166,6 +166,8 @@ The shortlist of configuration flags is the following: Optional basic auth password for -datasource.url -datasource.basicAuth.username string Optional basic auth username for -datasource.url + -datasource.lookback duration + Lookback defines how far to look into past when evaluating queries. For example, if datasource.lookback=5m then param "time" with value now()-5m will be added to every query. -datasource.tlsCAFile string Optional path to TLS CA file to use for verifying connections to -datasource.url. By default system CA is used -datasource.tlsCertFile string