"Release: Updated versions in package to 9.0.0-beta.2" (#359)

(cherry picked from commit 0101c19374)

Co-authored-by: Todd Treece <360020+toddtreece@users.noreply.github.com>

.betterer.results

@@ -173,9 +173,6 @@ exports[`no enzyme tests`] = {
     "public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.test.tsx:4164297658": [
       [0, 17, 13, "RegExp match", "2409514259"]
     ],
-    "public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx:523695501": [
-      [0, 17, 13, "RegExp match", "2409514259"]
-    ],
     "public/app/features/folders/FolderSettingsPage.test.tsx:1109052730": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
@@ -203,7 +200,7 @@ exports[`no enzyme tests`] = {
     "public/app/features/teams/TeamSettings.test.tsx:2043271249": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
-    "public/app/features/users/UsersListPage.test.tsx:3908145117": [
+    "public/app/features/users/UsersListPage.test.tsx:2518052139": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
     "public/app/features/users/UsersTable.test.tsx:263958312": [

.drone.yml

@@ -15,7 +15,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -80,7 +80,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -168,7 +168,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -434,7 +434,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -504,7 +504,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -594,7 +594,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -683,7 +683,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -744,7 +744,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -828,7 +828,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1261,7 +1261,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1334,7 +1334,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -1422,7 +1422,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1507,7 +1507,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1813,7 +1813,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1937,7 +1937,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2014,7 +2014,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -2073,7 +2073,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2430,7 +2430,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2609,7 +2609,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2733,7 +2733,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -2808,7 +2808,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2886,7 +2886,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2947,7 +2947,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3026,7 +3026,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3088,7 +3088,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3126,7 +3126,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3164,7 +3164,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3220,7 +3220,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3268,7 +3268,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3317,7 +3317,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3593,7 +3593,7 @@ steps:
   name: identify-runner
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3711,7 +3711,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3782,7 +3782,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -3830,7 +3830,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4185,7 +4185,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4355,7 +4355,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4470,7 +4470,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.49/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -4667,6 +4667,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 39c6fd27fc223b7bc99242101d28f508cdbbf01b561330bb52979f1d032af5d5
+hmac: a697f4b02af2da0fc6c0d751e40e59db542541d6024e5f0c2b062c7060d635ab
 
 ...

conf/defaults.ini

@@ -305,7 +305,7 @@ content_security_policy = false
 # $ROOT_PATH is server.root_url without the protocol.
 content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 
-# Controls if old angular plugins are supported or not. This will be disabled by default in Grafana v9.
+# Controls if old angular plugins are supported or not. This will be disabled by default in future release
 angular_support_enabled = true
 
 [security.encryption]
@@ -582,8 +582,6 @@ enabled = false
 header_name = X-WEBAUTH-USER
 header_property = username
 auto_sign_up = true
-# Deprecated, use sync_ttl instead
-ldap_sync_ttl = 60
 sync_ttl = 60
 whitelist =
 headers =
@@ -1174,9 +1172,6 @@ promQueryBuilder = true
 # The new loki visual query builder
 lokiQueryBuilder = true
 
-# InfluxDB backend migration
-influxdbBackendMigration = true
-
 # Experimental Explore to Dashboard workflow
 explore2Dashboard = true
 

conf/sample.ini

@@ -305,7 +305,7 @@
 # $ROOT_PATH is server.root_url without the protocol.
 ;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""
 
-# Controls if old angular plugins are supported or not. This will be disabled by default in Grafana v9.
+# Controls if old angular plugins are supported or not. This will be disabled by default in future release
 ;angular_support_enabled = true
 
 [security.encryption]

docs/sources/_index.md

@@ -1,9 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/", "/docs/grafana/latest/guides/reference/admin/", "/docs/grafana/v1.1/", "/docs/grafana/v3.1/"]
-description = "Guides, Installation and Feature Documentation"
-keywords = ["grafana", "installation", "documentation"]
-title = "Grafana documentation"
-+++
+---
+aliases:
+  - /docs/grafana/latest/
+  - /docs/grafana/latest/guides/reference/admin/
+  - /docs/grafana/v1.1/
+  - /docs/grafana/v3.1/
+description: Guides, Installation and Feature Documentation
+keywords:
+  - grafana
+  - installation
+  - documentation
+title: Grafana documentation
+---
 
 # Grafana documentation
 

docs/sources/administration/_index.md

@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/"]
-description = "Administration"
-title = "Administration"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/
+description: Administration
+title: Administration
+weight: 40
+---
 
 # Administration
 

docs/sources/administration/cli.md

@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/cli/"]
-description = "Guide to using grafana-cli"
-keywords = ["grafana", "cli", "grafana-cli", "command line interface"]
-title = "Grafana CLI"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/cli/
+description: Guide to using grafana-cli
+keywords:
+  - grafana
+  - cli
+  - grafana-cli
+  - command line interface
+title: Grafana CLI
+weight: 400
+---
 
 # Grafana CLI
 

docs/sources/administration/configuration.md

@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/configuration/", "/docs/grafana/latest/installation/configuration/"]
-description = "Configuration documentation"
-keywords = ["grafana", "configuration", "documentation"]
-title = "Configuration"
-weight = 150
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/configuration/
+  - /docs/grafana/latest/installation/configuration/
+description: Configuration documentation
+keywords:
+  - grafana
+  - configuration
+  - documentation
+title: Configuration
+weight: 150
+---
 
 # Configuration
 
@@ -602,7 +607,7 @@ Set Content Security Policy template used when adding the Content-Security-Polic
 
 ### angular_support_enabled
 
-This currently defaults to `true` but will in Grafana v9 default to `false`. When set to false the angular framework and support components will not be loaded. This means that
+This currently defaults to `true` but will default to `false` in a future release. When set to false the angular framework and support components will not be loaded. This means that
 all plugins and core features that depend on angular support will stop working.
 
 Current core features that will stop working:

docs/sources/administration/configure-docker.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/configure-docker/", "/docs/grafana/latest/installation/configure-docker/"]
-description = "Guide for configuring the Grafana Docker image"
-keywords = ["grafana", "configuration", "documentation", "docker"]
-title = "Configure Grafana Docker image"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/configure-docker/
+  - /docs/grafana/latest/installation/configure-docker/
+description: Guide for configuring the Grafana Docker image
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - docker
+title: Configure Grafana Docker image
+weight: 200
+---
 
 # Configure a Grafana Docker image
 

docs/sources/administration/database-encryption.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/database-encryption/"]
-description = "Grafana database encryption"
-keywords = ["grafana", "database", "encryption", "envelope encryption", "documentation"]
-title = "Database encryption"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/database-encryption/
+description: Grafana database encryption
+keywords:
+  - grafana
+  - database
+  - encryption
+  - envelope encryption
+  - documentation
+title: Database encryption
+weight: 450
+---
 
 # Grafana database encryption
 

docs/sources/administration/jaeger-instrumentation.md

@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/jaeger-instrumentation/"]
-description = "Jaeger traces emitted and propagation by Grafana"
-keywords = ["grafana", "jaeger", "tracing"]
-title = "Jaeger instrumentation"
-weight = 900
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/jaeger-instrumentation/
+description: Jaeger traces emitted and propagation by Grafana
+keywords:
+  - grafana
+  - jaeger
+  - tracing
+title: Jaeger instrumentation
+weight: 900
+---
 
 # Jaeger instrumentation
 

docs/sources/administration/manage-user-preferences/_index.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/change-your-password/", "/docs/grafana/latest/administration/manage-user-preferences/"]
-description = "Learn how to update your user preferences and switch organizations"
-keywords = ["password", "change", "organization", "change"]
-title = "Manage user preferences"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/change-your-password/
+  - /docs/grafana/latest/administration/manage-user-preferences/
+description: Learn how to update your user preferences and switch organizations
+keywords:
+  - password
+  - change
+  - organization
+  - change
+title: Manage user preferences
+weight: 400
+---
 
 # Manage user preferences
 

docs/sources/administration/manage-users-and-permissions/_index.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/"]
-title = "Manage users and permissions"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/
+title: Manage users and permissions
+weight: 200
+---
 
 # Manage users and permissions
 

docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md

@@ -1,8 +1,13 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/", "/docs/grafana/latest/manage-users/", "/docs/grafana/latest/permissions/", "/docs/grafana/latest/permissions/organization_roles/", "/docs/grafana/latest/permissions/overview/"]
-title = "About users and permissions"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/
+  - /docs/grafana/latest/manage-users/
+  - /docs/grafana/latest/permissions/
+  - /docs/grafana/latest/permissions/organization_roles/
+  - /docs/grafana/latest/permissions/overview/
+title: About users and permissions
+weight: 100
+---
 
 # About users and permissions
 

docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md

@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/", "/docs/grafana/latest/permissions/dashboard_folder_permissions/"]
-title = "Manage dashboard permissions"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/
+  - /docs/grafana/latest/permissions/dashboard_folder_permissions/
+title: Manage dashboard permissions
+weight: 500
+---
 
 # Manage dashboard permissions
 

docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md

@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/", "/docs/grafana/latest/manage-users/org-admin/"]
-title = "Manage users in an organization"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/
+  - /docs/grafana/latest/manage-users/org-admin/
+title: Manage users in an organization
+weight: 400
+---
 
 # Manage users in an organization
 

docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/"]
-title = "Change a user's organization permissions"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/
+title: Change a user's organization permissions
+weight: 30
+---
 
 # Change a user's organization permissions
 

docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/"]
-title = "Invite a user to join an organization"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/
+title: Invite a user to join an organization
+weight: 10
+---
 
 # Invite a user to join an organization
 

docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/"]
-title = "Manage a pending invitation"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/
+title: Manage a pending invitation
+weight: 20
+---
 
 # Manage a pending invitation
 

docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/"]
-title = "Remove a user from an organization"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/
+title: Remove a user from an organization
+weight: 40
+---
 
 # Remove a user from an organization
 

docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/"]
-title = "View a list of organization users"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/
+title: View a list of organization users
+weight: 50
+---
 
 # View a list of organization users
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md

@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/", "/docs/grafana/latest/manage-users/server-admin/", "/docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/"]
-title = "Manage users globally"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/
+  - /docs/grafana/latest/manage-users/server-admin/
+  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/
+title: Manage users globally
+weight: 300
+---
 
 # Manage users globally
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md

@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/"]
-title = "Add or remove a user from an organization"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/
+title: Add or remove a user from an organization
+weight: 30
+---
 
 # Add a user to an organization
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/"]
-title = "Add a user"
-weight = 10
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/
+title: Add a user
+weight: 10
+---
 
 # Add a user
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/"]
-title = "Assign or remove Grafana server administrator privileges"
-weight = 20
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/
+title: Assign or remove Grafana server administrator privileges
+weight: 20
+---
 
 # Assign or remove Grafana server administrator privileges
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/"]
-title = "Change a user's organization permissions"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/
+title: Change a user's organization permissions
+weight: 50
+---
 
 # Change a user's organization permissions
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/"]
-title = "Force a user to logout from Grafana"
-weight = 90
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/
+title: Force a user to logout from Grafana
+weight: 90
+---
 
 # Force a user to log out of Grafana
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/"]
-title = "Grant editors administrator permissions"
-weight = 60
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
+title: Grant editors administrator permissions
+weight: 60
+---
 
 # Grant editors administrator permissions
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md

@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/"]
-title = "View and edit a user account"
-weight = 110
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/
+title: View and edit a user account
+weight: 110
+---
 
 # View user details
 

docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/"]
-title = "View a list of users"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/
+title: View a list of users
+weight: 100
+---
 
 # View a list of users
 

docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md

@@ -1,8 +1,12 @@
-+++
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/", "/docs/grafana/latest/manage-users/add-or-remove-user-from-team/", "/docs/grafana/latest/manage-users/create-or-remove-team/", "/docs/grafana/latest/manage-users/manage-teams/"]
-title = "Manage teams"
-weight = 600
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/
+  - /docs/grafana/latest/manage-users/add-or-remove-user-from-team/
+  - /docs/grafana/latest/manage-users/create-or-remove-team/
+  - /docs/grafana/latest/manage-users/manage-teams/
+title: Manage teams
+weight: 600
+---
 
 # Manage teams
 

docs/sources/administration/preferences/_index.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/"]
-title = "Preferences"
-weight = 50
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/
+title: Preferences
+weight: 50
+---
 
 # Grafana preferences
 

docs/sources/administration/preferences/change-grafana-name.md

@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-name/"]
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change name and email"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-name/
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change name and email
+weight: 100
+---
 
 # Change Grafana name and email
 

docs/sources/administration/preferences/change-grafana-theme.md

@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-theme/"]
-description = "How to set the Grafana UI theme"
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change UI theme"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-theme/
+description: How to set the Grafana UI theme
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change UI theme
+weight: 200
+---
 
 # Change Grafana UI theme
 

docs/sources/administration/preferences/change-grafana-timezone.md

@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-timezone/"]
-description = "How to change your Grafana timezone"
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change default timezone"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-timezone/
+description: How to change your Grafana timezone
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change default timezone
+weight: 400
+---
 
 # Change the Grafana default timezone
 

docs/sources/administration/preferences/change-home-dashboard.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/administration/change-home-dashboard/", "/docs/grafana/latest/administration/preferences/change-home-dashboard/"]
-description = "How to replace the default home dashboard"
-keywords = ["grafana", "configuration", "documentation", "home"]
-title = "Change home dashboard"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/change-home-dashboard/
+  - /docs/grafana/latest/administration/preferences/change-home-dashboard/
+description: How to replace the default home dashboard
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - home
+title: Change home dashboard
+weight: 300
+---
 
 # Change the default home dashboard
 

docs/sources/administration/provisioning.md

@@ -1,10 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/administration/provisioning/", "/docs/grafana/latest/installation/provisioning/"]
-description = ""
-keywords = ["grafana", "provisioning"]
-title = "Provisioning"
-weight = 800
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/provisioning/
+  - /docs/grafana/latest/installation/provisioning/
+description: ''
+keywords:
+  - grafana
+  - provisioning
+title: Provisioning
+weight: 800
+---
 
 # Provisioning Grafana
 

docs/sources/administration/security.md

@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/security/", "/docs/grafana/latest/installation/security/"]
-description = "Security Docs"
-keywords = ["grafana", "security", "documentation"]
-title = "Security"
-weight = 500
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/security/
+  - /docs/grafana/latest/installation/security/
+description: Security Docs
+keywords:
+  - grafana
+  - security
+  - documentation
+title: Security
+weight: 500
+---
 
 # Security
 

docs/sources/administration/set-up-for-high-availability.md

@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/administration/set-up-for-high-availability/", "/docs/grafana/latest/tutorials/ha_setup/"]
-keywords = ["grafana", "tutorials", "HA", "high availability"]
-title = "Set up Grafana for high availability"
-weight = 1200
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/set-up-for-high-availability/
+  - /docs/grafana/latest/tutorials/ha_setup/
+keywords:
+  - grafana
+  - tutorials
+  - HA
+  - high availability
+title: Set up Grafana for high availability
+weight: 1200
+---
 
 # Set up Grafana for high availability
 

docs/sources/administration/view-server/_index.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/administration/view-server/"]
-title = "View server"
-weight = 100
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/view-server/
+title: View server
+weight: 100
+---
 
 # View server information
 

docs/sources/administration/view-server/internal-metrics.md

@@ -1,10 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/admin/metrics/", "/docs/grafana/latest/administration/view-server/internal-metrics/"]
-description = "Internal metrics exposed by Grafana"
-keywords = ["grafana", "metrics", "internal metrics"]
-title = "Internal Grafana metrics"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/admin/metrics/
+  - /docs/grafana/latest/administration/view-server/internal-metrics/
+description: Internal metrics exposed by Grafana
+keywords:
+  - grafana
+  - metrics
+  - internal metrics
+title: Internal Grafana metrics
+weight: 200
+---
 
 # Internal Grafana metrics
 

docs/sources/administration/view-server/view-server-settings.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/admin/view-server-settings/", "/docs/grafana/latest/administration/view-server/view-server-settings/"]
-description = "How to view server settings in the Grafana UI"
-keywords = ["grafana", "configuration", "server", "settings"]
-title = "View server settings"
-weight = 300
-+++
+---
+aliases:
+  - /docs/grafana/latest/admin/view-server-settings/
+  - /docs/grafana/latest/administration/view-server/view-server-settings/
+description: How to view server settings in the Grafana UI
+keywords:
+  - grafana
+  - configuration
+  - server
+  - settings
+title: View server settings
+weight: 300
+---
 
 # View Grafana server settings
 

docs/sources/administration/view-server/view-server-stats.md

@@ -1,9 +1,14 @@
-+++
-aliases = ["/docs/grafana/latest/admin/view-server-stats/", "/docs/grafana/latest/administration/view-server/view-server-stats/"]
-keywords = ["grafana", "server", "statistics"]
-title = "View server stats"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/admin/view-server-stats/
+  - /docs/grafana/latest/administration/view-server/view-server-stats/
+keywords:
+  - grafana
+  - server
+  - statistics
+title: View server stats
+weight: 400
+---
 
 # View Grafana server stats
 

docs/sources/alerting/_index.md

@@ -1,8 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/", "/docs/grafana/latest/alerting/unified-alerting/difference-old-new/"]
-title = "Alerting"
-weight = 114
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting/
+title: Alerting
+weight: 114
+---
 
 # Grafana alerting
 
@@ -18,13 +20,13 @@ For new installations or existing installs without alerting configured, Grafana
 | ----------- | ------------- | ------------- | ------------- |
 | Grafana 9.0 | On by default | On by default | On by default |
 
-- For existing OSS installations with legacy dashboard alerting, you can [opt-in]({{< relref "./opt-in.md" >}}) to Grafana alerting.
-- For Grafana Cloud instances using legacy cloud alerting, contact customer support to migrate to Grafana alerting.
+Existing installations that upgrade to v9.0 will have Grafana alerting enabled by default. For more information on migrating from legacy or the cloud alerting plugin, see [Migrating to Grafana alerting]({{< relref "./migrating-alerts/_index.md" >}}).
 
 Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "./fundamentals/_index.md" >}}) of Grafana alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.
 
-- [Enable Grafana alerting in OSS]({{< relref "./opt-in.md" >}})
-- [Migrating legacy alerts]({{< relref "./migrating-legacy-alerts.md" >}})
+- [About alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}})
+- [Migrating legacy alerts]({{< relref "./migrating-alerts/_index.md" >}})
+- [Disable Grafana alerting in OSS]({{< relref "./migrating-alerts/opt-out.md" >}})
 - [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule.md" >}})
 - [Create Grafana Mimir or Loki managed alerting rules]({{< relref "alerting-rules/create-mimir-loki-managed-rule.md" >}})
 - [View existing alerting rules and manage their current state]({{< relref "alerting-rules/rule-list.md" >}})

docs/sources/alerting/about-alerting.md

@@ -0,0 +1,33 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/about-alerting/
+description: A quick overview of Grafana alerting
+keywords:
+  - grafana
+  - alerting
+  - overview
+  - concepts
+  - basics
+title: About Grafana alerting
+weight: 100
+---
+
+# About Grafana alerting
+
+Grafana Alerting consists of several individual concepts that are at the core of a flexible and powerful alerting engine.
+
+This topic explains how to create [alert rules]({{< relref "./fundamentals/alert-rules/_index.md" >}}), their relationship with [alert instances]({{< relref "./fundamentals/alert-rules/alert-instances.md" >}}) and the various alert rule [states and transitions]({{< relref "./fundamentals/state-and-health.md" >}}), [notification policies]({{< relref "./notifications/_index.md" >}}) and [contact points]({{< relref "./contact-points/_index.md" >}}).
+
+These three individual concepts are the minimum necessities to successfully create alerts and receive notifications.
+
+We will also touch on various other concepts such as [silences]({{< relref "./silences/_index.md" >}}) and [mute timings]({{< relref "./notifications/mute-timings.md" >}}) to more granularly manage alert notifications, [role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) to limit access and manage permissions and additional advanced topics such as [external alertmanagers]({{< relref "./fundamentals/alertmanager.md#add-a-new-external-alertmanager" >}}) and [high availability]({{< relref "./high-availability/_index.md" >}}).
+
+## Overview
+
+{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram.jpg" caption="Grafana alerting overview" >}}
+
+As shown in the diagram above, Grafana alerting uses [labels]({{< relref "./fundamentals/annotation-label/how-to-use-labels.md" >}}) to match an alert rule and its instances to a specific notification policy. This concept of labels and label matching is important and is also used in [silences]({{< relref "./silences/_index.md" >}}).
+
+Each notification policy specifies a set of [label matchers]({{< relref "./fundamentals/annotation-label/labels-and-label-matchers.md" >}}) to indicate what alerts they are responsible for.
+
+A notification policy has a [contact point]({{< relref "./contact-points/_index.md" >}}) assigned to it that consists of one or more [notifiers]({{< relref "./contact-points/_index.md#list-of-notifiers-supported-by-grafana" >}}).

docs/sources/alerting/alert-groups/_index.md

@@ -1,10 +1,15 @@
-+++
-title = "Alert groups"
-description = "Alert groups"
-keywords = ["grafana", "alerting", "alerts", "groups"]
-weight = 445
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: Alert groups
+weight: 445
+---
 
 # Alert groups
 

docs/sources/alerting/alert-groups/filter-alerts.md

@@ -1,10 +1,15 @@
-+++
-title = "Filter alerts"
-description = "Alert groups"
-keywords = ["grafana", "alerting", "alerts", "groups"]
-weight = 445
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: Filter alerts
+weight: 445
+---
 
 # Filter alerts by group
 

docs/sources/alerting/alert-groups/view-alert-grouping.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alert-groups/", "/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
-description = "Alert groups"
-keywords = ["grafana", "alerting", "alerts", "groups"]
-title = "View alert groupings"
-weight = 445
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alert-groups/
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: View alert groupings
+weight: 445
+---
 
 # View alert groupings
 

docs/sources/alerting/alerting-limitations.md

@@ -1,8 +1,9 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-limitations/"]
-title = "Limitations"
-weight = 552
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-limitations/
+title: Limitations
+weight: 552
+---
 
 # Limitations
 

docs/sources/alerting/alerting-rules/_index.md

@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/", "/docs/grafana/latest/alerting/rules/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/"]
-title = "Create and manage rules"
-weight = 130
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/
+  - /docs/grafana/latest/alerting/rules/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/
+title: Create and manage rules
+weight: 130
+---
 
 # Create and manage Grafana alerting rules
 

docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md

@@ -1,41 +1,48 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/"]
-description = "Create Grafana managed alert rule"
-keywords = ["grafana", "alerting", "guide", "rules", "create"]
-title = "Create Grafana managed alert rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/
+description: Create Grafana managed alert rule
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+title: Create Grafana managed alert rule
+weight: 400
+---
 
 # Create a Grafana managed alerting rule
 
-Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fix thresholds. When these are executed, Grafana sends notifications to the contact point.
+Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fix thresholds. When these are executed, Grafana sends notifications to the contact point. For information on Grafana alerting, see [About Grafana alerting]({{< relref "../about-alerting.md" >}}) which explains the various components of Grafana alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/_index.md" >}}) of Grafana alerting.
 
 ## Add Grafana managed rule
 
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **New alert rule**.
-1. In Step 1, add the rule name, type, and storage location.
-   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
-   - From the **Rule type** drop-down, select **Grafana managed alert**.
-   - From the **Folder** drop-down, select the folder where you want to store the rule. If you do not select a folder, the rule is stored in the General folder. To create a new folder, click the drop-down and enter the new folder name.
-1. In Step 2, add queries and expressions to evaluate.
-   - Keep the default name or hover over and click the edit icon to change the name.
+1. Click **New alert rule**. The new alerting rule page opens where the Grafana managed alerts option is selected by default.
+1. In Step 1, add queries and expressions to evaluate, and then select the alert condition.
    - For queries, select a data source from the drop-down.
    - Add one or more [queries]({{< relref "../../panels/query-a-data-source/add-a-query.md" >}}) or [expressions]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md" >}}).
    - For each expression, select either **Classic condition** to create a single alert rule, or choose from **Math**, **Reduce**, **Resample** options to generate separate alert for each series. For details on these options, see [Single and multi dimensional rule](#single-and-multi-dimensional-rule).
    - Click **Run queries** to verify that the query is successful.
-1. In Step 3, add conditions.
+   - Next, select the query or expression for your alert condition.
+1. In Step 2, specify the alert evaluation interval.
    - From the **Condition** drop-down, select the query or expression to trigger the alert rule.
    - For **Evaluate every**, specify the frequency of evaluation. Must be a multiple of 10 seconds. For examples, `1m`, `30s`.
    - For **Evaluate for**, specify the duration for which the condition must be true before an alert fires.
-     > **Note:** Once a condition is breached, the alert goes into the Pending state. If the condition remains breached for the duration specified, the alert transitions to the Firing state, else it reverts back to the Normal state.
+     > **Note:** Once a condition is breached, the alert goes into the Pending state. If the condition remains breached for the duration specified, the alert transitions to the `Firing` state, otherwise it reverts back to the `Normal` state.
    - In **Configure no data and error handling**, configure alerting behavior in the absence of data. Use the guidelines in [No data and error handling](#no-data-and-error-handling).
    - Click **Preview alerts** to check the result of running the query at this moment. Preview excludes no data and error handling.
-1. In Step 4, add additional metadata associated with the rule.
+1. In Step 3, add the rule name, storage location, rule group, as well as additional metadata associated with the rule.
+   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+   - From the **Folder** drop-down, select the folder where you want to store the rule.
+   - For **Group**, specify a pre-defined group. 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.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
    - Add custom labels.
 1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+1. Next, create a [notification]({{< relref "../notifications/_index.md" >}}) for the rule.
 
 ### Single and multi dimensional rule
 

docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md

@@ -1,10 +1,19 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/"]
-description = "Create Grafana Mimir or Loki managed recording rule"
-keywords = ["grafana", "alerting", "guide", "rules", "recording rules", "create"]
-title = "Create Grafana Mimir or Loki managed recording rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+description: Create Grafana Mimir or Loki managed recording rule
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - recording rules
+  - create
+title: Create Grafana Mimir or Loki managed recording rule
+weight: 400
+---
 
 # Create a Grafana Mimir or Loki managed recording rule
 
@@ -12,16 +21,35 @@ You can create and manage recording rules for an external Grafana Mimir or Loki
 
 ## Before you begin
 
-For Grafana Mimir and Loki data sources to work with Grafana 8.0 alerting, enable the ruler API by configuring their respective services.
+- Verify that you have write permission to the Prometheus or Loki data source. Otherwise, you will not be able to create or update Grafana Mimir managed alerting rules.
 
-**Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
+- For Grafana Mimir and Loki data sources, enable the ruler API by configuring their respective services.
 
-**Grafana Mimir** - When configuring a Grafana Prometheus data source to point to Grafana Mimir, use the legacy `/api/prom` prefix, not `/prometheus`. Currently, we support only single-binary mode and you cannot provide a separate URL for the ruler API.
+  - **Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
 
-> **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings page and clear the **Manage alerts via Alerting UI** checkbox.
+  - **Grafana Mimir** - use the [legacy `/api/prom` prefix](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#path-prefixes), not `/prometheus`. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
+
+> **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
 
 ## Add a Grafana Mimir or Loki managed recording rule
 
+To create a Grafana Mimir or Loki managed recording rule
+
+1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
+1. Click **New alert rule**. The new alerting rule page opens where the **Grafana managed alert** option is selected by default.
+1. In Step 1, select **Mimir or Loki recording rule** option.
+   - Select your Loki or Prometheus data source, add the query to evaluate, and then select the alert condition.
+   - Enter a PromQL or LogQL expression. The rule fires if the evaluation result has at least one series with a value that is greater than 0. An alert is created for each series.
+1. In Step 2, add the rule name, namespace, rule group, as well as additional metadata associated with the rule.
+   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+   - From the **Namespace** drop-down, select an existing rule namespace. Otherwise, click Add new and enter a name to create 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]({{< relref "./edit-mimir-loki-namespace-group.md" >}}).
+   - From the **Group** drop-down, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create 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.
+   - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
+   - Add Runbook URL, panel, dashboard, and alert IDs.
+   - Add custom labels.
+1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+1. Next, create a [notification]({{< relref "../notifications/_index.md" >}}) for the rule.
+
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
 1. Click **New alert rule**.
 1. In Step 1, add the rule name, type, and storage location.

docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md

@@ -1,18 +1,26 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/"]
-description = "Create Grafana Mimir or Loki managed alerting rule"
-keywords = ["grafana", "alerting", "guide", "rules", "create"]
-title = "Create Grafana Mimir or Loki managed alert rule"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+description: Create Grafana Mimir or Loki managed alerting rule
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+title: Create Grafana Mimir or Loki managed alert rule
+weight: 400
+---
 
 # Create a Grafana Mimir or Loki managed alerting rule
 
-Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance.
+Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance that has ruler API enabled. For information on Grafana alerting, see [About Grafana alerting]({{< relref "../about-alerting.md" >}}) which explains the various components of Grafana alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/_index.md" >}}) of Grafana alerting.
 
 ## Before you begin
 
-- Verify that you have write permission to the Prometheus data source. Otherwise, you will not be able to create or update Grafana Mimir managed alerting rules.
+- Verify that you have write permission to the Prometheus or Loki data source. Otherwise, you will not be able to create or update Grafana Mimir managed alerting rules.
 
 - For Grafana Mimir and Loki data sources, enable the ruler API by configuring their respective services.
 
@@ -25,23 +33,19 @@ Grafana allows you to create alerting rules for an external Grafana Mimir or Lok
 ## Add a Grafana Mimir or Loki managed alerting rule
 
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **New alert rule**.
-1. In Step 1, add the rule name, type, and storage location.
-   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
-   - From the **Rule type** drop-down, select **Mimir / Loki managed alert**.
-   - From the **Select data source** drop-down, select an external Prometheus, an external Loki, or a Grafana Cloud data source.
-   - From the **Namespace** drop-down, select an existing rule namespace. Otherwise, click **Add new** and enter a name to create 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]({{< relref "./edit-mimir-loki-namespace-group.md" >}}).
-   - From the **Group** drop-down, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create 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.
-     {{< figure src="/static/img/docs/alerting/unified/rule-edit-mimir-alert-type-8-0.png" max-width="550px" caption="Alert details" >}}
-1. In Step 2, add the query to evaluate.
-   - Enter a PromQL or LogQL expression. The rule fires if the evaluation result has at least one series with a value that is greater than 0. An alert is created for each series.
-     {{< figure src="/static/img/docs/alerting/unified/rule-edit-mimir-query-8-0.png" max-width="550px" caption="Alert details" >}}
-1. In Step 3, add conditions.
+1. Click **New alert rule**. The new alerting rule page opens where the Grafana managed alerts option is selected by default.
+1. In Step 1, select **Mimir or Loki alert** option.
+   - Next, select your Loki or Prometheus data source and add the query to evaluate.
+   - Enter a PromQL or LogQL expression to query. The rule fires if the evaluation result has at least one series with a value that is greater than 0. An alert is created for each series.
+1. In Step 2, specify the alert evaluation interval.
    - In the **For** text box, specify the duration for which the condition must be true before an alert fires. If you specify `5m`, the condition must be true for 5 minutes before the alert fires.
      > **Note:** Once a condition is met, the alert goes into the `Pending` state. If the condition remains active for the duration specified, the alert transitions to the `Firing` state, else it reverts to the `Normal` state.
-1. In Step 4, add additional metadata associated with the rule.
+1. In Step 3, add the rule name, namespace, rule group, as well as additional metadata associated with the rule.
+   - In **Rule name**, add a descriptive name. This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+   - From the **Namespace** drop-down, select an existing rule namespace. Otherwise, click **Add new** and enter a name to create 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]({{< relref "./edit-mimir-loki-namespace-group.md" >}}).
+   - From the **Group** drop-down, select an existing group within the selected namespace. Otherwise, click **Add new** and enter a name to create 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.
    - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
    - Add Runbook URL, panel, dashboard, and alert IDs.
    - Add custom labels.
-1. To evaluate the rule and see what alerts it would produce, click **Preview alerts**. It will display a list of alerts with state and value of for each one.
 1. Click **Save** to save the rule or **Save and exit** to save the rule and go back to the Alerting page.
+1. Next, create a [notification]({{< relref "../notifications/_index.md" >}}) for the rule.

docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md

@@ -1,10 +1,20 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/"]
-description = "Edit Grafana Mimir or Loki rule groups and namespaces"
-keywords = ["grafana", "alerting", "guide", "group", "namespace", "grafana mimir", "loki"]
-title = "Grafana Mimir or Loki rule groups and namespaces"
-weight = 405
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
+description: Edit Grafana Mimir or Loki rule groups and namespaces
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - group
+  - namespace
+  - grafana mimir
+  - loki
+title: Grafana Mimir or Loki rule groups and namespaces
+weight: 405
+---
 
 # Grafana Mimir or Loki rule groups and namespaces
 

docs/sources/alerting/alerting-rules/rule-list.md

@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/rule-list/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/"]
-description = "Manage alerting rules"
-keywords = ["grafana", "alerting", "guide", "rules", "view"]
-title = "Manage alerting rules"
-weight = 402
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/rule-list/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/
+description: Manage alerting rules
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - view
+title: Manage alerting rules
+weight: 402
+---
 
 # Manage alerting rules
 

docs/sources/alerting/contact-points/_index.md

@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/contact-points/", "/docs/grafana/latest/alerting/unified-alerting/contact-points/"]
-description = "Create or edit contact point"
-keywords = ["grafana", "alerting", "guide", "contact point", "notification channel", "create"]
-title = "Contact points"
-weight = 430
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/
+  - /docs/grafana/latest/alerting/unified-alerting/contact-points/
+description: Create or edit contact point
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - notification channel
+  - create
+title: Contact points
+weight: 430
+---
 
 # Contact points
 
@@ -12,199 +20,11 @@ Use contact points to define how your contacts are notified when an alert fires.
 
 You can configure Grafana managed contact points as well as contact points for an [external Alertmanager data source]({{< relref "../../datasources/alertmanager.md" >}}). For more information, see [Alertmanager]({{< relref "../fundamentals/alertmanager.md" >}}).
 
-## Add a contact point
+Before you begin, see [About Grafana alerting]({{< relref "../about-alerting.md" >}}) which explains the various components of Grafana alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/_index.md" >}}) of Grafana alerting.
 
-1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **Contact points** to open the page listing existing contact points.
-1. Click **New contact point**.
-1. From the **Alertmanager** dropdown, select an Alertmanager. By default, Grafana Alertmanager is selected.
-1. In **Name**, enter a descriptive name for the contact point.
-1. From **Contact point type**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
-1. Some contact point types, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point type.
-1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
-1. To add another contact point type, click **New contact point type** and repeat steps 6 through 8.
-1. Click **Save contact point** to save your changes.
-
-## Edit a contact point
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. Find the contact point to edit, then click **Edit** (pen icon).
-1. Make any changes and click **Save contact point**.
-
-## Test a contact point
-
-For Grafana managed contact points, you can send a test notification which helps verify a contact point is configured correctly.
-
-To send a test notification:
-
-1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Contact** points.
-1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed.
-1. Click **Test** (paper airplane icon) to open the contact point testing modal.
-1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
-1. Click **Send test notification** to fire the alert.
-
-## Delete a contact point
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. Find the contact point to delete, then click **Delete** (trash icon).
-1. In the confirmation dialog, click **Yes, delete**.
-
-> **Note:** You cannot delete contact points that are in use by a notification policy. You will have to either delete the [notification policy]({{< relref "../notifications/_index.md" >}}) or update it to use another contact point.
-
-## Edit Alertmanager global config
-
-To edit global configuration options for an external Alertmanager, like SMTP server, that is used by default for all email contact types:
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. From the **Alertmanager** drop-down, select an external Alertmanager data source.
-1. Click the **Edit global config** option.
-1. Add global configuration settings.
-1. Click **Save global config** to save your changes.
-
-> **Note** This option is available only for external Alertmanagers. You can configure some global options for Grafana contact types, like email settings, via [Grafana configuration]({{< relref "../../administration/configuration.md" >}}).
-
-## List of notifiers supported by Grafana
-
-| Name                                          | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
-| --------------------------------------------- | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
-| [DingDing](#dingdingdingtalk)                 | `dingding`                | Supported            | N/A                                                                                                      |
-| [Discord](#discord)                           | `discord`                 | Supported            | N/A                                                                                                      |
-| [Email](#email)                               | `email`                   | Supported            | Supported                                                                                                |
-| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | Supported            | N/A                                                                                                      |
-| [Kafka](#kafka)                               | `kafka`                   | Supported            | N/A                                                                                                      |
-| Line                                          | `line`                    | Supported            | N/A                                                                                                      |
-| Microsoft Teams                               | `teams`                   | Supported            | N/A                                                                                                      |
-| [Opsgenie](#opsgenie)                         | `opsgenie`                | Supported            | Supported                                                                                                |
-| [Pagerduty](#pagerduty)                       | `pagerduty`               | Supported            | Supported                                                                                                |
-| Prometheus Alertmanager                       | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
-| [Pushover](#pushover)                         | `pushover`                | Supported            | Supported                                                                                                |
-| Sensu                                         | `sensu`                   | Supported            | N/A                                                                                                      |
-| [Sensu Go](#sensu-go)                         | `sensugo`                 | Supported            | N/A                                                                                                      |
-| [Slack](#slack)                               | `slack`                   | Supported            | Supported                                                                                                |
-| Telegram                                      | `telegram`                | Supported            | N/A                                                                                                      |
-| Threema                                       | `threema`                 | Supported            | N/A                                                                                                      |
-| VictorOps                                     | `victorops`               | Supported            | Supported                                                                                                |
-| [Webhook](#webhook)                           | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
-| [WeCom](#wecom)                               | `wecom`                   | Supported            | N/A                                                                                                      |
-| [Zenduty](#zenduty)                           | `webhook`                 | Supported            | N/A                                                                                                      |
-
-### Webhook
-
-Example JSON body:
-
-```json
-{
-  "receiver": "My Super Webhook",
-  "status": "firing",
-  "orgId": 1,
-  "alerts": [
-    {
-      "status": "firing",
-      "labels": {
-        "alertname": "High memory usage",
-        "team": "blue",
-        "zone": "us-1"
-      },
-      "annotations": {
-        "description": "The system has high memory usage",
-        "runbook_url": "https://myrunbook.com/runbook/1234",
-        "summary": "This alert was triggered for zone us-1"
-      },
-      "startsAt": "2021-10-12T09:51:03.157076+02:00",
-      "endsAt": "0001-01-01T00:00:00Z",
-      "generatorURL": "https://play.grafana.org/alerting/1afz29v7z/edit",
-      "fingerprint": "c6eadffa33fcdf37",
-      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1",
-      "dashboardURL": "",
-      "panelURL": "",
-      "valueString": "[ metric='' labels={} value=14151.331895396988 ]"
-    },
-    {
-      "status": "firing",
-      "labels": {
-        "alertname": "High CPU usage",
-        "team": "blue",
-        "zone": "eu-1"
-      },
-      "annotations": {
-        "description": "The system has high CPU usage",
-        "runbook_url": "https://myrunbook.com/runbook/1234",
-        "summary": "This alert was triggered for zone eu-1"
-      },
-      "startsAt": "2021-10-12T09:56:03.157076+02:00",
-      "endsAt": "0001-01-01T00:00:00Z",
-      "generatorURL": "https://play.grafana.org/alerting/d1rdpdv7k/edit",
-      "fingerprint": "bc97ff14869b13e3",
-      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1",
-      "dashboardURL": "",
-      "panelURL": "",
-      "valueString": "[ metric='' labels={} value=47043.702386305304 ]"
-    }
-  ],
-  "groupLabels": {},
-  "commonLabels": {
-    "team": "blue"
-  },
-  "commonAnnotations": {},
-  "externalURL": "https://play.grafana.org/",
-  "version": "1",
-  "groupKey": "{}:{}",
-  "truncatedAlerts": 0,
-  "title": "[FIRING:2]  (blue)",
-  "state": "alerting",
-  "message": "**Firing**\n\nLabels:\n - alertname = T2\n - team = blue\n - zone = us-1\nAnnotations:\n - description = This is the alert rule checking the second system\n - runbook_url = https://myrunbook.com\n - summary = This is my summary\nSource: https://play.grafana.org/alerting/1afz29v7z/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1\n\nLabels:\n - alertname = T1\n - team = blue\n - zone = eu-1\nAnnotations:\nSource: https://play.grafana.org/alerting/d1rdpdv7k/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1\n"
-}
-```
-
-### Webhook fields
-
-#### Body
-
-| Key               | Type                      | Description                                                                     |
-| ----------------- | ------------------------- | ------------------------------------------------------------------------------- |
-| receiver          | string                    | Name of the webhook                                                             |
-| status            | string                    | Current status of the alert, `firing` or `resolved`                             |
-| orgId             | number                    | ID of the organization related to the payload                                   |
-| alerts            | array of [alerts](#alert) | Alerts that are triggering                                                      |
-| groupLabels       | object                    | Labels that are used for grouping, map of string keys to string values          |
-| commonLabels      | object                    | Labels that all alarms have in common, map of string keys to string values      |
-| commonAnnotations | object                    | Annotations that all alarms have in common, map of string keys to string values |
-| externalURL       | string                    | External URL to the Grafana instance sending this webhook                       |
-| version           | string                    | Version of the payload                                                          |
-| groupKey          | string                    | Key that is used for grouping                                                   |
-| truncatedAlerts   | number                    | Number of alerts that were truncated                                            |
-| title             | string                    | **Will be deprecated soon**                                                     |
-| state             | string                    | **Will be deprecated soon**                                                     |
-| message           | string                    | **Will be deprecated soon**                                                     |
-
-#### Alert
-
-| Key          | Type   | Description                                                                        |
-| ------------ | ------ | ---------------------------------------------------------------------------------- |
-| status       | string | Current status of the alert, `firing` or `resolved`                                |
-| labels       | object | Labels that are part of this alert, map of string keys to string values            |
-| annotations  | object | Annotations that are part of this alert, map of string keys to string values       |
-| startsAt     | string | Start time of the alert                                                            |
-| endsAt       | string | End time of the alert, default value when not resolved is `0001-01-01T00:00:00Z`   |
-| valueString  | string | Values that triggered the current status                                           |
-| generatorURL | string | URL of the alert rule in the Grafana UI                                            |
-| fingerprint  | string | The labels fingerprint, alarms with the same labels will have the same fingerprint |
-| silenceURL   | string | URL to silence the alert rule in the Grafana UI                                    |
-| dashboardURL | string | **Will be deprecated soon**                                                        |
-| panelURL     | string | **Will be deprecated soon**                                                        |
-
-#### Removed fields related to dashboards
-
-Alerts are not coupled to dashboards anymore therefore the fields related to dashboards `dashboardId` and `panelId` have been removed.
-
-### WeCom
-
-WeCom contact points need a Webhook URL. These are obtained by setting up a WeCom robot on the corresponding group chat. To obtain a Webhook URL using the WeCom desktop Client please follow these steps:
-
-1. Click the "..." in the top right corner of a group chat that you want your alerts to be delivered to
-2. Click "Add Group Robot", select "New Robot" and give your robot a name. Click "Add Robot"
-3. There should be a Webhook URL in the panel.
-
-| Setting | Description        |
-| ------- | ------------------ |
-| Url     | WeCom webhook URL. |
+- [Create contact point]({{< relref "./create-contact-point.md" >}})
+- [Edit contact point]({{< relref "./edit-contact-point.md" >}})
+- [Test contact point]({{< relref "./test-contact-point.md" >}})
+- [Delete contact point]({{< relref "./delete-contact-point.md" >}})
+- [List of notifiers]({{< relref "./notifiers/_index.md" >}})
+- [Message templating]({{< relref "./message-templating/_index.md" >}})

docs/sources/alerting/contact-points/create-contact-point.md

@@ -0,0 +1,31 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Add contact point
+weight: 100
+---
+
+# Add a contact point
+
+Use contact points to define how your contacts are notified when an alert fires.
+
+To add a contact point
+
+1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
+1. Click **Contact points** to open the page listing existing contact points.
+1. Click **New contact point**.
+1. From the **Alertmanager** dropdown, select an Alertmanager. By default, Grafana Alertmanager is selected.
+1. In **Name**, enter a descriptive name for the contact point.
+1. From **Contact point type**, select a type and fill out mandatory fields. For example, if you choose email, enter the email addresses. Or if you choose Slack, enter the Slack channel(s) and users who should be contacted.
+1. Some contact point types, like email or webhook, have optional settings. In **Optional settings**, specify additional settings for the selected contact point type.
+1. In Notification settings, optionally select **Disable resolved message** if you do not want to be notified when an alert resolves.
+1. To add another contact point type, click **New contact point type** and repeat steps 6 through 8.
+1. Click **Save contact point** to save your changes.

docs/sources/alerting/contact-points/delete-contact-point.md

@@ -0,0 +1,26 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Delete a contact point
+weight: 115
+---
+
+## Delete a contact point
+
+For Grafana managed contact points, you can send a test notification which helps verify a contact point is configured correctly.
+
+To delete a contact point
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. Find the contact point to delete, then click **Delete** (trash icon).
+1. In the confirmation dialog, click **Yes, delete**.
+
+> **Note:** You cannot delete contact points that are in use by a notification policy. You will have to either delete the [notification policy]({{< relref "../notifications/_index.md" >}}) or update it to use another contact point.

docs/sources/alerting/contact-points/edit-alertmanager-config.md

@@ -0,0 +1,26 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Edit contact point
+weight: 120
+---
+
+# Edit Alertmanager global config
+
+To edit global configuration options for an external Alertmanager, like SMTP server, that is used by default for all email contact types:
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. From the **Alertmanager** drop-down, select an external Alertmanager data source.
+1. Click the **Edit global config** option.
+1. Add global configuration settings.
+1. Click **Save global config** to save your changes.
+
+> **Note** This option is available only for external Alertmanagers. You can configure some global options for Grafana contact types, like email settings, via [Grafana configuration]({{< relref "../../administration/configuration.md" >}})

docs/sources/alerting/contact-points/edit-contact-point.md

@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Edit contact point
+weight: 105
+---
+
+# Edit a contact point
+
+Use contact points to define how your contacts are notified when an alert fires.
+
+To edit a contact point
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. Find the contact point to edit, then click **Edit** (pen icon).
+1. Make any changes and click **Save contact point**.

docs/sources/alerting/contact-points/message-templating/_index.md

@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/message-templating/", "/docs/grafana/latest/alerting/unified-alerting/message-templating/"]
-description = "Message templating"
-keywords = ["grafana", "alerting", "guide", "contact point", "templating"]
-title = "Message templating"
-weight = 400
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+description: Message templating
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Message templating
+weight: 400
+---
 
 # Message templating
 
@@ -16,41 +23,11 @@ Since most of the contact point fields can be templated, you can create reusable
 
 The following example shows how to use default templates to render an alert message in Slack. The message title contains a count of alerts that are firing or were resolved. The message body lists the alerts and their status.
 
-<img  src="/static/img/docs/alerting/unified/contact-points-template-fields-8-0.png" width="450px">
+{{< figure src="/static/img/docs/alerting/unified/contact-points-template-fields-8-0.png" class="docs-image--no-shadow" max-width= "550px" caption="Default template" >}}
 
 The following example shows the use of a custom template within one of the contact point fields.
 
-<img  src="/static/img/docs/alerting/unified/contact-points-use-template-8-0.png" width="400px">
-
-### Create a message template
-
-> **Note:** Before Grafana v8.2, the configuration of the embedded Alertmanager was shared across organisations. Users of Grafana 8.0 and 8.1 are advised to use the new Grafana 8 alerts only if they have one organisation. Otherwise, silences for the Grafana managed alerts will be visible by all organizations.
-
-1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. From Alertmanager drop-down, select an external Alertmanager to create and manage templates for the external data source. Otherwise, keep the default option of Grafana.
-   {{< figure max-width="250px" src="/static/img/docs/alerting/unified/contact-points-select-am-8-0.gif" caption="Select Alertmanager" >}}
-1. Click **Add template**.
-1. In **Name**, add a descriptive name.
-1. In **Content**, add the content of the template.
-1. Click **Save template** button at the bottom of the page.
-   <img  src="/static/img/docs/alerting/unified/templates-create-8-0.png" width="600px">
-
-The `define` tag in the Content section assigns the template name. This tag is optional, and when omitted, the template name is derived from the **Name** field. When both are specified, it is a best practice to ensure that they are the same.
-
-### Edit a message template
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. In the Template table, find the template you want to edit, then click the **Edit** (pen icon).
-1. Make your changes, then click **Save template**.
-
-### Delete a message template
-
-1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
-1. In the Template table, find the template you want to delete, then click the **Delete** (trash icon).
-1. In the confirmation dialog, click **Yes, delete** to delete the template.
-
-Use caution when deleting a template since Grafana does not prevent you from deleting templates that are in use.
+{{< figure src="/static/img/docs/alerting/unified/contact-points-use-template-8-0.png" class="docs-image--no-shadow" max-width= "550px" caption="Default template" >}}
 
 ### Nested templates
 
@@ -79,59 +56,6 @@ You can use any of the following built-in template options to embed custom templ
 | `default.message`       | Provides a formatted summary of firing and resolved alerts.   |
 | `teams.default.message` | Similar to `default.messsage`, formatted for Microsoft Teams. |
 
-### Example of a custom template
-
-Here's an example of how to use a custom template. You can also use the default template included in the setup.
-
-Step 1: Configure a template to render a single alert.
-
-```
-{{ define "myalert" }}
-  [{{.Status}}] {{ .Labels.alertname }}
-
-  Labels:
-  {{ range .Labels.SortedPairs }}
-    {{ .Name }}: {{ .Value }}
-  {{ end }}
-
-  {{ if gt (len .Annotations) 0 }}
-  Annotations:
-  {{ range .Annotations.SortedPairs }}
-    {{ .Name }}: {{ .Value }}
-  {{ end }}
-  {{ end }}
-
-  {{ if gt (len .SilenceURL ) 0 }}
-    Silence alert: {{ .SilenceURL }}
-  {{ end }}
-  {{ if gt (len .DashboardURL ) 0 }}
-    Go to dashboard: {{ .DashboardURL }}
-  {{ end }}
-{{ end }}
-```
-
-Step 2: Configure a template to render entire notification message.
-
-```
-{{ define "mymessage" }}
-  {{ if gt (len .Alerts.Firing) 0 }}
-    {{ len .Alerts.Firing }} firing:
-    {{ range .Alerts.Firing }} {{ template "myalert" .}} {{ end }}
-  {{ end }}
-  {{ if gt (len .Alerts.Resolved) 0 }}
-    {{ len .Alerts.Resolved }} resolved:
-    {{ range .Alerts.Resolved }} {{ template "myalert" .}} {{ end }}
-  {{ end }}
-{{ end }}
-```
-
-Step 3: Add `mymessage` in the notification message field.
-
-```
-Alert summary:
-{{ template "mymessage" . }}
-```
-
 ### HTML in message templates
 
 HTML in alerting message templates is escaped. We do not support rendering of HTML in the resulting notification.

docs/sources/alerting/contact-points/message-templating/create-message-template.md

@@ -0,0 +1,32 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Create message template
+weight: 100
+---
+
+# Create a message template
+
+You can use message templates to customize notification messages for the contact point types.
+
+To create a message tempplate:
+
+1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
+2. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+3. From Alertmanager drop-down, select an external Alertmanager to create and manage templates for the external data source. Otherwise, keep the default option of Grafana.
+   {{< figure max-width="250px" src="/static/img/docs/alerting/unified/contact-points-select-am-8-0.gif" caption="Select Alertmanager" >}}
+4. Click **Add template**.
+5. In **Name**, add a descriptive name.
+6. In **Content**, add the content of the template.
+7. Click **Save template** button at the bottom of the page.
+   <img  src="/static/img/docs/alerting/unified/templates-create-8-0.png" width="600px">
+
+The `define` tag in the Content section assigns the template name. This tag is optional, and when omitted, the template name is derived from the **Name** field. When both are specified, it is a best practice to ensure that they are the same.

docs/sources/alerting/contact-points/message-templating/delete-message-template.md

@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Delete message template
+weight: 110
+---
+
+# Edit a message template
+
+Message templates customize notification messages for the contact point types.
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. In the Template table, find the template you want to delete, then click the **Delete** (trash icon).
+1. In the confirmation dialog, click **Yes, delete** to delete the template.
+
+Use caution when deleting a template since Grafana does not prevent you from deleting templates that are in use.

docs/sources/alerting/contact-points/message-templating/edit-message-template.md

@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Edit message template
+weight: 100
+---
+
+# Edit a message template
+
+Message templates customize notification messages for the contact point types.
+
+To edit a message template
+
+1. In the Alerting page, click **Contact points** to open the page listing existing contact points.
+1. In the Template table, find the template you want to edit, then click the **Edit** (pen icon).
+1. Make your changes, then click **Save template**.

docs/sources/alerting/contact-points/message-templating/example-template-functions.md

@@ -0,0 +1,126 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Examples of template functions
+weight: 130
+---
+
+# Examples of template functions
+
+## humanize
+
+**Template string** `{ humanize $value }`
+
+**Input** `1234567.0`
+
+**Expected** `1.235M`
+
+## humanize1024
+
+**TemplateString** `{ humanize1024 $value } `
+
+**Input** `1048576.0`
+
+**Expected** `1Mi`
+
+## humanizeDuration
+
+**TemplateString** `{ humanizeDuration $value }`
+
+**Input** `899.99`
+
+**Expected** `14m 59s`
+
+### humanizePercentage
+
+**TemplateString** `{ humanizePercentage $value }`
+
+**Input** `0.1234567`
+
+**Expected** `12.35%`
+
+## humanizeTimestamp
+
+**TemplateString** `{ $value | humanizeTimestamp }`
+
+**Input** `1435065584.128`
+
+**Expected** `2015-06-23 13:19:44.128 +0000 UTC`
+
+## title
+
+**TemplateString** `{ $value | title }`
+
+**Input** `aa bb CC`
+
+**Expected** `Aa Bb Cc`
+
+### toUpper
+
+**TemplateString** `{ $value | toUpper }`
+
+**Input** `aa bb CC`
+
+**Expected** `AA BB CC`
+
+### toLower
+
+**TemplateString** `{ $value | toLower }`
+
+**Input** `aA bB CC`
+
+**Expected** `aa bb cc`
+
+## match
+
+**TemplateString** `{ match "a+" $labels.instance }`
+
+**Input** `aa`
+
+**Expected** `true`
+
+## reReplaceAll
+
+**TemplateString** `{{ reReplaceAll "localhost:(.*)" "my.domain:$1" $labels.instance }}`
+
+**Input** `localhost:3000`
+
+**Expected** `my.domain:3000`
+
+### graphLink
+
+**TemplateString** `{{ graphLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}`
+
+**Expected** `/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":false,"range":true}]`
+
+### tableLink
+
+**TemplateString** `{{ tableLink "{\"expr\": \"up\", \"datasource\": \"gdev-prometheus\"}" }}`
+
+**Expected** `/explore?left=["now-1h","now","gdev-prometheus",{"datasource":"gdev-prometheus","expr":"up","instant":true,"range":false}]`
+
+## args
+
+**TemplateString** `{{define "x"}}{{.arg0}} {{.arg1}}{{end}}{{template "x" (args 1 "2")}}`
+
+**Expected** `1 2`
+
+## externalURL
+
+**TemplateString** `{ externalURL }`
+
+**Expected** `http://localhost/path/prefix`
+
+## pathPrefix
+
+**TemplateString** `{ pathPrefix }`
+
+**Expected** `/path/prefix`

docs/sources/alerting/contact-points/message-templating/example-template.md

@@ -0,0 +1,67 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Example message template
+weight: 115
+---
+
+# Example of a custom template
+
+Here's an example of how to use a custom template. You can also use the default template included in the setup.
+
+Step 1: Configure a template to render a single alert.
+
+```
+{{ define "myalert" }}
+  [{{.Status}}] {{ .Labels.alertname }}
+
+  Labels:
+  {{ range .Labels.SortedPairs }}
+    {{ .Name }}: {{ .Value }}
+  {{ end }}
+
+  {{ if gt (len .Annotations) 0 }}
+  Annotations:
+  {{ range .Annotations.SortedPairs }}
+    {{ .Name }}: {{ .Value }}
+  {{ end }}
+  {{ end }}
+
+  {{ if gt (len .SilenceURL ) 0 }}
+    Silence alert: {{ .SilenceURL }}
+  {{ end }}
+  {{ if gt (len .DashboardURL ) 0 }}
+    Go to dashboard: {{ .DashboardURL }}
+  {{ end }}
+{{ end }}
+```
+
+Step 2: Configure a template to render entire notification message.
+
+```
+{{ define "mymessage" }}
+  {{ if gt (len .Alerts.Firing) 0 }}
+    {{ len .Alerts.Firing }} firing:
+    {{ range .Alerts.Firing }} {{ template "myalert" .}} {{ end }}
+  {{ end }}
+  {{ if gt (len .Alerts.Resolved) 0 }}
+    {{ len .Alerts.Resolved }} resolved:
+    {{ range .Alerts.Resolved }} {{ template "myalert" .}} {{ end }}
+  {{ end }}
+{{ end }}
+```
+
+Step 3: Add `mymessage` in the notification message field.
+
+```
+Alert summary:
+{{ template "mymessage" . }}
+```

docs/sources/alerting/contact-points/message-templating/template-data.md

@@ -1,8 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/message-templating/template-data/", "/docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/"]
-keywords = ["grafana", "alerting", "guide", "contact point", "templating"]
-title = "Template data"
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/message-templating/template-data/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Template data
+weight: 120
+---
 
 # Template data
 

docs/sources/alerting/contact-points/message-templating/template-functions.md

@@ -1,8 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/message-templating/template-functions/", "/docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/"]
-keywords = ["grafana", "alerting", "guide", "contact point", "templating"]
-title = "Template functions"
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Template functions
+weight: 125
+---
 
 # Template Functions
 

docs/sources/alerting/contact-points/notifiers/_index.md

@@ -0,0 +1,41 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: List of notifiers
+weight: 130
+---
+
+# List of supported notifiers
+
+The following table lists the notifiers (contact point types) supported by Grafana.
+
+| Name                                          | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
+| --------------------------------------------- | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
+| [DingDing](#dingdingdingtalk)                 | `dingding`                | Supported            | N/A                                                                                                      |
+| [Discord](#discord)                           | `discord`                 | Supported            | N/A                                                                                                      |
+| [Email](#email)                               | `email`                   | Supported            | Supported                                                                                                |
+| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | Supported            | N/A                                                                                                      |
+| [Kafka](#kafka)                               | `kafka`                   | Supported            | N/A                                                                                                      |
+| Line                                          | `line`                    | Supported            | N/A                                                                                                      |
+| Microsoft Teams                               | `teams`                   | Supported            | N/A                                                                                                      |
+| [Opsgenie](#opsgenie)                         | `opsgenie`                | Supported            | Supported                                                                                                |
+| [Pagerduty](#pagerduty)                       | `pagerduty`               | Supported            | Supported                                                                                                |
+| Prometheus Alertmanager                       | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
+| [Pushover](#pushover)                         | `pushover`                | Supported            | Supported                                                                                                |
+| Sensu                                         | `sensu`                   | Supported            | N/A                                                                                                      |
+| [Sensu Go](#sensu-go)                         | `sensugo`                 | Supported            | N/A                                                                                                      |
+| [Slack](#slack)                               | `slack`                   | Supported            | Supported                                                                                                |
+| Telegram                                      | `telegram`                | Supported            | N/A                                                                                                      |
+| Threema                                       | `threema`                 | Supported            | N/A                                                                                                      |
+| VictorOps                                     | `victorops`               | Supported            | Supported                                                                                                |
+| [Webhook](#webhook)                           | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
+| [WeCom](#wecom)                               | `wecom`                   | Supported            | N/A                                                                                                      |
+| [Zenduty](#zenduty)                           | `webhook`                 | Supported            | N/A                                                                                                      |

docs/sources/alerting/contact-points/notifiers/webhook-notifier.md

@@ -0,0 +1,137 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Webhook notifier
+weight: 105
+---
+
+### Webhook
+
+This topic helps you configure the Webhook notifier. It also discusses that [WeCom]({{< relref "./webhook-notifier/#wecom" >}}) contact points need a Webhook URL.
+
+Example JSON body:
+
+```json
+{
+  "receiver": "My Super Webhook",
+  "status": "firing",
+  "orgId": 1,
+  "alerts": [
+    {
+      "status": "firing",
+      "labels": {
+        "alertname": "High memory usage",
+        "team": "blue",
+        "zone": "us-1"
+      },
+      "annotations": {
+        "description": "The system has high memory usage",
+        "runbook_url": "https://myrunbook.com/runbook/1234",
+        "summary": "This alert was triggered for zone us-1"
+      },
+      "startsAt": "2021-10-12T09:51:03.157076+02:00",
+      "endsAt": "0001-01-01T00:00:00Z",
+      "generatorURL": "https://play.grafana.org/alerting/1afz29v7z/edit",
+      "fingerprint": "c6eadffa33fcdf37",
+      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1",
+      "dashboardURL": "",
+      "panelURL": "",
+      "valueString": "[ metric='' labels={} value=14151.331895396988 ]"
+    },
+    {
+      "status": "firing",
+      "labels": {
+        "alertname": "High CPU usage",
+        "team": "blue",
+        "zone": "eu-1"
+      },
+      "annotations": {
+        "description": "The system has high CPU usage",
+        "runbook_url": "https://myrunbook.com/runbook/1234",
+        "summary": "This alert was triggered for zone eu-1"
+      },
+      "startsAt": "2021-10-12T09:56:03.157076+02:00",
+      "endsAt": "0001-01-01T00:00:00Z",
+      "generatorURL": "https://play.grafana.org/alerting/d1rdpdv7k/edit",
+      "fingerprint": "bc97ff14869b13e3",
+      "silenceURL": "https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1",
+      "dashboardURL": "",
+      "panelURL": "",
+      "valueString": "[ metric='' labels={} value=47043.702386305304 ]"
+    }
+  ],
+  "groupLabels": {},
+  "commonLabels": {
+    "team": "blue"
+  },
+  "commonAnnotations": {},
+  "externalURL": "https://play.grafana.org/",
+  "version": "1",
+  "groupKey": "{}:{}",
+  "truncatedAlerts": 0,
+  "title": "[FIRING:2]  (blue)",
+  "state": "alerting",
+  "message": "**Firing**\n\nLabels:\n - alertname = T2\n - team = blue\n - zone = us-1\nAnnotations:\n - description = This is the alert rule checking the second system\n - runbook_url = https://myrunbook.com\n - summary = This is my summary\nSource: https://play.grafana.org/alerting/1afz29v7z/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT2%2Cteam%3Dblue%2Czone%3Dus-1\n\nLabels:\n - alertname = T1\n - team = blue\n - zone = eu-1\nAnnotations:\nSource: https://play.grafana.org/alerting/d1rdpdv7k/edit\nSilence: https://play.grafana.org/alerting/silence/new?alertmanager=grafana&matchers=alertname%3DT1%2Cteam%3Dblue%2Czone%3Deu-1\n"
+}
+```
+
+### Webhook fields
+
+## Body
+
+| Key               | Type                      | Description                                                                     |
+| ----------------- | ------------------------- | ------------------------------------------------------------------------------- |
+| receiver          | string                    | Name of the webhook                                                             |
+| status            | string                    | Current status of the alert, `firing` or `resolved`                             |
+| orgId             | number                    | ID of the organization related to the payload                                   |
+| alerts            | array of [alerts](#alert) | Alerts that are triggering                                                      |
+| groupLabels       | object                    | Labels that are used for grouping, map of string keys to string values          |
+| commonLabels      | object                    | Labels that all alarms have in common, map of string keys to string values      |
+| commonAnnotations | object                    | Annotations that all alarms have in common, map of string keys to string values |
+| externalURL       | string                    | External URL to the Grafana instance sending this webhook                       |
+| version           | string                    | Version of the payload                                                          |
+| groupKey          | string                    | Key that is used for grouping                                                   |
+| truncatedAlerts   | number                    | Number of alerts that were truncated                                            |
+| title             | string                    | **Will be deprecated soon**                                                     |
+| state             | string                    | **Will be deprecated soon**                                                     |
+| message           | string                    | **Will be deprecated soon**                                                     |
+
+### Alert
+
+| Key          | Type   | Description                                                                        |
+| ------------ | ------ | ---------------------------------------------------------------------------------- |
+| status       | string | Current status of the alert, `firing` or `resolved`                                |
+| labels       | object | Labels that are part of this alert, map of string keys to string values            |
+| annotations  | object | Annotations that are part of this alert, map of string keys to string values       |
+| startsAt     | string | Start time of the alert                                                            |
+| endsAt       | string | End time of the alert, default value when not resolved is `0001-01-01T00:00:00Z`   |
+| valueString  | string | Values that triggered the current status                                           |
+| generatorURL | string | URL of the alert rule in the Grafana UI                                            |
+| fingerprint  | string | The labels fingerprint, alarms with the same labels will have the same fingerprint |
+| silenceURL   | string | URL to silence the alert rule in the Grafana UI                                    |
+| dashboardURL | string | **Will be deprecated soon**                                                        |
+| panelURL     | string | **Will be deprecated soon**                                                        |
+
+### Removed fields related to dashboards
+
+Alerts are not coupled to dashboards anymore therefore the fields related to dashboards `dashboardId` and `panelId` have been removed.
+
+## WeCom
+
+WeCom contact points need a Webhook URL. These are obtained by setting up a WeCom robot on the corresponding group chat. To obtain a Webhook URL using the WeCom desktop Client please follow these steps:
+
+1. Click the "..." in the top right corner of a group chat that you want your alerts to be delivered to
+2. Click "Add Group Robot", select "New Robot" and give your robot a name. Click "Add Robot"
+3. There should be a Webhook URL in the panel.
+
+| Setting | Description        |
+| ------- | ------------------ |
+| Url     | WeCom webhook URL. |

docs/sources/alerting/contact-points/test-contact-point.md

@@ -0,0 +1,26 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - contact point
+  - templating
+title: Test a contact point
+weight: 110
+---
+
+# Test a contact point
+
+For Grafana managed contact points, you can send a test notification which helps verify a contact point is configured correctly.
+
+To send a test notification:
+
+1. In the Grafana side bar, hover your cursor over the **Alerting** (bell) icon and then click **Contact** points.
+1. Find the contact point to test, then click **Edit** (pen icon). You can also create a new contact point if needed.
+1. Click **Test** (paper airplane icon) to open the contact point testing modal.
+1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
+1. Click **Send test notification** to fire the alert.

docs/sources/alerting/difference-old-new.md

@@ -1,11 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/difference-old-new/", "/docs/grafana/latest/alerting/unified-alerting/difference-old-new/"]
-description = "What's New with Grafana alerts"
-draft = true
-keywords = ["grafana", "alerting", "guide"]
-title = "What's new in Grafana alerting"
-weight = 108
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/difference-old-new/
+  - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/
+description: What's New with Grafana alerts
+draft: true
+keywords:
+  - grafana
+  - alerting
+  - guide
+title: What's new in Grafana alerting
+weight: 108
+---
 
 # What's new in Grafana alerting
 

docs/sources/alerting/fundamentals/_index.md

@@ -1,13 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/unified-alerting/fundamentals/"]
-title = "Alerting fundamentals"
-weight = 110
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/
+title: Alerting fundamentals
+weight: 110
+---
 
 # Alerting fundamentals
 
 This section includes the following fundamental concepts of Grafana alerting:
 
+- [Alert rules]({{< relref "./alert-rules/_index.md" >}})
 - [Annotations and labels for alerting rules]({{< relref "./annotation-label/_index.md" >}})
 - [Alertmanager]({{< relref "./alertmanager.md" >}})
 - [State and health of alerting rules]({{< relref "./state-and-health.md" >}})

docs/sources/alerting/fundamentals/alert-rules/_index.md

@@ -0,0 +1,22 @@
+---
+description: About Grafana alert rules
+keywords:
+  - grafana
+  - alerting
+  - rules
+title: Alert rules
+weight: 101
+---
+
+# About alert rules
+
+An alerting rule is a set of evaluation criteria that determines whether an alert instance will fire. The rule consists of one or more queries and expressions, a condition, the frequency of evaluation, and optionally, the duration over which the condition is met.
+
+While queries and expressions select the data set to evaluate, a condition sets the threshold that an alert must meet or exceed to create an alert.
+
+An interval specifies how frequently an alerting rule is evaluated. Duration, when configured, indicates how long a condition must be met. The alert rules can also define alerting behavior in the absence of data.
+
+- [Alert rule types]({{< relref "./alert-rule-types.md" >}})
+- [Alert instances]({{< relref "./alert-instances.md" >}})
+- [Organising alert rules]({{< relref "./organising-alerts.md" >}})
+- [Annotation and labels]({{< relref "../annotation-label/_index.md" >}})

docs/sources/alerting/fundamentals/alert-rules/alert-instances.md

@@ -0,0 +1,25 @@
+---
+description: Learn about Grafana alert instances
+keywords:
+  - grafana
+  - alerting
+  - instances
+title: Alert instances
+weight: 103
+---
+
+# Alert instances
+
+Grafana managed alerts support multi-dimensional alerting. Each alert rule can create multiple alert instances. This is exceptionally powerful if you are observing multiple series in a single expression.
+
+Consider the following PromQL expression:
+
+```promql
+sum by(cpu) (
+  rate(node_cpu_seconds_total{mode!="idle"}[1m])
+)
+```
+
+A rule using this expression will create as many alert instances as the amount of CPUs we are observing after the first evaluation, allowing a single rule to report the status of each CPU.
+
+{{< figure src="/static/img/docs/alerting/unified/multi-dimensional-alert.png" caption="A multi-dimensional Grafana managed alert rule" >}}

docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md

@@ -0,0 +1,33 @@
+---
+description: Learn about the different alert rule types
+keywords:
+  - grafana
+  - alerting
+  - rule types
+title: Alert rule types
+weight: 102
+---
+
+# Alert rule types
+
+Grafana supports several alert rule types, the following sections will explain their merits and demerits and help you choose the right alert type for your use case.
+
+## Grafana managed rules
+
+Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of your existing data sources.
+
+In additional to supporting any datasource you can also add additional [expressions]({{< relref "../../../panels/query-a-data-source/use-expressions-to-manipulate-data/_index.md" >}}) to transform your data and express alert conditions.
+
+## Mimir, Loki and Cortex rules
+
+To create Mimir, Loki or Cortex alerts you must have a compatible Prometheus data source. You can check if your data source is compatible by testing the data source and checking the details if the ruler API is supported.
+
+{{< figure src="/static/img/docs/alerting/unified/mimir-datasource-check.png" caption="Successfully connected to a Mimir Prometheus datasource" max-width="40%" >}}
+
+## Recording rules
+
+Recording rules are only available for compatible Prometheus data sources like Mimir, Loki and Cortex.
+
+A recording rule allows you to save an expression's result to a new set of time series. This is useful if you want to run alerts on aggregated data or if you have dashboards that query the same expression repeatedly.
+
+Read more about [recording rules](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) in Prometheus.

docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md

@@ -0,0 +1,25 @@
+---
+description: Learn how to organize alert rules
+keywords:
+  - grafana
+  - alerting
+  - organization
+title: Organising alert rules
+weight: 104
+---
+
+## Namespaces and groups
+
+Alerts can be organized using Folders for Grafana-managed rules and namespaces for Mimir or Loki rules and group names.
+
+### Namespaces
+
+When creating Grafana-managed rules, the folder can be used to perform access control and grant or deny access to all rules within a specific folder.
+
+### Groups
+
+All rules within a group are evaluated at the same **interval**.
+
+Alert rules and recording rules within a group will always be evaluated **sequentially**, meaning no rules will be evaluated at the same time and in order of appearance.
+
+> **Note** If you want rules to be evaluated concurrently and with different intervals, consider storing them in different groups.

docs/sources/alerting/fundamentals/alertmanager.md

@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/alertmanager/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/"]
-title = "Alertmanager"
-weight = 116
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/alertmanager/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/
+title: Alertmanager
+weight: 116
+---
 
 # Alertmanager
 

docs/sources/alerting/fundamentals/annotation-label/_index.md

@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-rules/alert-annotation-label/", "/docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/"]
-description = "Annotations and labels for alerting"
-keywords = ["grafana", "alerting", "guide", "rules", "create"]
-title = "Annotations and labels for alerting rules"
-weight = 401
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-rules/alert-annotation-label/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/
+description: Annotations and labels for alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+title: Annotations and labels for alerting rules
+weight: 401
+---
 
 # Annotations and labels for alerting rules
 

docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md

@@ -1,9 +1,13 @@
-+++
-title = "Labels in Grafana alerting"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Labels in Grafana alerting
+weight: 117
+---
 
 # Labels in Grafana alerting
 

docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md

@@ -1,9 +1,13 @@
-+++
-title = "Label matchers"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Label matchers
+weight: 117
+---
 
 # How label matching works
 

docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md

@@ -1,9 +1,13 @@
-+++
-title = "Template variables for alerting rule labels and annotations"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Template variables for alerting rule labels and annotations
+weight: 117
+---
 
 # Template variables for alerting rule labels and annotations
 

docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md

@@ -1,8 +1,11 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/", "/docs/grafana/latest/alerting/metrics/", "/docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/"]
-title = "Alerting on numeric data"
-weight = 116
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/
+title: Alerting on numeric data
+weight: 116
+---
 
 # Alerting on numeric data
 

docs/sources/alerting/fundamentals/state-and-health.md

@@ -1,9 +1,15 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/fundamentals/state-and-health/", "/docs/grafana/llatest/alerting/unified-alerting/alerting-rules/state-and-health/"]
-description = "State and Health of alerting rules"
-keywords = ["grafana", "alerting", "guide", "state"]
-title = "State and health of alerting rules"
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/state-and-health/
+  - /docs/grafana/llatest/alerting/unified-alerting/alerting-rules/state-and-health/
+description: State and Health of alerting rules
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - state
+title: State and health of alerting rules
+---
 
 # State and health of alerting rules
 

docs/sources/alerting/high-availability/_index.md

@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/high-availability/", "/docs/grafana/latest/alerting/unified-alerting/high-availability/"]
-description = "High availability"
-keywords = ["grafana", "alerting", "tutorials", "ha", "high availability"]
-title = " Alerting high availability"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/high-availability/
+  - /docs/grafana/latest/alerting/unified-alerting/high-availability/
+description: High availability
+keywords:
+  - grafana
+  - alerting
+  - tutorials
+  - ha
+  - high availability
+title: ' Alerting high availability'
+weight: 450
+---
 
 # About alerting high availability
 

docs/sources/alerting/high-availability/enable-alerting-ha.md

@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/high-availability/enable-alerting-ha/", "/docs/grafana/latest/alerting/unified-alerting/high-availability/"]
-description = "Enable alerting high availability"
-keywords = ["grafana", "alerting", "tutorials", "ha", "high availability"]
-title = "Enable alerting high availability"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/high-availability/enable-alerting-ha/
+  - /docs/grafana/latest/alerting/unified-alerting/high-availability/
+description: Enable alerting high availability
+keywords:
+  - grafana
+  - alerting
+  - tutorials
+  - ha
+  - high availability
+title: Enable alerting high availability
+weight: 450
+---
 
 # Enable alerting high availability
 

docs/sources/alerting/migrating-alerts/_index.md

@@ -0,0 +1,27 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/migrating-alerts/
+description: Migrate Grafana alerts
+title: Migrate to Grafana alerting
+weight: 113
+---
+
+# Migrate to Grafana alerting
+
+Grafana alerting is the default for new Cloud, Enterprise, and OSS installations. The new installations will only show the Grafana alerting icon in the left navigation panel.
+
+Existing installations that upgrade to v9.0 will have Grafana alerting enabled by default.
+
+| Grafana instance upgraded to v 90 |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Cloud                             | Existing Cloud installations with legacy dashboard alerting will have two alerting icons in the left navigation panel - the old alerting plugin icon and the new Grafana alerting icon. During upgrade, existing alerts from the Cloud alerting plugin are migrated to Grafana alerting. Once migration is complete, you can access aman manage the older alerts from the new alerting Grafana alerting icon in the navigation panel. The (older) Cloud alerting plugin is uninstalled from your cloud instance. Contact customer support if you **do not wish** to migrate to Grafana alerting for your Cloud stack. If you choose to use legacy alerting, use the You will see the new Grafana alerting icon as well as the old Cloud alerting plugin in the left navigation panel. |
+| Enterprise                        | Existing Enterprise instances using legacy alerting will have both the old (marked as legacy) and the new alerting icons in the navigation panel. During upgrade, existing legacy alerts are migrated to Grafana alerting. If you wish, you can [opt-out]({{< relref "./opt-out.md" >}}) of Grafana alerting and roll back to legacy alerting. In that case, you can manage your legacy alerts from the alerting icon marked as legacy.                                                                                                                                                                                                                                                                                                                                               |
+| OSS                               | Existing OSS installations with legacy dashboard alerting will have two alerting icons in the left navigation panel - the old alerting icon (marked as legacy) and the new Grafana alerting icon. During upgrade, existing legacy alerts are migrated to Grafana alerting. If you wish, you can [opt-out]({{< relref "./opt-out.md" >}}) of Grafana alerting and roll back to legacy alerting. In that case, you can manage your legacy alerts from the alerting icon marked as legacy.                                                                                                                                                                                                                                                                                               |
+
+During migration from legacy alerting to unified alerting, the legacy alerts are updated to the new alerts type, as a result, the user does not lose alerts or alerting data. However, if a user rolls back to legacy alerting after having migrated to unified alerting, they will only get the legacy alerts they had right before migration.
+
+## Roll back to legacy alerting
+
+Although we encourage you to use Grafana alerting, roll back to legacy alerting is supported in Grafana 9. Rolling back can result in data loss (you will loose all alerts that you created using Grafana alerting). This is applicable to the fresh installation as well as upgraded setups.
+
+> **Note:** Legacy alerting will be deprecated in a future release (v10).

docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md

@@ -1,13 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/migrating-legacy-alerts/", "/docs/grafana/latest/alerting/unified-alerting/opt-in/"]
-description = "Migrate legacy dashboard alerts"
-title = "Migrating legacy dashboard alerts"
-weight = 114
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/migrating-legacy-alerts/
+  - /docs/grafana/latest/alerting/unified-alerting/opt-in/
+description: Migrate legacy dashboard alerts
+title: Migrating legacy dashboard alerts
+weight: 114
+---
 
 # Migrating legacy dashboard alerts
 
-When Grafana alerting is enabled or Grafana is upgraded to the latest version, existing legacy dashboard alerts migrate in a format compatible with the Grafana alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside new alerts.
+When Grafana alerting is enabled or Grafana is upgraded to the latest version, existing legacy dashboard alerts migrate in a format compatible with the Grafana alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside any new alerts. This topic explains how legacy dashboard alerts are migrated and some limitations.
+
+> **Note:** This topic is only relevant for OSS and Enterprise customers. Contact customer support to enable or disable Grafana alerting for your Cloud stack.
 
 Read and write access to legacy dashboard alerts and Grafana alerts are governed by the permissions of the folders storing them. During migration, legacy dashboard alert permissions are matched to the new rules permissions as follows:
 
@@ -15,20 +19,9 @@ Read and write access to legacy dashboard alerts and Grafana alerts are governed
 - If there are no dashboard permissions and the dashboard is under a folder, then the rule is linked to this folder and inherits its permissions.
 - If there are no dashboard permissions and the dashboard is under the General folder, then the rule is linked to the `General Alerting` folder, and the rule inherits the default permissions.
 
-> **Note:** Since there is no `Keep Last State` option for [`No Data`]({{< relref "./alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) in Grafana alerting, this option becomes `NoData` during the legacy rules migration. Option "Keep Last State" for [`Error handling`]({{< relref "./alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a [silence]({{< relref "./silences/_index.md" >}}) for each alert rule with a duration of 1 year.
+> **Note:** Since there is no `Keep Last State` option for [`No Data`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) in Grafana alerting, this option becomes `NoData` during the legacy rules migration. Option "Keep Last State" for [`Error handling`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a [silence]({{< relref "../silences/_index.md" >}}) for each alert rule with a duration of 1 year.
 
 Notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
 
 Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts.
 Silences (expiring after one year) are created for all paused dashboard alerts.
-
-## Disable Grafana alerts
-
-To disable Grafana alerts and enable legacy dashboard alerts:
-
-1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [Grafana alerting]({{< relref "../administration/configuration.md#unified_alerting" >}}) section.
-1. Set the `enabled` property to `false`.
-1. For [legacy dashboard alerting]({{< relref "../administration/configuration.md#alerting" >}}), set the `enabled` flag to `true`.
-1. Restart Grafana for the configuration changes to take effect.
-
-> **Note:** Switching from one flavor of alerting to another can result in data loss. This is applicable to the fresh installation as well as upgraded setups.

docs/sources/alerting/migrating-alerts/opt-out.md

@@ -0,0 +1,42 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/opt-in/
+  - /docs/grafana/latest/alerting/unified-alerting/opt-in/
+description: Disable Grafana alerts
+title: Opt-out of Grafana alerting
+weight: 113
+---
+
+# Opt-out to Grafana alerting in OSS
+
+This topic discusses how to disable Grafana alerting and migrate to legacy dashboard alerting. It also provides guidance on how to enable Grafana alerting once you are ready to migrate to Grafana alerting.
+
+> **Note:** This topic is only relevant for OSS and Enterprise customers. Contact customer support to enable or disable Grafana alerting for your Grafana Cloud stack.
+
+## Before you begin
+
+We recommend that you backup Grafana's database. If you are using PostgreSQL as the backend database, then the minimum required version is 9.5.
+
+## Opt-out of Grafana alerts
+
+To opt-out of Grafana alerts and roll back to legacy dashboard alerting:
+
+1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [Grafana alerting]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
+1. Set the `enabled` property to `false`.
+1. For [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `true`.
+1. Restart Grafana for the configuration changes to take effect.
+
+> **Note:** Rolling back from Grafana to legacy alerting can result in data loss. This is applicable to the fresh installation as well as upgraded setups.
+
+## Opt-in to Grafana alerting
+
+When you are ready to make the switch, the following procedure will help you migrate to Grafana alerting.
+
+To opt-in to Grafana alerts:
+
+1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section.
+2. Set the `enabled` property to `true`.
+3. Next, for [legacy dashboard alerting]({{< relref "../../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
+4. Restart Grafana for the configuration changes to take effect.
+
+> **Note:** The `ngalert` toggle previously used to enable or disable Grafana alerting is no longer available.

docs/sources/alerting/notifications/_index.md

@@ -1,10 +1,17 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/notifications/", "/docs/grafana/latest/alerting/unified-alerting/notifications/"]
-description = "Notification policies"
-keywords = ["grafana", "alerting", "guide", "notification policies", "routes"]
-title = "Notification policies"
-weight = 440
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/notifications/
+  - /docs/grafana/latest/alerting/unified-alerting/notifications/
+description: Notification policies
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - notification policies
+  - routes
+title: Notification policies
+weight: 440
+---
 
 # Notification policies
 

docs/sources/alerting/notifications/mute-timings.md

@@ -1,10 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/notifications/mute-timings/", "/docs/grafana/latest/alerting/unified-alerting/notifications/mute-timings/"]
-description = "Mute timings"
-keywords = ["grafana", "alerting", "guide", "mute", "mute timings", "mute time interval"]
-title = "Mute timings"
-weight = 450
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/notifications/mute-timings/
+  - /docs/grafana/latest/alerting/unified-alerting/notifications/mute-timings/
+description: Mute timings
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - mute
+  - mute timings
+  - mute time interval
+title: Mute timings
+weight: 450
+---
 
 # Mute timings
 

docs/sources/alerting/opt-in.md

@@ -1,41 +0,0 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/opt-in/", "/docs/grafana/latest/alerting/unified-alerting/opt-in/"]
-description = "Enable Grafana alerts"
-title = "Opt-in to Grafana alerting"
-weight = 113
-+++
-
-# Opt-in to Grafana alerting in OSS
-
-Grafana alerting is enabled by default for new Cloud and OSS installations.
-
-- For existing OSS installations that use legacy dashboard alerts, unified alerting is still an opt-in feature.
-- For existing Grafana Cloud users, contact customer support to enable Grafana alerting for your Cloud stack.
-
-## Before you begin
-
-We recommend that you backup Grafana's database. If you are using PostgreSQL as the backend database, then the minimum required version is 9.5.
-
-## Enable Grafana alerting
-
-To enable Grafana alerts:
-
-1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [unified alerts]({{< relref "../administration/configuration.md#unified_alerting" >}}) section.
-2. Set the `enabled` property to `true`.
-3. Next, for [legacy dashboard alerting]({{< relref "../administration/configuration.md#alerting" >}}), set the `enabled` flag to `false`.
-4. Restart Grafana for the configuration changes to take effect.
-
-> **Note:** The `ngalert` toggle previously used to enable or disable Grafana alerting is no longer available.
-
-Before v8.2, notification logs and silences were stored on a disk. If you did not use persistent disks, you would have lost any configured silences and logs on a restart, resulting in unwanted or duplicate notifications. We no longer require the use of a persistent disk. Instead, the notification logs and silences are stored regularly (every 15 minutes). If you used the file-based approach, Grafana reads the existing file and persists it eventually.
-
-## Disable Grafana alerts
-
-To disable Grafana alerts and roll back to legacy dashboard alerting:
-
-1. In your custom configuration file ($WORKING_DIR/conf/custom.ini), go to the [Grafana alerting]({{< relref "../administration/configuration.md#unified_alerting" >}}) section.
-1. Set the `enabled` property to `false`.
-1. For [legacy dashboard alerting]({{< relref "../administration/configuration.md#alerting" >}}), set the `enabled` flag to `true`.
-1. Restart Grafana for the configuration changes to take effect.
-
-> **Note:** Switching from one flavor of alerting to another can result in data loss. This is applicable to the fresh installation as well as upgraded setups.

docs/sources/alerting/silences/_index.md

@@ -1,10 +1,15 @@
-+++
-title = "Silences"
-description = "Silences"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 450
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Silences
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Silences
+weight: 450
+---
 
 # About alerting silences
 

docs/sources/alerting/silences/create-silence.md

@@ -1,10 +1,15 @@
-+++
-title = "Create a silence"
-description = "Add silence alert notification"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 450
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Add silence alert notification
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Create a silence
+weight: 450
+---
 
 # Create a silence
 

docs/sources/alerting/silences/edit-silence.md

@@ -1,10 +1,15 @@
-+++
-title = "Edit silences"
-description = "Edit alerting silences"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 450
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Edit alerting silences
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Edit silences
+weight: 450
+---
 
 # Edit silences
 

docs/sources/alerting/silences/label-matching-alert-suppression.md

@@ -1,10 +1,15 @@
-+++
-title = "Label matching and alert suppression"
-description = "Silences alert notifications"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 452
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Silences alert notifications
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Label matching and alert suppression
+weight: 452
+---
 
 # About label matching for alert suppression
 

docs/sources/alerting/silences/linking-to-silence-form.md

@@ -1,10 +1,15 @@
-+++
-title = "Create URL to link to silence form"
-description = "Linking to a silence form"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 451
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Linking to a silence form
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Create URL to link to silence form
+weight: 451
+---
 
 # Create a URL to link to a silence form
 

docs/sources/alerting/silences/remove-silence.md

@@ -1,10 +1,15 @@
-+++
-title = "Remove silences"
-description = "Remove alerting silences"
-keywords = ["grafana", "alerting", "silence", "mute"]
-weight = 451
-aliases = ["/docs/grafana/latest/alerting/unified-alerting/silences/"]
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/silences/
+description: Remove alerting silences
+keywords:
+  - grafana
+  - alerting
+  - silence
+  - mute
+title: Remove silences
+weight: 451
+---
 
 # Remove silences
 

docs/sources/auth/_index.md

@@ -1,9 +1,10 @@
-+++
-aliases = ["/docs/grafana/latest/auth/"]
-description = "Authentication"
-title = "Authentication"
-weight = 30
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/
+description: Authentication
+title: Authentication
+weight: 30
+---
 
 # User Authentication Overview
 

docs/sources/auth/auth-proxy.md

@@ -1,10 +1,16 @@
-+++
-aliases = ["/docs/grafana/latest/auth/auth-proxy/", "/docs/grafana/latest/tutorials/authproxy/"]
-description = "Grafana Auth Proxy Guide "
-keywords = ["grafana", "configuration", "documentation", "proxy"]
-title = "Auth Proxy"
-weight = 200
-+++
+---
+aliases:
+  - /docs/grafana/latest/auth/auth-proxy/
+  - /docs/grafana/latest/tutorials/authproxy/
+description: 'Grafana Auth Proxy Guide '
+keywords:
+  - grafana
+  - configuration
+  - documentation
+  - proxy
+title: Auth Proxy
+weight: 200
+---
 
 # Auth Proxy Authentication