From 7c8cb35426cab8cc21b62ad14949441d72837f8e Mon Sep 17 00:00:00 2001 From: Maarten De Wispelaere Date: Thu, 2 Sep 2021 21:16:39 +0200 Subject: [PATCH 1/4] add "manageAlerts" option to prov. docs --- docs/sources/administration/provisioning.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index af583fac56cc2..2e0ae64a13f82 100644 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -154,6 +154,7 @@ Since not all datasources have the same configuration settings we only have the | maxSeries | number | Influxdb | Max number of series/tables that Grafana processes | | 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 | Manage alerts via Alerting UI | | 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' | From d7085355a675cc0500b7e32397e529fcd23ac3d4 Mon Sep 17 00:00:00 2001 From: Maarten De Wispelaere <50638541+BitProcessor@users.noreply.github.com> Date: Tue, 14 Sep 2021 13:18:43 +0200 Subject: [PATCH 2/4] Update docs/sources/administration/provisioning.md Takes into account suggestion from @domasx2 Co-authored-by: Domas --- docs/sources/administration/provisioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index 2e0ae64a13f82..dcc58191c0b2b 100644 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -154,7 +154,7 @@ Since not all datasources have the same configuration settings we only have the | maxSeries | number | Influxdb | Max number of series/tables that Grafana processes | | 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 | Manage alerts via Alerting UI | +| manageAlerts | boolean | Prometheus and Loki | Manage alerts via Alerting UI | | 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' | From a254240a396c0c70d9bf6fdba1f497abe5af5377 Mon Sep 17 00:00:00 2001 From: achatterjee-grafana Date: Wed, 15 Sep 2021 12:09:51 -0400 Subject: [PATCH 3/4] Revert "Update docs/sources/administration/provisioning.md " This reverts commit d7085355a675cc0500b7e32397e529fcd23ac3d4. --- docs/sources/administration/provisioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index dcc58191c0b2b..2e0ae64a13f82 100644 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -154,7 +154,7 @@ Since not all datasources have the same configuration settings we only have the | maxSeries | number | Influxdb | Max number of series/tables that Grafana processes | | 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 | +| manageAlerts | boolean | Prometheus | Manage alerts via Alerting UI | | 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' | From b1f8b58a46df35830c1d135f2ead1b46b35754bb Mon Sep 17 00:00:00 2001 From: achatterjee-grafana Date: Wed, 15 Sep 2021 12:11:08 -0400 Subject: [PATCH 4/4] Adding content back. --- docs/sources/administration/provisioning.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md index 2e0ae64a13f82..28404d6d7dd13 100644 --- a/docs/sources/administration/provisioning.md +++ b/docs/sources/administration/provisioning.md @@ -154,7 +154,7 @@ Since not all datasources have the same configuration settings we only have the | maxSeries | number | Influxdb | Max number of series/tables that Grafana processes | | 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 | Manage alerts via Alerting UI | +| manageAlerts | boolean | Prometheus and Loki | Manage alerts via Alerting UI | | 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' |