"Release: Updated versions in package to 8.5.14" (#547 )

Swap order of login fields
(cherry picked from commit 5ec176cada)
2026-01-06 17:33:49 +08:00 · 2022-09-29 09:51:04 +03:00 · 2022-09-29 09:47:09 +03:00 · 2022-09-29 09:47:03 +03:00 · 2022-09-29 09:46:44 +03:00 · 2022-09-29 09:41:23 +03:00
872 changed files with 5986 additions and 8344 deletions
--- a/.betterer.results
+++ b/.betterer.results
@@ -116,7 +116,7 @@ exports[`no enzyme tests`] = {
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.test.js:1966455998": [
      [14, 17, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js:3568627238": [
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js:3813002651": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.js:3006381933": [
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -21,7 +21,7 @@ DRONE := $(GOBIN)/drone-v1.4.0
 $(DRONE): $(BINGO_DIR)/drone.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
 	@echo "(re)installing $(GOBIN)/drone-v1.4.0"
-	@cd $(BINGO_DIR) && CGO_ENABLED=0 $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone"

 WIRE := $(GOBIN)/wire-v0.5.0
 $(WIRE): $(BINGO_DIR)/wire.mod
--- a/.bingo/drone.mod
+++ b/.bingo/drone.mod
@@ -1,8 +1,7 @@
 module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

-go 1.19
+go 1.17

 replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible

 require github.com/drone/drone-cli v1.4.0 // drone
-require golang.org/x/sys v0.0.0-20221010170243-090e33056c14 
--- a/.bingo/go.mod
+++ b/.bingo/go.mod
@@ -1,3 +1 @@
-module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
-
-go 1.19
+module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
--- a/.drone.star
+++ b/.drone.star
@@ -7,8 +7,7 @@
 load('scripts/drone/pipelines/pr.star', 'pr_pipelines')
 load('scripts/drone/pipelines/main.star', 'main_pipelines')
 load('scripts/drone/pipelines/docs.star', 'docs_pipelines')
-load('scripts/drone/pipelines/release.star', 'release_pipelines', 'publish_image_pipelines',
-'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'verify_release_pipeline')
+load('scripts/drone/pipelines/release.star', 'release_pipelines', 'publish_image_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline')
 load('scripts/drone/version.star', 'version_branch_pipelines')
 load('scripts/drone/pipelines/cron.star', 'cronjobs')
 load('scripts/drone/vault.star', 'secrets')
@@ -18,5 +17,5 @@ def main(ctx):
    return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \
        publish_image_pipelines('public') + publish_image_pipelines('security') + \
        publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \
-        publish_npm_pipelines('public') + publish_packages_pipeline() + [verify_release_pipeline()] + \
+        publish_npm_pipelines('public') + publish_packages_pipeline() + \
        version_branch_pipelines() + cronjobs(edition=edition) + secrets()
--- a/.drone.yml
+++ b/.drone.yml
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -25,16 +25,9 @@ go.sum @grafana/backend-platform
 /.bingo @grafana/backend-platform

 # Continuous Integration
-.drone.yml @grafana/grafana-delivery
-.drone.star @grafana/grafana-delivery
-/scripts/drone/ @grafana/grafana-delivery
-/pkg/build/ @grafana/grafana-delivery
-/.dockerignore @grafana/grafana-delivery
-/Dockerfile @grafana/grafana-delivery
-/Makefile @grafana/grafana-delivery
-/scripts/build/ @grafana/grafana-delivery
-/scripts/list-release-artifacts.sh @grafana/grafana-delivery
-/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-delivery
+.drone.yml @grafana/grafana-release-eng
+.drone.star @grafana/grafana-release-eng
+/scripts/drone/ @grafana/grafana-release-eng

 # Cloud Datasources backend code
 /pkg/tsdb/cloudwatch @grafana/cloud-datasources
@@ -171,4 +164,3 @@ lerna.json @grafana/frontend-ops

 # Cloud middleware
 /grafana-mixin/ @grafana/hosted-grafana-team
-
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -15,4 +15,4 @@
    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported",
    "skipLabels": [ "backport", "no-backport"]
  }
-]
+]
--- a/.github/workflows/auto-milestone.yml
+++ b/.github/workflows/auto-milestone.yml
@@ -1,22 +0,0 @@
-name: Auto-milestone
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-
-      - name: Run auto-milestone
-        uses: grafana/grafana-github-actions-go/auto-milestone@main
-        with:
-          pr: ${{ github.event.pull_request.number }}
-          token: ${{ steps.generate_token.outputs.token }}
--- a/.github/workflows/create-security-patch-from-security-mirror.yml
+++ b/.github/workflows/create-security-patch-from-security-mirror.yml
@@ -1,28 +0,0 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. 
-name: Create security patch
-run-name: create-security-patch
-on:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-    branches:
-      - "main"
-      - "v*.*.*"
-
-# This is run before the pull request has been merged, so we'll run against the src branch
-jobs:
-  trigger_downstream_create_security_patch:
-    concurrency: create-patch-${{ github.ref_name }}
-    uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main
-    if: github.repository == 'grafana/grafana-security-mirror' 
-    with:
-      repo: "${{ github.repository }}"
-      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
-      patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main"
-      patch_repo: "grafana/grafana-security-patches"
-      patch_prefix: "${{ github.event.pull_request.number }}"
-    secrets: inherit
-
--- a/.github/workflows/detect-breaking-changes-build-skip.yml
+++ b/.github/workflows/detect-breaking-changes-build-skip.yml
@@ -1,34 +0,0 @@
-# Workflow for skipping the Levitate detection
-# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github.
-# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.)
-
-name: Levitate / Detect breaking changes
-
-on:
-  pull_request:
-    paths-ignore:
-      - "packages/**"
-    branches:
-      - 'main'
-
-jobs:
-  detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Skipping
-        run: echo "No modifications in the public API (packages/), skipping."
-
-        # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped)
-      - name: Persisting the check output
-        run: |
-          mkdir -p ./levitate
-          echo "{ \"shouldSkip\": true }" > ./levitate/result.json
-
-      # Upload artifact (so it can be used in the more privileged "report" workflow)
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: levitate
-          path: levitate/
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -1,11 +1,6 @@
 name: Levitate / Detect breaking changes

-on: 
-  pull_request:
-    paths:
-      - 'packages/**'
-    branches:
-      - 'main'
+on: pull_request

 jobs:
  buildPR:
--- a/.github/workflows/pr-patch-check.yml
+++ b/.github/workflows/pr-patch-check.yml
@@ -1,26 +0,0 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo Ex: grafana/grafana
-name: Check for patch conflicts
-run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
-on:
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-    branches:
-      - "main"
-      - "v*.*.*"
-      - "release-*"
-
-# Since this is run on a pull request, we want to apply the patches intended for the
-# target branch onto the source branch, to verify compatibility before merging.
-jobs:
-  trigger_downstream_patch_check:
-    uses: grafana/security-patch-actions/.github/workflows/test-patches.yml@main
-    with:
-      src_repo: "${{ github.repository }}"
-      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
-      patch_repo: "${{ github.repository }}-security-patches"
-      patch_ref: "${{ github.base_ref }}" # this is the target branch name, Ex: "main"
-    secrets: inherit
--- a/.github/workflows/publish-technical-documentation-next.yml
+++ b/.github/workflows/publish-technical-documentation-next.yml
@@ -1,38 +0,0 @@
-name: "publish-technical-documentation-next"
-
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "docs/sources/**"
-  workflow_dispatch:
-jobs:
-  sync:
-    if: "github.repository == 'grafana/grafana'"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-
-      - name: "Clone website-sync Action"
-        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-        # GitHub administrator to update the organization secret.
-        # The IT helpdesk can update the organization secret.
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to website repository (next)"
-        uses: "./.github/actions/website-sync"
-        id: "publish-next"
-        with:
-          repository: "grafana/website"
-          branch: "master"
-          host: "github.com"
-          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-          # GitHub administrator to update the organization secret.
-          # The IT helpdesk can update the organization secret.
-          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
-          source_folder: "docs/sources"
-          target_folder: "content/docs/grafana/next"
--- a/.github/workflows/publish-technical-documentation-release.yml
+++ b/.github/workflows/publish-technical-documentation-release.yml
@@ -1,89 +0,0 @@
-name: "publish-technical-documentation-release"
-
-on:
-  push:
-    branches:
-      - v[0-9]+.[0-9]+.x
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-    paths:
-      - "docs/sources/**"
-  workflow_dispatch:
-jobs:
-  sync:
-    if: "github.repository == 'grafana/grafana'"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-        with:
-          fetch-depth: 0
-
-      - name: "Checkout Actions library"
-        uses: "actions/checkout@v3"
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: "./actions"
-
-      - name: "Install Actions from library"
-        run: "npm install --production --prefix ./actions"
-
-      - name: "Determine if there is a matching release tag"
-        id: "has-matching-release-tag"
-        uses: "./actions/has-matching-release-tag"
-        with:
-          ref_name: "${{ github.ref_name }}"
-          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
-          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
-
-      - name: "Generate packages_api docs"
-        uses: "actions/setup-node@v3.2.0"
-        id: "generate-packages_api-docs"
-        with:
-          node-version-file: ".nvmrc"
-
-      - name: "Get yarn cache directory path"
-        id: "yarn-cache-dir-path"
-        run: "echo ::set-output name=dir::$(yarn config get cacheFolder)"
-
-      - uses: "actions/cache@v2.1.7"
-        with:
-          path: "${{ steps.yarn-cache-dir-path.outputs.dir }}"
-          key: "yarn-${{ hashFiles('**/yarn.lock') }}"
-          restore-keys: |
-              yarn-
-
-      - run: "yarn install --immutable"
-
-      - run: "./scripts/ci-reference-docs-build.sh"
-
-      - name: "Determine technical documentation version"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./actions/docs-target"
-        id: "target"
-        with:
-          ref_name: "${{ github.ref_name }}"
-
-      - name: "Clone website-sync Action"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-        # GitHub administrator to update the organization secret.
-        # The IT helpdesk can update the organization secret.
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to website repository (release)"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./.github/actions/website-sync"
-        id: "publish-release"
-        with:
-          repository: "grafana/website"
-          branch: "master"
-          host: "github.com"
-          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-          # GitHub administrator to update the organization secret.
-          # The IT helpdesk can update the organization secret.
-          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
-          source_folder: "docs/sources"
-          target_folder: "content/docs/grafana/${{ steps.target.outputs.target }}"
--- a/.github/workflows/sync-mirror.yml
+++ b/.github/workflows/sync-mirror.yml
@@ -1,25 +0,0 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo, Ex: grafana/grafana
-name: Sync to mirror
-run-name: sync-to-mirror-${{ github.ref_name }}
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - "main"
-      - "v*.*.*"
-      - "release-*"
-
-# This is run after the pull request has been merged, so we'll run against the target branch
-jobs:
-  trigger_downstream_patch_mirror:
-    concurrency: patch-mirror-${{ github.ref_name }}
-    uses: grafana/security-patch-actions/.github/workflows/mirror-branch-and-apply-patches.yml@main
-    if: github.repository == 'grafana/grafana'
-    with:
-      ref: "${{ github.ref_name }}" # this is the target branch name, Ex: "main"
-      src_repo: "${{ github.repository }}"
-      dest_repo: "${{ github.repository }}-security-mirror"
-      patch_repo: "${{ github.repository }}-security-patches"
-    secrets: inherit
-
--- a/.gitignore
+++ b/.gitignore
@@ -59,7 +59,6 @@ public/css/*.min.css
 *.sublime-workspace
 *.swp
 .idea/
-.fleet/
 *.iml
 *.tmp
 .DS_Store
@@ -167,5 +166,3 @@ public/locales/**/*.js

 deployment_tools_config.json

-# Temporary file for backporting PRs
-.pr-body.txt
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,88 +1,3 @@
-<!-- 8.5.27 START -->
-
-# 8.5.27 (2023-06-22)
-
-### Bug fixes
-
- **Auth:** Fixed CVE-2023-3128. [#70576](https://github.com/grafana/grafana/issues/70576), [@zerok](https://github.com/zerok)
-
-<!-- 8.5.27 END -->
-<!-- 8.5.26 START -->
-
-# 8.5.26 (2023-05-22)
-
-### Bugfixes
-
- **Alerting:** Require alert.notifications:write permissions to test receivers and templates
-
-<!-- 8.5.26 END -->
-<!-- 8.5.22 START -->
-
-# 8.5.22 (2023-03-22)
-
-<!-- 8.5.22 END -->
-
-<!-- 8.5.21 START -->
-
-# 8.5.21 (2023-02-28)
-
-<!-- 8.5.21 END -->
-
-<!-- 8.5.20 START -->
-
-# 8.5.20 (2023-01-25)
-
-### Features and enhancements
-
- **Chore:** Upgrade Go to 1.19.4 [v8.5.x]. [#60824](https://github.com/grafana/grafana/pull/60824), [@sakjur](https://github.com/sakjur)
-
-<!-- 8.5.20 END -->
-
-<!-- 8.5.15 START -->
-
-# 8.5.15 (2022-11-08)
-
-### Features and enhancements
-
- **Chore:** Upgrade Go to 1.19.2. [#56857](https://github.com/grafana/grafana/pull/56857), [@sakjur](https://github.com/sakjur)
-
-<!-- 8.5.15 END -->
-
-<!-- 8.5.14 START -->
-
-# 8.5.14 (2022-10-11)
-
-### Features and enhancements
-
- **Access Control:** Allow org admins to invite new users. [#55585](https://github.com/grafana/grafana/pull/55585), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-
-<!-- 8.5.14 END -->
-
-<!-- 8.5.13 START -->
-
-# 8.5.13 (2022-09-20)
-
-### Features and enhancements
-
- **Plugins:** Expose @emotion/react to plugins to prevent load failures. [#55297](https://github.com/grafana/grafana/pull/55297), [@jackw](https://github.com/jackw)
-
-### Bug fixes
-
- **AuthNZ:** Security fixes for CVE-2022-35957 and CVE-2022-36062. [#55495](https://github.com/grafana/grafana/pull/55495), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-
-<!-- 8.5.13 END -->
-
-<!-- 8.5.11 START -->
-
-# 8.5.11 (2022-08-30)
-
-### Features and enhancements
-
- **Rendering:** Add support for renderer token (#54425). [#54438](https://github.com/grafana/grafana/pull/54438), [@joanlopez](https://github.com/joanlopez)
- **Alerting:** AlertingProxy to elevate permissions for request forwarded to data proxy when RBAC enabled. [#53681](https://github.com/grafana/grafana/pull/53681), [@yuri-tceretian](https://github.com/yuri-tceretian)
-
-<!-- 8.5.11 END -->
-
 <!-- 8.5.10 START -->

 # 8.5.10 (2022-08-08)
@@ -92,7 +7,6 @@
 - **RBAC:** Fix Anonymous Editors missing dashboard controls. [#52649](https://github.com/grafana/grafana/pull/52649), [@gamab](https://github.com/gamab)

 <!-- 8.5.10 END -->
-
 <!-- 8.5.9 START -->

 # 8.5.9 (2022-07-14)
@@ -102,7 +16,6 @@
 - **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52238](https://github.com/grafana/grafana/pull/52238), [@xlson](https://github.com/xlson)

 <!-- 8.5.9 END -->
-
 <!-- 8.5.6 START -->

 # 8.5.6 (2022-06-14)
@@ -130,7 +43,6 @@
 - **Alerting:** Remove double quotes from matchers. [#50044](https://github.com/grafana/grafana/pull/50044), [@alexweav](https://github.com/alexweav)

 <!-- 8.5.5 END -->
-
 <!-- 8.5.4 START -->

 # 8.5.4 (2022-05-30)
@@ -342,26 +254,6 @@ When user is using Github OAuth, GitHub login is showed as both Grafana login an

 The meaning of the default data source has now changed from being a persisted property in a panel. Before when you selected the default data source for a panel and later changed the default data source to another data source it would change all panels who were configured to use the default data source. From now on the default data source is just the default for new panels and changing the default will not impact any currently saved dashboards. Issue [#45132](https://github.com/grafana/grafana/issues/45132)

-<!-- 8.4.11 START -->
-
-# 8.4.11 (2022-08-30)
-
-### Features and enhancements
-
- **Rendering:** Add support for renderer token (#54425). [#54437](https://github.com/grafana/grafana/pull/54437), [@joanlopez](https://github.com/joanlopez)
-
-<!-- 8.4.11 END -->
-
-<!-- 8.4.10 START -->
-
-# 8.4.10 (2022-07-14)
-
-### Bug fixes
-
- **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52218](https://github.com/grafana/grafana/pull/52218), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-
-<!-- 8.4.10 END -->
-
 <!-- 8.4.7 START -->

 # 8.4.7 (2022-04-19)
@@ -549,16 +441,6 @@ AngularJS plugin support is now in a deprecated state, meaning it will be remove
 - **News:** Reload feed when changing the time range or refreshing. [#42217](https://github.com/grafana/grafana/pull/42217), [@ashharrison90](https://github.com/ashharrison90)
 - **UI/Plot:** Implement keyboard controls for plot cursor. [#42244](https://github.com/grafana/grafana/pull/42244), [@kaydelaney](https://github.com/kaydelaney)

-<!-- 8.3.11 START -->
-
-# 8.3.11 (2022-08-30)
-
-### Features and enhancements
-
- **Rendering:** Add support for renderer token (#54425). [#54436](https://github.com/grafana/grafana/pull/54436), [@joanlopez](https://github.com/joanlopez)
-
-<!-- 8.3.11 END -->
-
 <!-- 8.3.7 START -->

 # 8.3.7 (2022-03-01)
--- a/4
+++ b/4
@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

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

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

@@ -40,7 +40,7 @@ RUN go mod verify
 RUN make build-go

 # Final stage
-FROM alpine:3.17
+FROM alpine:3.15

 LABEL maintainer="Grafana team <hello@grafana.com>"

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

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

 WORKDIR /src/grafana

--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -437,9 +437,6 @@ sigv4_auth_enabled = false
 # Set to true to enable verbose logging of SigV4 request signing
 sigv4_verbose_logging = false

-# Use email lookup in addition to the unique ID provided by the IdP
-oauth_allow_insecure_email_lookup = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -431,9 +431,6 @@
 # Set to true to enable verbose logging of SigV4 request signing
 ;sigv4_verbose_logging = false

-# Use email lookup in addition to the unique ID provided by the IdP
-;oauth_allow_insecure_email_lookup = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -13,6 +13,7 @@ The following checklist/summary should give you a quick overview of what to ask/
 - Reviewed and approved?
 - All checks passed?
 - Proper pull request title?
+- Milestone assigned?
 - Add to changelog/release notes?
 - Needs backporting?

@@ -34,18 +35,10 @@ See [formatting guidelines](create-pull-request.md#formatting-guidelines) for mo

 ### Assign a milestone

-Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).
+A milestone **should** be added to every pull request. Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).

 This makes it easier to track what changes go into a certain release. Without this information, release managers have to go through git commits which is not an efficient process.

-That being said, _you don't have to assign a milestone manually_ to a pull request.
-Instead, when it is merged & closed then a bot will look for the most appropriate miletone and assign it to the pull request.
-
-That milestone should always reflect the branch that the pull request is merged into.
-For every major and minor release there is a milestone ending with `.x` (e.g. `10.0.x` for the 10.0.x releases).
-Pull requests targetting `main` should use the `.x` milestone of the next minor (or major) version (you can find that version number inside the `package.json` file).
-Backport pull requestss should use the version of the target branch (e.g. `9.4.x` for the `v9.4.x` branch).
-
 ### Include in changelog and release notes?

 At Grafana we generate the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) and [release notes](https://grafana.com/docs/grafana/latest/release-notes/) based on merged pull requests. Including changes in the changelog/release notes is very important to provide a somewhat complete picture of what changes a Grafana release actually includes.
@@ -60,15 +53,15 @@ The changelog/release notes are divided into sections and here's a description o

 **Features and enhancements:**

-Labeled with `add to changelog` and any of the other section rules don't apply.
+Milestone assigned and labeled with `add to changelog` and any of the other section rules don't apply.

 **Bug fixes:**

-Labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.
+Milestone assigned and labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.

 **Plugin development fixes & changes:**

-Labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.
+Milestone assigned and labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.

 **Deprecations:**

--- a/devenv/docker/blocks/alert_webhook_listener/main.go
+++ b/devenv/docker/blocks/alert_webhook_listener/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"  //nolint:staticcheck // No need to change in v8.
+	"io/ioutil"
 	"log"
 	"net/http"
 	"strings"
@@ -25,6 +25,5 @@ func hello(w http.ResponseWriter, r *http.Request) {

 func main() {
 	http.HandleFunc("/", hello)
-	//nolint:gosec
 	log.Fatal(http.ListenAndServe(":3010", nil))
 }
--- a/devenv/docker/blocks/slow_proxy/main.go
+++ b/devenv/docker/blocks/slow_proxy/main.go
@@ -47,6 +47,5 @@ func main() {
 		proxy.ServeHTTP(w, r)
 	})

-	//nolint:gosec
 	log.Fatal(http.ListenAndServe(":3011", nil))
 }
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,28 +1,27 @@
 .PHONY: pull docs docs-quick docs-no-pull docs-test docs-local-static

-PODMAN = $(shell if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)
-IMAGE = grafana/docs-base:latest
-CONTENT_PATH = /hugo/content/docs/grafana/latest
+IMAGE = grafana/grafana-docs-dev:latest
+CONTENT_PATH = /hugo/content/docs/grafana/next
 LOCAL_STATIC_PATH = ../../website/static
 PORT = 3002:3002

 pull:
-	$(PODMAN) pull $(IMAGE)
+	docker pull $(IMAGE)

 docs: pull
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server
+	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server"

-docs-preview: pull
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server BUILD_DRAFTS=true
+docs-quick: pull
+	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "ln -s /frontend-docs/packages_api /hugo/content/docs/grafana/next/packages_api && make server-quick"

 docs-no-pull:
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server
+	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server"

 docs-test: pull
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z --rm -it $(IMAGE) make prod
+	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z --rm -it $(IMAGE) /bin/bash -c 'make prod'

 # expects that you have grafana/website checked out in same path as the grafana repo.
 docs-local-static: pull
 	if [ ! -d "$(LOCAL_STATIC_PATH)" ]; then echo "local path (website project) $(LOCAL_STATIC_PATH) not found"]; exit 1; fi
-	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z \
+	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z \
 		-v $(shell pwd)/$(LOCAL_STATIC_PATH):/hugo/static:Z -p $(PORT) --rm -it $(IMAGE)
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -1,8 +1,9 @@
 ---
 aliases:
+  - /docs/grafana/latest/
+  - /docs/grafana/latest/guides/reference/admin/
  - /docs/grafana/v1.1/
  - /docs/grafana/v3.1/
-  - guides/reference/admin/
 description: Guides, Installation and Feature Documentation
 keywords:
  - grafana
--- a/docs/sources/administration/_index.md
+++ b/docs/sources/administration/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/
 description: Administration
 title: Administration
 weight: 40
--- a/docs/sources/administration/api-keys/_index.md
+++ b/docs/sources/administration/api-keys/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/api-keys/
 description: This section contains information about API keys in Grafana
 keywords:
  - API keys
--- a/docs/sources/administration/api-keys/about-api-keys.md
+++ b/docs/sources/administration/api-keys/about-api-keys.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/api-keys/about-api-keys/
 description: Learn about using API keys in Grafana
 menuTitle: About API keys
 title: About API keys in Grafana
--- a/docs/sources/administration/api-keys/create-api-key.md
+++ b/docs/sources/administration/api-keys/create-api-key.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/api-keys/create-api-key/
 description: How to create an API key in Grafana
 keywords:
  - API keys
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/cli/
 description: Guide to using grafana-cli
 keywords:
  - grafana
--- a/docs/sources/administration/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../installation/configuration/
+  - /docs/grafana/latest/administration/configuration/
+  - /docs/grafana/latest/installation/configuration/
 description: Configuration documentation
 keywords:
  - grafana
--- a/docs/sources/administration/configure-docker.md
+++ b/docs/sources/administration/configure-docker.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../installation/configure-docker/
+  - /docs/grafana/latest/administration/configure-docker/
+  - /docs/grafana/latest/installation/configure-docker/
 description: Guide for configuring the Grafana Docker image
 keywords:
  - grafana
--- a/docs/sources/administration/database-encryption.md
+++ b/docs/sources/administration/database-encryption.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/database-encryption/
 description: Grafana database encryption
 keywords:
  - grafana
--- a/docs/sources/administration/jaeger-instrumentation.md
+++ b/docs/sources/administration/jaeger-instrumentation.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/jaeger-instrumentation/
 description: Jaeger traces emitted and propagation by Grafana
 keywords:
  - grafana
--- a/docs/sources/administration/manage-organizations/_index.md
+++ b/docs/sources/administration/manage-organizations/_index.md
@@ -1,7 +1,8 @@
 ---
 aliases:
-  - ../manage-users/server-admin/
-  - ../manage-users/server-admin/server-admin-manage-orgs/
+  - /docs/grafana/latest/administration/manage-organizations/
+  - /docs/grafana/latest/manage-users/server-admin/
+  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/
 description: Describes how to use organizations to isolate dashboard to users and
  teams.
 keywords:
--- a/docs/sources/administration/manage-user-preferences/_index.md
+++ b/docs/sources/administration/manage-user-preferences/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - change-your-password/
+  - /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
--- a/docs/sources/administration/manage-users-and-permissions/_index.md
+++ b/docs/sources/administration/manage-users-and-permissions/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/
 title: Manage users and permissions
 weight: 200
 ---
--- 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,9 +1,10 @@
 ---
 aliases:
-  - ../../manage-users/
-  - ../../permissions/
-  - ../../permissions/organization_roles/
-  - ../../permissions/overview/
+  - /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
 ---
--- 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,6 +1,7 @@
 ---
 aliases:
-  - ../../permissions/dashboard_folder_permissions/
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/
+  - /docs/grafana/latest/permissions/dashboard_folder_permissions/
 title: Manage dashboard permissions
 weight: 500
 ---
--- 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,6 +1,7 @@
 ---
 aliases:
-  - ../../manage-users/org-admin/
+  - /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
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/
 title: Manage a pending invitation
 weight: 20
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,7 +1,8 @@
 ---
 aliases:
-  - ../../manage-users/server-admin/
-  - ../../manage-users/server-admin/server-admin-manage-users/
+  - /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
 ---
--- 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,6 +1,7 @@
 ---
 aliases:
-  - add-user-to-org/
+  - /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
 ---
--- 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,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/
 title: Add a user
 weight: 10
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,4 +1,6 @@
 ---
+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
 ---
--- 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,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
 title: Grant editors administrator permissions
 weight: 60
 ---
--- 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,6 +1,7 @@
 ---
 aliases:
-  - view-user-account-details/
+  - /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
 ---
--- 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,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/
 title: View a list of users
 weight: 100
 ---
--- 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,9 @@
 ---
 aliases:
-  - ../../manage-users/add-or-remove-user-from-team/
-  - ../../manage-users/create-or-remove-team/
-  - ../../manage-users/manage-teams/
+  - /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
 ---
--- a/docs/sources/administration/preferences/_index.md
+++ b/docs/sources/administration/preferences/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/preferences/
 title: Preferences
 weight: 50
 ---
--- a/docs/sources/administration/preferences/change-grafana-name.md
+++ b/docs/sources/administration/preferences/change-grafana-name.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-name/
 keywords:
  - grafana
  - configuration
@@ -12,7 +14,7 @@ weight: 100

 In Grafana, you can change your names and emails associated with groups or accounts in the Settings or Preferences. This topic provides instructions for each task.

-{{< docs/shared lookup="preferences/some-tasks-require-permissions.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}

 ## Change organization name

@@ -23,7 +25,7 @@ Grafana server administrators and organization administrators can change organiz
 Follow these instructions if you are a Grafana Server Admin.

 {{< docs/list >}}
-{{< docs/shared lookup="manage-users/view-server-org-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "manage-users/view-server-org-list.md" >}}

 1. In the organization list, click the name of the organization that you want to change.
 1. In **Name**, enter the new organization name.
@@ -35,7 +37,7 @@ Follow these instructions if you are a Grafana Server Admin.
 If you are an Organization Admin, follow these steps:

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/org-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}

 1. In **Organization name**, enter the new name.
 1. Click **Update organization name**.
--- a/docs/sources/administration/preferences/change-grafana-theme.md
+++ b/docs/sources/administration/preferences/change-grafana-theme.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-theme/
 description: How to set the Grafana UI theme
 keywords:
  - grafana
@@ -13,7 +15,7 @@ weight: 200

 In Grafana, you can modify the UI theme configured in the Settings or Preferences. Set the UI theme for the server, an organization, a team, or your personal user account using the instructions in this topic.

-{{< docs/shared lookup="preferences/some-tasks-require-permissions.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}

 ## Theme options

@@ -46,8 +48,8 @@ To see what the current settings are, refer to [View server settings]({{< relref
 Organization administrators can change the UI theme for all users in an organization.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/org-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/select-ui-theme-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+{{< docs/shared "preferences/select-ui-theme-list.md" >}}
 {{< /docs/list >}}

 ## Change team UI theme
@@ -55,10 +57,10 @@ Organization administrators can change the UI theme for all users in an organiza
 Organization and team administrators can change the UI theme for all users in a team.

 {{< docs/list >}}
-{{< docs/shared lookup="manage-users/view-team-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "manage-users/view-team-list.md" >}}

 1. Click on the team that you want to change the UI theme for and then navigate to the **Settings** tab.
-   {{< docs/shared lookup="preferences/select-ui-theme-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+   {{< docs/shared "preferences/select-ui-theme-list.md" >}}
   {{< /docs/list >}}

 ## Change your personal UI theme
@@ -66,6 +68,6 @@ Organization and team administrators can change the UI theme for all users in a
 You can change the UI theme for your user account. This setting overrides UI theme settings at higher levels.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/navigate-user-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/select-ui-theme-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
+{{< docs/shared "preferences/select-ui-theme-list.md" >}}
 {{< /docs/list >}}
--- a/docs/sources/administration/preferences/change-grafana-timezone.md
+++ b/docs/sources/administration/preferences/change-grafana-timezone.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/preferences/change-grafana-timezone/
 description: How to change your Grafana timezone
 keywords:
  - grafana
@@ -13,7 +15,7 @@ weight: 400

 By default, Grafana uses the timezone in your web browser. However, you can override this setting at the server, organization, team, or individual user level. This topic provides instructions for each task.

-{{< docs/shared lookup="preferences/some-tasks-require-permissions.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}

 ## Set server timezone

@@ -24,8 +26,8 @@ Grafana server administrators can choose a default timezone for all users on the
 Organization administrators can choose a default timezone for their organization.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/org-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/select-timezone-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+{{< docs/shared "preferences/select-timezone-list.md" >}}
 {{< /docs/list >}}

 ## Set team timezone
@@ -33,10 +35,10 @@ Organization administrators can choose a default timezone for their organization
 Organization administrators and team administrators can choose a default timezone for all users in a team.

 {{< docs/list >}}
-{{< docs/shared lookup="manage-users/view-team-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "manage-users/view-team-list.md" >}}

 1. Click on the team you that you want to change the timezone for and then navigate to the **Settings** tab.
-   {{< docs/shared lookup="preferences/select-timezone-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+   {{< docs/shared "preferences/select-timezone-list.md" >}}
   {{< /docs/list >}}

 ## Set your personal timezone
@@ -44,6 +46,6 @@ Organization administrators and team administrators can choose a default timezon
 You can change the timezone for your user account. This setting overrides timezone settings at higher levels.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/navigate-user-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/select-timezone-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
+{{< docs/shared "preferences/select-timezone-list.md" >}}
 {{< /docs/list >}}
--- a/docs/sources/administration/preferences/change-home-dashboard.md
+++ b/docs/sources/administration/preferences/change-home-dashboard.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../change-home-dashboard/
+  - /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
@@ -15,7 +16,7 @@ weight: 300

 The home dashboard you set is the one all users will see by default when they log in. You can set the home dashboard for the server, an organization, a team, or your personal user account. This topic provides instructions for each task.

-{{< docs/shared lookup="preferences/some-tasks-require-permissions.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}

 ## Navigate to the home dashboard

@@ -52,9 +53,9 @@ default_home_dashboard_path = data/main-dashboard.json
 Organization administrators can choose a home dashboard for their organization.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/navigate-to-the-dashboard-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/org-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/select-home-dashboard-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
 {{< /docs/list >}}

 ## Set home dashboard for your team
@@ -62,11 +63,11 @@ Organization administrators can choose a home dashboard for their organization.
 Organization administrators and Team Admins can choose a home dashboard for a team.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/navigate-to-the-dashboard-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="manage-users/view-team-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
+{{< docs/shared "manage-users/view-team-list.md" >}}

 1. Click on the team that you want to change the home dashboard for and then navigate to the **Settings** tab.
-   {{< docs/shared lookup="preferences/select-home-dashboard-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+   {{< docs/shared "preferences/select-home-dashboard-list.md" >}}
   {{< /docs/list >}}

 ## Set your personal home dashboard
@@ -74,7 +75,7 @@ Organization administrators and Team Admins can choose a home dashboard for a te
 You can choose your own personal home dashboard. This setting overrides all home dashboards set at higher levels.

 {{< docs/list >}}
-{{< docs/shared lookup="preferences/navigate-to-the-dashboard-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/navigate-user-preferences-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
-{{< docs/shared lookup="preferences/select-home-dashboard-list.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
+{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
+{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
 {{< /docs/list >}}
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../installation/provisioning/
+  - /docs/grafana/latest/administration/provisioning/
+  - /docs/grafana/latest/installation/provisioning/
 description: ''
 keywords:
  - grafana
@@ -160,7 +161,6 @@ Since not all datasources have the same configuration settings we only have the
 | httpMethod                 | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                                                                                                                                                                                        |
 | customQueryParameters      | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                                                                                                                                                                                   |
 | manageAlerts               | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                                                                                                                                                                                       |
-| alertmanagerUid            | string  | Prometheus and Loki                                              | UID of Alert Manager that manages Alert for this data source.                                                                                                                                                                                                                                                       |
 | esVersion                  | string  | Elasticsearch                                                    | Elasticsearch version (E.g. `7.0.0`, `7.6.1`)                                                                                                                                                                                                                                                                       |
 | timeField                  | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                                                                                                                                                                                        |
 | interval                   | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                                                                                                                                                                                         |
--- a/docs/sources/administration/security.md
+++ b/docs/sources/administration/security.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../installation/security/
+  - /docs/grafana/latest/administration/security/
+  - /docs/grafana/latest/installation/security/
 description: Security Docs
 keywords:
  - grafana
--- a/docs/sources/administration/service-accounts/_index.md
+++ b/docs/sources/administration/service-accounts/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/
 description: This page contains information about service accounts in Grafana
 keywords:
  - API keys
--- a/docs/sources/administration/service-accounts/about-service-accounts.md
+++ b/docs/sources/administration/service-accounts/about-service-accounts.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/about-service-accounts/
 description: This page contains detailed information about service accounts in Grafana
 menuTitle: About service accounts
 title: About service accounts
--- a/docs/sources/administration/service-accounts/add-service-account-token.md
+++ b/docs/sources/administration/service-accounts/add-service-account-token.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/add-service-account-token/
 description: This topic shows you how to add a token to a service account
 menuTitle: Add a token to a service account
 title: Add a token to a service account in Grafana
--- a/docs/sources/administration/service-accounts/create-service-account.md
+++ b/docs/sources/administration/service-accounts/create-service-account.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/create-service-account/
 description: How to create a service account in Grafana
 keywords:
  - Service accounts
--- a/docs/sources/administration/service-accounts/enable-service-accounts.md
+++ b/docs/sources/administration/service-accounts/enable-service-accounts.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/enable-service-accounts/
 description: This topic shows you how to to enable the service accounts feature in
  Grafana
 keywords:
--- a/docs/sources/administration/set-up-for-high-availability.md
+++ b/docs/sources/administration/set-up-for-high-availability.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../tutorials/ha_setup/
+  - /docs/grafana/latest/administration/set-up-for-high-availability/
+  - /docs/grafana/latest/tutorials/ha_setup/
 keywords:
  - grafana
  - tutorials
--- a/docs/sources/administration/view-server/_index.md
+++ b/docs/sources/administration/view-server/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/administration/view-server/
 title: View server
 weight: 100
 ---
--- a/docs/sources/administration/view-server/internal-metrics.md
+++ b/docs/sources/administration/view-server/internal-metrics.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../../admin/metrics/
+  - /docs/grafana/latest/admin/metrics/
+  - /docs/grafana/latest/administration/view-server/internal-metrics/
 description: Internal metrics exposed by Grafana
 keywords:
  - grafana
@@ -99,7 +100,7 @@ These instructions assume you have already added Graphite as a data source in Gr

 ## Pull metrics from Grafana backend plugin into Prometheus

-Any installed [backend plugin](https://grafana.com/developers/plugin-tools/introduction/backend-plugins) exposes a metrics endpoint through Grafana that you can configure Prometheus to scrape.
+Any installed [backend plugin]({{< relref "../../developers/plugins/backend/_index.md" >}}) exposes a metrics endpoint through Grafana that you can configure Prometheus to scrape.

 These instructions assume you have already added Prometheus as a data source in Grafana.

--- a/docs/sources/administration/view-server/view-server-settings.md
+++ b/docs/sources/administration/view-server/view-server-settings.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../../admin/view-server-settings/
+  - /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
--- a/docs/sources/administration/view-server/view-server-stats.md
+++ b/docs/sources/administration/view-server/view-server-stats.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../../admin/view-server-stats/
+  - /docs/grafana/latest/admin/view-server-stats/
+  - /docs/grafana/latest/administration/view-server/view-server-stats/
 keywords:
  - grafana
  - server
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/
 title: Alerts
 weight: 110
 ---
--- a/docs/sources/alerting/old-alerting/_index.md
+++ b/docs/sources/alerting/old-alerting/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/old-alerting/
 title: Legacy Grafana Alerts
 weight: 114
 ---
@@ -23,4 +25,4 @@ You can perform the following tasks for alerts:
 - [Test alert rules and troubleshoot]({{< relref "troubleshoot-alerts.md" >}})
 - [Add or edit an alert contact point]({{< relref "notifications.md" >}})

-{{< docs/shared lookup="alerts/grafana-managed-alerts.md" source="grafana" version="<GRAFANA VERSION>" >}}
+{{< docs/shared "alerts/grafana-managed-alerts.md" >}}
--- a/docs/sources/alerting/old-alerting/add-notification-template.md
+++ b/docs/sources/alerting/old-alerting/add-notification-template.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../add-notification-template/
+  - /docs/grafana/latest/alerting/add-notification-template/
+  - /docs/grafana/latest/alerting/old-alerting/add-notification-template/
 keywords:
  - grafana
  - documentation
--- a/docs/sources/alerting/old-alerting/create-alerts.md
+++ b/docs/sources/alerting/old-alerting/create-alerts.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../create-alerts/
+  - /docs/grafana/latest/alerting/create-alerts/
+  - /docs/grafana/latest/alerting/old-alerting/create-alerts/
 description: Configure alert rules
 keywords:
  - grafana
--- a/docs/sources/alerting/old-alerting/notifications.md
+++ b/docs/sources/alerting/old-alerting/notifications.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../notifications/
+  - /docs/grafana/latest/alerting/notifications/
+  - /docs/grafana/latest/alerting/old-alerting/notifications/
 description: Alerting notifications guide
 keywords:
  - Grafana
@@ -70,7 +71,7 @@ These examples show how often and when reminders are sent for a triggered alert.
 | Prometheus Alertmanager                       | `prometheus-alertmanager` | yes, external only | yes                      |
 | [Pushover](#pushover)                         | `pushover`                | yes                | no                       |
 | Sensu                                         | `sensu`                   | yes, external only | no                       |
-| Sensu Go                                      | `sensugo`                 | yes, external only | no                       |
+| [Sensu Go](#sensu-go)                         | `sensugo`                 | yes, external only | no                       |
 | [Slack](#slack)                               | `slack`                   | yes                | no                       |
 | Telegram                                      | `telegram`                | yes                | no                       |
 | Threema                                       | `threema`                 | yes, external only | no                       |
@@ -264,7 +265,7 @@ Alertmanager handles alerts sent by client applications such as Prometheus serve

 ### Sensu Go

-Grafana alert notifications can be sent to Sensu Go as events via the API. This operation requires an API key. For information on creating this key, refer to [Sensu Go documentation](https://docs.sensu.io/sensu-go/latest/operations/control-access/use-apikeys/#api-key-authentication).
+Grafana alert notifications can be sent to [Sensu](<(https://sensu.io)>) Go as events via the API. This operation requires an API key. For information on creating this key, refer to [Sensu Go documentation](https://docs.sensu.io/sensu-go/latest/operations/control-access/use-apikeys/#api-key-authentication).

 ## Enable images in notifications {#external-image-store}

--- a/docs/sources/alerting/old-alerting/pause-an-alert-rule.md
+++ b/docs/sources/alerting/old-alerting/pause-an-alert-rule.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../pause-an-alert-rule/
+  - /docs/grafana/latest/alerting/old-alerting/pause-an-alert-rule/
+  - /docs/grafana/latest/alerting/pause-an-alert-rule/
 description: Pause an existing alert rule
 keywords:
  - grafana
--- a/docs/sources/alerting/old-alerting/troubleshoot-alerts.md
+++ b/docs/sources/alerting/old-alerting/troubleshoot-alerts.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../troubleshoot-alerts/
+  - /docs/grafana/latest/alerting/old-alerting/troubleshoot-alerts/
+  - /docs/grafana/latest/alerting/troubleshoot-alerts/
 description: Troubleshoot alert rules
 keywords:
  - grafana
--- a/docs/sources/alerting/old-alerting/view-alerts.md
+++ b/docs/sources/alerting/old-alerting/view-alerts.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../view-alerts/
+  - /docs/grafana/latest/alerting/old-alerting/view-alerts/
+  - /docs/grafana/latest/alerting/view-alerts/
 description: View existing alert rules
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/_index.md
+++ b/docs/sources/alerting/unified-alerting/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - metrics/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/
 title: Grafana alerts
 weight: 113
 ---
@@ -9,7 +10,7 @@ weight: 113

 Grafana 8.0 has new and improved alerting that centralizes alerting information in a single, searchable view. It is enabled by default for all new OSS instances, and is an [opt-in]({{< relref "./opt-in.md" >}}) feature for older installations that still use legacy dashboard alerting. We encourage you to create issues in the Grafana GitHub repository for bugs found while testing Grafana alerting. See also, [What's New with Grafana alerting]({{< relref "./difference-old-new.md" >}}).

-> Refer to [Fine-grained access control]({{< relref "../../enterprise/access-control" >}}) in Grafana Enterprise to learn more about controlling access to alerts using fine-grained permissions.
+> Refer to [Fine-grained access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using fine-grained permissions.

 When Grafana alerting is enabled, you can:

--- a/docs/sources/alerting/unified-alerting/alert-groups.md
+++ b/docs/sources/alerting/unified-alerting/alert-groups.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
 description: Alert groups
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/alerting-rules/_index.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../rules/
+  - /docs/grafana/latest/alerting/rules/
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/
 title: Create and manage rules
 weight: 130
 ---
--- a/docs/sources/alerting/unified-alerting/alerting-rules/alert-annotation-label.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/alert-annotation-label.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/
 description: Annotations and labels for alerting
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/
 description: Create Grafana managed alert rule
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /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
--- a/docs/sources/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - create-cortex-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-rule/
 description: Create Grafana Mimir or Loki managed alerting rule
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /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
--- a/docs/sources/alerting/unified-alerting/alerting-rules/rule-list.md
+++ b/docs/sources/alerting/unified-alerting/alerting-rules/rule-list.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/
 description: Manage alerting rules
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/contact-points.md
+++ b/docs/sources/alerting/unified-alerting/contact-points.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/contact-points/
 description: Create or edit contact point
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/difference-old-new.md
+++ b/docs/sources/alerting/unified-alerting/difference-old-new.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/
 description: What's New with Grafana alerts
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/fundamentals/_index.md
+++ b/docs/sources/alerting/unified-alerting/fundamentals/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../metrics/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/
 title: Alerting fundamentals
 weight: 120
 ---
--- a/docs/sources/alerting/unified-alerting/fundamentals/alertmanager.md
+++ b/docs/sources/alerting/unified-alerting/fundamentals/alertmanager.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../../metrics/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/
 title: Alertmanager
 weight: 116
 ---
--- a/docs/sources/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts.md
+++ b/docs/sources/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../../metrics/
+  - /docs/grafana/latest/alerting/metrics/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/
 title: Alerting on numeric data
 weight: 116
 ---
@@ -18,7 +19,7 @@ Grafana managed alerts query the following backend data sources that have alerti

 - built-in data sources or those developed and maintained by Grafana: `Graphite`, `Prometheus`, `Loki`, `InfluxDB`, `Elasticsearch`,
  `Google Cloud Monitoring`, `Cloudwatch`, `Azure Monitor`, `MySQL`, `PostgreSQL`, `MSSQL`, `OpenTSDB`, `Oracle`, and `Azure Monitor`
- community developed backend data sources with alerting enabled (`backend` and `alerting` properties are set in the [plugin.json](https://grafana.com/developers/plugin-tools/reference-plugin-json))
+- community developed backend data sources with alerting enabled (`backend` and `alerting` properties are set in the [plugin.json]({{< relref "../../../developers/plugins/metadata.md" >}}))

 ### Metrics from the alerting engine

--- a/docs/sources/alerting/unified-alerting/fundamentals/state-and-health.md
+++ b/docs/sources/alerting/unified-alerting/fundamentals/state-and-health.md
@@ -1,5 +1,6 @@
 ---
 aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/state-and-health/
  - /docs/grafana/llatest/alerting/unified-alerting/alerting-rules/state-and-health/
 description: State and Health of alerting rules
 keywords:
--- a/docs/sources/alerting/unified-alerting/high-availability.md
+++ b/docs/sources/alerting/unified-alerting/high-availability.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/high-availability/
 description: High Availability
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/message-templating/_index.md
+++ b/docs/sources/alerting/unified-alerting/message-templating/_index.md
@@ -1,6 +1,7 @@
 ---
 aliases:
-  - ../message-templating/
+  - /docs/grafana/latest/alerting/message-templating/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
 description: Message templating
 keywords:
  - grafana
--- a/docs/sources/alerting/unified-alerting/message-templating/template-data.md
+++ b/docs/sources/alerting/unified-alerting/message-templating/template-data.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/
 keywords:
  - grafana
  - alerting
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Grot (@grafanabot)	5bc88988a5	"Release: Updated versions in package to 8.5.14" (#547 )	2022-09-29 09:51:04 +03:00
linoman	f5da388041	Swap order of login fields (cherry picked from commit `5ec176cada`)	2022-09-29 09:47:09 +03:00
linoman	5644758f0c	Add test for username/login field conflict (cherry picked from commit `7aabcf2694`)	2022-09-29 09:47:03 +03:00
Marcus Efraimsson	c658816f52	Security: Fix do not forward login cookie in outgoing requests (cherry picked from commit 54a32fc83b233f5910495b5fcca0b4f881221538)	2022-09-29 09:46:44 +03:00
Marcus Efraimsson	4dd56e4dab	Security: Make proxy endpoints not leak sensitive HTTP headers Fixes CVE-2022-31130 (cherry picked from commit 2974574a53ab6d26be7b706e76271173a91fea3a)	2022-09-29 09:41:23 +03:00
Will Browne	f68f621342	remove support for v1 (cherry picked from commit 8630a7a991af74edc4030f57d37a4bc263202fde)	2022-09-29 09:40:23 +03:00
Grot (@grafanabot)	38d274060d	"Release: Updated versions in package to 8.5.13" (#529 )	2022-09-20 10:28:06 +01:00
Ieva	e258dde881	V8.5.12 security patch (#486 ) * Data source: prevent from using auth proxy header as custom data source header (#477) * apply security changes for auth proxy permission escalation * add links to CVE * remove duplicate check * apply security fix for admin only folder migration (#484) Co-authored-by: Karl Persson <kalle.persson@grafana.com>	2022-09-20 10:12:24 +01:00