From d26b6aae07cd21cc284208b6735142b3edab0b96 Mon Sep 17 00:00:00 2001 From: Garrett Guillotte <100453168+gguillotte-grafana@users.noreply.github.com> Date: Mon, 14 Nov 2022 02:04:38 -0800 Subject: [PATCH] [v9.2.x] Docs: Add document for jsondata field alertmanagerUid (#57121) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add document for jsondata field `alertmanagerUid` (#52895) alertmanagerUid can be used to specify Alert Manager for a particular Prometheus/Loki data source. Co-authored-by: Garrett Guillotte * Docs: Fix provisioning table formatting (#57042) Co-authored-by: Vũ Quốc Phong Co-authored-by: Daniel Lee --- docs/sources/administration/provisioning/index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/sources/administration/provisioning/index.md b/docs/sources/administration/provisioning/index.md index 62ae3a1f109..02067c56796 100644 --- a/docs/sources/administration/provisioning/index.md +++ b/docs/sources/administration/provisioning/index.md @@ -157,7 +157,8 @@ Since not all datasources have the same configuration settings we only have the | httpMethod | string | Prometheus | HTTP Method. 'GET', 'POST', defaults to POST | | customQueryParameters | string | Prometheus | Query parameters to add, as a URL-encoded string. | | manageAlerts | boolean | Prometheus and Loki | Manage alerts via Alerting UI | -| esVersion | string | Elasticsearch | Elasticsearch version (e.g. `7.0.0`, `7.6.1`) | +| alertmanagerUid | string | Prometheus and Loki | UID of Alert Manager that manages Alert for this data source. | +| esVersion | string | Elasticsearch | Elasticsearch version (E.g. `7.0.0`, `7.6.1`) | | timeField | string | Elasticsearch | Which field that should be used as timestamp | | interval | string | Elasticsearch | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly' | | logMessageField | string | Elasticsearch | Which field should be used as the log message |