upgrade grabpl; set GRAFANA_BRANCH on init-enterprise steps

[v8.5.x] Chore: Upgrade Go to 1.19.9 (#67817 )
Chore: Upgrade Go to 1.19.9
2023-05-08 10:44:49 -05:00 · 2023-05-04 13:20:40 +03:00 · 2023-04-27 14:38:30 +03:00 · 2023-04-26 11:45:07 +03:00 · 2023-04-26 11:27:26 +03:00 · 2023-04-24 12:54:58 -05:00
872 changed files with 3573 additions and 2346 deletions
@@ -41,8 +41,8 @@ exports[`no enzyme tests`] = {
    "packages/grafana-ui/src/components/Logs/LogRows.test.tsx:3121815234": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:375894800": [
-      [0, 19, 13, "RegExp match", "2409514259"]
+    "packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:2976628669": [
+      [0, 26, 13, "RegExp match", "2409514259"]
    ],
    "packages/grafana-ui/src/components/Slider/Slider.test.tsx:751112695": [
      [0, 17, 13, "RegExp match", "2409514259"]
@@ -56,16 +56,16 @@ exports[`no enzyme tests`] = {
    "packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.test.tsx:3512289373": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/slate-plugins/braces.test.tsx:1440546721": [
+    "packages/grafana-ui/src/slate-plugins/braces.test.tsx:1691463920": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/slate-plugins/clear.test.tsx:1085648664": [
+    "packages/grafana-ui/src/slate-plugins/clear.test.tsx:3927593033": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/slate-plugins/runner.test.tsx:446043290": [
+    "packages/grafana-ui/src/slate-plugins/runner.test.tsx:1123710822": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/slate-plugins/suggestions.test.tsx:3654981205": [
+    "packages/grafana-ui/src/slate-plugins/suggestions.test.tsx:2682912140": [
      [0, 18, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.test.js:1974748555": [
@@ -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:3813002651": [
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js:3568627238": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.js:3006381933": [
@@ -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) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone"
+	@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"

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

-go 1.17
+go 1.19

 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 
@@ -1 +1,3 @@
-module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.
+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
@@ -25,9 +25,14 @@ go.sum @grafana/backend-platform
 /.bingo @grafana/backend-platform

 # Continuous Integration
-.drone.yml @grafana/grafana-release-eng
-.drone.star @grafana/grafana-release-eng
-/scripts/drone/ @grafana/grafana-release-eng
+.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

 # Cloud Datasources backend code
 /pkg/tsdb/cloudwatch @grafana/cloud-datasources
@@ -4,12 +4,10 @@
  ],
  "enabledManagers": ["npm"],
  "ignoreDeps": [
-    "@grafana/slate-react", // should be updated when the `slate` package is updated
    "@types/systemjs",
    "@types/d3-force", // we should bump this once we move to esm modules
    "@types/d3-interpolate", // we should bump this once we move to esm modules
    "@types/d3-scale-chromatic", // we should bump this once we move to esm modules
-    "@types/grafana__slate-react", // should be updated when the `slate` package is updated
    "@types/react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
    "commander", // we are planning to remove this, so no need to update it
    "d3",
@@ -23,8 +21,6 @@
    "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
    "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
    "react-router-dom", // we should bump this together with history
-    "slate",
-    "slate-plain-serializer",
    "systemjs",
    "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
    "ts-loader", // we should remove ts-loader and use babel-loader instead
@@ -0,0 +1,34 @@
+# 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/
@@ -1,6 +1,11 @@
 name: Levitate / Detect breaking changes

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

 jobs:
  buildPR:
@@ -15,6 +20,10 @@ jobs:
      with: 
        path: './pr'

+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16.16.0
+
    - name: Get yarn cache directory path
      id: yarn-cache-dir-path
      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -56,6 +65,10 @@ jobs:
        path: './base'
        ref: ${{ github.event.pull_request.base.ref }}

+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16.16.0
+
    - name: Get yarn cache directory path
      id: yarn-cache-dir-path
      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -0,0 +1,38 @@
+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"
@@ -0,0 +1,89 @@
+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: '16'
+
+      - 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 }}"
@@ -59,6 +59,7 @@ public/css/*.min.css
 *.sublime-workspace
 *.swp
 .idea/
+.fleet/
 *.iml
 *.tmp
 .DS_Store
@@ -117,6 +118,7 @@ debug.test

 /scripts/build/release_publisher/release_publisher
 *.patch
+!.yarn/patches/*.patch

 # Ignoring frontend packages specifics
 /packages/**/dist
@@ -3,40 +3,37 @@ enableTelemetry: false
 nodeLinker: pnp

 packageExtensions:
-  "@grafana/slate-react@0.22.10-grafana":
-    peerDependencies:
-      slate-react: ">=0.22.0"
-  "@mdx-js/loader@1.6.22":
+  '@mdx-js/loader@1.6.22':
    peerDependencies:
      react: 17.0.1
-  "@storybook/addon-docs@6.4.15":
+  '@storybook/addon-docs@6.4.15':
    peerDependencies:
-      "@storybook/manager-webpack5": 6.4.15
-  "@storybook/addon-essentials@6.4.15":
+      '@storybook/manager-webpack5': 6.4.15
+  '@storybook/addon-essentials@6.4.15':
    peerDependencies:
-      "@storybook/components": 6.4.15
-      "@storybook/core-events": 6.4.15
-      "@storybook/manager-webpack5": 6.4.15
-      "@storybook/theming": 6.4.15
-  "@storybook/core-server@6.4.15":
+      '@storybook/components': 6.4.15
+      '@storybook/core-events': 6.4.15
+      '@storybook/manager-webpack5': 6.4.15
+      '@storybook/theming': 6.4.15
+  '@storybook/core-server@6.4.15':
    peerDependencies:
-      "@babel/core": ^7.0.0
-  "@storybook/core@6.4.15":
+      '@babel/core': ^7.0.0
+  '@storybook/core@6.4.15':
    peerDependencies:
-      "@babel/core": ^7.0.0
-      "@storybook/manager-webpack5": 6.4.15
-  "@storybook/csf-tools@6.4.15":
+      '@babel/core': ^7.0.0
+      '@storybook/manager-webpack5': 6.4.15
+  '@storybook/csf-tools@6.4.15':
    peerDependencies:
-      "@babel/core": ^7.0.0
-  "@storybook/react@6.4.15":
+      '@babel/core': ^7.0.0
+  '@storybook/react@6.4.15':
    peerDependencies:
-      "@storybook/manager-webpack5": 6.4.15
+      '@storybook/manager-webpack5': 6.4.15
  doctrine@3.0.0:
    dependencies:
      assert: 2.0.0
  moveable@0.28.0:
    dependencies:
-      "@daybrush/utils": 1.6.0
+      '@daybrush/utils': 1.6.0
      framework-utils: ^1.1.0
  rc-time-picker@3.7.3:
    peerDependencies:
@@ -51,9 +48,9 @@ packageExtensions:
      react-simple-compat: 1.2.1
  react-compat-moveable@0.16.0:
    dependencies:
-      "@egjs/agent": ^2.2.1
-      "@egjs/children-differ": ^1.0.1
-      "@scena/matrix": 1.1.1
+      '@egjs/agent': ^2.2.1
+      '@egjs/children-differ': ^1.0.1
+      '@scena/matrix': 1.1.1
      css-to-mat: ^1.0.3
      gesto: ^1.7.0
      overlap-area: ^1.0.0
@@ -65,17 +62,17 @@ packageExtensions:
      webpack: 4.41.5
  react-icons@2.2.7:
    peerDependencies:
-      prop-types: "*"
+      prop-types: '*'
  react-resizable@3.0.4:
    peerDependencies:
      react-dom: 17.0.1

 plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
-    spec: "@yarnpkg/plugin-typescript"
+    spec: '@yarnpkg/plugin-typescript'
  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
+    spec: '@yarnpkg/plugin-interactive-tools'
  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
-    spec: "https://mskelton.dev/yarn-outdated/v2"
+    spec: 'https://mskelton.dev/yarn-outdated/v2'

 yarnPath: .yarn/releases/yarn-3.2.0.cjs
@@ -1,3 +1,80 @@
+<!-- 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)
+
+### Bug fixes
+
+- **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)
@@ -7,6 +84,7 @@
 - **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)
@@ -34,6 +112,7 @@
 - **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)
