Fix tests

Alerting docs: updates eval group and provisioning topics for support (#81066)

(cherry picked from commit f9486ad2ee)

Co-authored-by: brendamuir <100768211+brendamuir@users.noreply.github.com>

.betterer.results

@@ -5206,7 +5206,7 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/geomap/utils/selection.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
-    "public/app/plugins/panel/geomap/utils/tootltip.ts:5381": [
+    "public/app/plugins/panel/geomap/utils/tooltip.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"]
     ],

.changelog-archive/CHANGELOG.7.md

@@ -1294,7 +1294,7 @@ This option to group query variable values into groups by tags has been an exper
 **Deprecation warnings**
 
 - Scripted dashboards is now deprecated. The feature is not removed but will be in a future release. We hope to address the underlying requirement of dynamic dashboards in a different way. [#24059](https://github.com/grafana/grafana/issues/24059)
-- The unofficial first version of backend plugins together with usage of [grafana/grafana-plugin-model](https://github.com/grafana/grafana-plugin-model) is now deprecated and support for that will be removed in a future release. Please refer to [backend plugins documentation](https://grafana.com/docs/grafana/latest/developers/plugins/backend/) for information about the new officially supported backend plugins.
+- The unofficial first version of backend plugins together with usage of [grafana/grafana-plugin-model](https://github.com/grafana/grafana-plugin-model) is now deprecated and support for that will be removed in a future release. Please refer to [backend plugins documentation](/developers/plugin-tools/introduction/backend-plugins) for information about the new officially supported backend plugins.
 
 ## 7.0 Feature highlights
 

.codespellignore

@@ -0,0 +1,5 @@
+aks
+eror
+iam
+wan
+operato

.drone.star

@@ -7,58 +7,47 @@
 This module returns a Drone configuration including pipelines and secrets.
 """
 
-load("scripts/drone/events/pr.star", "pr_pipelines")
+load("scripts/drone/events/cron.star", "cronjobs")
 load("scripts/drone/events/main.star", "main_pipelines")
+load("scripts/drone/events/pr.star", "pr_pipelines")
 load(
     "scripts/drone/events/release.star",
-    "enterprise2_pipelines",
-    "enterprise_pipelines",
     "integration_test_pipelines",
-    "oss_pipelines",
     "publish_artifacts_pipelines",
     "publish_npm_pipelines",
     "publish_packages_pipeline",
-    "verify_release_pipeline",
+)
+load(
+    "scripts/drone/pipelines/ci_images.star",
+    "publish_ci_windows_test_image_pipeline",
 )
 load(
     "scripts/drone/pipelines/publish_images.star",
     "publish_image_pipelines_public",
 )
-load(
-    "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_windows_test_image_pipeline",
-)
-load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
-load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
 load(
     "scripts/drone/pipelines/windows.star",
     "windows_test_backend",
 )
-load("scripts/drone/version.star", "version_branch_pipelines")
-load("scripts/drone/events/cron.star", "cronjobs")
+load(
+    "scripts/drone/rgm.star",
+    "rgm",
+)
 load("scripts/drone/vault.star", "secrets")
 
 def main(_ctx):
     return (
         pr_pipelines() +
         main_pipelines() +
-        oss_pipelines() +
-        enterprise_pipelines() +
-        enterprise2_pipelines() +
         publish_image_pipelines_public() +
-        publish_github_pipeline("public") +
-        publish_github_pipeline("security") +
-        publish_aws_marketplace_pipeline("public") +
-        publish_artifacts_pipelines("security") +
         publish_artifacts_pipelines("public") +
         publish_npm_pipelines() +
         publish_packages_pipeline() +
-        [verify_release_pipeline()] +
+        rgm() +
         [windows_test_backend({
             "event": ["promote"],
             "target": ["test-windows"],
         }, "oss", "testing")] +
-        version_branch_pipelines() +
         integration_test_pipelines() +
         publish_ci_windows_test_image_pipeline() +
         cronjobs() +

.github/CODEOWNERS

@@ -13,7 +13,8 @@
 
 # Documentation
 /.changelog-archive @grafana/docs-grafana
-/CHANGELOG.md @grafana/docs-grafana
+/.codespellignore @grafana/docs-tooling
+/CHANGELOG.md @grafana/grafana-delivery
 /CODE_OF_CONDUCT.md @grafana/docs-grafana
 /CONTRIBUTING.md @grafana/docs-grafana
 /GOVERNANCE.md @RichiH
@@ -33,24 +34,25 @@
 /devenv/README.md @grafana/docs-grafana
 
 # Technical documentation
-/docs/                                    @Eve832 @jdbaldry
-/docs/sources/                            @Eve832
-/docs/sources/administration/             @Eve832 @GrafanaWriter
-/docs/sources/alerting/                   @brendamuir
-/docs/sources/dashboards/                 @imatwawana
-/docs/sources/datasources/                @Eve832 @GrafanaWriter
-/docs/sources/explore/                    @Eve832 @GrafanaWriter
-/docs/sources/fundamentals                @chri2547
-/docs/sources/getting-started/            @chri2547
-/docs/sources/introduction/               @chri2547
-/docs/sources/old-alerting/               @brendamuir
-/docs/sources/panels-visualizations/      @imatwawana
-/docs/sources/release-notes/              @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/              @chri2547
-/docs/sources/upgrade-guide/              @chri2547 @imatwawana
-/docs/sources/whatsnew/                   @chri2547 @imatwawana
-/docs/sources/developers/plugins/         @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/docs/sources/developers/plugins/backend/ @Eve832 @grafana/plugins-platform-backend
+# `make docs` procedure and related workflows are owned @grafana/docs-tooling. Slack #docs.
+# Documentation sources might have different owners.
+/docs/                                                                       @grafana/docs-tooling
+/docs/sources/                                                               @Eve832
+/docs/sources/administration/                                                @jdbaldry
+/docs/sources/alerting/                                                      @brendamuir
+/docs/sources/dashboards/                                                    @imatwawana
+/docs/sources/datasources/                                                   @lwandz13
+/docs/sources/explore/                                                       @grafana/explore-squad
+/docs/sources/fundamentals                                                   @chri2547
+/docs/sources/getting-started/                                               @chri2547
+/docs/sources/introduction/                                                  @chri2547
+/docs/sources/old-alerting/                                                  @brendamuir
+/docs/sources/panels-visualizations/                                         @imatwawana
+/docs/sources/release-notes/                                                 @Eve832 @GrafanaWriter
+/docs/sources/setup-grafana/                                                 @chri2547
+/docs/sources/upgrade-guide/                                                 @imatwawana
+/docs/sources/whatsnew/                                                      @imatwawana
+/docs/sources/developers/plugins/                                            @Eve832 @josmperez @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 
 # Backend code
 /go.mod @grafana/backend-platform
@@ -358,10 +360,10 @@ lerna.json @grafana/frontend-ops
 /public/app/features/api-keys/ @grafana/grafana-frontend-platform
 /public/app/features/canvas/ @grafana/dataviz-squad
 /public/app/features/commandPalette/ @grafana/grafana-frontend-platform
-/public/app/features/connections/ @grafana/plugins-platform-frontend
+/public/app/features/connections/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/correlations/ @grafana/explore-squad
 /public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/datasources/ @grafana/plugins-platform-frontend
+/public/app/features/datasources/ @grafana/plugins-platform-frontend @mikkancso
 /public/app/features/dimensions/ @grafana/dataviz-squad
 /public/app/features/dataframe-import/ @grafana/grafana-bi-squad
 /public/app/features/explore/ @grafana/explore-squad
@@ -582,6 +584,7 @@ embed.go @grafana/grafana-as-code
 /.github/pr-commands.json @marefr
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
+/.github/workflows/auto-milestone.yml @grafana/grafana-delivery
 /.github/workflows/backport.yml @grafana/grafana-delivery
 /.github/workflows/bump-version.yml @grafana/grafana-delivery
 /.github/workflows/close-milestone.yml @grafana/grafana-delivery
@@ -604,6 +607,8 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
 /.github/workflows/pr-commands-closed.yml @tolzhabayev
 /.github/workflows/pr-commands.yml @marefr
+/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery
+/.github/workflows/sync-mirror.yml @grafana/grafana-delivery
 /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana
 /.github/workflows/remove-milestone.yml @grafana/grafana-frontend-platform
@@ -613,6 +618,7 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/stale.yml @grafana/grafana-frontend-platform
 /.github/workflows/update-changelog.yml @grafana/grafana-delivery
 /.github/workflows/snyk.yml @grafana/security-team
+/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-delivery
 
 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot

.github/pr-checks.json

@@ -46,4 +46,4 @@
     },
     "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#include-in-changelog-and-release-notes"
   }
-]
+]

.github/workflows/auto-milestone.yml

@@ -0,0 +1,24 @@
+name: Auto-milestone
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - 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 }}

.github/workflows/bump-version.yml

@@ -55,6 +55,10 @@ jobs:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
+      # Go is required for also updating the schema versions as part of the precommit hook:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
       - uses: actions/setup-node@v3.5.1
         with:
           node-version: '16'
@@ -71,3 +75,4 @@ jobs:
         with:
           token: ${{ steps.generate_token.outputs.token }}
           metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+          precommit_make_target: gen-cue

.github/workflows/codeql-analysis.yml

@@ -44,7 +44,7 @@ jobs:
       name: Set go version
       uses: actions/setup-go@v3
       with:
-        go-version: '1.19.2'
+        go-version: '1.21.5'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/create-security-patch-from-security-mirror.yml

@@ -0,0 +1,28 @@
+# 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
+

.github/workflows/pr-codeql-analysis-go.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Set go version
       uses: actions/setup-go@v3
       with:
-        go-version: '1.19.2'
+        go-version: '1.21.5'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/pr-commands.yml

@@ -8,20 +8,44 @@ on:
 concurrency:
   group: pr-commands-${{ github.event.number }}
 jobs:
+  config:
+    runs-on: "ubuntu-latest"
+    outputs:
+      has-secrets: ${{ steps.check.outputs.has-secrets }}
+    steps:
+      - name: "Check for secrets"
+        id: check
+        shell: bash
+        run: |
+          if [ -n "${{ (secrets.GRAFANA_PR_AUTOMATION_APP_ID != '' &&
+                        secrets.GRAFANA_PR_AUTOMATION_APP_PEM != '' &&
+                        secrets.GRAFANA_MISC_STATS_API_KEY != ''
+                        ) || '' }}" ]; then
+            echo "has-secrets=1" >> "$GITHUB_OUTPUT"
+          fi
+
   main:
+    needs: config
+    if: needs.config.outputs.has-secrets
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
       - name: Install Actions
         run: npm install --production --prefix ./actions
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_PR_AUTOMATION_APP_PEM }}
       - name: Run Commands
         uses: ./actions/commands
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
-          configPath: pr-commands
+          token: ${{ steps.generate_token.outputs.token }}
+          configPath: pr-commands

.github/workflows/pr-patch-check.yml

@@ -0,0 +1,26 @@
+# 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

.github/workflows/sync-mirror.yml

@@ -0,0 +1,25 @@
+# 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
+

.pa11yci-pr.conf.js

@@ -80,7 +80,7 @@ var config = {
     {
       url: '${HOST}/?orgId=1',
       wait: 500,
-      threshold: 0,
+      threshold: 3,
     },
     {
       url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
@@ -93,7 +93,7 @@ var config = {
       url: '${HOST}/?orgId=1&search=open',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 3,
     },
     {
       url: '${HOST}/alerting/list',

.yarn/sdks/prettier/index.js

@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier/index.js
+    // Setup the environment to be able to require prettier
     require(absPnpApiPath).setup();
   }
 }
 
-// Defer to the real prettier/index.js your application uses
-module.exports = absRequire(`prettier/index.js`);
+// Defer to the real prettier your application uses
+module.exports = absRequire(`prettier`);

CONTRIBUTING.md

@@ -82,6 +82,6 @@ Before we can accept your pull request, you need to [sign our CLA](https://grafa
 ## Where do I go from here?
 
 - Set up your [development environment](contribute/developer-guide.md).
-- Learn how to [contribute documentation](contribute/README.md).
-- Get started [developing plugins](https://grafana.com/docs/grafana/latest/developers/plugins/) for Grafana.
+- Learn how to [contribute to our documentation](contribute/documentation/README.md).
+- Get started [developing plugins](https://grafana.com/developers/plugin-tools) for Grafana.
 - Look through the resources in the [contribute](contribute) folder.

Dockerfile

@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1
 
-ARG BASE_IMAGE=alpine:3.17
-ARG JS_IMAGE=node:18-alpine3.17
+ARG BASE_IMAGE=alpine:3.18.3
+ARG JS_IMAGE=node:18-alpine3.18
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.20.4-alpine3.17
+ARG GO_IMAGE=golang:1.21.5-alpine3.18
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
@@ -64,6 +64,7 @@ COPY pkg pkg
 COPY scripts scripts
 COPY conf conf
 COPY .github .github
+COPY LICENSE ./
 
 ENV COMMIT_SHA=${COMMIT_SHA}
 ENV BUILD_BRANCH=${BUILD_BRANCH}
@@ -110,7 +111,7 @@ RUN if grep -i -q alpine /etc/issue; then \
     elif grep -i -q ubuntu /etc/issue; then \
       DEBIAN_FRONTEND=noninteractive && \
       apt-get update && \
-      apt-get install -y ca-certificates curl tzdata && \
+      apt-get install -y ca-certificates curl tzdata musl && \
       apt-get autoremove -y && \
       rm -rf /var/lib/apt/lists/*; \
     else \
@@ -165,6 +166,7 @@ RUN if [ ! $(getent group "$GF_GID") ]; then \
 
 COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
 COPY --from=js-src /tmp/grafana/public ./public
+COPY --from=go-src /tmp/grafana/LICENSE ./
 
 EXPOSE 3000
 

Makefile

@@ -13,7 +13,6 @@ GO = go
 GO_FILES ?= ./pkg/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
-GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
 GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))
 
 targets := $(shell echo '$(sources)' | tr "," " ")
@@ -37,36 +36,68 @@ node_modules: package.json yarn.lock ## Install node modules.
 
 ##@ Swagger
 SPEC_TARGET = public/api-spec.json
-MERGED_SPEC_TARGET := public/api-merged.json
+ENTERPRISE_SPEC_TARGET = public/api-enterprise-spec.json
+MERGED_SPEC_TARGET = public/api-merged.json
 NGALERT_SPEC_TARGET = pkg/services/ngalert/api/tooling/api.json
 
 $(NGALERT_SPEC_TARGET):
 	+$(MAKE) -C pkg/services/ngalert/api/tooling api.json
 
-$(MERGED_SPEC_TARGET): $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) $(SWAGGER) ## Merge generated and ngalert API specs
+$(MERGED_SPEC_TARGET): swagger-oss-gen swagger-enterprise-gen $(NGALERT_SPEC_TARGET) $(SWAGGER) ## Merge generated and ngalert API specs
 	# known conflicts DsPermissionType, AddApiKeyCommand, Json, Duration (identical models referenced by both specs)
-	$(SWAGGER) mixin $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)
+	$(SWAGGER) mixin $(SPEC_TARGET) $(ENTERPRISE_SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)
 
-$(SPEC_TARGET): $(SWAGGER) ## Generate API Swagger specification
+swagger-oss-gen: $(SWAGGER) ## Generate API Swagger specification
+	@echo "re-generating swagger for OSS"
+	rm -f $(SPEC_TARGET)
 	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(SPEC_TARGET) \
 	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
 	-x "github.com/prometheus/alertmanager" \
 	-i pkg/api/swagger_tags.json \
-	--exclude-tag=alpha
-	go run pkg/services/ngalert/api/tooling/cmd/clean-swagger/main.go -if $@ -of $@
+	--exclude-tag=alpha \
+	--exclude-tag=enterprise
 
-swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET) validate-api-spec
+# this file only exists if enterprise is enabled
+ENTERPRISE_EXT_FILE = pkg/extensions/ext.go
+ifeq ("$(wildcard $(ENTERPRISE_EXT_FILE))","") ## if enterprise is not enabled
+swagger-enterprise-gen:
+	@echo "skipping re-generating swagger for enterprise: not enabled"
+else
+swagger-enterprise-gen: $(SWAGGER) ## Generate API Swagger specification
+	@echo "re-generating swagger for enterprise"
+	rm -f $(ENTERPRISE_SPEC_TARGET)
+	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(ENTERPRISE_SPEC_TARGET) \
+	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
+	-x "github.com/prometheus/alertmanager" \
+	-i pkg/api/swagger_tags.json \
+	--exclude-tag=alpha \
+	--include-tag=enterprise
+endif
 
-validate-api-spec: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
+swagger-gen: gen-go $(MERGED_SPEC_TARGET) swagger-validate
+
+swagger-validate: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
 	$(SWAGGER) validate $(<)
 
-clean-api-spec:
+swagger-clean:
 	rm -f $(SPEC_TARGET) $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
 
+.PHONY: cleanup-old-git-hooks
+cleanup-old-git-hooks:
+	./scripts/cleanup-husky.sh
+
+.PHONY: lefthook-install
+lefthook-install: cleanup-old-git-hooks $(LEFTHOOK) # install lefthook for pre-commit hooks
+	$(LEFTHOOK) install -f
+
+.PHONY: lefthook-uninstall
+lefthook-uninstall: $(LEFTHOOK)
+	$(LEFTHOOK) uninstall
+
 ##@ OpenAPI 3
 OAPI_SPEC_TARGET = public/openapi3.json
 
-openapi3-gen: swagger-api-spec ## Generates OpenApi 3 specs from the Swagger 2 already generated
+openapi3-gen: swagger-gen ## Generates OpenApi 3 specs from the Swagger 2 already generated
 	$(GO) run scripts/openapi3/openapi3conv.go $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
 
 ##@ Building
@@ -77,7 +108,7 @@ gen-cue: ## Do all CUE/Thema code generation
 	go generate ./public/app/plugins/gen.go
 	go generate ./pkg/kindsys/report.go
 
-gen-go: $(WIRE) gen-cue
+gen-go: $(WIRE)
 	@echo "generate go files"
 	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
 
@@ -133,6 +164,13 @@ test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
 	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)
 
+.PHONY: test-go-integration-alertmanager
+test-go-integration-alertmanager: ## Run integration tests for the remote alertmanager (config taken from the mimir_backend block).
+	@echo "test remote alertmanager integration tests"
+	$(GO) clean -testcache
+	AM_URL=http://localhost:8080 AM_TENANT_ID=test AM_PASSWORD=test \
+	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/notifier/...
+
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
@@ -191,7 +229,7 @@ build-docker-full: ## Build Docker image for development.
 	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
+	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--tag grafana/grafana$(TAG_SUFFIX):dev \
 	$(DOCKER_BUILD_ARGS)
@@ -204,10 +242,10 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg BINGO=false \
 	--build-arg GO_BUILD_TAGS=$(GO_BUILD_TAGS) \
 	--build-arg WIRE_TAGS=$(WIRE_TAGS) \
-	--build-arg COMMIT_SHA=$$(git rev-parse --short HEAD) \
+	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
-	--build-arg BASE_IMAGE=ubuntu:20.04 \
-	--build-arg GO_IMAGE=golang:1.20.4 \
+	--build-arg BASE_IMAGE=ubuntu:22.04 \
+	--build-arg GO_IMAGE=golang:1.21.5 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)
 
@@ -252,6 +290,9 @@ devenv-mysql:
 protobuf: ## Compile protobuf definitions
 	bash scripts/protobuf-check.sh
 	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
+	bash pkg/plugins/backendplugin/secretsmanagerplugin/generate.sh
+	bash pkg/services/store/entity/generate.sh
+	bash pkg/infra/grn/generate.sh
 
 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"
@@ -277,7 +318,7 @@ scripts/drone/TAGS: $(shell find scripts/drone -name '*.star')
 	etags --lang none --regex="/def \(\w+\)[^:]+:/\1/" --regex="/\s*\(\w+\) =/\1/" $^ -o $@
 
 format-drone:
-	buildifier -r scripts/drone
+	buildifier --lint=fix -r scripts/drone
 
 help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)

conf/defaults.ini

@@ -242,7 +242,7 @@ reporting_distributor = grafana-labs
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 check_for_updates = true
 
 # Set to false to disable all checks to https://grafana.com
@@ -556,6 +556,17 @@ azure_auth_enabled = false
 # Use email lookup in addition to the unique ID provided by the IdP
 oauth_allow_insecure_email_lookup = false
 
+# Set to true to include id of identity as a response header
+id_response_header_enabled = false
+
+# Prefix used for the id response header, X-Grafana-Identity-Id
+id_response_header_prefix = X-Grafana
+
+# List of identity namespaces to add id response headers for, separated by space.
+# Available namespaces are user, api-key and service-account.
+# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
+id_response_header_namespaces = user api-key service-account
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -589,6 +600,7 @@ allowed_organizations =
 role_attribute_path =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
+skip_org_role_sync = false
 tls_skip_verify_insecure = false
 
 #################################### GitLab Auth #########################
@@ -805,6 +817,24 @@ managed_identity_enabled = false
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 managed_identity_client_id =
 
+# Specifies whether Azure AD Workload Identity authentication should be enabled in datasources that support it
+# For more documentation on Azure AD Workload Identity, review this documentation:
+# https://azure.github.io/azure-workload-identity/docs/
+# Disabled by default, needs to be explicitly enabled
+workload_identity_enabled = false
+
+# Tenant ID of the Azure AD Workload Identity
+# Allows to override default tenant ID of the Azure AD identity associated with the Kubernetes service account
+workload_identity_tenant_id =
+
+# Client ID of the Azure AD Workload Identity
+# Allows to override default client ID of the Azure AD identity associated with the Kubernetes service account
+workload_identity_client_id =
+
+# Custom path to token file for the Azure AD Workload Identity
+# Allows to set a custom path to the projected service account token file
+workload_identity_token_file =
+
 #################################### Role-based Access Control ###########
 [rbac]
 # If enabled, cache permissions in a in memory cache
@@ -1040,8 +1070,8 @@ execute_alerts = true
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 evaluation_timeout = 30s
 
-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
-max_attempts = 3
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
+max_attempts = 1
 
 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1226,6 +1256,8 @@ enabled              = true
 interval_seconds     = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 disable_total_stats = false
+# The interval at which the total stats collector will update the stats. Default is 1800 seconds.
+total_stats_collector_interval_seconds = 1800
 
 #If both are set, basic auth will be required for the metrics endpoints.
 basic_auth_username =

conf/sample.ini

@@ -249,7 +249,7 @@
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 ;check_for_updates = true
 
 # Set to false to disable all checks to https://grafana.com
@@ -545,6 +545,17 @@
 # Use email lookup in addition to the unique ID provided by the IdP
 ;oauth_allow_insecure_email_lookup = false
 
+# Set to true to include id of identity as a response header
+;id_response_header_enabled = false
+
+# Prefix used for the id response header, X-Grafana-Identity-Id
+;id_response_header_prefix = X-Grafana
+
+# List of identity namespaces to add id response headers for, separated by space.
+# Available namespaces are user, api-key and service-account.
+# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
+;id_response_header_namespaces = user api-key service-account
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -578,6 +589,7 @@
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;allow_assign_grafana_admin = false
+;skip_org_role_sync = false
 
 #################################### GitLab Auth #########################
 [auth.gitlab]
@@ -776,6 +788,24 @@
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 ;managed_identity_client_id =
 
+# Specifies whether Azure AD Workload Identity authentication should be enabled in datasources that support it
+# For more documentation on Azure AD Workload Identity, review this documentation:
+# https://azure.github.io/azure-workload-identity/docs/
+# Disabled by default, needs to be explicitly enabled
+;workload_identity_enabled = false
+
+# Tenant ID of the Azure AD Workload Identity
+# Allows to override default tenant ID of the Azure AD identity associated with the Kubernetes service account
+;workload_identity_tenant_id =
+
+# Client ID of the Azure AD Workload Identity
+# Allows to override default client ID of the Azure AD identity associated with the Kubernetes service account
+;workload_identity_client_id =
+
+# Custom path to token file for the Azure AD Workload Identity
+# Allows to set a custom path to the projected service account token file
+;workload_identity_token_file =
+
 #################################### Role-based Access Control ###########
 [rbac]
 ;permission_cache = true
@@ -1009,8 +1039,8 @@
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;evaluation_timeout = 30s
 
-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
-;max_attempts = 3
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
+;max_attempts = 1
 
 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1167,6 +1197,8 @@
 ;interval_seconds  = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 ;disable_total_stats = false
+# The interval at which the total stats collector will update the stats. Default is 1800 seconds.
+;total_stats_collector_interval_seconds = 1800
 
 #If both are set, basic auth will be required for the metrics endpoints.
 ; basic_auth_username =

contribute/backend/upgrading-go-version.md

@@ -0,0 +1,22 @@
+# Upgrading Go Version
+
+Notes on upgrading Go version.
+
+Example PR: https://github.com/grafana/grafana/pull/79329
+
+## The main areas that need to change during the upgrade are:
+
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/scripts/drone/variables.star#L6
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Makefile#L264
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Dockerfile#L6
+
+Make sure to run `make drone` so that changes to `.star` files are reflected and `drone.yml` is generated.
+
+### Additional files to change
+
+- Take a look in `.github/workflows` folder for what `go` version is being used there in various workflows.
+- Make sure to create a PR with the corresponding changes in `grafana/grafana-enterprise` repository.
+
+## Updating the go.mod file
+
+Please avoid updating the `go.mod` to the newest version unless really necessary. This ensures backwards compatibility and introduces less breaking changes. Always upgrade Go version in the runtime files above first, let them run for a couple of weeks and only then consider updating the `go.mod` file if necessary.

contribute/breaking-changes-guide.md

@@ -104,7 +104,7 @@ myOldFunction(name: string) {
 2. Add info in the comment about **when it is going to be removed**
 3. Add info in the comment about **what should be used instead**
 4. In case it's a function or a method, use `deprecationWarning(<file name>, <old name>, <new name>)` to raise attention during runtime as well
-5. Update the [migration guide](../docs/sources/developers/plugins/migration-guide.md) with your instructions
+5. Update the [migration guide](/developers/plugin-tools/migration-guides/) with your instructions
 
 ### Communicate
 

contribute/merge-pull-request.md

@@ -13,7 +13,6 @@ 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?
 
@@ -40,11 +39,17 @@ See [formatting guidelines](create-pull-request.md#formatting-guidelines) for mo
 
 ### Assign a milestone
 
-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).
+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.
 
-Always assign the milestone for the version that a PR is merged into. PRs targetting `main` should use the next minor (or major) version and backport PRs should use the same value than the target branch.
+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?
 
@@ -80,15 +85,15 @@ The changelog/release notes are divided into sections and here's a description o
 
 **Features and enhancements:**
 
-Milestone assigned and labeled with `add to changelog` and any of the other section rules don't apply.
+Labeled with `add to changelog` and any of the other section rules don't apply.
 
 **Bug fixes:**
 
-Milestone assigned and labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.
+Labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.
 
 **Plugin development fixes & changes:**
 
-Milestone assigned and labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.
+Labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.
 
 **Deprecations:**
 

docs/docs.mk

@@ -76,7 +76,7 @@ docs-rm: ## Remove the docs container.
 
 .PHONY: docs-pull
 docs-pull: ## Pull documentation base image.
-	$(PODMAN) pull $(DOCS_IMAGE)
+	$(PODMAN) pull -q $(DOCS_IMAGE)
 
 make-docs: ## Fetch the latest make-docs script.
 make-docs:

docs/make-docs

@@ -19,6 +19,21 @@ readonly WEBSITE_MOUNTS="${WEBSITE_MOUNTS:-}"
 
 PODMAN="$(if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)"
 
+if ! command -v curl >/dev/null 2>&1; then
+  if ! command -v wget >/dev/null 2>&1; then
+    errr 'either `curl` or `wget` must be installed for this script to work.'
+
+    exit 1
+  fi
+fi
+
+if ! command -v "${PODMAN}" >/dev/null 2>&1; then
+  errr 'either `podman` or `docker` must be installed for this script to work.'
+
+  exit 1
+fi
+
+
 about() {
   cat <<EOF
 Test documentation locally with multiple source repositories.
@@ -214,9 +229,10 @@ repo_path() {
   done
   unset IFS
 
-  echo "ERRR: could not find project '${_repo}' in any of the paths in REPOS_PATH '${REPOS_PATH}'." >&2
-  echo "NOTE: you must have a checkout of the project '${_repo}' at '${REPOS_PATH##:*}/${_repo}'." >&2
-  echo "NOTE: if you have cloned the repository into a directory with a different name, consider changing it to ${_repo}." >&2
+  errr "could not find project '${_repo}' in any of the paths in REPOS_PATH '${REPOS_PATH}'."
+  note "you must have a checkout of the project '${_repo}' at '${REPOS_PATH##:*}/${_repo}'."
+  note "if you have cloned the repository into a directory with a different name, consider changing it to ${_repo}."
+
   unset _repo
   exit 1
 }
@@ -302,6 +318,50 @@ POSIX_HERESTRING
   unset _project _version _repo _path
 }
 
+await_build() {
+  url="$1"
+  req="$(if command -v curl >/dev/null 2>&1; then echo 'curl -s -o /dev/null'; else echo 'wget -q'; fi)"
+
+  sleep 2
+
+  if ${req} "${url}"; then
+    echo
+    echo "View documentation locally:"
+    for x in ${url_src_dst_vers}; do
+      IFS='^' read -r url _ _ <<POSIX_HERESTRING
+$x
+POSIX_HERESTRING
+
+      if [ -n "${url}" ]; then
+        if [ "${_url}" != "arbitrary" ]; then
+          echo "  ${url}"
+        fi
+      fi
+    done
+    echo
+    echo 'Press Ctrl+C to stop the server'
+  else
+    echo
+    errr 'The build was interrupted or a build error occurred, check the previous logs for possible causes.'
+  fi
+
+  unset url req
+}
+
+debg() {
+  if [ -n "${DEBUG}" ]; then
+    echo "DEBG: $1" >&2
+  fi
+}
+
+errr() {
+  echo "ERRR: $1" >&2
+}
+
+note() {
+  echo "NOTE: $1" >&2
+}
+
 url_src_dst_vers="$(url_src_dst_vers "$@")"
 
 volumes=""
@@ -327,13 +387,14 @@ POSIX_HERESTRING
 
   if [ "${_url}" != "arbitrary" ]; then
     if [ ! -f "${_src}/_index.md" ]; then
-      echo "ERRR: Index file '${_src}/_index.md' does not exist." >&2
-      echo "Is '${_src}' the correct source directory?" >&2
+      errr "Index file '${_src}/_index.md' does not exist."
+      note "Is '${_src}' the correct source directory?"
       exit 1
     fi
   fi
 
-  echo "DEBG: Mounting '${_src}' at container path '${_dst}'" >&2
+  debg "DEBG: Mounting '${_src}' at container path '${_dst}'"
+
   if [ -z "${volumes}" ]; then
     volumes="--volume=${_src}:${_dst}"
   else
@@ -359,35 +420,35 @@ case "${image}" in
     proj="$(new_proj "$1")"
     echo
     "${PODMAN}" run \
-      --init \
-      --interactive \
-      --name "${DOCS_CONTAINER}" \
-      --platform linux/amd64 \
-      --rm \
-      --tty \
-      ${volumes} \
-      "${DOCS_IMAGE}" \
-      "--include=${DOC_VALIDATOR_INCLUDE}" \
-      "--skip-checks=${DOC_VALIDATOR_SKIP_CHECKS}" \
-      /hugo/content/docs \
-      "$(proj_canonical "${proj}")" | sed "s#$(proj_dst "${proj}")#sources#"
+                --init \
+                --interactive \
+                --name "${DOCS_CONTAINER}" \
+                --platform linux/amd64 \
+                --rm \
+                --tty \
+                ${volumes} \
+                "${DOCS_IMAGE}" \
+                "--include=${DOC_VALIDATOR_INCLUDE}" \
+                "--skip-checks=${DOC_VALIDATOR_SKIP_CHECKS}" \
+                /hugo/content/docs \
+                "$(proj_canonical "${proj}")" | sed "s#$(proj_dst "${proj}")#sources#"
     ;;
   'grafana/vale')
     proj="$(new_proj "$1")"
     echo
     "${PODMAN}" run \
-      --init \
-      --interactive \
-      --name "${DOCS_CONTAINER}" \
-      --platform linux/amd64 \
-      --rm \
-      --tty \
-      ${volumes} \
-      "${DOCS_IMAGE}" \
-      "--minAlertLevel=${VALE_MINALERTLEVEL}" \
-      --config=/etc/vale/.vale.ini \
-      --output=line \
-      /hugo/content/docs | sed "s#$(proj_dst "${proj}")#sources#"
+                --init \
+                --interactive \
+                --name "${DOCS_CONTAINER}" \
+                --platform linux/amd64 \
+                --rm \
+                --tty \
+                ${volumes} \
+                "${DOCS_IMAGE}" \
+                "--minAlertLevel=${VALE_MINALERTLEVEL}" \
+                --config=/etc/vale/.vale.ini \
+                --output=line \
+                /hugo/content/docs | sed "s#$(proj_dst "${proj}")#sources#"
     ;;
   *)
     tempfile="$(mktemp -t make-docs.XXX)"
@@ -417,33 +478,38 @@ EOF
     volumes="${volumes} --volume=$(realpath "${tempfile}"):/entrypoint"
     readonly volumes
 
-    echo
-    echo "Documentation will be served at the following URLs:"
-    for x in ${url_src_dst_vers}; do
-      IFS='^' read -r url _ _ <<POSIX_HERESTRING
-$x
-POSIX_HERESTRING
+    IFS='' read -r cmd <<EOF
+${PODMAN} run \
+  --env=HUGO_REFLINKSERRORLEVEL=${HUGO_REFLINKSERRORLEVEL} \
+  --init \
+  --interactive \
+  --name=${DOCS_CONTAINER} \
+  --platform=linux/amd64 \
+  --publish=${DOCS_HOST_PORT}:3002 \
+  --publish=3003:3003 \
+  --rm \
+  --tty \
+  ${volumes} \
+  ${DOCS_IMAGE} \
+  /entrypoint
+EOF
+    await_build http://localhost:3002 &
 
-      if [ -n "${url}" ]; then
-        if [ "${_url}" != "arbitrary" ]; then
-          echo "  ${url}"
-        fi
-      fi
-    done
-
-    echo
-    "${PODMAN}" run \
-      --env "HUGO_REFLINKSERRORLEVEL=${HUGO_REFLINKSERRORLEVEL}" \
-      --init \
-      --interactive \
-      --name "${DOCS_CONTAINER}" \
-      --platform linux/amd64 \
-      --publish "${DOCS_HOST_PORT}:3002" \
-      --publish "3003:3003" \
-      --rm \
-      --tty \
-      ${volumes} \
-      "${DOCS_IMAGE}" \
-      /entrypoint
+    if [ -n "${DEBUG}" ]; then
+      ${cmd}
+    else
+      ${cmd} 2>&1| sed \
+                     -e '/Web Server is available at http:\/\/localhost:3003\/ (bind address 0.0.0.0)/ d' \
+                     -e '/^hugo server/ d' \
+                     -e '/fatal: not a git repository (or any parent up to mount point \/)/ d' \
+                     -e '/Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)./ d' \
+                     -e "/Makefile:[0-9]*: warning: overriding recipe for target 'docs'/ d" \
+                     -e "/docs.mk:[0-9]*: warning: ignoring old recipe for target 'docs'/ d" \
+                     -e '/\/usr\/bin\/make -j 2 proxy hserver-docs HUGO_PORT=3003/ d' \
+                     -e '/website-proxy/ d' \
+                     -e '/rm -rf dist*/ d' \
+                     -e '/Press Ctrl+C to stop/ d' \
+                     -e '/make/ d' || echo
+    fi
     ;;
 esac

docs/sources/_index.md

@@ -3,204 +3,15 @@ aliases:
   - /docs/grafana/v1.1/
   - /docs/grafana/v3.1/
   - guides/reference/admin/
-cascade:
-  # Until a better mechanism for arrangement is thought of, the following sequence should be ordered alphabetically by the `_target.path` value.
-  - _target: { path: /docs/grafana/** } # Default to every page having "Enterprise" and "Open source" labels.
-    labels:
-      products:
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/** }
-    labels:
-      products:
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/administration/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/administration/enterprise-licensing/** }
-    labels:
-      products:
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/administration/organization-management/** }
-    labels:
-      products:
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/administration/provisioning/** }
-    labels:
-      products:
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/administration/recorded-queries/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/administration/roles-and-permissions/access-control/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/administration/stats-and-license/** }
-    labels:
-      products:
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/alerting/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/breaking-changes/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/dashboards/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/datasources/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/explore/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/fundamentals/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/introduction/grafana-cloud/** }
-    labels:
-      products:
-        - cloud
-
-  - _target: { path: /docs/grafana/*/introduction/grafana-enterprise/** }
-    labels:
-      products:
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/panels-visualizations/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/release-notes/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/search/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/audit-grafana/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/configure-authentication/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/configure-authentication/enhanced-ldap/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/configure-authentication/saml/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target:
-      path: /docs/grafana/*/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/**
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/configure-request-security/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/configure-team-sync/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-
-  - _target: { path: /docs/grafana/*/setup-grafana/configure-security/export-logs/** }
-    labels:
-      products:
-        - cloud
-        - oss
-
-  - _target: { path: /docs/grafana/*/troubleshooting/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
-
-  - _target: { path: /docs/grafana/*/whatsnew/** }
-    labels:
-      products:
-        - cloud
-        - enterprise
-        - oss
 description: Guides, installation, and feature documentation
 keywords:
   - grafana
   - installation
   - documentation
+labels:
+  products:
+    - enterprise
+    - oss
 title: Grafana documentation
 ---
 
@@ -228,12 +39,16 @@ title: Grafana documentation
         <img src="/static/img/logos/logo-docker.svg">
         <h5>Run Docker image</h5>
     </a>
+    <a href="{{< relref "setup-grafana/installation/kubernetes/" >}}" class="nav-cards__item nav-cards__item--install">
+        <img src="/static/img/logos/logo-kubernetes.svg">
+        <h5>Run on Kubernetes</h5>
+    </a>
     <a href="https://grafana.com/docs/grafana-cloud/" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-cloud">
         </div>
         <h5>Grafana Cloud</h5>
     </a>
-    <a href="https://grafana.com/grafana/nightly?edition=oss" class="nav-cards__item nav-cards__item--install">
+    <a href="https://grafana.com/grafana/download/nightly?edition=oss" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-moon-o">
         </div>
         <h5>Nightly builds</h5>

docs/sources/administration/_index.md

@@ -1,5 +1,9 @@
 ---
 description: Administration
+labels:
+  products:
+    - enterprise
+    - oss
 title: Administration
 weight: 40
 ---

docs/sources/administration/api-keys/index.md

@@ -6,6 +6,10 @@ description: This section contains information about API keys in Grafana
 keywords:
   - API keys
   - Service accounts
+labels:
+  products:
+    - enterprise
+    - oss
 menuTitle: API keys
 title: API keys
 weight: 700
@@ -131,7 +135,7 @@ Complete the following steps to migrate from API keys to service accounts for AP
    This action generates a service account token.
 
 1. Store the ID and secret that the system returns to you.
-1. Pass the token in the `Authrorization` header, prefixed with `Bearer`.
+1. Pass the token in the `Authorization` header, prefixed with `Bearer`.
 
    This action authenticates API requests.
 

docs/sources/administration/back-up-grafana/index.md

@@ -0,0 +1,15 @@
+---
+description: Describes how to back up a locally provisioned Grafana instance.
+keywords:
+  - grafana
+  - backup
+labels:
+  products:
+    - enterprise
+    - oss
+title: Back up Grafana
+weight: 80
+menuTitle: Back up Grafana
+---
+
+{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA VERSION>" >}}

docs/sources/administration/correlations/_index.md

@@ -1,34 +1,43 @@
 ---
-title: Correlations
-weight: 900
 keywords:
   - correlations
   - Explore
+labels:
+  products:
+    - enterprise
+    - oss
+title: Correlations
+weight: 900
 ---
 
 # Correlations
 
 You can create interactive links for Explore visualizations to run queries related to presented data by setting up Correlations.
 
-A correlation defines how data in one [data source]({{< relref "/docs/grafana/latest/datasources/" >}}) is used to query data in another data source. Some examples:
+A correlation defines how data in one [data source]({{< relref "../../datasources" >}}) is used to query data in another data source.
+Some examples:
 
 - an application name returned in a logs data source can be used to query metrics related to that application in a metrics data source, or
 - a user name returned by an SQL data source can be used to query logs related to that particular user in a logs data source
 
-[Explore]({{< relref "/docs/grafana/latest/explore/" >}}) takes user-defined correlations to display links inside the visualizations. You can click on a link to run the related query and see results in [Explore Split View]({{< relref "/docs/grafana/latest/explore/#split-and-compare" >}}).
+[Explore]({{< relref "../../explore" >}}) takes user-defined correlations to display links inside the visualizations.
+You can click on a link to run the related query and see results in [Explore Split View]({{< relref "../../explore#split-and-compare" >}}).
 
 Explore visualizations that currently support showing links based on correlations:
 
 - [Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}})
 - [Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}})
 
-You can configure correlations using [Administration > Correlation page]({{< relref "/docs/grafana/latest/administration/" >}}) or with [provisioning]({{< relref "/docs/grafana/latest/administration/provisioning" >}}).
+You can configure correlations using the **Administration > Correlation** page in Grafana or with [provisioning]({{< relref "../provisioning" >}}).
 
-> **Note:** Correlations are available in Grafana 10.0+ as an opt-in beta feature. Modify Grafana [configuration file]({{< relref "/docs/grafana/latest/setup-grafana/configure-grafana/#configuration-file-location" >}}) to enable the `correlations` [feature toggle]({{< relref "/docs/grafana/latest/setup-grafana/configure-grafana/#feature_toggles" >}}) to use it.
+{{% admonition type="note" %}}
+Correlations are available in Grafana 10.0+ as an opt-in beta feature.
+Modify the Grafana [configuration file]({{< relref "../../setup-grafana/configure-grafana#configuration-file-location" >}}) to enable the `correlations` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}) to use it.
+{{% /admonition %}}
 
 ## Example of how links work in Explore once set up
 
-{{< figure src="/static/img/docs/correlations/correlations-in-explore-10-0.gif" caption="Correlations links in Explore" >}}
+{{< figure src="/static/img/docs/correlations/correlations-in-explore-10-0.gif" alt="Demonstration of following a correlation link in Grafana Explore" caption="Correlations links in Explore" >}}
 
 See also:
 

docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md

@@ -1,6 +1,10 @@
 ---
-title: Add permissions to create new correlations
+labels:
+  products:
+    - enterprise
+    - oss
 menuTitle: Add permissions
+title: Add permissions to create new correlations
 weight: 30
 ---
 
@@ -8,7 +12,7 @@ weight: 30
 
 ## Before you begin
 
-Adding access to create correlations for [Viewers and Editors]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) is available with [Role-based access control]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}).
+Adding access to create correlations for [Viewers and Editors]({{< relref "../../../administration/roles-and-permissions" >}}) is available with [Role-based access control]({{< relref "../../../administration/roles-and-permissions/access-control" >}}).
 
 ## Add permissions to create correlations
 

docs/sources/administration/correlations/correlation-configuration/index.md

@@ -1,4 +1,8 @@
 ---
+labels:
+  products:
+    - enterprise
+    - oss
 title: Correlation
 weight: 10
 ---
@@ -29,7 +33,9 @@ Learn how to create correlations using the [Administration page]({{< relref "./c
 
 ## Source data source and result field
 
-Links are shown in Explore visualizations for the results from the correlation’s source data source. A link is assigned to one of the fields from the result provided in the correlation configuration (the results field). Each visualization displays fields with links in a different way ([Correlations in Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}}) and see [Correlations in Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}}))
+Links are shown in Explore visualizations for the results from the correlation’s source data source.
+A link is assigned to one of the fields from the result provided in the correlation configuration (the results field).
+Each visualization displays fields with links in a different way ([Correlations in Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}}) and see [Correlations in Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}})).
 
 ## Target query
 
@@ -37,9 +43,11 @@ The target query is run when a link is clicked in the visualization. You can use
 
 ### Correlation Variables
 
-You can use variables inside the target query to access the source data related to the query. Correlations use [Grafana variable syntax]({{< relref "/docs/grafana/latest/dashboards/variables/variable-syntax" >}}). Variables are filled with values from the source results when the link is clicked. There are two types of variables you can use:
+You can use variables inside the target query to access the source data related to the query.
+Correlations use [Grafana variable syntax]({{< relref "../../../dashboards/variables/variable-syntax" >}}).
+Variables are filled with values from the source results when the link is clicked. There are two types of variables you can use:
 
-- [field variables]({{< relref "/docs/grafana/latest/panels-visualizations/configure-data-links#field-variables" >}}) (allows to access field values and labels)
+- [field variables]({{< relref "../../../panels-visualizations/configure-data-links#field-variables" >}}) (allows to access field values and labels)
 - correlation variables (allows to access field values and transformations)
 
 Example: If source results contain a field called “employee”, the value of the field can be accessed with:

docs/sources/administration/correlations/correlation-permissions/index.md

@@ -1,15 +1,19 @@
 ---
+labels:
+  products:
+    - enterprise
+    - oss
 title: Permissions
 weight: 20
 ---
 
 # Permissions
 
-Users with [Viewer base role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) or with [datasources:query RBAC role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}) can:
+Users with [Viewer base role]({{< relref "../../../administration/roles-and-permissions" >}}) or with [datasources:query RBAC role]({{< relref "../../../administration/roles-and-permissions/access-control" >}}) can:
 
-- Use correlations in Explore’s visualizations
-- List all available correlations in read-only mode
+- Use correlations in Explore’s visualizations.
+- List all available correlations in read-only mode.
 
-Users with [Admin base role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) or with [datasources:write RBAC role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}) can:
+Users with [Admin base role]({{< relref "../../../administration/roles-and-permissions" >}}) or with [datasources:write RBAC role]({{< relref "../../../administration/roles-and-permissions/access-control" >}}) can:
 
-- Add, edit and delete correlations
+- Add, edit and delete correlations.

docs/sources/administration/correlations/create-a-new-correlation/index.md

@@ -1,4 +1,8 @@
 ---
+labels:
+  products:
+    - enterprise
+    - oss
 title: Create a new correlation
 weight: 40
 ---
@@ -76,7 +80,7 @@ Description of provisioning properties:
 : Correlation type. “query” is the only supported type at the moment
 
 **config.target**
-: [Target query model]({{< relref "#determine-target-query-model-structure" >}})
+: [Target query model](#determine-target-query-model-structure)
 
 **config.field**
 : Name of the field where link is shown

docs/sources/administration/correlations/use-correlations-in-visualizations/index.md

@@ -1,4 +1,8 @@
 ---
+labels:
+  products:
+    - enterprise
+    - oss
 title: Use correlations in visualizations
 weight: 70
 ---
@@ -23,7 +27,7 @@ weight: 70
 1. Open Explore.
 1. Select a data source that you chose as the source data source of the correlation.
 1. Run a query that results in data containing fields required to build variables in the target query.
-1. Links are added to cell rows in the column representing the field with the assigned link ([the results field]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration#source-data-source-and-result-field" >}}).
+1. Links are added to cell rows in the column representing the field with the assigned link ([the results field]({{< relref "../correlation-configuration#source-data-source-and-result-field" >}}).
 1. Cells containing multiple links accessible with a context menu.
 
    {{< figure src="/static/img/docs/correlations/correlations-in-table-10-0.png" max-width="600px" caption="Correlations links in table" >}}

docs/sources/administration/correlations/use-variables-and-transformations/index.md

@@ -1,4 +1,8 @@
 ---
+labels:
+  products:
+    - enterprise
+    - oss
 title: Use variables and transformations in a correlation
 weight: 60
 ---
@@ -69,7 +73,7 @@ Instructions below show how to set up a link that can run metrics query for the
        - Required correlation type (query)
        - Target query matching test data source model
      - “App metrics” correlation contains the following configuration:
-       - Alias is set to ${application} variable (note that in provisioning files $ is used to access environment variables so it has to be [escaped]({{< relref "/docs/grafana/latest/administration/provisioning#using-environment-variables" >}})).
+       - Alias is set to ${application} variable (note that in provisioning files $ is used to access environment variables so it has to be [escaped]({{< relref "../../../administration/provisioning#using-environment-variables" >}})).
        - Regular expression transformation is created to extract values from “msg” field
          - Regular expression transformation is used to capture the application name from the full name of the service stored in the log line.
          - The output of the transformation is mapped to a variable called “application”.

docs/sources/administration/data-source-management/index.md

@@ -7,6 +7,10 @@ aliases:
   - ../features/datasources/add-a-data-source/
   - ../permissions/datasource_permissions/
 description: Data source management information for Grafana administrators
+labels:
+  products:
+    - enterprise
+    - oss
 title: Data source management
 weight: 100
 ---
@@ -32,14 +36,14 @@ Only users with the organization admin role can add data sources.
 1. Click the data source you want to add.
 1. Configure the data source following instructions specific to that data source.
 
-   For links to data source-specific documentation, see [Data sources]({{< relref "../../datasources" >}}).
+For links to data source-specific documentation, see [Data sources]({{< relref "../../datasources" >}}).
 
 ## Data source permissions
 
 You can configure data source permissions to allow or deny certain users the ability to query or edit a data source. Each data source’s configuration includes a Permissions tab where you can restrict data source permissions to specific users, teams, or roles.
 
 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud).
 {{% /admonition %}}
 
 By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just queries that exist on dashboards to which they have access. Additionally, by default, data sources can be edited by the user who created the data source, as well as users with the `Admin` role.
@@ -81,29 +85,33 @@ You can assign data source permissions to users, teams, and roles which will all
 
 <div class="clearfix"></div>
 
-## Query caching
+## Query and resource caching
 
-When query caching is enabled, Grafana temporarily stores the results of data source queries. When you or another user submit the exact same query again, the results will come back from the cache instead of from the data source (like Splunk or ServiceNow) itself.
+When you enable query and resource caching, Grafana temporarily stores the results of data source queries and resource requests. When you or another user submit the same query or resource request again, the results will come back from the cache instead of from the data source.
 
-Query caching works for all backend data sources. You can enable the cache globally and configure the cache duration (also called Time to Live, or TTL).
+When using Grafana, a query pertains to a request for data frames to be modified or displayed. A resource relates to any HTTP requests made by a plugin, such as the Amazon Timestream plugin requesting a list of available databases from AWS. For more information on data source queries and resources, please see the developers page on [backend plugins](/developers/plugin-tools/introduction/backend-plugins).
+
+The caching feature works for **all** backend data sources. You can enable the cache globally in Grafana's [configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}), and configure a cache duration (also called Time to Live, or TTL) for each data source individually.
 
 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
+Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud](/docs/grafana-cloud/).
 {{% /admonition %}}
 
-The following cache backends are available: in-memory, Redis, and Memcached.
+The following cache backend options are available: in-memory, Redis, and Memcached.
 
 {{% admonition type="note" %}}
 Storing cached queries in-memory can increase Grafana's memory footprint. In production environments, a Redis or Memcached backend is highly recommended.
 {{% /admonition %}}
 
-When a panel queries a cached data source, the time until this query fetches fresh data is determined by the panel's **interval.** This means that wider panels and dashboards with shorter time ranges fetch new data more frequently than narrower panels and dashboards with longer time ranges.
+When a panel queries a data source with cached data, it will either fetch fresh data or use cached data depending on the panel's **interval.** The interval is used to round the query time range to a nearby cached time range, increasing the likelihood of cache hits. Therefore, wider panels and dashboards with shorter time ranges fetch new data more often than narrower panels and dashboards with longer time ranges.
 
-Interval is visible in a panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated like this: `(max data points) / time range`. Max data points are calculated based on the width of the panel. For example, a full-width panel on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes. In this example, cached data for this panel will be served for up to 10 minutes before Grafana queries the data source again and returns new data.
+A panel's interval is visible in the [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated as follows: `time range / max data points`. Max data points are calculated based on the width of the panel. For example, a wide panel with `1000 data points` on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes: `7d / 1000 = 10m`. In this example, cached data for this panel will be served for up to 10 minutes before Grafana needs to query the data source again for new data.
 
-You can make a panel retrieve fresh data more frequently by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).
+You can configure a panel to retrieve data more often by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).
 
-### Query caching benefits
+### Caching benefits
+
+By reducing the number of queries and requests sent to data sources, caching can provide the following benefits:
 
 - Faster dashboard load times, especially for popular dashboards.
 - Reduced API costs.
@@ -111,21 +119,13 @@ You can make a panel retrieve fresh data more frequently by increasing the **Max
 
 ### Data sources that work with query caching
 
-Query caching works for all [Enterprise data sources](/grafana/plugins/?type=datasource&enterprise=1) as well as the following [built-in data sources]({{< relref "../../datasources/" >}}):
+Query caching works for Grafana's [built-in data sources]({{< relref "../../datasources/#built-in-core-data-sources" >}}), and [backend data source plugins](https://grafana.com/grafana/plugins/?type=datasource) that extend the `DataSourceWithBackend` class in the plugins SDK.
 
-- CloudWatch Metrics
-- Google Cloud Monitoring
-- InfluxDB
-- Microsoft SQL Server
-- MySQL
-- Postgres
-- Tempo
+To verify that a data source works with query caching, follow the [instructions below](#enable-and-configure-query-caching) to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
 
-Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana query caching does not improve performance.
-
-Query caching also works for all data sources that include a backend. More specifically, caching works with data sources that extend the `DataSourceWithBackend` class in the plugins SDK.
-
-To tell if a data source works with query caching, follow the instructions below to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
+{{% admonition type="note" %}}
+Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana _query_ caching does not significantly improve performance. However, _resource_ caching may help. See the developers page on [plugin resources](/developers/plugin-tools/introduction/backend-plugins) for details.
+{{% /admonition %}}
 
 ### Enable and configure query caching
 
@@ -140,7 +140,7 @@ By default, data source queries are not cached. To enable query caching for a si
 1. Click **Enable**.
 1. (Optional) Choose custom TTLs for the data source's queries and resources caching. If you skip this step, then Grafana uses the default TTL.
 
-You can optionally override a data source's configured TTL for individual dashboard panels. This can be be useful when you have queries whose results change more or less often than the configured TTL. In the Edit Panel view, select the caching-enabled data source, expand the Query options, and enter your the TTL in milliseconds.
+You can optionally override a data source's configured TTL for individual dashboard panels. This can be useful when you have queries whose results change more or less often than the configured TTL. In the Edit Panel view, select the caching-enabled data source, expand the Query options, and enter your the TTL in milliseconds.
 
 {{< figure max-width="500px" src="/media/docs/grafana/per-panel-cache-ttl-9-4.png" caption="Set Cache TTL for a single panel" >}}
 
@@ -148,7 +148,7 @@ You can optionally override a data source's configured TTL for individual dashbo
 If query caching is enabled and the Cache tab is not visible in a data source's settings, then query caching is not available for that data source.
 {{% /admonition %}}
 
-To configure global settings for query caching, refer to the [Query caching section of Enterprise Configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).
+To configure global settings for query caching, refer to the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).
 
 ### Disable query caching
 
@@ -159,7 +159,7 @@ To disable query caching for a single data source:
 1. In the data source list, click the data source that you want to turn off caching for.
 1. On the Cache tab, click **Disable**.
 
-To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the [Query caching section of Enterprise Configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.
+To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the `caching` section of [Configure Grafana Enterprise]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.
 
 ### Clear cache
 
@@ -195,4 +195,4 @@ For more documentation on a specific data source plugin's features, including it
 
 ### Create a data source plugin
 
-To build your own data source plugin, refer to the ["Build a data source plugin"](/tutorials/build-a-data-source-plugin/) tutorial and our documentation about [building a plugin](/developers/plugins/).
+To build your own data source plugin, refer to the ["Build a data source plugin"](/developers/plugin-tools/tutorials/build-a-data-source-plugin) tutorial and our documentation about [building a plugin](/developers/plugin-tools).

docs/sources/administration/enterprise-licensing/_index.md

@@ -13,6 +13,10 @@ keywords:
   - grafana
   - licensing
   - enterprise
+labels:
+  products:
+    - enterprise
+    - oss
 title: Grafana Enterprise license
 weight: 500
 ---

docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md

@@ -11,6 +11,10 @@ keywords:
   - marketplace
   - enterprise
   - license
+labels:
+  products:
+    - enterprise
+    - oss
 title: Activate a Grafana Enterprise license purchased through AWS Marketplace
 weight: 400
 ---

docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md

@@ -10,6 +10,10 @@ keywords:
   - aws
   - marketplace
   - activate
+labels:
+  products:
+    - enterprise
+    - oss
 title: Activate a Grafana Enterprise license from AWS Marketplace on ECS
 weight: 250
 ---

docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md

@@ -10,6 +10,10 @@ keywords:
   - marketplace
   - eks
   - activate
+labels:
+  products:
+    - enterprise
+    - oss
 title: Activate a Grafana Enterprise license from AWS Marketplace on EKS
 weight: 200
 ---

docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md

@@ -10,6 +10,10 @@ keywords:
   - aws
   - marketplace
   - activate
+labels:
+  products:
+    - enterprise
+    - oss
 title: Activate a Grafana Enterprise license from AWS on an instance deployed outside
   of AWS
 weight: 300

docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md

@@ -12,6 +12,10 @@ keywords:
   - add
   - remove
   - users
+labels:
+  products:
+    - enterprise
+    - oss
 title: Manage your Grafana Enterprise license in AWS Marketplace
 weight: 400
 ---

docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md

@@ -10,6 +10,10 @@ keywords:
   - marketplace
   - transfer
   - move
+labels:
+  products:
+    - enterprise
+    - oss
 title: Transfer your AWS Marketplace Grafana Enterprise license
 weight: 400
 ---

docs/sources/administration/organization-management/index.md

@@ -8,6 +8,10 @@ description: Describes how to use organizations to isolate dashboard to users an
 keywords:
   - organizations
   - dashboards
+labels:
+  products:
+    - enterprise
+    - oss
 menuTitle: Manage organizations
 title: Manage organizations
 weight: 200

docs/sources/administration/organization-preferences/index.md

@@ -6,6 +6,10 @@ aliases:
   - preferences/change-grafana-theme/
   - preferences/change-grafana-timezone/
   - preferences/change-home-dashboard/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Organization preferences
 weight: 500
 ---

docs/sources/administration/plugin-management/index.md

@@ -5,6 +5,10 @@ aliases:
   - ../plugins/installation/
   - ../plugins/plugin-signature-verification/
   - ../plugins/plugin-signatures/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Plugin management
 weight: 600
 ---
@@ -13,13 +17,13 @@ weight: 600
 
 Besides the wide range of visualizations and data sources that are available immediately after you install Grafana, you can extend your Grafana experience with _plugins_.
 
-You can [install]({{< relref "#install-a-plugin" >}}) one of the plugins built by the Grafana community, or [build one yourself]({{< relref "../../developers/plugins/" >}}).
+You can [install](#install-a-plugin) one of the plugins built by the Grafana community, or [build one yourself](/developers/plugin-tools).
 
 Grafana supports three types of plugins: [panels](/grafana/plugins?type=panel), [data sources](/plugins?type=datasource), and [apps](/grafana/plugins?type=app).
 
 ## Panel plugins
 
-Add new visualizations to your dashboard with panel plugins, such as the [Worldmap Panel](/grafana/plugins/grafana-worldmap-panel), [Clock](/grafana/plugins/grafana-clock-panel), and [Pie Chart](/grafana/plugins/grafana-piechart-panel).
+Add new visualizations to your dashboard with panel plugins, such as the [Clock](/grafana/plugins/grafana-clock-panel), [Mosaic](/grafana/plugins/boazreicher-mosaicplot-panel) and [Variable](/grafana/plugins/volkovlabs-variable-panel) panels.
 
 Use panel plugins when you want to:
 
@@ -96,6 +100,7 @@ To browse for available plugins:
 To install a plugin:
 
 1. In Grafana, click **Administration > Plugins** in the side navigation menu to view installed plugins.
+1. Click the **All** filter to browse all available plugins.
 1. Browse and find a plugin.
 1. Click on the plugin logo.
 1. Click **Install**.
@@ -167,7 +172,7 @@ Grafana also writes an error message to the server log:
 WARN[05-26|12:00:00] Some plugin scanning errors were found   errors="plugin '<plugin id>' is unsigned, plugin '<plugin id>' has an invalid signature"
 ```
 
-If you are a plugin developer and want to know how to sign your plugin, refer to [Sign a plugin]({{< relref "../../developers/plugins/sign-a-plugin/" >}}).
+If you are a plugin developer and want to know how to sign your plugin, refer to [Sign a plugin](/developers/plugin-tools/publish-a-plugin/sign-a-plugin).
 
 | Signature status   | Description                                                                     |
 | ------------------ | ------------------------------------------------------------------------------- |

docs/sources/administration/provisioning/index.md

@@ -5,6 +5,10 @@ description: Describes provisioning settings for Grafana using configuration fil
 keywords:
   - grafana
   - provisioning
+labels:
+  products:
+    - enterprise
+    - oss
 title: Provision Grafana
 weight: 600
 ---
@@ -58,7 +62,7 @@ Currently we do not provide any scripts/manifests for configuring Grafana. Rathe
 | Tool      | Project                                                                                                        |
 | --------- | -------------------------------------------------------------------------------------------------------------- |
 | Puppet    | [https://forge.puppet.com/puppet/grafana](https://forge.puppet.com/puppet/grafana)                             |
-| Ansible   | [https://github.com/cloudalchemy/ansible-grafana](https://github.com/cloudalchemy/ansible-grafana)             |
+| Ansible   | [https://github.com/grafana/grafana-ansible-collection](https://github.com/grafana/grafana-ansible-collection) |
 | Chef      | [https://github.com/sous-chefs/chef-grafana](https://github.com/sous-chefs/chef-grafana)                       |
 | Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana) |
 | Jsonnet   | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/)                         |
@@ -366,8 +370,8 @@ By default, Grafana deletes dashboards in the database if the file is removed. Y
 
 {{% admonition type="note" %}}
 Provisioning allows you to overwrite existing dashboards
-which leads to problems if you re-use settings that are supposed to be unique.
-Be careful not to re-use the same `title` multiple times within a folder
+which leads to problems if you reuse settings that are supposed to be unique.
+Be careful not to reuse the same `title` multiple times within a folder
 or `uid` within the same installation as this will cause weird behaviors.
 {{% /admonition %}}
 

docs/sources/administration/recorded-queries/index.md

@@ -7,6 +7,10 @@ keywords:
   - query
   - queries
   - recorded
+labels:
+  products:
+    - cloud
+    - enterprise
 title: Recorded queries
 weight: 300
 ---

docs/sources/administration/roles-and-permissions/_index.md

@@ -6,6 +6,10 @@ aliases:
   - ../permissions/overview/
   - manage-users-and-permissions/about-users-and-permissions/
 description: Information about Grafana user, team, and organization roles and permissions
+labels:
+  products:
+    - enterprise
+    - oss
 title: Roles and permissions
 weight: 300
 ---

docs/sources/administration/roles-and-permissions/access-control/_index.md

@@ -6,6 +6,10 @@ aliases:
 description: Role-based access control (RBAC) provides a standardized way of granting,
   changing, and revoking access so that users can view and modify Grafana resources,
   such as users and reports.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Role-based access control (RBAC)
 title: Grafana Role-based access control (RBAC)
 weight: 120

docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md

@@ -4,6 +4,10 @@ aliases:
   - ../../../enterprise/access-control/manage-role-assignments/manage-built-in-role-assignments/
   - ../../../enterprise/access-control/manage-role-assignments/manage-user-role-assignments/
 description: Learn how to assign RBAC roles to users and teams in Grafana.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Assign RBAC roles
 title: Assign Grafana RBAC roles
 weight: 40

docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md

@@ -2,6 +2,10 @@
 aliases:
   - ../../../enterprise/access-control/configure-rbac/
 description: Learn how to configure RBAC.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Configure RBAC
 title: Configure RBAC in Grafana
 weight: 30

docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md

@@ -3,6 +3,10 @@ aliases:
   - ../../../enterprise/access-control/custom-role-actions-scopes/
   - ../../../enterprise/access-control/permissions/
 description: Learn about Grafana RBAC permissions, actions, and scopes.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: RBAC permissions, actions, and scopes
 title: Grafana RBAC permissions, actions, and scopes
 weight: 80

docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md

@@ -5,6 +5,10 @@ aliases:
   - ../../../enterprise/access-control/provisioning/
 description: Learn how to view permissions associated with roles, create custom roles,
   and update and delete roles in Grafana.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Manage RBAC roles
 title: Manage Grafana RBAC roles
 weight: 50

docs/sources/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/index.md

@@ -4,6 +4,10 @@ aliases:
   - ../../../enterprise/access-control/usage-scenarios/
 description: Plan your RBAC rollout strategy before you begin assigning roles to users
   and teams.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Plan your RBAC rollout strategy
 title: Plan your Grafana RBAC rollout strategy
 weight: 20

docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md

@@ -4,6 +4,10 @@ aliases:
   - ../../../enterprise/access-control/rbac-fixed-basic-role-definitions/
 description: This topic includes a table that lists permission associated with Grafana
   fixed and basic roles.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: RBAC role definitions
 title: Grafana RBAC role definitions
 weight: 70
@@ -97,7 +101,7 @@ The following tables list permissions associated with basic and fixed roles.
 
 ### Alerting roles
 
-If alerting is [enabled]({{< relref "../../../../alerting/set-up/migrating-alerts/opt-out/" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
+If alerting is [enabled]({{< relref "../../../../alerting/set-up/migrating-alerts" >}}), you can use predefined roles to manage user access to alert rules, alert instances, and alert notification settings and create custom roles to limit user access to alert rules in a folder.
 
 Access to Grafana alert rules is an intersection of many permissions:
 

docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md

@@ -4,6 +4,10 @@ aliases:
   - rbac-provisioning/
 description: Learn about RBAC Grafana provisioning and view an example YAML provisioning
   file that configures Grafana role assignments.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Provisioning RBAC with Grafana
 title: Provisioning RBAC with Grafana
 weight: 60

docs/sources/administration/roles-and-permissions/access-control/rbac-terraform-provisioning/index.md

@@ -3,6 +3,10 @@ aliases:
   - ../../../enterprise/access-control/rbac-provisioning/rbac-terraform-provisioning/
 description: Learn about RBAC Terraform provisioning and view an example of provisioning
   configuration for Grafana roles and role assignments.
+labels:
+  products:
+    - cloud
+    - enterprise
 menuTitle: Provisioning RBAC with Terraform
 title: Provisioning RBAC with Terraform
 weight: 60

docs/sources/administration/roles-and-permissions/access-control/troubleshooting/index.md

@@ -1,12 +1,11 @@
 ---
 aliases:
   - ../../../enterprise/access-control/troubleshooting/
+description: RBAC troubleshooting guide.
 labels:
   products:
     - cloud
     - enterprise
-    - oss
-description: RBAC troubleshooting guide.
 menuTitle: Troubleshooting RBAC
 title: Troubleshooting RBAC
 weight: 80
@@ -28,7 +27,7 @@ filters = accesscontrol:debug accesscontrol.evaluator:debug dashboard.permission
 ## Enable audit logging
 
 {{% admonition type="note" %}}
-Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud](/docs/grafana-cloud).
+Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) version 7.3 and later, and [Grafana Cloud](/docs/grafana-cloud).
 {{% /admonition %}}
 
 You can enable auditing in the Grafana configuration file.

docs/sources/administration/service-accounts/index.md

@@ -8,6 +8,10 @@ description: This page contains information about service accounts in Grafana
 keywords:
   - API keys
   - Service accounts
+labels:
+  products:
+    - enterprise
+    - oss
 menuTitle: Service accounts
 title: Service accounts
 weight: 800

docs/sources/administration/stats-and-license/index.md

@@ -11,6 +11,10 @@ keywords:
   - configuration
   - server
   - settings
+labels:
+  products:
+    - cloud
+    - enterprise
 title: View server statistics and license
 weight: 400
 ---

docs/sources/administration/team-management/index.md

@@ -4,6 +4,10 @@ aliases:
   - ../manage-users/create-or-remove-team/
   - ../manage-users/manage-teams/
   - manage-users-and-permissions/manage-teams/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Team management
 weight: 400
 ---

docs/sources/administration/user-management/_index.md

@@ -1,6 +1,10 @@
 ---
 aliases:
   - manage-users-and-permissions/
+labels:
+  products:
+    - enterprise
+    - oss
 title: User management
 weight: 200
 ---

docs/sources/administration/user-management/manage-dashboard-permissions/index.md

@@ -2,6 +2,10 @@
 aliases:
   - ../../permissions/dashboard_folder_permissions/
   - ../manage-users-and-permissions/manage-dashboard-permissions/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Manage dashboard permissions
 weight: 500
 ---

docs/sources/administration/user-management/manage-org-users/index.md

@@ -7,6 +7,10 @@ aliases:
   - ../manage-users-and-permissions/manage-org-users/manage-pending-invites/
   - ../manage-users-and-permissions/manage-org-users/remove-user-from-org/
   - ../manage-users-and-permissions/manage-org-users/view-list-org-users/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Manage users in an organization
 weight: 400
 ---

docs/sources/administration/user-management/server-user-management/_index.md

@@ -8,6 +8,10 @@ aliases:
   - ../manage-users-and-permissions/manage-server-users/view-edit-user-account/
   - ../manage-users-and-permissions/manage-server-users/view-list-users/
   - ../manage-users-and-permissions/manage-server-users/view-user-account-details/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Server user management
 weight: 100
 ---

docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md

@@ -4,6 +4,10 @@ aliases:
   - ../../manage-users-and-permissions/manage-server-users/add-user-to-org/
 description: Describes how a Grafana server administrator can add or remove users
   in an organization
+labels:
+  products:
+    - enterprise
+    - oss
 title: Add or remove a user in an organization
 weight: 30
 ---

docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md

@@ -3,6 +3,10 @@ aliases:
   - ../../manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/
 description: Describes how to assign and remove Grafana administrator privileges from
   a server user.
+labels:
+  products:
+    - enterprise
+    - oss
 title: Assign or remove Grafana server administrator privileges
 weight: 20
 ---

docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md

@@ -1,6 +1,10 @@
 ---
 aliases:
   - ../../manage-users-and-permissions/manage-server-users/change-user-org-permissions/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Change a user's organization permissions
 weight: 50
 ---

docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md

@@ -1,6 +1,10 @@
 ---
 aliases:
   - ../../manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
+labels:
+  products:
+    - enterprise
+    - oss
 title: Grant editors administrator permissions
 weight: 60
 ---

docs/sources/administration/user-management/user-preferences/index.md

@@ -8,6 +8,10 @@ keywords:
   - change
   - organization
   - change
+labels:
+  products:
+    - enterprise
+    - oss
 title: Manage user preferences
 weight: 400
 ---

docs/sources/alerting/_index.md

@@ -1,8 +1,15 @@
 ---
 aliases:
   - about-alerting/
-  - unified-alerting/alerting/
+  - ./unified-alerting/alerting/
+  - ./alerting/unified-alerting/
+canonical: https://grafana.com/docs/grafana/latest/alerting/
 description: Intro to key benefits and features of Grafana Alerting
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Alerting
 weight: 114
 ---

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

@@ -1,10 +1,17 @@
 ---
-menuTitle: Configure
 aliases:
   - old-alerting/create-alerts/
   - rules/
   - unified-alerting/alerting-rules/
+  - ./create-alerts/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/
 description: Configure alerting
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Configure
 title: Configure Alerting
 weight: 130
 ---

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

@@ -1,6 +1,7 @@
 ---
 aliases:
   - ../unified-alerting/alerting-rules/create-grafana-managed-rule/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/
 description: Create Grafana managed alert rule
 keywords:
   - grafana
@@ -8,6 +9,11 @@ keywords:
   - guide
   - rules
   - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Create Grafana-managed alert rules
 weight: 400
 ---

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

@@ -2,6 +2,7 @@
 aliases:
   - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
   - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
 description: Create Grafana Mimir or Loki managed recording rule
 keywords:
   - grafana
@@ -10,6 +11,11 @@ keywords:
   - rules
   - recording rules
   - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Create Grafana Mimir or Loki managed recording rules
 weight: 400
 ---

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

@@ -3,6 +3,7 @@ aliases:
   - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
   - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
   - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
 description: Create Grafana Mimir or Loki managed alerting rule
 keywords:
   - grafana
@@ -10,6 +11,11 @@ keywords:
   - guide
   - rules
   - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Create Grafana Mimir or Loki managed alert rules
 weight: 400
 ---

docs/sources/alerting/alerting-rules/create-notification-policy.md

@@ -3,6 +3,7 @@ aliases:
   - ../notifications/
   - ../old-alerting/notifications/
   - ../unified-alerting/notifications/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-notification-policy/
 description: Notification policies
 keywords:
   - grafana
@@ -10,6 +11,11 @@ keywords:
   - guide
   - notification policies
   - routes
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Configure notification policies
 weight: 420
 ---
@@ -48,10 +54,12 @@ Before Grafana v8.2, the configuration of the embedded Alertmanager was shared a
 
 ## Add new nested policy
 
+To create a new notification policy, you need to follow its tree structure. New policies created on the trunk of the tree (default policy), are the tree branches. And, subsequently, each branch can bear their own child policies. This is why you will always be adding a new **nested** policy under either the default policy, or under a already nested policy.
+
 1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
 1. Click **Notification policies**.
 1. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, the **Grafana Alertmanager** is selected.
-1. To add a top level specific policy, go to the Specific routing section and click **+New specific policy**.
+1. To add a top level specific policy, go to the Specific routing section (either to the default policy, or to another existing policy in which you would like to add a new nested policy) and click **+New nested policy**.
 1. In the Matching labels section, add one or more rules for matching alert labels.
 1. In the **Contact point** dropdown, select the contact point to send notification to if alert matches only this specific policy and not any of the nested policies.
 1. Optionally, enable **Continue matching subsequent sibling nodes** to continue matching sibling policies even after the alert matched the current policy. When this option is enabled, you can get more than one notification for one alert.

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

@@ -2,6 +2,7 @@
 aliases:
   - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
   - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/
 description: Edit Grafana Mimir or Loki rule groups and namespaces
 keywords:
   - grafana
@@ -11,6 +12,11 @@ keywords:
   - namespace
   - grafana mimir
   - loki
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Grafana Mimir or Loki rule groups and namespaces
 weight: 405
 ---

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

@@ -1,11 +1,13 @@
 ---
 aliases:
-  - ../../contact-points/create-contact-point/
-  - ../../contact-points/delete-contact-point/
-  - ../../contact-points/edit-contact-point/
-  - ../../contact-points/test-contact-point/
-  - ../create-contact-point/
-  - alerting/manage-notifications/manage-contact-points/
+  - ../contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/
+  - ../contact-points/create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/create-contact-point/
+  - ../contact-points/delete-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/delete-contact-point/
+  - ../contact-points/edit-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/edit-contact-point/
+  - ../contact-points/test-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/contact-points/test-contact-point/
+  - ../manage-notifications/manage-contact-points/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/manage-contact-points/
+  - create-contact-point/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-contact-point/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/
 description: How to manage your contact points
 keywords:
   - grafana
@@ -13,6 +15,11 @@ keywords:
   - guide
   - contact point
   - templating
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Configure contact points
 weight: 410
 ---

docs/sources/alerting/alerting-rules/manage-contact-points/configure-integrations.md

@@ -1,6 +1,7 @@
 ---
 aliases:
   - alerting/manage-notifications/manage-contact-points/configure-integrations/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/configure-integrations/
 description: Configure integrations
 keywords:
   - Grafana
@@ -9,6 +10,11 @@ keywords:
   - notifications
   - integrations
   - contact points
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Configure integrations
 weight: 100
 ---

docs/sources/alerting/alerting-rules/manage-contact-points/webhook-notifier.md

@@ -3,6 +3,7 @@ aliases:
   - ../contact-points/notifiers/webhook-notifier/
   - ../fundamentals/contact-points/webhook-notifier/
   - alerting/manage-notifications/manage-contact-points/webhook-notifier/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/manage-contact-points/webhook-notifier/
 description: Configure the webhook notifier for notifications
 keywords:
   - grafana
@@ -10,6 +11,11 @@ keywords:
   - guide
   - contact point
   - templating
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Configure the webhook notifier
 weight: 200
 ---

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

@@ -1,19 +1,26 @@
 ---
+_build:
+  list: false
 aliases:
   - unified-alerting/difference-old-new/
-description: What's New with Grafana alerts
-draft: true
+canonical: https://grafana.com/docs/grafana/latest/alerting/difference-old-new/
+description: Compare new unified alerting compared to legacy dashboard alerting
 keywords:
   - grafana
   - alerting
   - guide
-title: What's new in Grafana Alerting
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Grafana Alerting vs Legacy dashboard alerting
 weight: 108
 ---
 
-# What's new in Grafana Alerting
+# Grafana Alerting vs Legacy dashboard alerting
 
-Grafana Alerting has several enhancements over legacy dashboard alerting.
+Introduced in Grafana 8.0, and the only system since Grafana 10.0, Grafana Alerting has several enhancements over legacy dashboard alerting.
 
 ## Multi-dimensional alerting
 

docs/sources/alerting/fundamentals/_index.md

@@ -1,9 +1,15 @@
 ---
-menuTitle: Introduction
 aliases:
   - metrics/
   - unified-alerting/fundamentals/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/
 description: Intro to the key concepts in Alerting and how it works
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Introduction
 title: Introduction to Alerting
 weight: 105
 ---

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

@@ -1,9 +1,15 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/
 description: About Grafana alert rules
 keywords:
   - grafana
   - alerting
   - rules
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Alert rules
 weight: 105
 ---

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

@@ -1,9 +1,15 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/alert-instances/
 description: Learn about Grafana alert instances
 keywords:
   - grafana
   - alerting
   - instances
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Alert instances
 weight: 104
 ---

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

@@ -1,9 +1,15 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/alert-rule-types/
 description: Learn about the different alert rule types
 keywords:
   - grafana
   - alerting
   - rule types
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Alert rule types
 weight: 102
 ---

docs/sources/alerting/fundamentals/alert-rules/message-templating.md

@@ -3,6 +3,7 @@ aliases:
   - ../../contact-points/message-templating/
   - ../../message-templating/
   - ../../unified-alerting/message-templating/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/message-templating/
 description: Notification templating
 keywords:
   - grafana
@@ -10,6 +11,11 @@ keywords:
   - guide
   - contact point
   - templating
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Notification templating
 weight: 415
 ---
@@ -53,11 +59,11 @@ Alert summary:
 
 You can use any of the following built-in template options to embed custom templates.
 
-| Name                    | Notes                                                         |
-| ----------------------- | ------------------------------------------------------------- |
-| `default.title`         | Displays high-level status information.                       |
-| `default.message`       | Provides a formatted summary of firing and resolved alerts.   |
-| `teams.default.message` | Similar to `default.messsage`, formatted for Microsoft Teams. |
+| Name                    | Notes                                                        |
+| ----------------------- | ------------------------------------------------------------ |
+| `default.title`         | Displays high-level status information.                      |
+| `default.message`       | Provides a formatted summary of firing and resolved alerts.  |
+| `teams.default.message` | Similar to `default.message`, formatted for Microsoft Teams. |
 
 ### HTML in notification templates
 

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

@@ -1,9 +1,15 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/organising-alerts/
 description: Learn how to organize alert rules
 keywords:
   - grafana
   - alerting
   - organization
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Organising alert rules
 weight: 105
 ---

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

@@ -1,12 +1,18 @@
 ---
-title: Queries and conditions
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/queries-conditions/
 description: Introduction to queries and conditions
-weight: 103
 keywords:
   - grafana
   - alerting
   - queries
   - conditions
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Queries and conditions
+weight: 103
 ---
 
 # Queries and conditions
@@ -91,6 +97,27 @@ Checks if any time series data matches the alert condition.
 Classic condition expression queries always produce one alert instance only, no matter how many time series meet the condition.
 Classic conditions exist mainly for compatibility reasons and should be avoided if possible.
 
+## Aggregations
+
+Grafana Alerting provides the following aggregation functions to enable you to further refine your query.
+
+These functions are available for **Reduce** and **Classic condition** expressions only.
+
+| Function         | Expression       | What it does                                                                    |
+| ---------------- | ---------------- | ------------------------------------------------------------------------------- |
+| avg              | Reduce / Classic | Displays the average of the values                                              |
+| min              | Reduce / Classic | Displays the lowest value                                                       |
+| max              | Reduce / Classic | Displays the highest value                                                      |
+| sum              | Reduce / Classic | Displays the sum of all values                                                  |
+| count            | Reduce / Classic | Counts the number of values in the result                                       |
+| last             | Reduce / Classic | Displays the last value                                                         |
+| median           | Reduce / Classic | Displays the median value                                                       |
+| diff             | Classic          | Displays the difference between the newest and oldest value                     |
+| diff_abs         | Classic          | Displays the absolute value of diff                                             |
+| percent_diff     | Classic          | Displays the percentage value of the difference between newest and oldest value |
+| percent_diff_abs | Classic          | Displays the absolute value of percent_diff                                     |
+| count_non_null   | Classic          | Displays a count of values in the result set that aren't `null`                 |
+
 ## Alert condition
 
 An alert condition is the query or expression that determines whether the alert will fire or not depending on the value it yields. There can be only one condition which will determine the triggering of the alert.

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

@@ -1,11 +1,17 @@
 ---
-title: Alert rule evaluation
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/rule-evaluation/
 description: Introduction to alert rule evaluation
-weight: 106
 keywords:
   - grafana
   - alerting
   - evaluation
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Alert rule evaluation
+weight: 106
 ---
 
 # Alert rule evaluation
@@ -16,9 +22,11 @@ To do this, you need to make sure that your alert rule is in the right evaluatio
 
 ## Evaluation group
 
-Every alert rule is part of an evaluation group. Each evaluation group contains an evaluation interval that determines how frequently the alert rule is checked. Alert rules within the same group are evaluated one after the other, while alert rules in different groups can be evaluated simultaneously.
+Every alert rule is part of an evaluation group. Each evaluation group contains an evaluation interval that determines how frequently the alert rule is checked.
 
-This feature is especially useful for Prometheus/Mimir rules when you want to ensure that recording rules are evaluated before any alert rules.
+**Data-source managed** alert rules within the same group are evaluated one after the other, while alert rules in different groups can be evaluated simultaneously. This feature is especially useful when you want to ensure that recording rules are evaluated before any alert rules.
+
+**Grafana-managed** alert rules are evaluated at the same time, regardless of alert rule group. The default evaluation interval is set at 10 seconds, which means that Grafana-managed alert rules are evaluated every 10 seconds to the closest 10-second window on the clock, for example, 10:00:00, 10:00:10, 10:00:20, and so on. You can also configure your own evaluation interval, if required.
 
 **Note:**
 
@@ -39,7 +47,7 @@ Evaluation will occur as follows:
 [00:30] First evaluation - condition not met.
 
 [01:00] Second evaluation - condition breached.
-Pending counter starts. **Alert stars pending.**
+Pending counter starts. **Alert starts pending.**
 
 [01:30] Third evaluation - condition breached. Pending counter = 30s. **Pending state.**
 

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

@@ -1,12 +1,18 @@
 ---
 aliases:
   - ../unified-alerting/alerting-rules/state-and-health/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/state-and-health/
 description: State and Health of alerting rules
 keywords:
   - grafana
   - alerting
   - guide
   - state
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: State and health of alerting rules
 weight: 405
 ---

docs/sources/alerting/fundamentals/alertmanager.md

@@ -4,7 +4,13 @@ aliases:
   - ../metrics/
   - ../unified-alerting/fundamentals/alertmanager/
   - alerting/manage-notifications/alertmanager/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/alertmanager/
 description: Intro to the different Alertmanagers
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Alertmanager
 weight: 103
 ---

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

@@ -2,6 +2,7 @@
 aliases:
   - ../alerting-rules/alert-annotation-label/
   - ../unified-alerting/alerting-rules/alert-annotation-label/
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/
 description: Annotations and labels for alerting
 keywords:
   - grafana
@@ -9,6 +10,11 @@ keywords:
   - guide
   - rules
   - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Labels and annotations
 weight: 110
 ---

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

@@ -1,10 +1,16 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/how-to-use-labels/
 description: Learn about labels and label matchers in alerting
 keywords:
   - grafana
   - alerting
   - guide
   - fundamentals
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Labels in Grafana Alerting
 weight: 117
 ---

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

@@ -1,12 +1,18 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/labels-and-label-matchers/
 description: Learn about labels and label matchers in alerting
 keywords:
   - grafana
   - alerting
   - guide
   - fundamentals
-title: How label matching works
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 menuTitle: Label matchers
+title: How label matching works
 weight: 117
 ---
 
@@ -44,3 +50,15 @@ then:
 - A label matcher defined as `id=~[0-9]+` matches this alert rule.
 - A label matcher defined as `baz!~[0-9]+` matches this alert rule.
 - Two label matchers defined as `foo=bar` and `id=~[0-9]+` match this alert rule.
+
+## Exclude labels
+
+You can also write label matchers to exclude labels.
+
+Here is an example that shows how to exclude the label `Team`. You can choose between any of the values below to exclude labels.
+
+| Label  | Operator | Value |
+| ------ | -------- | ----- |
+| `team` | `=`      | `""`  |
+| `team` | `!~`     | `.+`  |
+| `team` | `=~`     | `^$`  |

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

@@ -1,4 +1,5 @@
 ---
+canonical: https://grafana.com/docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation/
 description: Learn about templating of labels and annotations
 keywords:
   - grafana
@@ -6,6 +7,11 @@ keywords:
   - templating
   - labels
   - annotations
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
 title: Templating labels and annotations
 weight: 117
 ---
@@ -97,15 +103,35 @@ If you were to print the value of the expression with RefID `B` in the summary o
 The summary will contain just the value:
 
 ```
-api has an over 5% of responses with 5xx errors: 6.789%
+api has over 5% of responses with 5xx errors: 6.78912%
 ```
 
-However, while `{{ $values.B }}` prints the number 6.789, it is actually a string as you are printing the object that contains both the labels and value for RefID B, not the floating point value of B. To use the floating point value of RefID B you must use the `Value` field from `$values.B`. If you were to humanize the floating point value in the summary of an alert:
+However, while `{{ $values.B }}` prints the number 6.78912, it is actually a string as you are printing the object that contains both the labels and value for RefID B, not the floating point value of B. To use the floating point value of RefID B you must use the `Value` field from `$values.B`.
+
+If you were to print the humanized floating point value in the summary of an alert:
 
 ```
 {{ $labels.service }} has over 5% of responses with 5xx errors: {{ humanize $values.B.Value }}%
 ```
 
+The summary will contain the humanized value:
+
+```
+api has over 5% of responses with 5xx errors: 6.789%
+```
+
+You can also compare the floating point value using the `eq`, `ne`, `lt`, `le`, `gt` and `ge` comparison operators:
+
+```
+{{ if gt $values.B.Value 50.0 -}}
+  Critical 5xx error rate
+{{ else -}}
+  Elevated 5xx error rate
+{{ end }}
+```
+
+When using comparison operators with `$values` make sure to compare it to a floating point number such as `50.0` and not an integer such as `50`. Go templates do not support implicit type coercion, and comparing a floating point number to an integer will break your template.
+
 ### No data, execution errors and timeouts
 
 If the query in your alert rule returns no data, or fails because of a datasource error or timeout, then any Threshold, Reduce or Math expressions that use that query will also return no data or an error. When this happens these expression will be absent from `$values`. It is good practice to check that a RefID is present before using it as otherwise your template will break should your query return no data or an error. You can do this using an if statement: