From 91f1162a774c4be59f997d6f160280a713539e76 Mon Sep 17 00:00:00 2001 From: brendamuir <100768211+brendamuir@users.noreply.github.com> Date: Wed, 27 Sep 2023 08:51:20 +0200 Subject: [PATCH] Alerting docs: backport 10.1 (#75485) --- .../rbac-fixed-basic-role-definitions/index.md | 2 +- docs/sources/alerting/alerting-rules/_index.md | 3 --- .../create-mimir-loki-managed-recording-rule.md | 5 +---- .../manage-notifications/images-in-notifications.md | 4 +--- .../alerting/manage-notifications/view-state-health.md | 6 +++--- .../set-up/configure-alert-state-history/index.md | 4 ---- .../set-up/provision-alerting-resources/_index.md | 8 ++++---- .../file-provisioning/index.md | 8 ++++---- 8 files changed, 14 insertions(+), 26 deletions(-) diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md index fc24c05c13e..704af27cb92 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md @@ -101,7 +101,7 @@ The following tables list permissions associated with basic and fixed roles. ### Alerting roles -If alerting is [enabled]({{< relref "../../../../alerting/set-up/migrating-alerts/opt-out/" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder. +If alerting is [enabled]({{< relref "../../../../alerting/set-up/migrating-alerts" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder. Access to Grafana alert rules is an intersection of many permissions: diff --git a/docs/sources/alerting/alerting-rules/_index.md b/docs/sources/alerting/alerting-rules/_index.md index da1bda8d87d..06e60be604b 100644 --- a/docs/sources/alerting/alerting-rules/_index.md +++ b/docs/sources/alerting/alerting-rules/_index.md @@ -47,9 +47,6 @@ For information on how to configure notification policies, see [Configure notifi [create-mimir-loki-managed-recording-rule]: "/docs/grafana/ -> /docs/grafana//alerting/alerting-rules/create-mimir-loki-managed-recording-rule" [create-mimir-loki-managed-recording-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-mimir-loki-managed-recording-rule" -[edit-mimir-loki-namespace-group]: "/docs/grafana/ -> /docs/grafana//alerting/alerting-rules/edit-mimir-loki-namespace-group" -[edit-mimir-loki-namespace-group]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/edit-mimir-loki-namespace-group" - [create-grafana-managed-rule]: "/docs/grafana/ -> /docs/grafana//alerting/alerting-rules/create-grafana-managed-rule" [create-grafana-managed-rule]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-grafana-managed-rule" diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md index 8db9738d680..a31758d2604 100644 --- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md +++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md @@ -58,7 +58,7 @@ To create recording rules, follow these steps. - Select your Loki or Prometheus data source. - Enter a query. 1. Add namespace and group. - - From the **Namespace** dropdown, select an existing rule namespace or add a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. For more information, see [Grafana Mimir or Loki rule groups and namespaces][edit-mimir-loki-namespace-group]. + - From the **Namespace** dropdown, select an existing rule namespace or add a new one. Namespaces can contain one or more rule groups and only have an organizational purpose. - From the **Group** dropdown, select an existing group within the selected namespace or add a new one. Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time. 1. Add labels. - Add custom labels selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value . @@ -70,7 +70,4 @@ To create recording rules, follow these steps. [configure-grafana]: "/docs/grafana/ -> /docs/grafana//setup-grafana/configure-grafana" [configure-grafana]: "/docs/grafana-cloud/ -> /docs/grafana//setup-grafana/configure-grafana" - -[edit-mimir-loki-namespace-group]: "/docs/grafana/ -> /docs/grafana//alerting/fundamentals/alert-rules/organising-alerts/" -[edit-mimir-loki-namespace-group]: "/docs/grafana-cloud/ -> /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/organising-alerts/" {{% /docs/reference %}} diff --git a/docs/sources/alerting/manage-notifications/images-in-notifications.md b/docs/sources/alerting/manage-notifications/images-in-notifications.md index 6d799ba2050..f6ee403bc57 100644 --- a/docs/sources/alerting/manage-notifications/images-in-notifications.md +++ b/docs/sources/alerting/manage-notifications/images-in-notifications.md @@ -69,9 +69,7 @@ If screenshots should be uploaded to cloud storage then `upload_external_image_s # will be persisted to disk for up to temp_data_lifetime. upload_external_image_storage = false -Please see [`[external_image_storage]`]({{< relref "../../setup-grafana/configure-grafana#external_image_storage" >}}) for instructions on how to configure cloud storage. Grafana will not start if `upload_external_image_storage` is `true` and `[external_image_storage]` contains missing or invalid configuration. - -If Grafana is acting as its own cloud storage then `[upload_external_image_storage]` should be set to `true` and the `local` provider should be set in [`[external_image_storage]`]({{< relref "../../setup-grafana/configure-grafana#external_image_storage" >}}). +For more information on image rendering, refer to [image rendering][image-rendering]. Restart Grafana for the changes to take effect. diff --git a/docs/sources/alerting/manage-notifications/view-state-health.md b/docs/sources/alerting/manage-notifications/view-state-health.md index 795c7098201..b65a4c9e2b5 100644 --- a/docs/sources/alerting/manage-notifications/view-state-health.md +++ b/docs/sources/alerting/manage-notifications/view-state-health.md @@ -83,9 +83,9 @@ You can handle these alerts the same way as regular alerts by adding a silence, Use the State history view to get insight into how your alert instances behave over time. View information on when a state change occurred, what the previous state was, the current state, any other alert instances that changed their state at the same time as well as what the query value was that triggered the change. -### Configure the state history view - -To enable the state history view, see [Configuring alert state history]({{< relref "../set-up/configure-alert-state-history/index.md" >}}). +{{% admonition type="note" %}} +Open source users must configure alert state history in order to be able to access the view. +{{% /admonition %}} ### View state history diff --git a/docs/sources/alerting/set-up/configure-alert-state-history/index.md b/docs/sources/alerting/set-up/configure-alert-state-history/index.md index 45e9b85e9a7..5a1145531b3 100644 --- a/docs/sources/alerting/set-up/configure-alert-state-history/index.md +++ b/docs/sources/alerting/set-up/configure-alert-state-history/index.md @@ -16,10 +16,6 @@ weight: 600 # Configure Alert State History -{{% admonition type="note" %}} -This applies to Open Source only. There is no configuration required if you are using Grafana Cloud. -{{% /admonition %}} - Starting with Grafana 10, Alerting can record all alert rule state changes for your Grafana managed alert rules in a Loki instance. This allows you to explore the behavior of your alert rules in the Grafana explore view and levels up the existing state history modal with a powerful new visualisation. diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md index 302025f344b..8ca675a7c11 100644 --- a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md +++ b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md @@ -28,9 +28,11 @@ There are three options to choose from: 1. Provision your alerting resources using the Alerting Provisioning HTTP API. - For more information on the Alerting Provisioning HTTP API, refer to [Alerting provisioning API]({{< relref "../../../developers/http_api/alerting_provisioning" >}}). + For more information on the Alerting Provisioning HTTP API, refer to [Alerting provisioning HTTP API][alerting_provisioning]. -1. Provision your alerting resources using [Terraform](https://www.terraform.io/). +1. {{% admonition type="note" %}} + If you are using Open Source, you can provision your alerting resources using [Terraform](https://www.terraform.io/). + {{% /admonition %}} **Note:** @@ -40,8 +42,6 @@ Currently, provisioning for Grafana Alerting supports alert rules, contact point [Grafana provisioning][provisioning] -[Terraform provisioning](/docs/grafana-cloud/infrastructure-as-code/terraform/) - [Grafana Alerting provisioning API][alerting_provisioning] {{% docs/reference %}} diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md index 8b207c4d20a..3f04acbd706 100644 --- a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md +++ b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md @@ -138,7 +138,7 @@ deleteRules: Create or delete contact points in your Grafana instance(s). 1. Create a contact point in Grafana. -1. Use the [Alerting provisioning API]({{< relref "../../../../developers/http_api/alerting_provisioning" >}}) export endpoints to download a provisioning file for your contact point. +1. Use the [Alerting provisioning API][alerting_provisioning] export endpoints to download a provisioning file for your contact point. 1. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory. Example configuration files can be found below. @@ -497,12 +497,12 @@ settings: Create or reset the notification policy tree in your Grafana instance(s). 1. Create a notification policy in Grafana. -2. Use the [Alerting provisioning API]({{< relref "../../../../developers/http_api/alerting_provisioning" >}}) export endpoints to download a provisioning file for your notification policy. -3. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory. +1. Use the [Alerting provisioning API][alerting_provisioning] export endpoints to download a provisioning file for your notification policy. +1. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory. Example configuration files can be found below. -4. Ensure that your files are in the right directory on the node running the Grafana server, so that they deploy alongside your Grafana instance(s). +1. Ensure that your files are in the right directory on the node running the Grafana server, so that they deploy alongside your Grafana instance(s). Here is an example of a configuration file for creating notification policies.