@@ -245,6 +324,26 @@ 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)
@@ -432,6 +531,16 @@ 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)
@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.17.11-alpine3.15 as go-builder
+FROM golang:1.19.9-alpine3.17 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.15
+FROM alpine:3.17

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

@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

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

 WORKDIR /src/grafana

@@ -1020,6 +1020,8 @@ container_name =
 server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 callback_url =
+# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
+renderer_token = -
 # Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 # which this setting can help protect against by only allowing a certain amount of concurrent requests.
 concurrent_render_request_limit = 30
@@ -999,6 +999,8 @@
 ;server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
+# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
+;renderer_token = -
 # Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 # which this setting can help protect against by only allowing a certain amount of concurrent requests.
 ;concurrent_render_request_limit = 30
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
+	"io/ioutil"  //nolint:staticcheck // No need to change in v8.
 	"log"
 	"net/http"
 	"strings"
@@ -25,5 +25,6 @@ func hello(w http.ResponseWriter, r *http.Request) {

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

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

-IMAGE = grafana/grafana-docs-dev:latest
-CONTENT_PATH = /hugo/content/docs/grafana/next
+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
 LOCAL_STATIC_PATH = ../../website/static
 PORT = 3002:3002

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

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

-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-preview: pull
+	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) make server BUILD_DRAFTS=true

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

 docs-test: pull
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z --rm -it $(IMAGE) /bin/bash -c 'make prod'
+	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z --rm -it $(IMAGE) 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
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z \
+	$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z \
 		-v $(shell pwd)/$(LOCAL_STATIC_PATH):/hugo/static:Z -p $(PORT) --rm -it $(IMAGE)
