Merge branch 'v9.0.x' into release-v9.0.0

RolePicker: Fix submenu position on horizontal space overflow (#50769 ) (#50843 )
(cherry picked from commit 2fbe99c1be) Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
2025-12-21 03:54:29 +08:00 · 2022-06-15 10:57:21 +03:00 · 2022-06-15 09:20:03 +02:00 · 2022-06-14 15:48:44 -04:00 · 2022-06-14 19:41:56 +01:00 · 2022-06-14 19:55:57 +02:00
1557 changed files with 86129 additions and 35442 deletions
--- a/.betterer.results
+++ b/.betterer.results
@@ -125,12 +125,9 @@ exports[`no enzyme tests`] = {
    "public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx:3032694716": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx:2026575657": [
+    "public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx:3743889097": [
      [0, 26, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/core/components/Select/FolderPicker.test.tsx:993468764": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "public/app/core/components/Select/MetricSelect.test.tsx:3351544014": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -173,9 +170,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 +197,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": [
@@ -212,11 +206,11 @@ exports[`no enzyme tests`] = {
    "public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx:3822406835": [
      [1, 19, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx:1224072551": [
+    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx:227258837": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx:2097436158": [
-      [1, 19, 13, "RegExp match", "2409514259"]
+    "public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx:1501504663": [
+      [2, 19, 13, "RegExp match", "2409514259"]
    ],
    "public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx:3481855642": [
      [0, 26, 13, "RegExp match", "2409514259"]
@@ -224,7 +218,7 @@ exports[`no enzyme tests`] = {
    "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx:248699332": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/plugins/datasource/influxdb/components/ConfigEditor.test.tsx:3456478975": [
+    "public/app/plugins/datasource/influxdb/components/ConfigEditor.test.tsx:57753101": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
    "public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx:1488067923": [
--- a/.drone.yml
+++ b/.drone.yml
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: publish_docs
 on:
  push:
    branches:
-    - main
+    - v9.0.x
    paths:
    - 'docs/sources/**'
    - 'packages/grafana-*/**'
@@ -41,7 +41,7 @@ jobs:
        host: github.com
        github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
        source_folder: docs/sources
-        target_folder: content/docs/grafana/next
+        target_folder: content/docs/grafana/latest
        allow_no_changes: 'true'
    - shell: bash
      run: |
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,548 @@
+<!-- 9.0.0 START -->
+
+# 9.0.0 (2022-06-10)
+
+### Features and enhancements
+
+- **API:** Add GET /api/annotations/:annotationId endpoint. [#47739](https://github.com/grafana/grafana/pull/47739), [@scottbock](https://github.com/scottbock)
+- **API:** Add endpoint for updating a data source by its UID. [#49396](https://github.com/grafana/grafana/pull/49396), [@papagian](https://github.com/papagian)
+- **AccessControl:** Add enterprise only setting for rbac permission cache. [#49006](https://github.com/grafana/grafana/pull/49006), [@kalleep](https://github.com/kalleep)
+- **AccessControl:** Document basic roles changes and provisioning V2. [#48910](https://github.com/grafana/grafana/pull/48910), [@gamab](https://github.com/gamab)
+- **AccessControl:** Enable RBAC by default. [#48813](https://github.com/grafana/grafana/pull/48813), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **AddDataSourceConfig:** Remove deprecated checkHealth prop. [#50296](https://github.com/grafana/grafana/pull/50296), [@kaydelaney](https://github.com/kaydelaney)
+- **Alerting:** Add Image URLs to Microsoft Teams notifier. [#49385](https://github.com/grafana/grafana/pull/49385), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Add RBAC actions and role for provisioning API routes. [#50459](https://github.com/grafana/grafana/pull/50459), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Add Screenshot URLs to Pagerduty Notifier. [#49377](https://github.com/grafana/grafana/pull/49377), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Add a "Reason" to Alert Instances to show underlying cause of state. [#49259](https://github.com/grafana/grafana/pull/49259), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Add a general screenshot service and alerting-specific image service. [#49293](https://github.com/grafana/grafana/pull/49293), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Add image url or file attachment to email notifications. [#49381](https://github.com/grafana/grafana/pull/49381), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Add image_urls to OpsGenie notification details. [#49379](https://github.com/grafana/grafana/pull/49379), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Add notification policy flow chart. [#49405](https://github.com/grafana/grafana/pull/49405), [@peterholmberg](https://github.com/peterholmberg)
+- **Alerting:** Attach image URL to alerts in Webhook notifier format. [#49378](https://github.com/grafana/grafana/pull/49378), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Attach image URLs or upload files to Discord notifications. [#49439](https://github.com/grafana/grafana/pull/49439), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Attach image URLs to Google Chat notifications. [#49445](https://github.com/grafana/grafana/pull/49445), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Attach screenshot data to Unified Alerting notifications. [#49374](https://github.com/grafana/grafana/pull/49374), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Create folder for alerting when start from the scratch. [#48866](https://github.com/grafana/grafana/pull/48866), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Modify alertmanager endpoints for proxying using the datasource UID. [#47978](https://github.com/grafana/grafana/pull/47978), [@papagian](https://github.com/papagian)
+- **Alerting:** Modify endpoint for testing a datasource rule using the UID. [#48070](https://github.com/grafana/grafana/pull/48070), [@papagian](https://github.com/papagian)
+- **Alerting:** Modify prometheus endpoints for proxying using the datasource UID. [#48052](https://github.com/grafana/grafana/pull/48052), [@papagian](https://github.com/papagian)
+- **Alerting:** State Manager takes screenshots. [#49338](https://github.com/grafana/grafana/pull/49338), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Use UID scope for folders authorization. [#48970](https://github.com/grafana/grafana/pull/48970), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** modify ruler endpoints for proxying using the datasource UID. [#48046](https://github.com/grafana/grafana/pull/48046), [@papagian](https://github.com/papagian)
+- **Angular:** Adds back two angular directives that are still used by remaining angular bits and plugins. [#50380](https://github.com/grafana/grafana/pull/50380), [@torkelo](https://github.com/torkelo)
+- **Azure Monitor:** Add Resource Picker to Metrics Queries. [#49029](https://github.com/grafana/grafana/pull/49029), [@sarahzinger](https://github.com/sarahzinger)
+- **Azure Monitor:** Add search feature to resource picker. [#48234](https://github.com/grafana/grafana/pull/48234), [@sarahzinger](https://github.com/sarahzinger)
+- **AzureMonitor:** Add support for selecting multiple options when using the equals and not equals dimension filters. [#48650](https://github.com/grafana/grafana/pull/48650), [@aangelisc](https://github.com/aangelisc)
+- **AzureMonitor:** Remove deprecated code. [#48328](https://github.com/grafana/grafana/pull/48328), [@andresmgot](https://github.com/andresmgot)
+- **Build:** Change names to PascalCase to match. [#48949](https://github.com/grafana/grafana/pull/48949), [@zuchka](https://github.com/zuchka)
+- **Chore:** Remove deprecated DataSourceAPI methods. [#49313](https://github.com/grafana/grafana/pull/49313), [@ifrost](https://github.com/ifrost)
+- **Chore:** Upgrade typescript to 4.6.4. [#49016](https://github.com/grafana/grafana/pull/49016), [@kaydelaney](https://github.com/kaydelaney)
+- **Cloud Monitoring:** Use new annotation API. [#49026](https://github.com/grafana/grafana/pull/49026), [@kevinwcyu](https://github.com/kevinwcyu)
+- **CloudMonitoring:** Allow to set a custom value or disable graph_period. [#48646](https://github.com/grafana/grafana/pull/48646), [@andresmgot](https://github.com/andresmgot)
+- **CloudWatch:** Add generic filter component to variable editor. [#47907](https://github.com/grafana/grafana/pull/47907), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Added missing AWS/AppRunner metrics. [#49174](https://github.com/grafana/grafana/pull/49174), [@Aton-Kish](https://github.com/Aton-Kish)
+- **CloudWatch:** Enable support for dynamic labels with migrated alias patterns. [#49173](https://github.com/grafana/grafana/pull/49173), [@sunker](https://github.com/sunker)
+- **Cloudwatch:** Pass label in deep link. [#49160](https://github.com/grafana/grafana/pull/49160), [@sunker](https://github.com/sunker)
+- **Cloudwatch:** Use new annotation API. [#48102](https://github.com/grafana/grafana/pull/48102), [@sunker](https://github.com/sunker)
+- **Dashboard:** Validate dashboards against schema on save. [#48252](https://github.com/grafana/grafana/pull/48252), [@sdboyer](https://github.com/sdboyer)
+- **DashboardPickerByID:** Add option to exclude dashboards. [#49211](https://github.com/grafana/grafana/pull/49211), [@Clarity-89](https://github.com/Clarity-89)
+- **DashboardPickerById:** Add optionLabel prop. [#47556](https://github.com/grafana/grafana/pull/47556), [@Clarity-89](https://github.com/Clarity-89)
+- **Dashboards:** Display values of 0 with the configured decimal places. [#48155](https://github.com/grafana/grafana/pull/48155), [@wx1322](https://github.com/wx1322)
+- **Data:** Remove deprecated types and functions from valueMappings. [#50035](https://github.com/grafana/grafana/pull/50035), [@kaydelaney](https://github.com/kaydelaney)
+- **Elasticsearch:** Remove browser access mode. [#49014](https://github.com/grafana/grafana/pull/49014), [@gabor](https://github.com/gabor)
+- **Elasticsearch:** Remove support for versions after their end of the life (<7.10.0). [#48715](https://github.com/grafana/grafana/pull/48715), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Encryption:** Add support for multiple data keys per day. [#47765](https://github.com/grafana/grafana/pull/47765), [@joanlopez](https://github.com/joanlopez)
+- **Encryption:** Enable envelope encryption by default. [#49301](https://github.com/grafana/grafana/pull/49301), [@joanlopez](https://github.com/joanlopez)
+- **Explore:** Remove support for legacy, compact format URLs. [#49350](https://github.com/grafana/grafana/pull/49350), [@gelicia](https://github.com/gelicia)
+- **Explore:** Skip Angular error handling when Angular support is disabled. [#49311](https://github.com/grafana/grafana/pull/49311), [@ifrost](https://github.com/ifrost)
+- **Explore:** simplify support for multiple query editors. [#48701](https://github.com/grafana/grafana/pull/48701), [@Elfo404](https://github.com/Elfo404)
+- **FeatureToggles:** Support changing feature toggles with URL parameters. [#50275](https://github.com/grafana/grafana/pull/50275), [@ryantxu](https://github.com/ryantxu)
+- **FileUpload:** Make component accessible by keyboard navigation. [#47497](https://github.com/grafana/grafana/pull/47497), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Formatting:** Make SI number formats more robust. [#50117](https://github.com/grafana/grafana/pull/50117), [@kaydelaney](https://github.com/kaydelaney)
+- **Graph:** Deprecate Graph (old) and make it no longer a visualization option for new panels. [#48034](https://github.com/grafana/grafana/pull/48034), [@torkelo](https://github.com/torkelo)
+- **IconButton:** IconButtons are now correctly aligned in Safari. [#48759](https://github.com/grafana/grafana/pull/48759), [@ashharrison90](https://github.com/ashharrison90)
+- **Logger:** Enable new logging format by default. [#47584](https://github.com/grafana/grafana/pull/47584), [@ying-jeanne](https://github.com/ying-jeanne)
+- **Loki:** Add more query patterns. [#50248](https://github.com/grafana/grafana/pull/50248), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Enable new visual query builder by default. [#48346](https://github.com/grafana/grafana/pull/48346), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** use the same dataframe-format for both live and normal queries. [#47153](https://github.com/grafana/grafana/pull/47153), [@gabor](https://github.com/gabor)
+- **OAuth:** Make allowed email domain case insensitive. [#49252](https://github.com/grafana/grafana/pull/49252), [@Jguer](https://github.com/Jguer)
+- **Panels:** Use the No value option when showing the no data message. [#47675](https://github.com/grafana/grafana/pull/47675), [@torkelo](https://github.com/torkelo)
+- **Plugins:** Remove plugin list panel. [#46914](https://github.com/grafana/grafana/pull/46914), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Query History:** Enable new query history by default. [#49407](https://github.com/grafana/grafana/pull/49407), [@ifrost](https://github.com/ifrost)
+- **QueryEditorRow:** Show query errors next to query in a consistent way across Grafana. [#47613](https://github.com/grafana/grafana/pull/47613), [@torkelo](https://github.com/torkelo)
+- **SAML:** Implement Name Templates for assertion_attribute_name option. [#48022](https://github.com/grafana/grafana/pull/48022), [@mmandrus](https://github.com/mmandrus)
+- **Service accounts:** Do not display service accounts assigned to team. [#48995](https://github.com/grafana/grafana/pull/48995), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Settings:** Use Grafana Azure SDK to pass Azure env vars for external plugins. [#48954](https://github.com/grafana/grafana/pull/48954), [@kostrse](https://github.com/kostrse)
+- **Shortcuts:** Add shortcut to show shortcuts to the list of shortcuts. [#48395](https://github.com/grafana/grafana/pull/48395), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Traces Panel:** Add new Traces Panel visualization. [#47534](https://github.com/grafana/grafana/pull/47534), [@joey-grafana](https://github.com/joey-grafana)
+- **Traces:** Filter by service/span name and operation in Tempo and Jaeger. [#48209](https://github.com/grafana/grafana/pull/48209), [@joey-grafana](https://github.com/joey-grafana)
+- **Transformations:** Allow more complex regex expressions in `Rename by regex`. [#48179](https://github.com/grafana/grafana/pull/48179), [@ashharrison90](https://github.com/ashharrison90)
+- **grafana/ui:** Add default type="button" to <Button>. [#48183](https://github.com/grafana/grafana/pull/48183), [@axelavargas](https://github.com/axelavargas)
+
+### Bug fixes
+
+- **Alerting:** Fix database unavailable removes rules from scheduler. [#49874](https://github.com/grafana/grafana/pull/49874), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **AzureMonitor:** Fix auto-selection of time-grain for metrics. [#49278](https://github.com/grafana/grafana/pull/49278), [@aangelisc](https://github.com/aangelisc)
+- **DataSources:** Fixes issue with expressions not being queried. [#50446](https://github.com/grafana/grafana/pull/50446), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **GraphNG:** Fix thresholds by color not following data update. [#48571](https://github.com/grafana/grafana/pull/48571), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Jaeger:** Update operations dropdown. [#49329](https://github.com/grafana/grafana/pull/49329), [@joey-grafana](https://github.com/joey-grafana)
+- **Login:** Fix mismatching label on auth_module in user list. [#49177](https://github.com/grafana/grafana/pull/49177), [@Jguer](https://github.com/Jguer)
+- **Playlists:** Save button now correctly creates a new playlist. [#50381](https://github.com/grafana/grafana/pull/50381), [@ashharrison90](https://github.com/ashharrison90)
+- **RBAC:** Fix migrations running in the wrong order causing inheritance problem in enterprise. [#50452](https://github.com/grafana/grafana/pull/50452), [@gamab](https://github.com/gamab)
+- **RBAC:** Fix migrations running into the wrong order. (Enterprise)
+- **ServiceAccounts:** Add identifiable token prefix to service account tokens. [#49011](https://github.com/grafana/grafana/pull/49011), [@Jguer](https://github.com/Jguer)
+- **Traces:** Fix missing CopyButton on KeyValueTables and overlapping of panels. [#49271](https://github.com/grafana/grafana/pull/49271), [@svennergr](https://github.com/svennergr)
+
+### Breaking changes
+
+The `@grafana/ui` package helper function `selectOptionInTest` used in frontend tests has been removed as it caused testing libraries to be bundled in the production code of Grafana. If you were using this helper function in your tests please update your code accordingly:
+
+```js
+// before
+import { selectOptionInTest } from '@grafana/ui';
+// ...test usage
+await selectOptionInTest(selectEl, 'Option 2');
+
+// after
+import { select } from 'react-select-event';
+// ...test usage
+await select(selectEl, 'Option 2', { container: document.body });
+```
+
+Issue [#50442](https://github.com/grafana/grafana/issues/50442)
+
+Removed deprecated `checkHealth` prop from the `@grafana/e2e` `addDataSource` config. Previously this value defaulted to `false`, and has not been used in end-to-end tests since Grafana 8.0.3. Issue [#50296](https://github.com/grafana/grafana/issues/50296)
+
+Removes the deprecated `LegacyBaseMap`, `LegacyValueMapping`, `LegacyValueMap`, and `LegacyRangeMap` types, and `getMappedValue` function from grafana-data. Migration is as follows:
+| Old | New |
+| ------------- | ------------- |
+| `LegacyBaseMap` | `MappingType` |
+| `LegacyValueMapping` | `ValueMapping` |
+| `LegacyValueMap` | `ValueMap` |
+| `LegacyRangeMap` | `RangeMap` |
+| `getMappedValue` | `getValueMappingResult` | Issue [#50035](https://github.com/grafana/grafana/issues/50035)
+
+This change fixes a bug in Grafana where intermittent failure of database, network between Grafana and the database, or error in querying the database would cause all alert rules to be unscheduled in Grafana. Following this change scheduled alert rules are not updated unless the query is successful.
+
+The `get_alert_rules_duration_seconds` metric has been renamed to `schedule_query_alert_rules_duration_seconds`. Issue [#49874](https://github.com/grafana/grafana/issues/49874)
+
+- Any secret (data sources credential, alert manager credential, etc, etc) created or modified with Grafana v9.0 won't be decryptable from any previous version (by default) because the way encrypted secrets are stored into the database has changed. Although secrets created or modified with previous versions will still be decryptable by Grafana v9.0.
+- If required, although generally discouraged, the `disableEnvelopeEncryption` feature toggle can be enabled to keep envelope encryption disabled once updating to Grafana v9.0.
+- In case of need to rollback to an earlier version of Grafana (i.e. Grafana v8.x) for any reason, after being created or modified any secret with Grafana v9.0, the `envelopeEncryption` feature toggle will need to be enabled to keep backwards compatibility (only from `v8.3.x` a bit unstable, from `8.5.x` stable).
+- As a final attempt to deal with issues related with the aforementioned situations, the `grafana-cli admin secrets-migration rollback` command has been designed to move back all the Grafana secrets encrypted with envelope encryption to legacy encryption. So, after running that command it should be safe to disable envelope encryption and/or roll back to a previous version of Grafana.
+- Alternatively or complementarily to all the points above, backing up the Grafana database before updating could be a good idea to prevent disasters (although the risk of getting some secrets corrupted only applies to those updates/created with after updating to Grafana v9.0). Issue [#49301](https://github.com/grafana/grafana/issues/49301)
+
+- According to the dynamic labels documentation, you can use up to five dynamic values per label. There’s currently no such restriction in the alias pattern system, so if more than 5 patterns are being used the GetMetricData API will return an error.
+- Dynamic labels only allow ${LABEL} to be used once per query. There’s no such restriction in the alias pattern system, so in case more than 1 is being used the GetMetricData API will return an error.
+- When no alias is provided by the user, Grafana will no longer fallback with custom rules for naming the legend.
+- In case a search expression is being used and no data is returned, Grafana will no longer expand dimension values, for instance when using a multi-valued template variable or star wildcard `*` in the dimension value field. Ref https://github.com/grafana/grafana/issues/20729
+- Time series might be displayed in a different order. Using for example the dynamic label `${PROP('MetricName')}`, might have the consequence that the time series are returned in a different order compared to when the alias pattern `{{metric}}` is used
+
+Issue [#49173](https://github.com/grafana/grafana/issues/49173)
+
+In Elasticsearch, browser access mode was deprecated in grafana 7.4.0 and removed in 9.0.0. If you used this mode, please switch to server access mode on the datasource configuration page. Issue [#49014](https://github.com/grafana/grafana/issues/49014)
+
+Environment variables passed from Grafana to external Azure plugins have been renamed:
+
+- `AZURE_CLOUD` renamed to `GFAZPL_AZURE_CLOUD`
+- `AZURE_MANAGED_IDENTITY_ENABLED` renamed to `GFAZPL_MANAGED_IDENTITY_ENABLED`
+- `AZURE_MANAGED_IDENTITY_CLIENT_ID` renamed to `GFAZPL_MANAGED_IDENTITY_CLIENT_ID`
+
+There are no known plugins which were relying on these variables. Moving forward plugins should read Azure settings only via Grafana Azure SDK which properly handles old and new environment variables. Issue [#48954](https://github.com/grafana/grafana/issues/48954)
+
+Removes support for for ElasticSearch versions after their end-of-life, currently versions < 7.10.0. To continue to use ElasticSearch data source, upgrade ElasticSearch to version 7.10.0+.
+Issue [#48715](https://github.com/grafana/grafana/issues/48715)
+
+Application Insights and Insight Analytics queries in Azure Monitor were deprecated in Grafana 8.0 and finally removed in 9.0. Deprecated queries will no longer be executed. Please refer to the [documentation](https://grafana.com/docs/grafana/latest/datasources/azuremonitor/deprecated-application-insights/) for more information about this change.
+
+Issue [#48328](https://github.com/grafana/grafana/issues/48328)
+
+**grafana/ui: Button now specifies a default type="button"**
+
+The `Button` component provided by @grafana/ui now specifies a default `type="button"` when no type is provided. In previous versions, if the attribute was not specified for buttons associated with a `<form>` the default value was `submit` per the [specification](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type)
+
+You can preserve the old behavior by explicitly setting the type attribute: `<Button type="submit" />`
+
+[Github Issue #41863](https://github.com/grafana/grafana/issues/41863).
+Issue [#48183](https://github.com/grafana/grafana/issues/48183)
+
+The `Rename by regex` transformation has been improved to allow global patterns of the form `/<stringToReplace>/g`. Depending on the regex match used, this may cause some transformations to behave slightly differently. You can guarantee the same behaviour as before by wrapping the `match` string in forward slashes (`/`), e.g. `(.*)` would become `/(.*)/` Issue [#48179](https://github.com/grafana/grafana/issues/48179)
+
+`<Select />` menus will now portal to the document body by default. This is to give more consistent behaviour when positioning and overlaying. If you were setting `menuShouldPortal={true}` before you can safely remove that prop and behaviour will be the same. If you weren't explicitly setting that prop, there should be no visible changes in behaviour but your tests may need updating. Please see the original PR (https://github.com/grafana/grafana/pull/36398) for migration guides. If you were setting `menuShouldPortal={false}` this will continue to prevent the menu from portalling.
+
+Issue [#48176](https://github.com/grafana/grafana/issues/48176)
+
+Grafana alerting endpoint prefixed with `api/v1/rule/test` that tests a rule against a Corte/Loki data source now expects the data source UID as a path parameter instead of the data source numeric identifier. Issue [#48070](https://github.com/grafana/grafana/issues/48070)
+
+Grafana alerting endpoints prefixed with `api/prometheus/` that proxy requests to a Cortex/Loki data source now expect the data source UID as a path parameter instead of the data source numeric identifier. Issue [#48052](https://github.com/grafana/grafana/issues/48052)
+
+Grafana alerting endpoints prefixed with `api/ruler/` that proxy requests to a Cortex/Loki data source now expect the data source UID as a path parameter instead of the data source numeric identifier. Issue [#48046](https://github.com/grafana/grafana/issues/48046)
+
+Grafana alerting endpoints prefixed with `api/alertmanager/` that proxy requests to an Alertmanager now expect the data source UID as a path parameter instead of the data source numeric identifier. Issue [#47978](https://github.com/grafana/grafana/issues/47978)
+
+The format of log messages have been updated, `lvl` is now `level` and `eror`and `dbug` has been replaced with `error` and `debug`. The precision of timestamps has been increased. To smooth the transition, it is possible to opt-out of the new log format by enabling the feature toggle `oldlog`. This option will be removed in a future minor release. Issue [#47584](https://github.com/grafana/grafana/issues/47584)
+
+In the Loki data source, the dataframe format used to represent Loki logs-data has been changed to a more efficient format. The query-result is represented by a single dataframe with a "labels" column, instead of the separate dataframes for every labels-value. When displaying such data in explore, or in a logs-panel in the dashboard will continue to work without changes, but if the data was loaded into a different dashboard-panel, or Transforms were used, adjustments may be necessary. For example, if you used the "labels to fields" transformation with the logs data, please switch to the "extract fields" transformation. Issue [#47153](https://github.com/grafana/grafana/issues/47153)
+
+### Deprecations
+
+`setExploreQueryField`, `setExploreMetricsQueryField` and `setExploreLogsQueryField` are now deprecated and will be removed in a future release. If you need to set a different query editor for Explore, conditionally render based on `props.app` in your regular query editor. Please refer to https://grafana.com/docs/grafana/latest/developers/plugins/add-support-for-explore-queries/ for more information.
+Issue [#48701](https://github.com/grafana/grafana/issues/48701)
+
+### Plugin development fixes & changes
+
+- **Chore:** Remove react-testing-lib from bundles. [#50442](https://github.com/grafana/grafana/pull/50442), [@jackw](https://github.com/jackw)
+- **Select:** Portal menu by default. [#48176](https://github.com/grafana/grafana/pull/48176), [@ashharrison90](https://github.com/ashharrison90)
+
+<!-- 9.0.0 END -->
+<!-- 9.0.0-beta3 START -->
+
+# 9.0.0-beta3 (2022-06-06)
+
+### Features and enhancements
+
+- **Alerting:** Add provenance guard to config api. [#50147](https://github.com/grafana/grafana/pull/50147), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **Alerting:** Make folder filter clearable in Alert list panel. [#50093](https://github.com/grafana/grafana/pull/50093), [@peterholmberg](https://github.com/peterholmberg)
+- **Alerting:** Provisioning API - Alert rules. [#47930](https://github.com/grafana/grafana/pull/47930), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **Alerting:** Remove Image Upload code from Slack notifier. [#50062](https://github.com/grafana/grafana/pull/50062), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Remove double quotes from matchers. [#50038](https://github.com/grafana/grafana/pull/50038), [@gotjosh](https://github.com/gotjosh)
+- **Cloudwatch:** Dynamic labels autocomplete. [#49794](https://github.com/grafana/grafana/pull/49794), [@sunker](https://github.com/sunker)
+- **Datasource:** Remove deprecated max_idle_connections_per_host setting. [#49948](https://github.com/grafana/grafana/pull/49948), [@marefr](https://github.com/marefr)
+- **Datasource:** Remove support for unencrypted passwords. [#49987](https://github.com/grafana/grafana/pull/49987), [@marefr](https://github.com/marefr)
+- **Dependencies:** Update to Golang version `1.17.11`. [#50253](https://github.com/grafana/grafana/pull/50253), [@dsotirakis](https://github.com/dsotirakis)
+- **Loki:** Run query when pressing Enter on line-filters. [#49913](https://github.com/grafana/grafana/pull/49913), [@svennergr](https://github.com/svennergr)
+- **Metrics:** Remove support for using summaries instead of histogram for HTTP instrumentation. [#49985](https://github.com/grafana/grafana/pull/49985), [@bergquist](https://github.com/bergquist)
+- **Plugins:** Remove deprecated /api/tsdb/query metrics endpoint. [#49916](https://github.com/grafana/grafana/pull/49916), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Support headers field for check health. [#49930](https://github.com/grafana/grafana/pull/49930), [@marefr](https://github.com/marefr)
+- **Prometheus/Loki:** Add raw query and syntax highlight in explain mode. [#50070](https://github.com/grafana/grafana/pull/50070), [@aocenas](https://github.com/aocenas)
+- **Prometheus:** Migrate metadata queries to use resource calls. [#49921](https://github.com/grafana/grafana/pull/49921), [@srclosson](https://github.com/srclosson)
+- **RBAC:** Make RBAC action names more consistent. [#49730](https://github.com/grafana/grafana/pull/49730), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **RBAC:** Make RBAC action names more consistent. (Enterprise)
+- **Settings:** Sunset non-duration based login lifetime config. [#49944](https://github.com/grafana/grafana/pull/49944), [@sakjur](https://github.com/sakjur)
+- **[9.0.x] Alerting:** Update alert rule diff to not see difference between nil and empty map. [#50198](https://github.com/grafana/grafana/pull/50198), [@yuri-tceretian](https://github.com/yuri-tceretian)
+
+### Bug fixes
+
+- **Alerting:** Fix alert list panel showing firing alerts with no instances. [#50069](https://github.com/grafana/grafana/pull/50069), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Fix notification policy "Override grouping" form save. [#50031](https://github.com/grafana/grafana/pull/50031), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Remove double quotes from matchers. [#50046](https://github.com/grafana/grafana/pull/50046), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Use correct permission scope for external AM updates. [#50159](https://github.com/grafana/grafana/pull/50159), [@gillesdemey](https://github.com/gillesdemey)
+- **Datasource:** Fix allowed cookies to be forwarded as header to backend datasources. [#49541](https://github.com/grafana/grafana/pull/49541), [@marefr](https://github.com/marefr)
+- **Licensing:** Fix trial expiration warning. (Enterprise)
+- **Loki:** Fix uncaught errors if `labelKey` contains special characters. [#49887](https://github.com/grafana/grafana/pull/49887), [@svennergr](https://github.com/svennergr)
+- **Prometheus:** Fix aligning of labels of exemplars after backend migration. [#49924](https://github.com/grafana/grafana/pull/49924), [@aocenas](https://github.com/aocenas)
+- **SharePDF:** Fix repeated datasource variables in PDF. (Enterprise)
+- **State Timeline:** Fix Null Value Filling and Value Transformation. [#50054](https://github.com/grafana/grafana/pull/50054), [@codeincarnate](https://github.com/codeincarnate)
+- **Usage stats:** Divide collection into multiple functions to isolate failures. [#49928](https://github.com/grafana/grafana/pull/49928), [@sakjur](https://github.com/sakjur)
+
+### Breaking changes
+
+Removes support for storing/using datasource `password` and `basicAuthPassword` unencrypted which was [deprecated in Grafana v8.1.0](https://grafana.com/docs/grafana/latest/installation/upgrading/#use-of-unencrypted-passwords-for-data-sources-no-longer-supported). Please use `secureJsonData.password` and `secureJsonData.basicAuthPassword`. Issue [#49987](https://github.com/grafana/grafana/issues/49987)
+
+Removes the option to instrument HTTP request in Grafana using summaries instead of histograms. Issue [#49985](https://github.com/grafana/grafana/issues/49985)
+
+Removes support for deprecated dataproxy.max_idle_connections_per_host setting. Please use max_idle_connections instead. Issue [#49948](https://github.com/grafana/grafana/issues/49948)
+
+Removes the deprecated `getFormStyles` function from grafana-ui.
+Prefer using `GrafanaTheme2` and the `useStyles2` hook. Issue [#49945](https://github.com/grafana/grafana/issues/49945)
+
+The configuration options `auth.login_maximum_inactive_lifetime_days` and `auth.login_maximum_lifetime_days` were deprecated in Grafana v7.2.0 and have now been removed. Use `login_maximum_inactive_lifetime_duration` and `login_maximum_lifetime_duration` to customize the maximum lifetime of a login session. Issue [#49944](https://github.com/grafana/grafana/issues/49944)
+
+Removed the deprecated `isFocused` and `isInvalid` props from the `InlineLabel` component. These props haven't done anything for a while, so migration is just a matter of removing the props. Issue [#49929](https://github.com/grafana/grafana/issues/49929)
+
+Removed the deprecated `onColorChange` prop from `ColorPicker`. Moving forward the `onChange` prop should be used. Issue [#49923](https://github.com/grafana/grafana/issues/49923)
+
+`/api/tsdb/query` API has been removed. Use [/api/ds/query](https://grafana.com/docs/grafana/latest/http_api/data_source/#query-a-data-source) instead.
+Issue [#49916](https://github.com/grafana/grafana/issues/49916)
+
+`onClipboardCopy` and `onClipboardError` APIs have been changed such that the callback's argument is just the text that's been copied rather than the old `ClipboardEvent` interface.
+Migration should just be a matter of going from
+
+```tsx
+<ClipboardButton
+  {/*other props... */}
+  onClipboardCopy={(e) => {
+    console.log(`Text "${e.text}" was copied!`);
+  }}
+/>
+```
+
+to
+
+````tsx
+<ClipboardButton
+  {/* other props... */}
+  onClipboardCopy={(copiedText) => {
+    console.log(`Text "${copiedText}" was copied!`);
+  }}
+/>
+``` Issue [#49847](https://github.com/grafana/grafana/issues/49847)
+
+
+The following RBAC action renames have been carried out:
+
+* `users.authtoken:update` -> `users.authtoken:write`;
+* `users.password:update` -> `users.password:write`;
+* `users.permissions:update` -> `users.permissions:write`;
+* `users.quotas:update` -> `users.quotas:write`;
+* `org.users.role:update` -> `org.users:write`;
+* `alert.instances:update` -> `alert.instances:write`;
+* `alert.rules:update` -> `alert.rules:write`;
+* `users.authtoken:list` -> `users.authtoken:read`;
+* `users.quotas:list` -> `users.quotas:read`;
+* `users.teams:read` -> replaced by `users.read` + `teams:read`
+
+We've added a migration from the old action names to the new names and have updated our documentation. But you will have to update any scripts and provisioning files that are using the old action names. Issue [#49730](https://github.com/grafana/grafana/issues/49730)
+
+
+The following RBAC action renames have been carried out:
+
+* `reports.admin:write` -> `reports:write`;
+* `reports.admin:create` -> `reports:create`;
+* `licensing:update` -> `licensing:write`;
+* `roles:list` -> `roles:read`;
+* `teams.roles:list` -> `teams.roles:read`;
+* `users.roles:list` -> `users.roles:read`;
+* `users.permissions:list` -> `users.permissions:read`
+
+We've added a migration from the old action names to the new names and have updated our documentation. But you will have to update any scripts and provisioning files that are using the old action names. Issue [#3372](https://github.com/grafana/grafana/issues/3372)
+
+### Plugin development fixes & changes
+
+- **UI:** Remove deprecated getFormStyles function. [#49945](https://github.com/grafana/grafana/pull/49945), [@kaydelaney](https://github.com/kaydelaney)
+- **InlineLabel:** Remove deprecated props. [#49929](https://github.com/grafana/grafana/pull/49929), [@kaydelaney](https://github.com/kaydelaney)
+- **ColorPicker:** Remove deprecated onColorChange prop. [#49923](https://github.com/grafana/grafana/pull/49923), [@kaydelaney](https://github.com/kaydelaney)
+- **ClipboardButton:** Simplify callbacks. [#49847](https://github.com/grafana/grafana/pull/49847), [@kaydelaney](https://github.com/kaydelaney)
+
+<!-- 9.0.0-beta3 END -->
+<!-- 9.0.0-beta2 START -->
+
+# 9.0.0-beta2 (2022-05-31)
+
+### Features and enhancements
+
+- **Alerting:** Add legacy indicator to navbar. [#49511](https://github.com/grafana/grafana/pull/49511), [@peterholmberg](https://github.com/peterholmberg)
+- **Alerting:** Add templated subject config to email notifier. [#49742](https://github.com/grafana/grafana/pull/49742), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Enable Unified Alerting for open source and enterprise. [#49834](https://github.com/grafana/grafana/pull/49834), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Make alertmanager datasource stable. [#49485](https://github.com/grafana/grafana/pull/49485), [@gillesdemey](https://github.com/gillesdemey)
+- **Angular:** Remove deprecated angular modal support and libs. [#49781](https://github.com/grafana/grafana/pull/49781), [@torkelo](https://github.com/torkelo)
+- **AuthProxy:** Remove deprecated ldap_sync_ttl setting. [#49902](https://github.com/grafana/grafana/pull/49902), [@kalleep](https://github.com/kalleep)
+- **Build:** Enable long term caching for frontend assets. [#47625](https://github.com/grafana/grafana/pull/47625), [@jackw](https://github.com/jackw)
+- **Chore:** Remove deprecated TextDisplayOptions export. [#49705](https://github.com/grafana/grafana/pull/49705), [@kaydelaney](https://github.com/kaydelaney)
+- **Chore:** Remove deprecated `surface` prop from IconButton. [#49715](https://github.com/grafana/grafana/pull/49715), [@kaydelaney](https://github.com/kaydelaney)
+- **Chore:** Remove usage of deprecated getColorForTheme function. [#49519](https://github.com/grafana/grafana/pull/49519), [@kaydelaney](https://github.com/kaydelaney)
+- **DatePicker:** Add minDate prop. [#49503](https://github.com/grafana/grafana/pull/49503), [@alexanderzobnin](https://github.com/alexanderzobnin)
+- **Notification history:** Enable by default. [#49502](https://github.com/grafana/grafana/pull/49502), [@ashharrison90](https://github.com/ashharrison90)
+- **Prometheus:** Add pluginVersion to query. [#49414](https://github.com/grafana/grafana/pull/49414), [@toddtreece](https://github.com/toddtreece)
+- **Prometheus:** Enable prometheusStreamingJSONParser by default. [#49475](https://github.com/grafana/grafana/pull/49475), [@toddtreece](https://github.com/toddtreece)
+- **Prometheus:** Predefined scopes for Azure authentication. [#49557](https://github.com/grafana/grafana/pull/49557), [@kostrse](https://github.com/kostrse)
+- **Prometheus:** Streaming JSON parser performance improvements. [#48792](https://github.com/grafana/grafana/pull/48792), [@toddtreece](https://github.com/toddtreece)
+- **ValueMapping:** Add support for regex replacement over multiple lines. [#49607](https://github.com/grafana/grafana/pull/49607), [@ashharrison90](https://github.com/ashharrison90)
+
+### Bug fixes
+
+- **Accessibility:** Pressing escape in a Modal or DashboardSettings correctly closes the overlay. [#49500](https://github.com/grafana/grafana/pull/49500), [@ashharrison90](https://github.com/ashharrison90)
+- **Alerting:** Validate alert notification UID length. [#45546](https://github.com/grafana/grafana/pull/45546), [@wbrowne](https://github.com/wbrowne)
+- **BackendSrv:** Throw an error when fetching an invalid JSON. [#47493](https://github.com/grafana/grafana/pull/47493), [@leventebalogh](https://github.com/leventebalogh)
+- **Fix:** Timeseries migration regex override. [#49629](https://github.com/grafana/grafana/pull/49629), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Loki:** Fix unwrap parsing in query builder. [#49732](https://github.com/grafana/grafana/pull/49732), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Navigation:** Position hamburger menu correctly in mobile view. [#49603](https://github.com/grafana/grafana/pull/49603), [@ashharrison90](https://github.com/ashharrison90)
+- **PanelEditor:** Fixes issue with Table view and multi data frames. [#49854](https://github.com/grafana/grafana/pull/49854), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Preferences:** Fix updating of preferences for Navbar and Query History. [#49677](https://github.com/grafana/grafana/pull/49677), [@ivanahuckova](https://github.com/ivanahuckova)
+- **TimeRange:** Fixes issue when zooming out on a timerange with timespan 0. [#49622](https://github.com/grafana/grafana/pull/49622), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Variables:** Fixes DS variables not being correctly used in panel queries. [#49323](https://github.com/grafana/grafana/pull/49323), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+
+### Breaking changes
+
+Drop support for deprecated setting ldap_sync_ttl under [auth.proxy]
+Only sync_ttl will work from now on Issue [#49902](https://github.com/grafana/grafana/issues/49902)
+
+Removes support for deprecated `heading` and `description` props. Moving forward, the `Card.Heading` and `Card.Description` components should be used. Issue [#49885](https://github.com/grafana/grafana/issues/49885)
+
+Removes the deprecated `link` variant from the `Button` component.
+To migrate, replace any usage of `variant="link"` with `fill="text"`. Issue [#49843](https://github.com/grafana/grafana/issues/49843)
+
+Removes the deprecated `surface` prop from the `IconButton` component. This prop hasn't actually done anything for a while, so it should be safe to just remove any instances of its usage.
+Issue [#49715](https://github.com/grafana/grafana/issues/49715)
+
+Removes the deprecated `TextDisplayOptions` export from `@grafana/data` in favor of `VizTextDisplayOptions` from `@grafana/schema`. To migrate, just replace usage of `TextDisplayOptions` with `VizTextDisplayOptions`. Issue [#49705](https://github.com/grafana/grafana/issues/49705)
+
+Removed support for the deprecated `getColorForTheme(color: string, theme: GrafanaTheme)` function in favor of the
+`theme.visualization.getColorByName(color: string)` method. The output of this method is identical to the removed function, so migration should just be a matter of rewriting calls of `getColorForTheme(myColor, myTheme)` to `myTheme.visualization.getColorByName(myColor)`.
+Issue [#49519](https://github.com/grafana/grafana/issues/49519)
+
+In the Prometheus data source, for consistency and performance reasons, we changed how we represent `NaN` (not a number) values received from Prometheus. In the past versions, we converted these to `null` in the frontend (for dashboard and explore), and kept as `NaN` in the alerting path. Starting with this version, we will always keep it as `NaN`. This change should be mostly invisible for the users. Issue [#49475](https://github.com/grafana/grafana/issues/49475)
+
+Plugins using custom Webpack configs could potentially break due to the changes between webpack@4 and webpack@5. Please refer to the [official migration guide](https://webpack.js.org/migrate/5/) for assistance.
+
+Webpack 5 does not include polyfills for node.js core modules by default (e.g. `buffer`, `stream`, `os`). This can result in failed builds for plugins. If polyfills are required it is recommended to create a custom webpack config in the root of the plugin repo and add the required fallbacks:
+
+```js
+// webpack.config.js
+
+module.exports.getWebpackConfig = (config, options) => ({
+  ...config,
+  resolve: {
+    ...config.resolve,
+    fallback: {
+      os: require.resolve('os-browserify/browser'),
+      stream: require.resolve('stream-browserify'),
+      timers: require.resolve('timers-browserify'),
+    },
+  },
+});
+````
+
+Please refer to the webpack build error messages or the [official migration guide](https://webpack.js.org/migrate/5/) for assistance with fallbacks.
+
+**Which issue(s) this PR fixes**:
+
+<!--
+
+- Automatically closes linked issue when the Pull Request is merged.
+
+Usage: "Fixes #<issue number>", or "Fixes (paste link of issue)"
+
+-->
+
+Fixes #
+
+**Special notes for your reviewer**:
+
+It does not bump the following dependencies to the very latest due to the latest versions being ES modules:
+
+- ora
+- globby
+- execa
+- chalk
+  Issue [#47826](https://github.com/grafana/grafana/issues/47826)
+
+We have changed the internals of `backendSrv.fetch()` to throw an error when the response is an incorrect JSON.
+
+```javascript
+// PREVIOUSLY: this was returning with an empty object {} - in case the response is an invalid JSON
+return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
+
+// AFTER THIS CHANGE: the following will throw an error - in case the response is an invalid JSON
+return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
+```
+
+**When is the response handled as JSON?**
+
+- If the response has the `"Content-Type: application/json"` header, OR
+- If the backendSrv options ([`BackendSrvRequest`](https://github.com/grafana/grafana/blob/e237ff20a996c7313632b2e28f38032012f0e340/packages/grafana-runtime/src/services/backendSrv.ts#L8)) specify the response as JSON: `{ responseType: 'json' }`
+
+**How does it work after this change?**
+
+- In case it is recognised as a JSON response and the response is empty, it returns an empty object `{}`
+- In case it is recognised as a JSON response and it has formatting errors, it throws an error
+
+**How to migrate?**
+Make sure to handle possible errors on the callsite where using `backendSrv.fetch()` (or any other `backendSrv` methods). Issue [#47493](https://github.com/grafana/grafana/issues/47493)
+
+### Plugin development fixes & changes
+
+- **UI/Card:** Remove deprecated props. [#49885](https://github.com/grafana/grafana/pull/49885), [@kaydelaney](https://github.com/kaydelaney)
+- **UI/Button:** Remove deprecated "link" variant. [#49843](https://github.com/grafana/grafana/pull/49843), [@kaydelaney](https://github.com/kaydelaney)
+- **Toolkit:** Bump dependencies. [#47826](https://github.com/grafana/grafana/pull/47826), [@jackw](https://github.com/jackw)
+
+<!-- 9.0.0-beta2 END -->
+
+<!-- 9.0.0-beta1 START -->
+
+# 9.0.0-beta1 (2022-05-24)
+
+### Features and enhancements
+
+- **AccessControl:** Add setting for permission cache. (Enterprise)
+- **AccessControl:** Check dashboard permissions for reports. (Enterprise)
+- **Auth:** Remove grafana ui dependency to the aws sdk. [#43559](https://github.com/grafana/grafana/pull/43559), [@sunker](https://github.com/sunker)
+- **BasicRoles:** Add API endpoint to reset basic roles permissions to factory. (Enterprise)
+- **LDAP Mapping:** Allow Grafana Admin mapping without org role. [#37189](https://github.com/grafana/grafana/pull/37189), [@krzysdabro](https://github.com/krzysdabro)
+- **Licensing:** Only enforce total number of users. (Enterprise)
+- **Loki:** do not convert NaN to null. [#45389](https://github.com/grafana/grafana/pull/45389), [@gabor](https://github.com/gabor)
+- **Report:** API support for multiple dashboards. (Enterprise)
+- **Report:** Support sending embedded image in the report email. (Enterprise)
+- **Report:** UI for multiple dashboards. (Enterprise)
+- **Reporting:** Remove redundant empty attachment when export to CSV is enabled. (Enterprise)
+- **SAML:** Implement Name Templates for assertion_attribute_name option. (Enterprise)
+- **SSE/Alerting:** Support prom instant vector responses. [#44865](https://github.com/grafana/grafana/pull/44865), [@kylebrandt](https://github.com/kylebrandt)
+- **Tracing:** Add trace to metrics config behind feature toggle. [#46298](https://github.com/grafana/grafana/pull/46298), [@connorlindsey](https://github.com/connorlindsey)
+
+### Bug fixes
+
+- **Fix:** Prevent automatic parsing of string data types to numbers. [#46035](https://github.com/grafana/grafana/pull/46035), [@joshhunt](https://github.com/joshhunt)
+- **Prometheus:** Fix inconsistent labels in exemplars resulting in marshal json error. [#46135](https://github.com/grafana/grafana/pull/46135), [@hanjm](https://github.com/hanjm)
+
+### Breaking changes
+
+In the Loki data source, for consistency and performance reasons, we changed how we represent `NaN` (not a number) values received from Loki. In the past versions, we converted these to `null` in the frontend (for dashboard and explore), and kept as `NaN` in the alerting path. Starting with this version, we will always keep it as `NaN`. This change should be mostly invisible for the users. Issue [#45389](https://github.com/grafana/grafana/issues/45389)
+
+The dependency to [grafana/aws-sdk](https://github.com/grafana/grafana-aws-sdk-react) is moved from [grafana/ui](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/package.json) to the plugin. This means that any plugin that use SIGV4 auth need to pass a SIGV4 editor component as a prop to the `DataSourceHttpSettings` component. Issue [#43559](https://github.com/grafana/grafana/issues/43559)
+
+<!-- 9.0.0-beta1 END -->
+<!-- 8.5.4 START -->
+
+# 8.5.4 (2022-05-30)
+
+### Features and enhancements
+
+- **Alerting:** Remove disabled flag for data source when migrating alerts. [#48559](https://github.com/grafana/grafana/pull/48559), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Show notification tab of legacy alerting only to editor. [#49624](https://github.com/grafana/grafana/pull/49624), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Update migration to migrate only alerts that belong to existing org\dashboard. [#49192](https://github.com/grafana/grafana/pull/49192), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **AzureMonitor:** Do not quote variables when a custom "All" variable option is used. [#49428](https://github.com/grafana/grafana/pull/49428), [@andresmgot](https://github.com/andresmgot)
+- **AzureMonitor:** Update allowed namespaces. [#48468](https://github.com/grafana/grafana/pull/48468), [@jcolladokuri](https://github.com/jcolladokuri)
+- **CloudMonitor:** Correctly encode default project response. [#49510](https://github.com/grafana/grafana/pull/49510), [@aangelisc](https://github.com/aangelisc)
+- **Cloudwatch:** Add support for new AWS/RDS EBS\* metrics. [#48798](https://github.com/grafana/grafana/pull/48798), [@szymonpk](https://github.com/szymonpk)
+- **InfluxDB:** Use backend for influxDB by default via feature toggle. [#48453](https://github.com/grafana/grafana/pull/48453), [@yesoreyeram](https://github.com/yesoreyeram)
+- **Legend:** Use correct unit for percent and count calculations. [#49004](https://github.com/grafana/grafana/pull/49004), [@dprokop](https://github.com/dprokop)
+- **LokI:** use millisecond steps in Grafana 8.5.x. [#48630](https://github.com/grafana/grafana/pull/48630), [@gabor](https://github.com/gabor)
+- **Plugins:** Introduce HTTP 207 Multi Status response to api/ds/query. [#48550](https://github.com/grafana/grafana/pull/48550), [@wbrowne](https://github.com/wbrowne)
+- **Reporting:** Improve PDF file size using grid layout. (Enterprise)
+- **Transformations:** Add an All Unique Values Reducer. [#48653](https://github.com/grafana/grafana/pull/48653), [@josiahg](https://github.com/josiahg)
+- **Transformers:** avoid error when the ExtractFields source field is missing. [#49368](https://github.com/grafana/grafana/pull/49368), [@wardbekker](https://github.com/wardbekker)
+- **[v8.5.x] Alerting:** Update migration to migrate only alerts that belong to existing org\dashboard. [#49199](https://github.com/grafana/grafana/pull/49199), [@grafanabot](https://github.com/grafanabot)
+- **[v8.5.x] Reporting:** Improve PDF file size using grid layout. (Enterprise)
+
+### Bug fixes
+
+- **Alerting:** Allow disabling override timings for notification policies. [#48648](https://github.com/grafana/grafana/pull/48648), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Allow serving images from custom url path. [#49022](https://github.com/grafana/grafana/pull/49022), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Apply Custom Headers to datasource queries. [#47860](https://github.com/grafana/grafana/pull/47860), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Fix RBAC actions for notification policies. [#49185](https://github.com/grafana/grafana/pull/49185), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Fix access to alerts for viewer with editor permissions when RBAC is disabled. [#49270](https://github.com/grafana/grafana/pull/49270), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Fix anonymous access to alerting. [#49203](https://github.com/grafana/grafana/pull/49203), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** correctly show all alerts in a folder. [#48684](https://github.com/grafana/grafana/pull/48684), [@gillesdemey](https://github.com/gillesdemey)
+- **AzureMonitor:** Fixes metric definition for Azure Storage queue/file/blob/table resources. [#49101](https://github.com/grafana/grafana/pull/49101), [@aangelisc](https://github.com/aangelisc)
+- **Dashboard:** Fix dashboard update permission check. [#48746](https://github.com/grafana/grafana/pull/48746), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **DashboardExport:** Fix exporting and importing dashboards where query data source ended up as incorrect. [#48410](https://github.com/grafana/grafana/pull/48410), [@torkelo](https://github.com/torkelo)
+- **FileUpload:** clicking the `Upload file` button now opens the modal correctly. [#48766](https://github.com/grafana/grafana/pull/48766), [@ashharrison90](https://github.com/ashharrison90)
+- **GrafanaUI:** Fix color of links in error Tooltips in light theme. [#49327](https://github.com/grafana/grafana/pull/49327), [@joshhunt](https://github.com/joshhunt)
+- **LibraryPanels:** Fix library panels not connecting properly in imported dashboards. [#49161](https://github.com/grafana/grafana/pull/49161), [@joshhunt](https://github.com/joshhunt)
+- **Loki:** Improve unpack parser handling. [#49074](https://github.com/grafana/grafana/pull/49074), [@gabor](https://github.com/gabor)
+- **RolePicker:** Fix menu position on smaller screens. [#48429](https://github.com/grafana/grafana/pull/48429), [@Clarity-89](https://github.com/Clarity-89)
+- **TimeRange:** Fixes updating time range from url and browser history. [#48657](https://github.com/grafana/grafana/pull/48657), [@torkelo](https://github.com/torkelo)
+- **TimeSeries:** Fix detection & rendering of sparse datapoints. [#48841](https://github.com/grafana/grafana/pull/48841), [@leeoniya](https://github.com/leeoniya)
+- **Timeseries:** Fix outside range stale state. [#49633](https://github.com/grafana/grafana/pull/49633), [@ryantxu](https://github.com/ryantxu)
+- **Tooltip:** Fix links not legible in Tooltips when using light theme. [#48748](https://github.com/grafana/grafana/pull/48748), [@joshhunt](https://github.com/joshhunt)
+- **Tooltip:** Sort decimals using standard numeric compare. [#49084](https://github.com/grafana/grafana/pull/49084), [@dprokop](https://github.com/dprokop)
+- **Transforms:** Labels to fields, fix label picker layout. [#49304](https://github.com/grafana/grafana/pull/49304), [@torkelo](https://github.com/torkelo)
+- **Variables:** Fixes issue with data source variables not updating queries with variable. [#49478](https://github.com/grafana/grafana/pull/49478), [@torkelo](https://github.com/torkelo)
+- **[v8.5.x] Alerting:** Fix RBAC actions for notification policies (#49185). [#49348](https://github.com/grafana/grafana/pull/49348), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **[v8.5.x] Alerting:** Fix access to alerts for viewer with editor permissions when RBAC is disabled. [#49427](https://github.com/grafana/grafana/pull/49427), [@konrad147](https://github.com/konrad147)
+- **[v8.5.x] Alerting:** Fix anonymous access to alerting. [#49268](https://github.com/grafana/grafana/pull/49268), [@yuri-tceretian](https://github.com/yuri-tceretian)
+
+### Breaking changes
+
+For a data source query made via /api/ds/query :
+
+- If the `DatasourceQueryMultiStatus` feature is enabled and
+  - The data source response has an error set as part of the `DataResponse`, the resulting HTTP status code is now `207 Multi Status` instead of `400 Bad gateway`
+- If the `DatasourceQueryMultiStatus` feature is **not** enabled and
+  - The data source response has an error set as part of the `DataResponse`, the resulting HTTP status code is `400 Bad Request` (no breaking change)
+    --> Issue [#48550](https://github.com/grafana/grafana/issues/48550)
+
+<!-- 8.5.4 END -->
 <!-- 8.5.3 START -->

 # 8.5.3
--- a/2
+++ b/2
@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.17.9-alpine3.15 as go-builder
+FROM golang:1.17.11-alpine3.15 as go-builder

 RUN apk add --no-cache gcc g++ make

--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.17.9 AS go-builder
+FROM golang:1.17.11 AS go-builder

 WORKDIR /src/grafana

--- a/LICENSING.md
+++ b/LICENSING.md
@@ -17,6 +17,8 @@ packages/grafana-toolkit/
 packages/grafana-ui/
 packages/jaeger-ui-components/
 packaging/
+pkg/coremodel/
+pkg/framework/coremodel/
 grafana-mixin/
 cue/
 ```
--- a/4
+++ b/4
@@ -50,7 +50,7 @@ $(SPEC_TARGET): $(API_DEFINITION_FILES) ## Generate API spec
 	-x "github.com/prometheus/alertmanager" \
 	-i /grafana/pkg/api/docs/tags.json

-swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET)
+swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET) validate-api-spec

 $(NGALERT_SPEC_TARGET):
 	+$(MAKE) -C pkg/services/ngalert/api/tooling api.json
@@ -67,7 +67,7 @@ ensure_go-swagger_mac:
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/docs/tags.json

-swagger-api-spec-mac: gen-go --swagger-api-spec-mac $(MERGED_SPEC_TARGET)
+swagger-api-spec-mac: gen-go --swagger-api-spec-mac $(MERGED_SPEC_TARGET) validate-api-spec

 validate-api-spec: $(MERGED_SPEC_TARGET) ## Validate API spec
 	docker run --rm -it \
--- a/conf/defaults.ini
+++ b/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]
@@ -477,6 +477,8 @@ token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
 allowed_domains =
 allowed_groups =
+role_attribute_path =
+role_attribute_strict = false

 #################################### Google Auth #########################
 [auth.google]
@@ -582,8 +584,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 =
@@ -844,7 +844,7 @@ min_interval = 10s
 [unified_alerting.screenshots]
 # Enable screenshots in notifications. This option requires a remote HTTP image rendering service. Please
 # see [rendering] for further configuration options.
-enabled =
+capture = false

 # The maximum number of screenshots that can be taken at the same time. This option is different from
 # concurrent_render_request_limit as max_concurrent_screenshots sets the number of concurrent screenshots
@@ -972,6 +972,7 @@ url = https://grafana.com
 url = https://grafana.com

 #################################### Distributed tracing ############
+# Opentracing is deprecated use opentelemetry instead
 [tracing.jaeger]
 # jaeger destination (ex localhost:6831)
 address =
@@ -1174,9 +1175,6 @@ promQueryBuilder = true
 # The new loki visual query builder
 lokiQueryBuilder = true

-# InfluxDB backend migration
-influxdbBackendMigration = true
-
 # Experimental Explore to Dashboard workflow
 explore2Dashboard = true

--- a/conf/provisioning/datasources/sample.yaml
+++ b/conf/provisioning/datasources/sample.yaml
@@ -19,8 +19,6 @@ apiVersion: 1
 #   orgId: 1
 #   # <string> url
 #   url: http://localhost:8080
-#   # <string> database password, if used
-#   password:
 #   # <string> database user, if used
 #   user:
 #   # <string> database name, if used
@@ -29,8 +27,6 @@ apiVersion: 1
 #   basicAuth:
 #   # <string> basic auth username
 #   basicAuthUser:
-#   # <string> basic auth password
-#   basicAuthPassword:
 #   # <bool> enable/disable with credentials headers
 #   withCredentials:
 #   # <bool> mark as default datasource. Max one per org
--- a/conf/sample.ini
+++ b/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]
@@ -937,6 +937,7 @@
 ;url = https://grafana.com

 #################################### Distributed tracing ############
+# Opentracing is deprecated use opentelemetry instead
 [tracing.jaeger]
 # Enable by setting the address sending traces to jaeger (ex localhost:6831)
 ;address = localhost:6831
--- a/contribute/create-pull-request.md
+++ b/contribute/create-pull-request.md
@@ -117,11 +117,14 @@ If you're unsure, see the existing [changelog](https://github.com/grafana/grafan

 ### Pull request titles

+The pull request title should be formatted according to `<Area>: <Summary>` (Both "Area" and "Summary" should start with a capital letter).
+
 The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they becomes a part of the Git commit body.

 We use the pull request title when we generate change logs for releases. As such, we strive to make the title as informative as possible.

-Make sure that the title for your pull request uses the same format as the subject line in the commit message.
+**Example:**
+`Docs: Change url to URL in all documentation files`

 ## Configuration changes

--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -136,17 +136,23 @@ Running the backend tests on Windows currently needs some tweaking, so use the b
 go run build.go test
 ```

-### Run PostgreSQL and MySQL integration tests
+### Run SQLLite, PostgreSQL and MySQL integration tests

-To run PostgreSQL and MySQL integration tests locally, you need to start the docker blocks for MySQL and/or PostgreSQL test data sources by running `make devenv sources=mysql_tests,postgres_tests`. When your test data sources are running, you can execute integration tests by running:
+By default, Grafana runs SQLite to run tests with SQLite.

+```bash
+go test -covermode=atomic -tags=integration ./pkg/...
 ```
+
+To run PostgreSQL and MySQL integration tests locally, start the Docker blocks for MySQL and/or PostgreSQL test data sources by running `make devenv sources=mysql_tests,postgres_tests`. When your test data sources are running, you can execute integration tests by running:
+
+```bash
 GRAFANA_TEST_DB=mysql go test -covermode=atomic -tags=integration ./pkg/...
 ```

 and/or

-```
+```bash
 GRAFANA_TEST_DB=postgres go test -covermode=atomic -tags=integration ./pkg/...
 ```

--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -27,10 +27,15 @@ Before you can merge a pull request, it must have a review approval, and all the

 ### Format the pull request title

-The pull request title should be formatted according to `<Area>: <Summary>`. Keep the summary short and understandable for the community as a whole.
+The pull request title should be formatted according to `<Area>: <Summary>` (Both "Area" and "Summary" should start with a capital letter).
+
+Keep the summary short and understandable for the community as a whole.

 All commits in a pull request are squashed when merged and the pull request title will be the default subject line of the squashed commit message. It's also used for [changelog/release notes](#include-in-changelog-and-release-notes).

+**Example:**
+`Docs: Change url to URL in all documentation files`
+
 See [formatting guidelines](create-pull-request.md#formatting-guidelines) for more information.

 ### Assign a milestone
--- a/devenv/dev-dashboards/panel-heatmap/heatmap-calculate-log.json
+++ b/devenv/dev-dashboards/panel-heatmap/heatmap-calculate-log.json
@@ -0,0 +1,553 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 1,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "points",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 2,
+            "scaleDistribution": {
+              "log": 2,
+              "type": "log"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 0,
+        "y": 0
+      },
+      "id": 3,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "9.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "max": 500000,
+          "min": 0.01,
+          "refId": "A",
+          "scenarioId": "random_walk",
+          "seriesCount": 2,
+          "spread": 1000,
+          "startValue": 0.01
+        }
+      ],
+      "title": "Time series",
+      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Dashboard --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 8,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "bucket": {
+          "layout": "auto"
+        },
+        "calculate": true,
+        "calculation": {
+          "yBuckets": {
+            "scale": {
+              "log": 2,
+              "type": "log"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "mode": "calculate",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        },
+        "yAxisLabels": "auto",
+        "yAxisReverse": false
+      },
+      "pluginVersion": "9.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "panelId": 3,
+          "refId": "A"
+        }
+      ],
+      "title": "log2",
+      "type": "heatmap-new"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Dashboard --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 16,
+        "y": 0
+      },
+      "id": 7,
+      "options": {
+        "bucket": {
+          "layout": "auto"
+        },
+        "calculate": true,
+        "calculation": {
+          "yBuckets": {
+            "scale": {
+              "log": 2,
+              "type": "log"
+            },
+            "value": "2"
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "mode": "calculate",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        },
+        "yAxisLabels": "auto",
+        "yAxisReverse": false
+      },
+      "pluginVersion": "9.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "panelId": 3,
+          "refId": "A"
+        }
+      ],
+      "title": "log2 split 2",
+      "type": "heatmap-new"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Dashboard --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 0,
+        "y": 14
+      },
+      "id": 4,
+      "options": {
+        "bucket": {
+          "layout": "auto"
+        },
+        "calculate": true,
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "mode": "calculate",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        },
+        "yAxisLabels": "auto",
+        "yAxisReverse": false
+      },
+      "pluginVersion": "9.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "panelId": 3,
+          "refId": "A"
+        }
+      ],
+      "title": "linear",
+      "type": "heatmap-new"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Dashboard --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 8,
+        "y": 14
+      },
+      "id": 5,
+      "options": {
+        "bucket": {
+          "layout": "auto"
+        },
+        "calculate": true,
+        "calculation": {
+          "yBuckets": {
+            "scale": {
+              "log": 10,
+              "type": "log"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "mode": "calculate",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        },
+        "yAxisLabels": "auto",
+        "yAxisReverse": false
+      },
+      "pluginVersion": "9.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "panelId": 3,
+          "refId": "A"
+        }
+      ],
+      "title": "log10",
+      "type": "heatmap-new"
+    },
+    {
+      "datasource": {
+        "type": "datasource",
+        "uid": "-- Dashboard --"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 14,
+        "w": 8,
+        "x": 16,
+        "y": 14
+      },
+      "id": 8,
+      "options": {
+        "bucket": {
+          "layout": "auto"
+        },
+        "calculate": true,
+        "calculation": {
+          "yBuckets": {
+            "scale": {
+              "log": 10,
+              "type": "log"
+            },
+            "value": "2"
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "scale": "exponential",
+          "scheme": "Spectral",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "mode": "calculate",
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false
+        },
+        "yAxisLabels": "auto",
+        "yAxisReverse": false
+      },
+      "pluginVersion": "9.0.0-pre",
+      "targets": [
+        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
+          "panelId": 3,
+          "refId": "A"
+        }
+      ],
+      "title": "log10 split 2",
+      "type": "heatmap-new"
+    }
+  ],
+  "schemaVersion": 36,
+  "style": "dark",
+  "tags": ["gdev", "panel-tests", "graph-ng"],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Heatmap calculate (log)",
+  "uid": "ZXYQTA97ZZ",
+  "version": 1,
+  "weekStart": ""
+}
--- a/devenv/docker/loadtest/annotations_by_tag_test.js
+++ b/devenv/docker/loadtest/annotations_by_tag_test.js
@@ -57,7 +57,7 @@ export default (data) => {
        requests.push({ method: 'GET', url: '/api/annotations?from=1580825186534&to=1580846786535' });

        for (let n = 0; n < batchCount; n++) {
-          requests.push({ method: 'POST', url: '/api/tsdb/query', body: payload });
+          requests.push({ method: 'POST', url: '/api/ds/query', body: payload });
        }

        let responses = client.batch(requests);
--- a/devenv/docker/loadtest/auth_key_test.js
+++ b/devenv/docker/loadtest/auth_key_test.js
@@ -62,7 +62,7 @@ export default (data) => {
        requests.push({ method: 'GET', url: '/api/annotations?dashboardId=2074&from=1548078832772&to=1548082432772' });

        for (let n = 0; n < batchCount; n++) {
-          requests.push({ method: 'POST', url: '/api/tsdb/query', body: payload });
+          requests.push({ method: 'POST', url: '/api/ds/query', body: payload });
        }

        let responses = client.batch(requests);
--- a/devenv/docker/loadtest/auth_token_slow_test.js
+++ b/devenv/docker/loadtest/auth_token_slow_test.js
@@ -59,7 +59,7 @@ export default (data) => {
        requests.push({ method: 'GET', url: '/api/annotations?dashboardId=2074&from=1548078832772&to=1548082432772' });

        for (let n = 0; n < batchCount; n++) {
-          requests.push({ method: 'POST', url: '/api/tsdb/query', body: payload });
+          requests.push({ method: 'POST', url: '/api/ds/query', body: payload });
        }

        let responses = client.batch(requests);
--- a/devenv/docker/loadtest/auth_token_test.js
+++ b/devenv/docker/loadtest/auth_token_test.js
@@ -58,7 +58,7 @@ export default (data) => {
        requests.push({ method: 'GET', url: '/api/annotations?dashboardId=2074&from=1548078832772&to=1548082432772' });

        for (let n = 0; n < batchCount; n++) {
-          requests.push({ method: 'POST', url: '/api/tsdb/query', body: payload });
+          requests.push({ method: 'POST', url: '/api/ds/query', body: payload });
        }

        let responses = client.batch(requests);
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -1,31 +1,38 @@
-+++
-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

 ## Installing Grafana

 <div class="nav-cards">
-    <a href="{{< relref "installation/debian.md" >}}" class="nav-cards__item nav-cards__item--install">
+    <a href="{{< relref "setup-grafana/installation/debian/" >}}" class="nav-cards__item nav-cards__item--install">
        <div class="nav-cards__icon fa fa-linux">
        </div>
        <h5>Install on Linux</h5>
    </a>
-    <a href="{{< relref "installation/mac.md" >}}" class="nav-cards__item nav-cards__item--install">
+    <a href="{{< relref "setup-grafana/installation/mac/" >}}" class="nav-cards__item nav-cards__item--install">
        <div class="nav-cards__icon fa fa-apple">
        </div>
        <h5>Install on macOS</h5>
    </a>
-    <a href="{{< relref "installation/windows.md" >}}" class="nav-cards__item nav-cards__item--install">
+    <a href="{{< relref "setup-grafana/installation/windows/" >}}" class="nav-cards__item nav-cards__item--install">
        <div class="nav-cards__icon fa fa-windows">
        </div>
        <h5>Install on Windows</h5>
    </a>
-    <a href="{{< relref "installation/docker.md" >}}" class="nav-cards__item nav-cards__item--install">
+    <a href="{{< relref "setup-grafana/installation/docker/" >}}" class="nav-cards__item nav-cards__item--install">
        <img src="/static/img/logos/logo-docker.svg">
        <h5>Run Docker image</h5>
    </a>
@@ -44,27 +51,27 @@ title = "Grafana documentation"
 ## Guides

 <div class="nav-cards">
-    <a href="{{< relref "getting-started/getting-started.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "getting-started/build-first-dashboard/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Getting started</h4>
        <p>Learn the basics of using Grafana.</p>
    </a>
-    <a href="{{< relref "basics/_index.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "basics/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Grafana basics</h4>
        <p>Learn basic observability.</p>
    </a>
-    <a href="{{< relref "administration/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "setup-grafana/configure-grafana/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Configure Grafana</h4>
        <p>Review the configuration and setup options.</p>
    </a>
-    <a href="{{< relref "basics/timeseries.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "basics/timeseries/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Intro to time series</h4>
        <p>Learn about time series data.</p>
    </a>
-    <a href="{{< relref "administration/provisioning.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "administration/provisioning/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>Provisioning</h4>
        <p>Learn how to automate your Grafana configuration.</p>
    </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v8-0.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "whatsnew/whats-new-in-v8-0/" >}}" class="nav-cards__item nav-cards__item--guide">
        <h4>What's new in v8.0</h4>
        <p>Explore the features and enhancements in the latest release.</p>
    </a>
@@ -74,51 +81,51 @@ title = "Grafana documentation"
 ## Data source guides

 <div class="nav-cards">
-    <a href="{{< relref "datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/graphite/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_graphite.svg" >
      <h5>Graphite</h5>
    </a>
-    <a href="{{< relref "datasources/elasticsearch.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/elasticsearch/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_elasticsearch.svg" >
      <h5>Elasticsearch</h5>
    </a>
-    <a href="{{< relref "datasources/influxdb/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/influxdb/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_influxdb.svg" >
      <h5>InfluxDB</h5>
    </a>
-    <a href="{{< relref "datasources/prometheus.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/prometheus/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_prometheus.svg" >
      <h5>Prometheus</h5>
    </a>
-    <a href="{{< relref "datasources/google-cloud-monitoring/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/google-cloud-monitoring/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_cloudmonitoring.svg">
      <h5>Google Cloud Monitoring</h5>
    </a>
-    <a href="{{< relref "datasources/aws-cloudwatch/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/aws-cloudwatch/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_cloudwatch.svg">
      <h5>AWS CloudWatch</h5>
    </a>
-    <a href="{{< relref "datasources/azuremonitor/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/azuremonitor/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_azure_monitor.jpg">
      <h5>Azure Monitor</h5>
    </a>
-    <a href="{{< relref "datasources/loki.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/loki/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_loki.svg">
      <h5>Loki</h5>
    </a>
-    <a href="{{< relref "datasources/mysql.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/mysql/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_mysql.png" >
      <h5>MySQL</h5>
    </a>
-    <a href="{{< relref "datasources/postgres.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/postgres/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_postgres.svg" >
      <h5>Postgres</h5>
    </a>
-    <a href="{{< relref "datasources/mssql.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/mssql/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/sql_server_logo.svg">
      <h5>Microsoft SQL Server</h5>
    </a>
-    <a href="{{< relref "datasources/opentsdb.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/opentsdb/" >}}" class="nav-cards__item nav-cards__item--ds">
      <img src="/static/img/docs/logos/icon_opentsdb.png" >
      <h5>OpenTSDB</h5>
    </a>
--- a/docs/sources/administration/_index.md
+++ b/docs/sources/administration/_index.md
@@ -1,17 +1,18 @@
-+++
-aliases = ["/docs/grafana/latest/administration/"]
-description = "Administration"
-title = "Administration"
-weight = 40
-+++
+---
+aliases:
+  - /docs/grafana/latest/administration/
+description: Administration
+title: Administration
+weight: 40
+---

 # Administration

 This section includes information for Grafana administrators, team administrators, and users performing administrative tasks:

- [Change Preferences]({{< relref "preferences" >}})
- [Configuration]({{< relref "configuration" >}})
- [Configure Docker image]({{< relref "configure-docker" >}})
- [Security]({{< relref "security" >}})
- [Database encryption]({{< relref "database-encryption" >}})
- [Service accounts]({{< relref "service-accounts" >}})
+- [Change Preferences]({{< relref "preferences/" >}})
+- [Configuration]({{< relref "../setup-grafana/configure-grafana/" >}})
+- [Configure Docker image]({{< relref "configure-docker/" >}})
+- [Security]({{< relref "../setup-grafana/configure-security/" >}})
+- [Database encryption]({{< relref "../setup-grafana/configure-security/configure-database-encryption/" >}})
+- [Service accounts]({{< relref "service-accounts/" >}})
--- a/docs/sources/administration/api-keys/_index.md
+++ b/docs/sources/administration/api-keys/_index.md
@@ -14,6 +14,6 @@ weight: 300

 API Keys can be used to interact with Grafana HTTP APIs.

-We recommend using service accounts instead of API keys if you are on Grafana 8.5+, for more information refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts.md#" >}}).
+We recommend using service accounts instead of API keys if you are on Grafana 8.5+, for more information refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts/#" >}}).

 {{< section >}}
--- a/docs/sources/administration/api-keys/about-api-keys.md
+++ b/docs/sources/administration/api-keys/about-api-keys.md
@@ -11,4 +11,4 @@ weight: 30

 An API key is a randomly generated string that external systems use to interact with Grafana HTTP APIs.

-When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources. For more information about creating API keys, refer to [Create an API key]({{< relref "./create-api-key.md#" >}}).
+When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources. For more information about creating API keys, refer to [Create an API key]({{< relref "create-api-key/#" >}}).
--- a/docs/sources/administration/api-keys/create-api-key.md
+++ b/docs/sources/administration/api-keys/create-api-key.md
@@ -14,13 +14,13 @@ weight: 50

 Create an API key when you want to manage your computed workload with a user.

-For more information about API keys, refer to [About API keys in Grafana]({{< relref "./about-api-keys.md" >}}).
+For more information about API keys, refer to [About API keys in Grafana]({{< relref "about-api-keys/" >}}).

-This topic shows you how to create an API key using the Grafana UI. You can also create an API key using the Grafana HTTP API. For more information about creating API keys via the API, refer to [Create API key via API]({{< relref "../../developers/http_api/create-api-tokens-for-org.md#how-to-create-a-new-organization-and-an-api-token" >}}).
+This topic shows you how to create an API key using the Grafana UI. You can also create an API key using the Grafana HTTP API. For more information about creating API keys via the API, refer to [Create API key via API]({{< relref "../../developers/http_api/create-api-tokens-for-org/#how-to-create-a-new-organization-and-an-api-token" >}}).

 ## Before you begin:

- Ensure you have permission to create and edit API keys. For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).
+- Ensure you have permission to create and edit API keys. For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#" >}}).

 **To create an API key:**

--- a/docs/sources/administration/cli.md
+++ b/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

@@ -132,7 +137,7 @@ grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new pass

 ### Override config file

-`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
+`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../setup-grafana/configure-grafana/" >}}) for more information about configuring Grafana and default configuration file locations.

 **Example:**

@@ -142,7 +147,7 @@ grafana-cli --config "/etc/configuration/" admin reset-admin-password mynewpassw

 ## Plugins commands

-Grafana CLI allows you to install, upgrade, and manage your Grafana plugins. For more information about installing plugins, refer to [plugins page]({{< relref "../plugins/installation.md" >}}).
+Grafana CLI allows you to install, upgrade, and manage your Grafana plugins. For more information about installing plugins, refer to [plugins page]({{< relref "../plugins/installation/" >}}).

 All listed commands apply to the Grafana default repositories and directories. You can override the defaults with [Global Options](#global-options).

@@ -214,7 +219,7 @@ grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new pass

 If you have not lost the admin password, we recommend that you change the user password either in the User Preferences or in the Server Admin > User tab.

-If you need to set the password in a script, then you can use the [Grafana User API]({{< relref "../developers/http_api/user.md#change-password" >}}).
+If you need to set the password in a script, then you can use the [Grafana User API]({{< relref "../developers/http_api/user/#change-password" >}}).

 ### Migrate data and encrypt passwords

--- a/docs/sources/administration/configure-docker.md
+++ b/docs/sources/administration/configure-docker.md
@@ -1,14 +1,20 @@
-+++
-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

-If you are running Grafana in a Docker image, then you configure Grafana using [environment variables]({{< relref "../administration/configuration.md#configure-with-environment-variables" >}}) rather than directly editing the configuration file. If you want to save your data, then you also need to designate persistent storage or bind mounts for the Grafana container.
+If you are running Grafana in a Docker image, then you configure Grafana using [environment variables]({{< relref "../setup-grafana/configure-grafana/#configure-with-environment-variables" >}}) rather than directly editing the configuration file. If you want to save your data, then you also need to designate persistent storage or bind mounts for the Grafana container.

 > **Note:** These examples use the Grafana Enterprise docker image. You can use the Grafana Open Source edition by changing the docker image to `grafana/grafana-oss`.

@@ -53,7 +59,7 @@ The following settings are hard-coded when launching the Grafana Docker containe

 ## Logging

-Logs in the Docker container go to standard out by default, as is common in the Docker world. Change this by setting a different [log mode]({{< relref "../administration/configuration.md#mode" >}}).
+Logs in the Docker container go to standard out by default, as is common in the Docker world. Change this by setting a different [log mode]({{< relref "../setup-grafana/configure-grafana/#mode" >}}).

 Example:

--- a/docs/sources/administration/jaeger-instrumentation.md
+++ b/docs/sources/administration/jaeger-instrumentation.md
@@ -1,17 +0,0 @@
-+++
-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
-
-Grafana supports [Jaeger tracing](https://www.jaegertracing.io/).
-
-Grafana can emit Jaeger traces for its HTTP API endpoints and propagate Jaeger trace information to data sources.
-All HTTP endpoints are logged evenly (annotations, dashboard, tags, and so on).
-When a trace ID is propagated, it is reported with operation 'HTTP /datasources/proxy/:id/\*'.
-
-Refer to [Configuration]({{< relref "configuration.md#tracing-jaeger" >}}) for information about enabling Jaeger tracing.
--- a/docs/sources/administration/manage-organizations/_index.md
+++ b/docs/sources/administration/manage-organizations/_index.md
@@ -42,7 +42,7 @@ The following table summarizes the resources you can share and/or isolate using

 The member of one organization cannot view dashboards assigned to another organization. However, a user can belong to multiple organizations.

-Grafana Server Administrators are responsible for creating organizations. For more information about the Grafana Server Administrator role, refer to [Grafana server administrators]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#Grafana server administrators" >}}).
+Grafana Server Administrators are responsible for creating organizations. For more information about the Grafana Server Administrator role, refer to [Grafana server administrators]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#Grafana server administrators" >}}).

 ## View a list of organizations

@@ -80,9 +80,9 @@ Create an organization when you want to isolate dashboards and other resources f

 1. On the **Preferences** tab, select a home dashboard, time zone, and week start.

-   For more information about preferences, refer to [Preferences]({{< relref "../preferences/_index.md" >}}).
+   For more information about preferences, refer to [Preferences]({{< relref "../preferences/" >}}).

-For more information about adding users to an organization, refer to [Add a user to an organization]({{< relref "../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md" >}}).
+For more information about adding users to an organization, refer to [Add a user to an organization]({{< relref "../manage-users-and-permissions/manage-server-users/add-remove-user-to-org/" >}}).

 ## Delete an organization

--- a/docs/sources/administration/manage-user-preferences/_index.md
+++ b/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

@@ -16,7 +22,7 @@ You can also view important information about your account, such as the organiza

 You can change your Grafana password at any time.

-> **Note**: If your Grafana instance uses an <!--[external authentication provider]({{< relref "../../auth/_index.md" >}})--> external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.
+> **Note**: If your Grafana instance uses an <!--[external authentication provider]({{< relref "../../setup-grafana/configure-security/configure-authentication/" >}})--> external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.

 **To change your password**:

@@ -41,7 +47,7 @@ Your profile includes your name, user name, and email address, which you can upd

 ## Edit your preferences

-You can choose the way you would like data to appear in Grafana, including the UI theme, home dashboard, timezone, and first day of the week. You can set these preferences for your own account, for a team, for an organization, or Grafana-wide using configuration settings. Your user preferences take precedence over team, organization, and Grafana default preferences. For more information, see [Grafana preferences]({{< relref "../../administration/preferences/_index.md" >}}).
+You can choose the way you would like data to appear in Grafana, including the UI theme, home dashboard, timezone, and first day of the week. You can set these preferences for your own account, for a team, for an organization, or Grafana-wide using configuration settings. Your user preferences take precedence over team, organization, and Grafana default preferences. For more information, see [Grafana preferences]({{< relref "../preferences/" >}}).

 - **UI theme** determines whether Grafana appears in light mode or dark mode. By default, UI theme is set to dark mode.
 - **Home dashboard** refers to the dashboard you see when you sign in to Grafana. By default, this is set to the Home dashboard.
@@ -75,7 +81,7 @@ Every user is a member of at least one organization. You can have different role
 1. Hover your cursor over the user icon in the lower-left corner of the page and click **Preferences**.
 1. Scroll down to the **Organizations** section and review the following information:
   - **Name**: The name of the organizations of which you are a member.
-   - **Role**: The role to which you are assigned in the organization. For more information about roles and permissions, refer to [Organization users and permissions]({{< relref "../../administration/manage-users-and-permissions/about-users-and-permissions.md#organization-users-and-permissions" >}}).
+   - **Role**: The role to which you are assigned in the organization. For more information about roles and permissions, refer to [Organization users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#organization-users-and-permissions" >}}).
   - **Current**: Grafana indicates the organization that you are currently signed into as _Current_. If you are a member of multiple organizations, you can click **Select** to switch to that organization.

 ## View your Grafana sessions
--- a/docs/sources/administration/manage-users-and-permissions/_index.md
+++ b/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

--- a/docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md
+++ b/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

@@ -26,7 +31,7 @@ A server administrator can perform the following tasks:

 - Manage users and permissions
 - Create, edit, and delete organizations
- View server-wide settings defined in the [Configuration]({{< relref "../../administration/configuration.md" >}}) file
+- View server-wide settings defined in the [Configuration]({{< relref "../../setup-grafana/configure-grafana/" >}}) file
 - View Grafana server statistics, including total users and active sessions
 - Upgrade the server to Grafana Enterprise.

@@ -52,7 +57,7 @@ Permissions assigned to a user within an organization control the extent to whic

 ### Organization roles

-Organization role-based permissions are global, which means that each permission level applies to all Grafana resources within an given organization. For example, an editor can see and update _all_ dashboards in an organization, unless those dashboards have been specifically restricted using [dashboard permissions]({{< relref "manage-dashboard-permissions/_index.md" >}}).
+Organization role-based permissions are global, which means that each permission level applies to all Grafana resources within an given organization. For example, an editor can see and update _all_ dashboards in an organization, unless those dashboards have been specifically restricted using [dashboard permissions]({{< relref "manage-dashboard-permissions/" >}}).

 Grafana uses the following roles to control user access:

@@ -92,9 +97,9 @@ You can specify the following permissions to dashboards and folders.
 - **Edit**: Can create and edit dashboards. Editors _cannot_ change folder or dashboard permissions, or add, edit, or delete folders.
 - **View**: Can only view dashboards and folders.

-For more information about assigning dashboard folder permissions, refer to [Grant dashboard folder permissions]({{< relref "./manage-dashboard-permissions/_index.md#grant-dashboard-folder-permissions" >}}).
+For more information about assigning dashboard folder permissions, refer to [Grant dashboard folder permissions]({{< relref "manage-dashboard-permissions/#grant-dashboard-folder-permissions" >}}).

-For more information about assigning dashboard permissions, refer to [Grant dashboard permissions]({{< relref "./manage-dashboard-permissions/_index.md#grant-dashboard-permissions" >}}).
+For more information about assigning dashboard permissions, refer to [Grant dashboard permissions]({{< relref "manage-dashboard-permissions/#grant-dashboard-permissions" >}}).

 ## Editors with administrator permissions

@@ -104,18 +109,18 @@ If you have access to the Grafana server, you can modify the default editor role

 This setting can be used to enable self-organizing teams to administer their own dashboards.

-For more information about assigning administrator permissions to editors, refer to [Grant editors administrator permissions]({{< relref "./manage-server-users/grant-editor-admin-permissions.md" >}}).
+For more information about assigning administrator permissions to editors, refer to [Grant editors administrator permissions]({{< relref "manage-server-users/grant-editor-admin-permissions/" >}}).

 ## Viewers with dashboard preview and Explore permissions

 If you have access to the Grafana server, you can modify the default viewer role so that viewers can:

 - Edit and preview dashboards, but cannot save their changes or create new dashboards.
- Access and use [Explore]({{< relref "../../explore/_index.md" >}}).
+- Access and use [Explore]({{< relref "../../explore/" >}}).

 Extending the viewer role is useful for public Grafana installations where you want anonymous users to be able to edit panels and queries, but not be able to save or create new dashboards.

-For more information about assigning dashboard preview permissions to viewers, refer to [Enable viewers to preview dashboards and use Explore]({{< relref "./manage-dashboard-permissions/_index.md#enable-viewers-to-preview-dashboards-and-use-explore" >}}).
+For more information about assigning dashboard preview permissions to viewers, refer to [Enable viewers to preview dashboards and use Explore]({{< relref "manage-dashboard-permissions/#enable-viewers-to-preview-dashboards-and-use-explore" >}}).

 ## Teams and permissions

@@ -126,7 +131,7 @@ You can assign a team member one of the following permissions:
 - **Member**: Includes the user as a member of the team. Members do not have team administrator privileges.
 - **Admin**: Administrators have permission to manage various aspects of the team, including team membership, permissions, and settings.

-Because teams exist inside an organization, the organization administrator can manage all teams. When the `editors_can_admin` setting is enabled, editors can create teams and manage teams that they create. For more information about the `editors_can_admin` setting, refer to [Grant editors administrator permissions]({{< relref "./manage-server-users/grant-editor-admin-permissions.md" >}}).
+Because teams exist inside an organization, the organization administrator can manage all teams. When the `editors_can_admin` setting is enabled, editors can create teams and manage teams that they create. For more information about the `editors_can_admin` setting, refer to [Grant editors administrator permissions]({{< relref "manage-server-users/grant-editor-admin-permissions/" >}}).

 ## Grafana Enterprise user permissions features

@@ -141,13 +146,13 @@ Grafana Enterprise provides the following permissions-related features:

 By default, a user can query any data source in an organization, even if the data source is not linked to the user's dashboards.

-Data source permissions enable you to restrict data source query permissions to specific **Users** and **Teams**. For more information about assigning data source permissions, refer to [Data source permissions]({{< relref "../../enterprise/datasource_permissions.md" >}}).
+Data source permissions enable you to restrict data source query permissions to specific **Users** and **Teams**. For more information about assigning data source permissions, refer to [Data source permissions]({{< relref "../../enterprise/datasource_permissions/" >}}).

 ### Role-based access control

 RBAC provides you a way of granting, changing, and revoking user read and write access to Grafana resources, such as users, reports, and authentication.

-For more information about RBAC, refer to [Role-based access control]({{< relref "../../enterprise/access-control" >}}).
+For more information about RBAC, refer to [Role-based access control]({{< relref "../../enterprise/access-control/" >}}).

 ### Learn more

--- a/docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md
+++ b/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

@@ -74,7 +76,7 @@ This modification is useful for public Grafana installations where you want anon

 1. Open the Grafana configuration file.

-   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration" >}}).
+   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../setup-grafana/configure-grafana/" >}}).

 1. Locate the `viewers_can_edit` parameter.
 1. Set the `viewers_can_edit` value to `true`.
@@ -142,4 +144,4 @@ Dashboard permissions settings:

 Result: You receive an error message that cannot override a higher permission with a lower permission in the same dashboard. User1 has administrator permissions.

-> Refer to [Role-based access Control]({{< relref "../../../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to understand how to use RBAC permissions to restrict access to dashboards, folders, administrative functions, and other resources.
+> Refer to [Role-based access Control]({{< relref "../../../enterprise/access-control/" >}}) in Grafana Enterprise to understand how to use RBAC permissions to restrict access to dashboards, folders, administrative functions, and other resources.
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md
+++ b/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

--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md
+++ b/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

@@ -24,4 +25,4 @@ Update user permissions when you want to enhance or restrict a user's access to
 1. Select the role that you want to assign.
 1. Click **Update**.

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also [change a user's organization permissions]({{< relref "../../manage-users-and-permissions/manage-server-users/change-user-org-permissions.md" >}}) in the Server Admin section.
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [change a user's organization permissions]({{< relref "../manage-server-users/change-user-org-permissions/" >}}) in the Server Admin section.
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md
+++ b/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

@@ -11,7 +12,7 @@ When you invite users to join an organization, you assign the **Admin**, **Edito
 - If you know that the user already has access Grafana and you know their user name, then you issue an invitation by entering their user name.
 - If the user is new to Grafana, then use their email address to issue an invitation. The system automatically creates the user account on first sign in.

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also manually [add a user to an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md" >}}).
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can also manually [add a user to an organization]({{< relref "../manage-server-users/add-remove-user-to-org/" >}}).

 ## Before you begin

@@ -34,7 +35,7 @@ When you invite users to join an organization, you assign the **Admin**, **Edito
   | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
   | Email or username | Either the email or username that the user will use to sign in to Grafana.                                                                                                                                                                                               |
   | Name              | The user's name.                                                                                                                                                                                                                                                         |
-   | Role              | Click the organization role to assign this user. For more information about organization roles, refer to [Organization roles]({{< relref "../about-users-and-permissions#organization-roles" >}})..                                                                      |
+   | Role              | Click the organization role to assign this user. For more information about organization roles, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles" >}})..                                                                     |
   | Send invite email | Switch to on if your organization has configured. The system sends an email to the user inviting them to sign in to Grafana and join the organization. Switch to off if you are not using email. The user can sign in to Grafana with the email or username you entered. |

 1. Click **Submit**.
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md
+++ b/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

--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md
+++ b/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

@@ -24,4 +25,4 @@ This action does not remove the user account from the Grafana server.

 1. Click the red **X** to remove the user from the organization.

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md#remove-a-user-from-an-organization" >}}) on the Users page of the Server Admin section.
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [remove a user from an organization]({{< relref "../manage-server-users/add-remove-user-to-org/#remove-a-user-from-an-organization" >}}) on the Users page of the Server Admin section.
--- a/docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md
+++ b/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

@@ -19,4 +20,4 @@ You can see a list of users with accounts in your Grafana organization. If neces

 ![Org Admin user list](/static/img/docs/manage-users/org-user-list-7-3.png)

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../../manage-users-and-permissions/manage-server-users/view-list-users.md" >}}) in the Server Admin section of Grafana.
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../manage-server-users/view-list-users/" >}}) in the Server Admin section of Grafana.
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md
@@ -1,17 +1,20 @@
-+++
-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

 A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system.

-If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions in Grafana, you can manage all users for a Grafana instance in the Server Admin section:
+If you have [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions in Grafana, you can manage all users for a Grafana instance in the Server Admin section:

 {{< section >}}

-If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, refer to [Manage users in a organization]({{< relref "../../manage-users-and-permissions/manage-org-users/_index.md" >}}).
+If you have [organization administrator]({{< relref "../about-users-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, refer to [Manage users in a organization]({{< relref "../manage-org-users/" >}}).

-For more information about users and permissions, refer to [About users and permissions]({{< relref "../about-users-and-permissions" >}}).
+For more information about users and permissions, refer to [About users and permissions]({{< relref "../about-users-and-permissions/" >}}).
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md
+++ b/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

@@ -12,8 +14,8 @@ You are required to specify an Admin role for each organization. The first user

 ## Before you begin

- [Create an organization]({{< relref "../../manage-organizations/_index.md" >}})
- [Add a user]({{< relref "./add-user.md" >}}) to Grafana
+- [Create an organization]({{< relref "../../manage-organizations/" >}})
+- [Add a user]({{< relref "add-user/" >}}) to Grafana
 - Ensure you have Grafana server administrator privileges

 **To add a user to an organization**:
@@ -30,7 +32,7 @@ You are required to specify an Admin role for each organization. The first user

 The next time the user signs in, they will be able to navigate to their new organization using the Switch Organizations option in the user profile menu.

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still [invite a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [invite a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org/" >}}).

 # Remove a user from an organization

@@ -48,4 +50,4 @@ Remove a user from an organization when they no longer require access to the das
 1. In the **Organization** section, click **Remove from organization** next to the organization from which you want to remove the user.
 1. Click **Confirm removal**.

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/remove-user-from-org.md" >}}) in the Users section of organization configuration.
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [remove a user from an organization]({{< relref "../manage-org-users/remove-user-from-org/" >}}) in the Users section of organization configuration.
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md
+++ b/docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md
@@ -1,14 +1,15 @@
-+++
-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

 Add users when you want to manually provide individuals with access to Grafana.

-When you create a user using this method, you must create their password. The user does not receive a notification by email. To invite a user to Grafana and allow them to create their own password, [invite a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org.md" >}}).
+When you create a user using this method, you must create their password. The user does not receive a notification by email. To invite a user to Grafana and allow them to create their own password, [invite a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org/" >}}).

 When you configure advanced authentication using Oauth, SAML, LDAP, or the Auth proxy, users are created automatically.

@@ -23,6 +24,6 @@ When you configure advanced authentication using Oauth, SAML, LDAP, or the Auth
 1. Click **New user**.
 1. Complete the fields and click **Create user**.

-When you create a user, the system assigns the user viewer permissions in a default organization, which you can change. You can now [add a user to a second organization]({{< relref "./add-remove-user-to-org.md" >}}).
+When you create a user, the system assigns the user viewer permissions in a default organization, which you can change. You can now [add a user to a second organization]({{< relref "add-remove-user-to-org/" >}}).

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still add users by [inviting a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can still add users by [inviting a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org/" >}}).
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md
+++ b/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

@@ -12,7 +13,7 @@ Grafana server administrators are responsible for creating users, organizations,

 ## Before you begin

- [Add a user]({{< relref "./add-user.md" >}})
+- [Add a user]({{< relref "add-user/" >}})
 - Ensure you have Grafana server administrator privileges

 **To assign or remove Grafana administrator privileges**:
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md
+++ b/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

@@ -10,7 +11,7 @@ Update organization permissions when you want to enhance or restrict a user's ac

 ## Before you begin

- [Add a user to an organization]({{< relref "./add-remove-user-to-org.md" >}})
+- [Add a user to an organization]({{< relref "add-remove-user-to-org/" >}})
 - Ensure you have Grafana server administrator privileges

 **To change a user's organization permissions**:
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md
+++ b/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

--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md
+++ b/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

@@ -12,8 +13,8 @@ This setting can be used to enable self-organizing teams to administer their own

 When `editors_can_admin` is enabled:

- Users with the Editor role in an organization are Administrators for new dashboards and folders they create, meaning they can edit dashboard permissions. To learn more about dashboard permissions, refer to [Manage dashboard permissions]({{< relref "../manage-dashboard-permissions/_index.md" >}}).
- Users with the Editor role in an organization can create teams, and they are Administrators of the teams they create. To learn more about team permissions, refer to [Manage teams]({{< relref "../manage-teams/_index.md" >}})
+- Users with the Editor role in an organization are Administrators for new dashboards and folders they create, meaning they can edit dashboard permissions. To learn more about dashboard permissions, refer to [Manage dashboard permissions]({{< relref "../manage-dashboard-permissions/" >}}).
+- Users with the Editor role in an organization can create teams, and they are Administrators of the teams they create. To learn more about team permissions, refer to [Manage teams]({{< relref "../manage-teams/" >}})

 > **Note**: If you use Grafana Enterprise and customize users' permissions using RBAC, the RBAC permissions override the functionality enabled by the `editors_can_admin` flag.

@@ -25,7 +26,7 @@ When `editors_can_admin` is enabled:

 1. Log in to the Grafana server and open the Grafana configuration file.

-   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration" >}}).
+   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../setup-grafana/configure-grafana/" >}}).

 1. Locate the `editors_can_admin` parameter.
 1. Set the `editors_can_admin` value to `true`.
--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md
+++ b/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

--- a/docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md
+++ b/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

@@ -19,4 +20,4 @@ You can see a list of users with accounts on your Grafana server. This action mi

 ![Server Admin user list](/static/img/docs/manage-users/server-user-list-7-3.png)

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../../manage-users-and-permissions/manage-org-users/view-list-org-users.md" >}}).
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../manage-org-users/view-list-org-users/" >}}).
--- a/docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md
+++ b/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

--- a/docs/sources/administration/preferences/_index.md
+++ b/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

@@ -10,9 +11,9 @@ Grafana preferences are basic settings. They control the Grafana UI theme, home

 Preferences are sometimes confusing because they can be set at four different levels, listed from highest level to lowest:

- **Server -** Affects all users on the Grafana server. Set by a [Grafana server admin]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#grafana-server-administrators" >}}).
- **Organization -** Affects all users in an organization. Set by an [Organization admin]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#organization-roles" >}}).
- **Team -** Affects all users assigned to a team. Set by an Organization Admin or Team Admin. To learn more about these roles, refer to [Teams and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#teams-and-permissions" >}}).
+- **Server -** Affects all users on the Grafana server. Set by a [Grafana server admin]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#grafana-server-administrators" >}}).
+- **Organization -** Affects all users in an organization. Set by an [Organization admin]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#organization-roles" >}}).
+- **Team -** Affects all users assigned to a team. Set by an Organization Admin or Team Admin. To learn more about these roles, refer to [Teams and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#teams-and-permissions" >}}).
 - **User account -** Affects the individual user. Set by the user on their own account.

 The lowest level always takes precedence. For example, if a user sets their theme to **Light**, then their visualization of Grafana displays the light theme. Nothing at any higher level can override that.
--- a/docs/sources/administration/preferences/change-grafana-name.md
+++ b/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

@@ -54,4 +59,4 @@ To change the team name or email, follow these steps:

 ## Change user name or email

-To learn how to edit your user information, refer to [Edit your profile]({{< relref "../manage-user-preferences/_index.md#edit-your-profile" >}}).
+To learn how to edit your user information, refer to [Edit your profile]({{< relref "../manage-user-preferences/#edit-your-profile" >}}).
--- a/docs/sources/administration/preferences/change-grafana-theme.md
+++ b/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

@@ -34,9 +39,9 @@ Here is an example of the light theme.

 ## Change server UI theme

-Grafana server administrators can change the Grafana UI theme for all users on the server by setting the [default_theme]({{< relref "../configuration.md#default-theme" >}}) option in the Grafana configuration file.
+Grafana server administrators can change the Grafana UI theme for all users on the server by setting the [default_theme]({{< relref "../../setup-grafana/configure-grafana/#default-theme" >}}) option in the Grafana configuration file.

-To see what the current settings are, refer to [View server settings]({{< relref "../view-server/view-server-settings.md" >}}).
+To see what the current settings are, refer to [View server settings]({{< relref "../view-server/view-server-settings/" >}}).

 ## Change organization UI theme

--- a/docs/sources/administration/preferences/change-grafana-timezone.md
+++ b/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

@@ -14,7 +19,7 @@ By default, Grafana uses the timezone in your web browser. However, you can over

 ## Set server timezone

-Grafana server administrators can choose a default timezone for all users on the server by setting the [default_timezone]({{< relref "../configuration.md#default-timezone" >}}) option in the Grafana configuration file.
+Grafana server administrators can choose a default timezone for all users on the server by setting the [default_timezone]({{< relref "../../setup-grafana/configure-grafana/#default-timezone" >}}) option in the Grafana configuration file.

 ## Set organization timezone

--- a/docs/sources/administration/preferences/change-home-dashboard.md
+++ b/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

@@ -32,7 +38,7 @@ Users with the Grafana Server Admin flag on their account or access to the confi
 ### Use a JSON file as the home dashboard

 1. Save your JSON file somewhere that Grafana can access it. For example, in the Grafana `data` folder of Grafana.
-1. Update your configuration file to set the path to the JSON file. Refer to [default_home_dashboard_path]({{< relref "../configuration.md#default_home_dashboard_path" >}}) for more information about modifying the Grafana configuration files.
+1. Update your configuration file to set the path to the JSON file. Refer to [default_home_dashboard_path]({{< relref "../../setup-grafana/configure-grafana/#default_home_dashboard_path" >}}) for more information about modifying the Grafana configuration files.

 ```ini
 [dashboards]
--- a/docs/sources/administration/provisioning.md
+++ b/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

@@ -12,7 +16,7 @@ In previous versions of Grafana, you could only use the API for provisioning dat

 ## Config File

-Check out the [configuration]({{< relref "configuration.md" >}}) page for more information on what you can configure in `grafana.ini`
+Check out the [configuration]({{< relref "../setup-grafana/configure-grafana/" >}}) page for more information on what you can configure in `grafana.ini`

 ### Config File Locations

@@ -94,8 +98,6 @@ datasources:
    uid: my_unique_uid
    # <string> url
    url: http://localhost:8080
-    # <string> Deprecated, use secureJsonData.password
-    password:
    # <string> database user, if used
    user:
    # <string> database name, if used
@@ -104,8 +106,6 @@ datasources:
    basicAuth:
    # <string> basic auth username
    basicAuthUser:
-    # <string> Deprecated, use secureJsonData.basicAuthPassword
-    basicAuthPassword:
    # <bool> enable/disable with credentials headers
    withCredentials:
    # <bool> mark as default datasource. Max one per org
@@ -194,7 +194,7 @@ Since not all datasources have the same configuration settings we only have the

 `{"authType":"keys","defaultRegion":"us-west-2","timeField":"@timestamp"}`

-Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "configuration.md#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
+Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "../setup-grafana/configure-grafana/#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.

 > **Note:** Datasources tagged with _HTTP\*_ below denotes any data source which communicates using the HTTP protocol, e.g. all core data source plugins except MySQL, PostgreSQL and MSSQL.

@@ -233,7 +233,7 @@ datasources:

 > This feature is available from v7.1

-You can manage plugins in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "configuration.md#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.
+You can manage plugins in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "../setup-grafana/configure-grafana/#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.

 ### Example plugin configuration file

@@ -261,7 +261,7 @@ apps:

 ## Dashboards

-You can manage dashboards in Grafana by adding one or more YAML config files in the [`provisioning/dashboards`]({{< relref "configuration.md" >}}) directory. Each config file can contain a list of `dashboards providers` that load dashboards into Grafana from the local filesystem.
+You can manage dashboards in Grafana by adding one or more YAML config files in the [`provisioning/dashboards`]({{< relref "../setup-grafana/configure-grafana/" >}}) directory. Each config file can contain a list of `dashboards providers` that load dashboards into Grafana from the local filesystem.

 The dashboard provider config file looks somewhat like this:

@@ -316,7 +316,7 @@ Note: The JSON definition in the input field when using `Copy JSON to Clipboard`

 ### Reusable Dashboard URLs

-If the dashboard in the JSON file contains an [UID]({{< relref "../dashboards/json-model.md" >}}), Grafana forces insert/update on that UID. This allows you to migrate dashboards between Grafana instances and provisioning Grafana from configuration without breaking the URLs given because the new dashboard URL uses the UID as identifier.
+If the dashboard in the JSON file contains an [UID]({{< relref "../dashboards/json-model/" >}}), Grafana forces insert/update on that UID. This allows you to migrate dashboards between Grafana instances and provisioning Grafana from configuration without breaking the URLs given because the new dashboard URL uses the UID as identifier.
 When Grafana starts, it updates/inserts all dashboards available in the configured folders. If you modify the file, then the dashboard is also updated.
 By default, Grafana deletes dashboards in the database if the file is removed. You can disable this behavior using the `disableDeletion` setting.

@@ -601,4 +601,4 @@ The following sections detail the supported settings and secure settings for eac

 Grafana Enterprise supports provisioning for the following resources:

- [Role-based access control provisioning]({{< relref "../enterprise/access-control/rbac-provisioning.md" >}})
+- [Role-based access control provisioning]({{< relref "../enterprise/access-control/rbac-provisioning/" >}})
--- a/docs/sources/administration/service-accounts/about-service-accounts.md
+++ b/docs/sources/administration/service-accounts/about-service-accounts.md
@@ -11,7 +11,7 @@ weight: 30

 A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. Create service accounts and tokens to authenticate applications like Terraform with the Grafana API.

-> **Note:** Service accounts are available in Grafana 8.5+ as a beta feature. To enable service accounts, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#" >}}) section. Service accounts will eventually replace [API keys]({{< relref "../api-keys/_index.md" >}}) as the primary way to authenticate applications that interact with Grafana.
+> **Note:** Service accounts are available in Grafana 8.5+ as a beta feature. To enable service accounts, refer to [Enable service accounts]({{< relref "enable-service-accounts/#" >}}) section. Service accounts will eventually replace [API keys]({{< relref "../api-keys/" >}}) as the primary way to authenticate applications that interact with Grafana.

 A common use case for creating a service account is to perform operations on automated or triggered tasks. You can use service accounts to:

@@ -20,7 +20,7 @@ A common use case for creating a service account is to perform operations on aut
 - Set up an external SAML authentication provider
 - Interact with Grafana without signing in as a user

-In [Grafana Enterprise]({{< relref "../../enterprise/_index.md" >}}), you can also use service accounts in combination with [role-based access control]({{< relref "../../enterprise/access-control/about-rbac.md" >}}) to grant very specific permissions to applications that interact with Grafana.
+In [Grafana Enterprise]({{< relref "../../enterprise/" >}}), you can also use service accounts in combination with [role-based access control]({{< relref "../../enterprise/access-control/about-rbac/" >}}) to grant very specific permissions to applications that interact with Grafana.

 > **Note:** Service accounts can only act in the organization they are created for. If you have the same task that is needed for multiple organizations, we recommend creating service accounts in each organization.

@@ -46,4 +46,4 @@ The added benefits of service accounts to API keys include:
 - Service accounts resemble Grafana users and can be enabled/disabled, granted specific permissions, and remain active until they are deleted or disabled. API keys are only valid until their expiry date.
 - Service accounts can be associated with multiple tokens.
 - Unlike API keys, service account tokens are not associated with a specific user, which means that applications can be authenticated even if a Grafana user is deleted.
- You can grant granular permissions to service accounts by leveraging [fine-grained access control]({{< relref "../../enterprise/access-control" >}}). For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).
+- You can grant granular permissions to service accounts by leveraging [fine-grained access control]({{< relref "../../enterprise/access-control/" >}}). For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#" >}}).
--- a/docs/sources/administration/service-accounts/add-service-account-token.md
+++ b/docs/sources/administration/service-accounts/add-service-account-token.md
@@ -9,14 +9,14 @@ weight: 60

 # Add a token to a service account in Grafana

-A service account token is a generated random string that acts as an alternative to a password when authenticating with Grafana’s HTTP API. For more information about service accounts, refer to [About service accounts in Grafana]({{< relref "./about-service-accounts.md" >}}).
+A service account token is a generated random string that acts as an alternative to a password when authenticating with Grafana’s HTTP API. For more information about service accounts, refer to [About service accounts in Grafana]({{< relref "about-service-accounts/" >}}).

-You can create a service account token using the Grafana UI or via the API. For more information about creating a service account token via the API, refer to [Create service account tokens using the HTTP API]({{< relref "../../developers/http_api/serviceaccount.md#create-service-account-tokens" >}}).
+You can create a service account token using the Grafana UI or via the API. For more information about creating a service account token via the API, refer to [Create service account tokens using the HTTP API]({{< relref "../../developers/http_api/serviceaccount/#create-service-account-tokens" >}}).

 ## Before you begin

- Ensure you have added the `serviceAccounts` feature toggle to Grafana. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#" >}}).
- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).
+- Ensure you have added the `serviceAccounts` feature toggle to Grafana. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "enable-service-accounts/#" >}}).
+- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#" >}}).

 ## To add a token to a service account

--- a/docs/sources/administration/service-accounts/create-service-account.md
+++ b/docs/sources/administration/service-accounts/create-service-account.md
@@ -11,14 +11,14 @@ weight: 50

 # Create a service account in Grafana

-A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. For more information about how you can use service accounts, refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts.md#" >}}).
+A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. For more information about how you can use service accounts, refer to [About service accounts]({{< relref "about-service-accounts/#" >}}).

-For more information about creating service accounts via the API, refer to [Create a service account in the HTTP API]({{< relref "../../developers/http_api/serviceaccount.md#create-service-account" >}}).
+For more information about creating service accounts via the API, refer to [Create a service account in the HTTP API]({{< relref "../../developers/http_api/serviceaccount/#create-service-account" >}}).

 ## Before you begin

- Ensure you have added the feature toggle for service accounts `serviceAccounts`. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#" >}}).
- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).
+- Ensure you have added the feature toggle for service accounts `serviceAccounts`. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "enable-service-accounts/#" >}}).
+- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/#" >}}).

 ## To create a service account

--- a/docs/sources/administration/service-accounts/enable-service-accounts.md
+++ b/docs/sources/administration/service-accounts/enable-service-accounts.md
@@ -25,7 +25,7 @@ You can enable service accounts by:
 This topic shows you how to enable service accounts by modifying the Grafana configuration file.

 1. Sign in to the Grafana server and locate the configuration file. For more information about finding the configuration file, refer to LINK.
-2. Open the configuration file and locate the [feature toggles section]({{< relref "../../administration/configuration.md#feature_toggles" >}}). Add `serviceAccounts` as a [feature_toggle]({{< relref "../../administration/configuration.md#feature_toggle" >}}).
+2. Open the configuration file and locate the [feature toggles section]({{< relref "../../setup-grafana/configure-grafana/#feature_toggles" >}}). Add `serviceAccounts` as a [feature_toggle]({{< relref "../../setup-grafana/configure-grafana/#feature_toggle" >}}).

 ```
 [feature_toggles]
@@ -39,6 +39,6 @@ enable = serviceAccounts

 This topic shows you how to enable service accounts by setting environment variables before starting Grafana.

-Follow the instructions to [override configuration with environment variables]({{< relref "../../administration/configuration.md#override-configuration-with-environment-variables" >}}). Set the following environment variable: `GF_FEATURE_TOGGLES_ENABLE = serviceAccounts`.
+Follow the instructions to [override configuration with environment variables]({{< relref "../../setup-grafana/configure-grafana/#override-configuration-with-environment-variables" >}}). Set the following environment variable: `GF_FEATURE_TOGGLES_ENABLE = serviceAccounts`.

 > **Note:** Environment variables override configuration file settings.
--- a/docs/sources/administration/view-server/_index.md
+++ b/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

--- a/docs/sources/administration/view-server/view-server-settings.md
+++ b/docs/sources/administration/view-server/view-server-settings.md
@@ -1,18 +1,24 @@
-+++
-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

-> Refer to [Role-based access control]({{< relref "../../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to understand how you can control access with RBAC permissions.
+> Refer to [Role-based access control]({{< relref "../../enterprise/access-control/" >}}) in Grafana Enterprise to understand how you can control access with RBAC permissions.

-If you are a Grafana server administrator, use the Settings tab to view the settings that are applied to your Grafana server via the [Configuration]({{< relref "../configuration.md#config-file-locations" >}}) file and any environmental variables.
+If you are a Grafana server administrator, use the Settings tab to view the settings that are applied to your Grafana server via the [Configuration]({{< relref "../../setup-grafana/configure-grafana/#config-file-locations" >}}) file and any environmental variables.

-> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md" >}}).
+> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/" >}}).

 ## View server settings

@@ -21,4 +27,4 @@ If you are a Grafana server administrator, use the Settings tab to view the sett

 ## Available settings

-For a full list of server settings, refer to [Configuration]({{< relref "../configuration.md" >}}).
+For a full list of server settings, refer to [Configuration]({{< relref "../../setup-grafana/configure-grafana/" >}}).
--- a/docs/sources/administration/view-server/view-server-stats.md
+++ b/docs/sources/administration/view-server/view-server-stats.md
@@ -1,17 +1,22 @@
-+++
-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

-> Refer to [Role-based access control]({{< relref "../../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to understand how you can control access with RBAC permissions.
+> Refer to [Role-based access control]({{< relref "../../enterprise/access-control/" >}}) in Grafana Enterprise to understand how you can control access with RBAC permissions.

 If you are a Grafana server admin, then you can view useful statistics about your Grafana server in the Stats & Licensing tab.

-> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md" >}}).
+> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions/" >}}).

 ## View server stats

--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -1,35 +1,38 @@
-+++
-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
+# Grafana Alerting

-Grafana alerts allow you to learn about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. It centralizes alerting information in a single, searchable view that allows you to:
+Grafana Alerting allows you to learn about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. It centralizes alerting information in a single, searchable view that allows you to:

 - Create and manage Grafana alerts
 - Create and manage Grafana Mimir and Loki managed alerts
 - View alerting information from Prometheus and Alertmanager compatible data sources

-For new installations or existing installs without alerting configured, Grafana alerting is enabled by default.
+For new installations or existing installs without alerting configured, Grafana Alerting is enabled by default.

 | Release     | Cloud         | Enterprise    | OSS           |
 | ----------- | ------------- | ------------- | ------------- |
 | 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/" >}}).

-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.
+Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "fundamentals/" >}}) of Grafana Alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/" >}}) 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" >}})
- [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" >}})
- [View the state and health of alerting rules]({{< relref "./fundamentals/state-and-health.md" >}})
- [View alert groupings]({{< relref "./alert-groups/_index.md" >}})
- [Add or edit an alert contact point]({{< relref "./contact-points/_index.md" >}})
- [Add or edit notification policies]({{< relref "./notifications/_index.md" >}})
- [Add or edit silences]({{< relref "./silences/_index.md" >}})
+- [About alert rules]({{< relref "fundamentals/alert-rules/" >}})
+- [Migrating legacy alerts]({{< relref "migrating-alerts/" >}})
+- [Disable Grafana Alerting in OSS]({{< relref "migrating-alerts/opt-out/" >}})
+- [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule/" >}})
+- [Create Grafana Mimir or Loki managed alerting rules]({{< relref "alerting-rules/create-mimir-loki-managed-rule/" >}})
+- [View existing alerting rules and manage their current state]({{< relref "alerting-rules/rule-list/" >}})
+- [View the state and health of alerting rules]({{< relref "fundamentals/state-and-health/" >}})
+- [View alert groupings]({{< relref "alert-groups/" >}})
+- [Add or edit an alert contact point]({{< relref "contact-points/" >}})
+- [Add or edit notification policies]({{< relref "notifications/" >}})
+- [Add or edit silences]({{< relref "silences/" >}})
+- [Performance considerations for alerting]({{< relref "performance/" >}})
--- a/docs/sources/alerting/about-alerting.md
+++ b/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/" >}}), their relationship with [alert instances]({{< relref "fundamentals/alert-rules/alert-instances/" >}}) and the various alert rule [states and transitions]({{< relref "fundamentals/state-and-health/" >}}), [notification policies]({{< relref "notifications/" >}}) and [contact points]({{< relref "contact-points/" >}}).
+
+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/" >}}) and [mute timings]({{< relref "notifications/mute-timings/" >}}) to more granularly manage alert notifications, [role-based access control]({{< relref "../enterprise/access-control/" >}}) to limit access and manage permissions and additional advanced topics such as [external alertmanagers]({{< relref "fundamentals/alertmanager/#add-a-new-external-alertmanager" >}}) and [high availability]({{< relref "high-availability/" >}}).
+
+## 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/" >}}) 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/" >}}).
+
+Each notification policy specifies a set of [label matchers]({{< relref "fundamentals/annotation-label/labels-and-label-matchers/" >}}) to indicate what alerts they are responsible for.
+
+A notification policy has a [contact point]({{< relref "contact-points/" >}}) assigned to it that consists of one or more [notifiers]({{< relref "contact-points/#list-of-notifiers-supported-by-grafana" >}}).
--- a/docs/sources/alerting/alert-groups/_index.md
+++ b/docs/sources/alerting/alert-groups/_index.md
@@ -1,16 +1,22 @@
-+++
-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/alert-groups/
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+description: Alert groups
+keywords:
+  - grafana
+  - alerting
+  - alerts
+  - groups
+title: Alert groups
+weight: 445
+---

 # Alert groups

-Alert groups show grouped alerts from an Alertmanager instance. By default, the alerts are grouped by the label keys for the root policy in [notification policies]({{< relref "../notifications/_index.md" >}}). Grouping common alerts into a single alert group prevents duplicate alerts from being fired.
+Alert groups show grouped alerts from an Alertmanager instance. By default, the alerts are grouped by the label keys for the root policy in [notification policies]({{< relref "../notifications/" >}}). Grouping common alerts into a single alert group prevents duplicate alerts from being fired.

 For more information, see:

- [View alert groupings]({{< relref "./view-alert-grouping.md" >}})
- [Filter alerts by group]({{< relref "./filter-alerts.md" >}})
+- [View alert groupings]({{< relref "view-alert-grouping/" >}})
+- [Filter alerts by group]({{< relref "filter-alerts/" >}})
--- a/docs/sources/alerting/alert-groups/filter-alerts.md
+++ b/docs/sources/alerting/alert-groups/filter-alerts.md
@@ -1,10 +1,16 @@
-+++
-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/alert-groups/filter-alerts/
+  - /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

--- a/docs/sources/alerting/alert-groups/view-alert-grouping.md
+++ b/docs/sources/alerting/alert-groups/view-alert-grouping.md
@@ -1,10 +1,17 @@
-+++
-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/alert-groups/view-alert-grouping/
+  - /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

--- a/docs/sources/alerting/alerting-limitations.md
+++ b/docs/sources/alerting/alerting-limitations.md
@@ -1,10 +1,28 @@
-+++
-aliases = ["/docs/grafana/latest/alerting/alerting-limitations/"]
-title = "Limitations"
-weight = 552
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/alerting-limitations/
+title: Limitations
+weight: 552
+---

 # Limitations

- Grafana alerting system can retrieve rules from all available Prometheus, Loki, and Alertmanager data sources. It might not be able to fetch alerting rules from all other supported data sources at this time.
- We aim to support the latest two minor versions of both Prometheus and Alertmanager. We cannot guarantee that older versions will work. As an example, if the current Prometheus version is `2.31.1`, we support >= `2.29.0`.
+## Limited rule sources support
+
+Grafana Alerting can retrieve alerting and recording rules **stored** in most available Prometheus, Loki, Mimir, and Alertmanager compatible data sources.
+
+It does not support reading or writing alerting rules from any other data sources but the ones previously mentioned at this time.
+
+## Prometheus version support
+
+We support the latest two minor versions of both Prometheus and Alertmanager. We cannot guarantee that older versions will work.
+
+As an example, if the current Prometheus version is `2.31.1`, we support >= `2.29.0`.
+
+## Grafana is not an alert receiver
+
+Grafana is not an alert receiver; is it an alert generator. This means that Grafana cannot receive alerts from anything other than its internal alert generator.
+
+Receiving alerts from Prometheus (or anything else) is not supported at the time.
+
+For more information, refer to [this GitHub discussion](https://github.com/grafana/grafana/discussions/45773).
--- a/docs/sources/alerting/alerting-rules/_index.md
+++ b/docs/sources/alerting/alerting-rules/_index.md
@@ -1,10 +1,13 @@
-+++
-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
+# Create and manage Grafana Alerting rules

 An alerting rule is a set of evaluation criteria that determines whether an alert 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.

@@ -12,9 +15,9 @@ While queries and expressions select the data set to evaluate, a condition sets

 You can:

- [Create Grafana Mimir or Loki managed alert rule]({{< relref "./create-mimir-loki-managed-rule.md" >}})
- [Create Grafana Mimir or Loki managed recording rule]({{< relref "./create-mimir-loki-managed-recording-rule.md" >}})
- [Edit Grafana Mimir or Loki rule groups and namespaces]({{< relref "./edit-mimir-loki-namespace-group.md" >}})
- [Create Grafana managed alert rule]({{< relref "./create-grafana-managed-rule.md" >}})
- [State and health of alerting rules]({{< relref "../fundamentals/state-and-health.md" >}})
- [Manage alerting rules]({{< relref "./rule-list.md" >}})
+- [Create Grafana Mimir or Loki managed alert rule]({{< relref "create-mimir-loki-managed-rule/" >}})
+- [Create Grafana Mimir or Loki managed recording rule]({{< relref "create-mimir-loki-managed-recording-rule/" >}})
+- [Edit Grafana Mimir or Loki rule groups and namespaces]({{< relref "edit-mimir-loki-namespace-group/" >}})
+- [Create Grafana managed alert rule]({{< relref "create-grafana-managed-rule/" >}})
+- [State and health of alerting rules]({{< relref "../fundamentals/state-and-health/" >}})
+- [Manage alerting rules]({{< relref "rule-list/" >}})
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/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/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) 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" >}}).
+   - Add one or more [queries]({{< relref "../../panels/query-a-data-source/add-a-query/" >}}) or [expressions]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/" >}}).
   - 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.
-   - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
+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/" >}}).
   - 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/" >}}) for the rule.

 ### Single and multi dimensional rule

@@ -49,7 +56,7 @@ Use the classic condition expression to create a rule that triggers a single ale

 To generate a separate alert for each series, create a multi-dimensional rule. Use `Math`, `Reduce`, or `Resample` expressions to create a multi-dimensional rule. For example:

- Add a `Reduce` expression for each query to aggregate values in the selected time range into a single value. (Not needed for [rules using numeric data]({{< relref "../fundamentals/evaluate-grafana-alerts.md#alerting-on-numeric-data-1" >}})).
+- Add a `Reduce` expression for each query to aggregate values in the selected time range into a single value. (Not needed for [rules using numeric data]({{< relref "../fundamentals/evaluate-grafana-alerts/#alerting-on-numeric-data-1" >}})).
 - Add a `Math` expression with the condition for the rule. Not needed in case a query or a reduce expression already returns 0 if rule should not fire, or a positive number if it should fire. Some examples: `$B > 70` if it should fire in case value of B query/expression is more than 70. `$B < $C * 100` in case it should fire if value of B is less than value of C multiplied by 100. If queries being compared have multiple series in their results, series from different queries are matched if they have the same labels or one is a subset of the other.

 ![Query section multi dimensional](/static/img/docs/alerting/unified/rule-edit-multi-8-0.png 'Query section multi dimensional screenshot')
@@ -58,7 +65,7 @@ To generate a separate alert for each series, create a multi-dimensional rule. U

 #### Rule with classic condition

-For more information, see [expressions documentation]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions.md" >}}).
+For more information, see [expressions documentation]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/" >}}).

 ### No data and error handling

--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
@@ -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/" >}}).
+   - 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/" >}}).
+   - 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/" >}}) 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.
@@ -35,7 +63,7 @@ For Grafana Mimir and Loki data sources to work with Grafana 8.0 alerting, enabl
   - 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 additional metadata associated with the rule.
-   - 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 a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/" >}}).
   - 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.
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/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/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) 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.
-   - Add a description and summary to customize alert messages. Use the guidelines in [Annotations and labels for alerting]({{< relref "../fundamentals/annotation-label/_index.md" >}}).
+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/" >}}).
+   - 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/" >}}).
   - 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/" >}}) for the rule.
--- a/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md
+++ b/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

--- a/docs/sources/alerting/alerting-rules/rule-list.md
+++ b/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

@@ -55,5 +62,5 @@ Grafana managed alerting rules can only be edited or deleted by users with Edit
 To edit or delete a rule:

 1. Expand a rule row until you can see the rule controls of **View**, **Edit**, and **Delete**.
-1. Click **Edit** to open the create rule page. Make updates following instructions in [Create a Grafana managed alerting rule]({{< relref "./create-grafana-managed-rule.md" >}}) or [Create a Grafana Mimir or Loki managed alerting rule]({{< relref "./create-mimir-loki-managed-rule.md" >}}).
+1. Click **Edit** to open the create rule page. Make updates following instructions in [Create a Grafana managed alerting rule]({{< relref "create-grafana-managed-rule/" >}}) or [Create a Grafana Mimir or Loki managed alerting rule]({{< relref "create-mimir-loki-managed-rule/" >}}).
 1. Click **Delete** to delete a rule.
--- a/docs/sources/alerting/contact-points/_index.md
+++ b/docs/sources/alerting/contact-points/_index.md
@@ -1,210 +1,30 @@
-+++
-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

-Use contact points to define how your contacts are notified when an alert fires. A contact point can have one or more contact point types, for example, email, slack, webhook, and so on. When an alert fires, a notification is sent to all contact point types listed for a contact point. Optionally, use [message templates]({{< relref "./message-templating/_index.md" >}}) to customize notification messages for the contact point types.
+Use contact points to define how your contacts are notified when an alert fires. A contact point can have one or more contact point types, for example, email, slack, webhook, and so on. When an alert fires, a notification is sent to all contact point types listed for a contact point. Optionally, use [message templates]({{< relref "message-templating/" >}}) to customize notification messages for the contact point types.

-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" >}}).
+You can configure Grafana managed contact points as well as contact points for an [external Alertmanager data source]({{< relref "../../datasources/alertmanager/" >}}). For more information, see [Alertmanager]({{< relref "../fundamentals/alertmanager/" >}}).

-## Add a contact point
+Before you begin, see [About Grafana Alerting]({{< relref "../about-alerting/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) 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/" >}})
+- [Edit contact point]({{< relref "edit-contact-point/" >}})
+- [Test contact point]({{< relref "test-contact-point/" >}})
+- [Delete contact point]({{< relref "delete-contact-point/" >}})
+- [List of notifiers]({{< relref "notifiers/" >}})
+- [Message templating]({{< relref "message-templating/" >}})
--- a/docs/sources/alerting/contact-points/create-contact-point.md
+++ b/docs/sources/alerting/contact-points/create-contact-point.md
@@ -0,0 +1,32 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/create-contact-point/
+  - /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.
--- a/docs/sources/alerting/contact-points/delete-contact-point.md
+++ b/docs/sources/alerting/contact-points/delete-contact-point.md
@@ -0,0 +1,27 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/delete-contact-point/
+  - /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/" >}}) or update it to use another contact point.
--- a/docs/sources/alerting/contact-points/edit-alertmanager-config.md
+++ b/docs/sources/alerting/contact-points/edit-alertmanager-config.md
@@ -0,0 +1,27 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/edit-alertmanager-config/
+  - /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 "../../setup-grafana/configure-grafana/" >}})
--- a/docs/sources/alerting/contact-points/edit-contact-point.md
+++ b/docs/sources/alerting/contact-points/edit-contact-point.md
@@ -0,0 +1,25 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/edit-contact-point/
+  - /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**.
--- a/docs/sources/alerting/contact-points/message-templating/_index.md
+++ b/docs/sources/alerting/contact-points/message-templating/_index.md
@@ -1,56 +1,34 @@
-+++
-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/contact-points/message-templating/
+  - /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

-Notifications sent via [contact points]({{< relref "../../contact-points/_index.md" >}}) are built using messaging templates. Grafana's default templates are based on the [Go templating system](https://golang.org/pkg/text/template) where some fields are evaluated as text, while others are evaluated as HTML (which can affect escaping). The default template, defined in [default_template.go](https://github.com/grafana/grafana/blob/main/pkg/services/ngalert/notifier/channels/default_template.go), is a useful reference for custom templates.
+Notifications sent via [contact points]({{< relref "../" >}}) are built using messaging templates. Grafana's default templates are based on the [Go templating system](https://golang.org/pkg/text/template) where some fields are evaluated as text, while others are evaluated as HTML (which can affect escaping). The default template, defined in [default_template.go](https://github.com/grafana/grafana/blob/main/pkg/services/ngalert/notifier/channels/default_template.go), is a useful reference for custom templates.

-Since most of the contact point fields can be templated, you can create reusable custom templates and use them in multiple contact points. The [template data]({{< relref "./template-data.md" >}}) topic lists variables that are available for templating. The default template is defined in [default_template.go](https://github.com/grafana/grafana/blob/main/pkg/services/ngalert/notifier/channels/default_template.go) which can serve as a useful reference or starting point for custom templates.
+Since most of the contact point fields can be templated, you can create reusable custom templates and use them in multiple contact points. The [template data]({{< relref "template-data/" >}}) topic lists variables that are available for templating. The default template is defined in [default_template.go](https://github.com/grafana/grafana/blob/main/pkg/services/ngalert/notifier/channels/default_template.go) which can serve as a useful reference or starting point for custom templates.

 ### Using templates

 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 +57,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.
--- a/docs/sources/alerting/contact-points/message-templating/create-message-template.md
+++ b/docs/sources/alerting/contact-points/message-templating/create-message-template.md
@@ -0,0 +1,33 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/message-templating/create-message-template/
+  - /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.
--- a/docs/sources/alerting/contact-points/message-templating/delete-message-template.md
+++ b/docs/sources/alerting/contact-points/message-templating/delete-message-template.md
@@ -0,0 +1,25 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/message-templating/delete-message-template/
+  - /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.
--- a/docs/sources/alerting/contact-points/message-templating/edit-message-template.md
+++ b/docs/sources/alerting/contact-points/message-templating/edit-message-template.md
@@ -0,0 +1,25 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/message-templating/edit-message-template/
+  - /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**.
--- a/docs/sources/alerting/contact-points/message-templating/example-template-functions.md
+++ b/docs/sources/alerting/contact-points/message-templating/example-template-functions.md
@@ -0,0 +1,127 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/example-template-functions/
+  - /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`
--- a/docs/sources/alerting/contact-points/message-templating/example-template.md
+++ b/docs/sources/alerting/contact-points/message-templating/example-template.md
@@ -0,0 +1,68 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/message-templating/example-template/
+  - /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" . }}
+```
--- a/docs/sources/alerting/contact-points/message-templating/template-data.md
+++ b/docs/sources/alerting/contact-points/message-templating/template-data.md
@@ -1,12 +1,21 @@
-+++
-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/contact-points/message-templating/template-data/
+  - /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

-Template data is passed on to [message templates]({{< relref "./_index.md" >}}) as well as sent as payload to webhook pushes.
+Template data is passed on to [message templates]({{< relref "_index.md" >}}) as well as sent as payload to webhook pushes.

 | Name              | Type     | Notes                                                                                                                |
 | ----------------- | -------- | -------------------------------------------------------------------------------------------------------------------- |
--- a/docs/sources/alerting/contact-points/message-templating/template-functions.md
+++ b/docs/sources/alerting/contact-points/message-templating/template-functions.md
@@ -1,8 +1,17 @@
-+++
-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/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: Template functions
+weight: 125
+---

 # Template Functions

--- a/docs/sources/alerting/contact-points/notifiers/_index.md
+++ b/docs/sources/alerting/contact-points/notifiers/_index.md
@@ -0,0 +1,42 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/notifiers/
+  - /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                                                                                                      |
--- a/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md
+++ b/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md
@@ -0,0 +1,138 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/notifiers/webhook-notifier/
+  - /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. |
--- a/docs/sources/alerting/contact-points/test-contact-point.md
+++ b/docs/sources/alerting/contact-points/test-contact-point.md
@@ -0,0 +1,27 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/contact-points/message-templating/
+  - /docs/grafana/latest/alerting/contact-points/test-contact-point/
+  - /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.
--- a/docs/sources/alerting/difference-old-new.md
+++ b/docs/sources/alerting/difference-old-new.md
@@ -1,15 +1,20 @@
-+++
-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
+# What's new in Grafana Alerting

-Grafana alerting has several enhancements over legacy dashboard alerting.
+Grafana Alerting has several enhancements over legacy dashboard alerting.

 ## Multi-dimensional alerting

@@ -23,7 +28,7 @@ Since unified alerts are no longer directly tied to panel queries, they do not i

 ## Create Loki and Grafana Mimir alerting rules

-In Grafana alerting, you can manage Loki and Grafana Mimir alerting rules using the same UI and API as your Grafana managed alerts.
+In Grafana Alerting, you can manage Loki and Grafana Mimir alerting rules using the same UI and API as your Grafana managed alerts.

 ## View and search for alerts from Prometheus compatible data sources

@@ -31,7 +36,7 @@ Alerts for Prometheus compatible data sources are now listed under the Grafana a

 ## Special alerts for alert state NoData and Error

-Grafana alerting introduced a new concept of the alert states. When evaluation of an alerting rule produces state NoData or Error, Grafana alerting will generate special alerts that will have the following labels:
+Grafana Alerting introduced a new concept of the alert states. When evaluation of an alerting rule produces state NoData or Error, Grafana Alerting will generate special alerts that will have the following labels:

 - `alertname` with value DatasourceNoData or DatasourceError depending on the state.
 - `rulename` name of the alert rule the special alert belongs to.
--- a/docs/sources/alerting/fundamentals/_index.md
+++ b/docs/sources/alerting/fundamentals/_index.md
@@ -1,14 +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:
+This section includes the following fundamental concepts of Grafana Alerting:

- [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" >}})
- [Evaluating Grafana managed alerts]({{< relref "./evaluate-grafana-alerts.md" >}})
+- [Annotations and labels for alerting rules]({{< relref "annotation-label/" >}})
+- [Alertmanager]({{< relref "alertmanager/" >}})
+- [State and health of alerting rules]({{< relref "state-and-health/" >}})
+- [Evaluating Grafana managed alerts]({{< relref "evaluate-grafana-alerts/" >}})
--- a/docs/sources/alerting/fundamentals/alert-rules/_index.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md
@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/alert-rules/
+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/" >}})
+- [Alert instances]({{< relref "alert-instances/" >}})
+- [Organising alert rules]({{< relref "organising-alerts/" >}})
+- [Annotation and labels]({{< relref "../annotation-label/" >}})
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md
@@ -0,0 +1,27 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/alert-rules/alert-instances/
+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" >}}
--- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md
@@ -0,0 +1,35 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/alert-rules/alert-rule-types/
+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/" >}}) 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.
--- a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md
@@ -0,0 +1,27 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/alert-rules/organising-alerts/
+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.
--- a/docs/sources/alerting/fundamentals/alertmanager.md
+++ b/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

@@ -12,7 +15,7 @@ Grafana includes built-in support for Prometheus Alertmanager. By default, notif

 > **Note:** Before v8.2, the configuration of the embedded Alertmanager was shared across organizations. If you are on an older Grafana version, we recommend that you use Grafana alerts only if you have one organization. Otherwise, your contact points are visible to all organizations.

-Grafana alerting added support for external Alertmanager configuration. When you add an [Alertmanager data source]({{< relref "../../datasources/alertmanager.md" >}}), the Alertmanager drop-down shows a list of available external Alertmanager data sources. Select a data source to create and manage alerting for standalone Grafana Mimir or Loki data sources.
+Grafana Alerting added support for external Alertmanager configuration. When you add an [Alertmanager data source]({{< relref "../../datasources/alertmanager/" >}}), the Alertmanager drop-down shows a list of available external Alertmanager data sources. Select a data source to create and manage alerting for standalone Grafana Mimir or Loki data sources.

 {{< figure max-width="40%" src="/static/img/docs/alerting/unified/contact-points-select-am-8-0.gif" max-width="250px" caption="Select Alertmanager" >}}

--- a/docs/sources/alerting/fundamentals/annotation-label/_index.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/_index.md
@@ -1,14 +1,22 @@
-+++
-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/fundamentals/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

-Annotations and labels are key value pairs associated with alerts originating from the alerting rule, datasource response, and as a result of alerting rule evaluation. They can be used in alert notifications directly or in [templates]({{< relref "../../contact-points/message-templating/_index.md" >}}) and [template functions]({{< relref "../../contact-points/message-templating/template-functions" >}}) to create notification contact dynamically.
+Annotations and labels are key value pairs associated with alerts originating from the alerting rule, datasource response, and as a result of alerting rule evaluation. They can be used in alert notifications directly or in [templates]({{< relref "../../contact-points/message-templating/" >}}) and [template functions]({{< relref "../../contact-points/message-templating/template-functions/" >}}) to create notification contact dynamically.

 ## Annotations

@@ -20,6 +28,6 @@ Labels are key-value pairs that contain information about, and are used to uniqu

 Before you begin using annotations and labels, familiarize yourself with:

- [Labels in Grafana alerting]({{< relref "./how-to-use-labels.md" >}})
- [How label matching works]({{< relref "./how-to-use-labels.md" >}})
- [Template variables for alerting rule labels and annotations]({{< relref "./variables-label-annotation.md" >}})
+- [Labels in Grafana Alerting]({{< relref "how-to-use-labels/" >}})
+- [How label matching works]({{< relref "how-to-use-labels/" >}})
+- [Template variables for alerting rule labels and annotations]({{< relref "variables-label-annotation/" >}})
--- a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md
@@ -1,18 +1,24 @@
-+++
-title = "Labels in Grafana alerting"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/annotation-label/how-to-use-labels/
+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
+# Labels in Grafana Alerting

 This topic explains why labels are a fundamental component of alerting.

 - The complete set of labels for an alert is what uniquely identifies an alert within Grafana alerts.
- The Alertmanager uses labels to match alerts for [silences]({{< relref "../../silences/_index.md" >}}) and [alert groups]({{< relref "../../alert-groups/_index.md" >}}) in [notification policies]({{< relref "../../notifications/_index.md" >}}).
+- The Alertmanager uses labels to match alerts for [silences]({{< relref "../../silences/" >}}) and [alert groups]({{< relref "../../alert-groups/" >}}) in [notification policies]({{< relref "../../notifications/" >}}).
 - The alerting UI shows labels for every alert instance generated during evaluation of that rule.
 - Contact points can access labels to dynamically generate notifications that contain information specific to the alert that is resulting in a notification.
- Labels can be added to an [alerting rule]({{< relref "../../alerting-rules/_index.md" >}}). These manually configured labels are able to use template functions and reference other labels. Labels added to an alerting rule take precedence in the event of a collision between labels.
+- Labels can be added to an [alerting rule]({{< relref "../../alerting-rules/" >}}). These manually configured labels are able to use template functions and reference other labels. Labels added to an alerting rule take precedence in the event of a collision between labels.

 {{< figure src="/static/img/docs/alerting/unified/rule-edit-details-8-0.png" max-width="550px" caption="Alert details" >}}
--- a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md
@@ -1,13 +1,19 @@
-+++
-title = "Label matchers"
-description = "Learn about labels and label matchers in alerting"
-keywords = ["grafana", "alerting", "guide", "fundamentals"]
-weight = 117
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/annotation-label/labels-and-label-matchers/
+description: Learn about labels and label matchers in alerting
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - fundamentals
+title: Label matchers
+weight: 117
+---

 # How label matching works

-Use labels and label matchers to link alert rules to [notification policies]({{< relref "../../notifications/_index.md" >}}) and [silences]({{< relref "../../silences/_index.md" >}}). This allows for a very flexible way to manage your alert instances, specify which policy should handle them, and which alerts to silence.
+Use labels and label matchers to link alert rules to [notification policies]({{< relref "../../notifications/" >}}) and [silences]({{< relref "../../silences/" >}}). This allows for a very flexible way to manage your alert instances, specify which policy should handle them, and which alerts to silence.

 A label matchers consists of 3 distinct parts, the **label**, the **value** and the **operator**.

--- a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md
@@ -1,16 +1,22 @@
-+++
-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
-+++
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation/
+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

 The following template variables are available when expanding annotations and labels.

-| Name    | Description                                                                                                                                                                                                                                                                                                                                                                                             |
-| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| $labels | The labels from the query or condition. For example, `{{ $labels.instance }}` and `{{ $labels.job }}`. This is unavailable when the rule uses a [classic condition]({{< relref "../../alerting-rules/create-grafana-managed-rule/#single-and-multi-dimensional-rule" >}}).                                                                                                                              |
-| $values | The values of all reduce and math expressions that were evaluated for this alert rule. For example, `{{ $values.A }}`, `{{ $values.A.Labels }}` and `{{ $values.A.Value }}` where `A` is the `refID` of the expression. If the rule uses classic conditions, then a combination of the `refID` and position of the condition is used. For example, `{{ $values.A0.Value }}` or `{{ $values.A1.Value }}` |
-| $value  | The value string of the alert instance. For example, `[ var='A' labels={instance=foo} value=10 ]`.                                                                                                                                                                                                                                                                                                      |
+| Name    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
+| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| $labels | The labels from the query or condition. For example, `{{ $labels.instance }}` and `{{ $labels.job }}`. This is unavailable when the rule uses a [classic condition]({{< relref "../../alerting-rules/create-grafana-managed-rule/#single-and-multi-dimensional-rule" >}}).                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| $values | The values of all reduce and math expressions that were evaluated for this alert rule. For example, `{{ $values.A }}`, `{{ $values.A.Labels }}` and `{{ $values.A.Value }}` where `A` is the `refID` of the expression. If the rule uses classic conditions, then a combination of the `refID` and position of the condition is used. For example, `{{ $values.A0.Value }}` or `{{ $values.A1.Value }}`. If a value can return no data then it is recommended to use either `{{ $values.A }}` where the missing value will show `<no value>` or an if statement to check if `A` exists when using `{{ $values.A.Labels }}` and `{{ $values.A.Value }}`. For example, `{{ if $values.A }}{{ $values.A.Value }}{{ end }}`. |
+| $value  | The value string of the alert instance. For example, `[ var='A' labels={instance=foo} value=10 ]`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
--- a/Show More
+++ b/Show More