@@ -1,9 +1,8 @@
 ---
 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
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/
 description: Administration
 title: Administration
 weight: 40
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/api-keys/
 description: This section contains information about API keys in Grafana
 keywords:
  - API keys
@@ -1,6 +1,4 @@
 ---
-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
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/api-keys/create-api-key/
 description: How to create an API key in Grafana
 keywords:
  - API keys
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/cli/
 description: Guide to using grafana-cli
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/configuration/
-  - /docs/grafana/latest/installation/configuration/
+  - ../installation/configuration/
 description: Configuration documentation
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/configure-docker/
-  - /docs/grafana/latest/installation/configure-docker/
+  - ../installation/configure-docker/
 description: Guide for configuring the Grafana Docker image
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/database-encryption/
 description: Grafana database encryption
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/jaeger-instrumentation/
 description: Jaeger traces emitted and propagation by Grafana
 keywords:
  - grafana
@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-organizations/
-  - /docs/grafana/latest/manage-users/server-admin/
-  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/
+  - ../manage-users/server-admin/
+  - ../manage-users/server-admin/server-admin-manage-orgs/
 description: Describes how to use organizations to isolate dashboard to users and
  teams.
 keywords:
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/change-your-password/
-  - /docs/grafana/latest/administration/manage-user-preferences/
+  - change-your-password/
 description: Learn how to update your user preferences and switch organizations
 keywords:
  - password
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/
 title: Manage users and permissions
 weight: 200
 ---
@@ -1,10 +1,9 @@
 ---
 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/
+  - ../../manage-users/
+  - ../../permissions/
+  - ../../permissions/organization_roles/
+  - ../../permissions/overview/
 title: About users and permissions
 weight: 100
 ---
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/
-  - /docs/grafana/latest/permissions/dashboard_folder_permissions/
+  - ../../permissions/dashboard_folder_permissions/
 title: Manage dashboard permissions
 weight: 500
 ---
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/
-  - /docs/grafana/latest/manage-users/org-admin/
+  - ../../manage-users/org-admin/
 title: Manage users in an organization
 weight: 400
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/
 title: Manage a pending invitation
 weight: 20
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,8 +1,7 @@
 ---
 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/
+  - ../../manage-users/server-admin/
+  - ../../manage-users/server-admin/server-admin-manage-users/
 title: Manage users globally
 weight: 300
 ---
@@ -1,7 +1,6 @@
 ---
 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/
+  - add-user-to-org/
 title: Add or remove a user from an organization
 weight: 30
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/
 title: Add a user
 weight: 10
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,6 +1,4 @@
 ---
-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
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
 title: Grant editors administrator permissions
 weight: 60
 ---
@@ -1,7 +1,6 @@
 ---
 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/
+  - view-user-account-details/
 title: View and edit a user account
 weight: 110
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/
 title: View a list of users
 weight: 100
 ---
@@ -1,9 +1,8 @@
 ---
 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/
+  - ../../manage-users/add-or-remove-user-from-team/
+  - ../../manage-users/create-or-remove-team/
+  - ../../manage-users/manage-teams/
 title: Manage teams
 weight: 600
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/preferences/
 title: Preferences
 weight: 50
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/preferences/change-grafana-name/
 keywords:
  - grafana
  - configuration
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/preferences/change-grafana-theme/
 description: How to set the Grafana UI theme
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/preferences/change-grafana-timezone/
 description: How to change your Grafana timezone
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/change-home-dashboard/
-  - /docs/grafana/latest/administration/preferences/change-home-dashboard/
+  - ../change-home-dashboard/
 description: How to replace the default home dashboard
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/provisioning/
-  - /docs/grafana/latest/installation/provisioning/
+  - ../installation/provisioning/
 description: ''
 keywords:
  - grafana
@@ -161,6 +160,7 @@ 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'                                                                                                                                                                                                                         |
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/security/
-  - /docs/grafana/latest/installation/security/
+  - ../installation/security/
 description: Security Docs
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/service-accounts/
 description: This page contains information about service accounts in Grafana
 keywords:
  - API keys
@@ -1,6 +1,4 @@
 ---
-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
@@ -1,6 +1,4 @@
 ---
-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
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/service-accounts/create-service-account/
 description: How to create a service account in Grafana
 keywords:
  - Service accounts
@@ -1,6 +1,4 @@
 ---
-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:
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/set-up-for-high-availability/
-  - /docs/grafana/latest/tutorials/ha_setup/
+  - ../tutorials/ha_setup/
 keywords:
  - grafana
  - tutorials
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/view-server/
 title: View server
 weight: 100
 ---
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/admin/metrics/
-  - /docs/grafana/latest/administration/view-server/internal-metrics/
+  - ../../admin/metrics/
 description: Internal metrics exposed by Grafana
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/admin/view-server-settings/
-  - /docs/grafana/latest/administration/view-server/view-server-settings/
+  - ../../admin/view-server-settings/
 description: How to view server settings in the Grafana UI
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/admin/view-server-stats/
-  - /docs/grafana/latest/administration/view-server/view-server-stats/
+  - ../../admin/view-server-stats/
 keywords:
  - grafana
  - server
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/
 title: Alerts
 weight: 110
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/old-alerting/
 title: Legacy Grafana Alerts
 weight: 114
 ---
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/add-notification-template/
-  - /docs/grafana/latest/alerting/old-alerting/add-notification-template/
+  - ../add-notification-template/
 keywords:
  - grafana
  - documentation
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/create-alerts/
-  - /docs/grafana/latest/alerting/old-alerting/create-alerts/
+  - ../create-alerts/
 description: Configure alert rules
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/notifications/
-  - /docs/grafana/latest/alerting/old-alerting/notifications/
+  - ../notifications/
 description: Alerting notifications guide
 keywords:
  - Grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/old-alerting/pause-an-alert-rule/
-  - /docs/grafana/latest/alerting/pause-an-alert-rule/
+  - ../pause-an-alert-rule/
 description: Pause an existing alert rule
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/old-alerting/troubleshoot-alerts/
-  - /docs/grafana/latest/alerting/troubleshoot-alerts/
+  - ../troubleshoot-alerts/
 description: Troubleshoot alert rules
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/old-alerting/view-alerts/
-  - /docs/grafana/latest/alerting/view-alerts/
+  - ../view-alerts/
 description: View existing alert rules
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/metrics/
-  - /docs/grafana/latest/alerting/unified-alerting/
+  - metrics/
 title: Grafana alerts
 weight: 113
 ---
@@ -10,7 +9,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/_index.md" >}}) 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" >}}) in Grafana Enterprise to learn more about controlling access to alerts using fine-grained permissions.

 When Grafana alerting is enabled, you can:

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
 description: Alert groups
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/rules/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/
+  - ../rules/
 title: Create and manage rules
 weight: 130
 ---
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/
 description: Annotations and labels for alerting
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/
 description: Create Grafana managed alert rule
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-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
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /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/
+  - create-cortex-loki-managed-recording-rule/
 description: Create Grafana Mimir or Loki managed alerting rule
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-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
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/
 description: Manage alerting rules
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/contact-points/
 description: Create or edit contact point
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/
 description: What's New with Grafana alerts
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/metrics/
-  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/
+  - ../metrics/
 title: Alerting fundamentals
 weight: 120
 ---
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/metrics/
-  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/
+  - ../../metrics/
 title: Alertmanager
 weight: 116
 ---
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/metrics/
-  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/
+  - ../../metrics/
 title: Alerting on numeric data
 weight: 116
 ---
@@ -1,6 +1,5 @@
 ---
 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:
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/high-availability/
 description: High Availability
 keywords:
  - grafana
@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
 description: Message templating
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/
 keywords:
  - grafana
  - alerting
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
 keywords:
  - grafana
  - alerting
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/notifications/
 description: Notification policies
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/notifications/mute-timings/
 description: Mute timings
 keywords:
  - grafana
@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/unified-alerting/opt-in/
 description: Enable Grafana alerts
 title: Opt-in to Grafana alerting
 weight: 115
--- a/Show More
+++ b/Show More