apply security patch: v11.3.x/307-202501232116.patch

commit c5ca3ef17ad8afe659afe3c315ed3e78bf262764 Author: Matt Jacobson <matthew.jacobson@grafana.com> Date: Thu Jan 23 16:14:28 2025 -0500 linting commit f37e0a854ede2d24216bbec976f00e6f9ab6b145 Author: Matt Jacobson <matthew.jacobson@grafana.com> Date: Thu Jan 23 15:17:48 2025 -0500 CVE-2024-11741 - victorops url (cherry picked from commit 53ea127dd6575460618bb6dac3377cdd86846795)
[v11.3.x] Remove codespell (#99430 )
2025-01-24 14:56:44 -06:00 · 2025-01-23 13:03:54 +00:00 · 2025-01-21 10:18:40 +02:00 · 2025-01-17 12:12:03 -06:00 · 2025-01-17 09:40:39 -05:00 · 2025-01-17 09:33:25 +01:00
288 changed files with 2296 additions and 10303 deletions
--- a/.betterer.results
+++ b/.betterer.results
@@ -5679,6 +5679,9 @@ exports[`better eslint`] = {
    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx:5381": [
      [0, 0, 0, "Styles should be written using objects.", "0"]
    ],
+    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx:5381": [
+      [0, 0, 0, "Styles should be written using objects.", "0"]
+    ],
    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/MetricsQueryEditor/DynamicLabelsField.tsx:5381": [
      [0, 0, 0, "Styles should be written using objects.", "0"]
    ],
@@ -7389,6 +7392,14 @@ exports[`no gf-form usage`] = {
    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor/XrayLinkConfig.tsx:5381": [
      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
    ],
+    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryEditor.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/QueryEditor/LogsQueryEditor/LogsQueryField.tsx:5381": [
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
+      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
+    ],
    "public/app/plugins/datasource/cloudwatch/components/shared/LogGroups/LegacyLogGroupNamesSelection.tsx:5381": [
      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"],
      [0, 0, 0, "gf-form usage has been deprecated. Use a component from @grafana/ui or custom CSS instead.", "5381"]
--- a/.drone.yml
+++ b/.drone.yml
@@ -18,7 +18,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -69,7 +69,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - go install github.com/bazelbuild/buildtools/buildifier@latest
@@ -112,7 +112,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -170,7 +170,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -307,7 +307,7 @@ steps:
    path: /github-app
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -414,7 +414,7 @@ steps:
    path: /github-app
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -503,7 +503,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -625,11 +625,11 @@ steps:
    path: /github-app
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -689,14 +689,12 @@ steps:
    token:
      from_secret: drone_token
 - commands:
-  - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version
-  - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*'
-  - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
+  - docker run --privileged --rm tonistiigi/binfmt --install all
  - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
    -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
    -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.5 --yarn-cache=$$YARN_CACHE_FOLDER
-    --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.5
+    --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3
    --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
    .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD
    > packages.txt
@@ -753,7 +751,7 @@ steps:
    GF_APP_MODE: development
    GF_SERVER_HTTP_PORT: "3001"
    GF_SERVER_ROUTER_LOGGING: "1"
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: grafana-server
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite dashboards-suite
@@ -1094,7 +1092,7 @@ steps:
    path: /github-app
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -1107,7 +1105,7 @@ steps:
  name: compile-build-cmd
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1298,7 +1296,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -1678,7 +1676,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -1749,7 +1747,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -1807,7 +1805,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -1873,7 +1871,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1953,7 +1951,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -2019,7 +2017,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -2093,11 +2091,11 @@ steps:
    path: /github-app
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2156,14 +2154,12 @@ steps:
  image: node:20.9.0-alpine
  name: build-frontend-packages
 - commands:
-  - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --version
-  - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --uninstall 'qemu-*'
-  - docker run --privileged --rm tonistiigi/binfmt:qemu-v7.0.0-28 --install all
+  - docker run --privileged --rm tonistiigi/binfmt --install all
  - /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
    -a targz:grafana:linux/arm/v7 -a docker:grafana:linux/amd64 -a docker:grafana:linux/amd64:ubuntu
    -a docker:grafana:linux/arm64 -a docker:grafana:linux/arm64:ubuntu -a docker:grafana:linux/arm/v7
    -a docker:grafana:linux/arm/v7:ubuntu --go-version=1.23.5 --yarn-cache=$$YARN_CACHE_FOLDER
-    --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.5
+    --build-id=$$DRONE_BUILD_NUMBER --ubuntu-base=ubuntu:22.04 --alpine-base=alpine:3.20.3
    --tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
    .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' --verify='false' --grafana-dir=$$PWD
    > packages.txt
@@ -2224,7 +2220,7 @@ steps:
    GF_APP_MODE: development
    GF_SERVER_HTTP_PORT: "3001"
    GF_SERVER_ROUTER_LOGGING: "1"
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: grafana-server
 - commands:
  - ./bin/build e2e-tests --port 3001 --suite dashboards-suite
@@ -2639,7 +2635,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2652,7 +2648,7 @@ steps:
  name: compile-build-cmd
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -2922,7 +2918,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -2978,7 +2974,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -3042,7 +3038,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3120,7 +3116,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd
@@ -3223,7 +3219,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3236,7 +3232,7 @@ steps:
  name: compile-build-cmd
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -3464,11 +3460,11 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3596,11 +3592,11 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -4085,7 +4081,7 @@ steps:
  environment:
    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
      from_secret: dagger_token
-    ALPINE_BASE: alpine:3.20.5
+    ALPINE_BASE: alpine:3.20.3
    CDN_DESTINATION:
      from_secret: rgm_cdn_destination
    DESTINATION:
@@ -4160,7 +4156,7 @@ steps:
  environment:
    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
      from_secret: dagger_token
-    ALPINE_BASE: alpine:3.20.5
+    ALPINE_BASE: alpine:3.20.3
    CDN_DESTINATION:
      from_secret: rgm_cdn_destination
    DESTINATION:
@@ -4322,7 +4318,7 @@ steps:
  environment:
    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
      from_secret: dagger_token
-    ALPINE_BASE: alpine:3.20.5
+    ALPINE_BASE: alpine:3.20.3
    CDN_DESTINATION:
      from_secret: rgm_cdn_destination
    DESTINATION:
@@ -4424,7 +4420,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - yarn install --immutable || yarn install --immutable
@@ -4478,7 +4474,7 @@ services: []
 steps:
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -4559,7 +4555,7 @@ steps:
  environment:
    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
      from_secret: dagger_token
-    ALPINE_BASE: alpine:3.20.5
+    ALPINE_BASE: alpine:3.20.3
    CDN_DESTINATION:
      from_secret: rgm_cdn_destination
    DESTINATION:
@@ -4703,7 +4699,7 @@ steps:
  environment:
    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
      from_secret: dagger_token
-    ALPINE_BASE: alpine:3.20.5
+    ALPINE_BASE: alpine:3.20.3
    CDN_DESTINATION:
      from_secret: rgm_cdn_destination
    DESTINATION:
@@ -4830,7 +4826,7 @@ steps:
  environment:
    _EXPERIMENTAL_DAGGER_CLOUD_TOKEN:
      from_secret: dagger_token
-    ALPINE_BASE: alpine:3.20.5
+    ALPINE_BASE: alpine:3.20.3
    CDN_DESTINATION:
      from_secret: rgm_cdn_destination
    DESTINATION:
@@ -4974,13 +4970,13 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.2/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v3.1.1/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
 - commands:
  - echo $DRONE_RUNNER_NAME
-  image: alpine:3.20.5
+  image: alpine:3.20.3
  name: identify-runner
 - commands:
  - '# It is required that code generated from Thema/CUE be committed and in sync
@@ -5429,7 +5425,7 @@ steps:
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
-  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.20.5
+  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.20.3
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM ubuntu:22.04
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM byrnedo/alpine-curl:0.1.8
  - trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM plugins/slack
@@ -5468,7 +5464,7 @@ steps:
  - trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm
  - trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
  - trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
-  - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.20.5
+  - trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.20.3
  - trivy --exit-code 1 --severity HIGH,CRITICAL ubuntu:22.04
  - trivy --exit-code 1 --severity HIGH,CRITICAL byrnedo/alpine-curl:0.1.8
  - trivy --exit-code 1 --severity HIGH,CRITICAL plugins/slack
@@ -5733,6 +5729,6 @@ kind: secret
 name: gcr_credentials
 ---
 kind: signature
-hmac: 2b06b33f549498dcf3784702c29a6abddd3719b73b941e88caacf89efe11712c
+hmac: 0e1d79751c8853ce588b471b8d82d62f2a1ca1cd2cd049353a6bc8c7a3d21ff4

 ...
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -695,14 +695,12 @@ embed.go @grafana/grafana-as-code
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
 /.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend
-/.github/workflows/auto-milestone.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/backport.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/bump-version.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/close-milestone.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/release-pr.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/release-comms.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/migrate-prs.yml @grafana/grafana-developer-enablement-squad
-/.github/workflows/create-next-release-branch.yml @grafana/grafana-developer-enablement-squad
+/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/backport.yml @grafana/grafana-release-guild
+/.github/workflows/bump-version.yml @grafana/grafana-release-guild
+/.github/workflows/close-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/release-pr.yml @grafana/grafana-release-guild
+/.github/workflows/release-comms.yml @grafana/grafana-release-guild
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -10,19 +10,24 @@ jobs:
    if: github.repository == 'grafana/grafana'
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout
+      - name: Checkout Actions
        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_DELIVERY_BOT_APP_ID }}
          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - run: git config --global user.email '132647405+grafana-delivery-bot[bot]@users.noreply.github.com'
-      - run: git config --global user.name 'grafana-delivery-bot[bot]'
-      - run: git remote set-url origin "https://grafana-delivery-bot:${{ steps.generate_token.outputs.token }}@github.com/grafana/grafana.git"
      - name: Run backport
-        uses: grafana/grafana-github-actions-go/backport@main
+        uses: ./actions/backport
        with:
+          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
          token: ${{ steps.generate_token.outputs.token }}
+          labelsToAdd: "backport"
+          title: "[{{base}}] {{originalTitle}}"
--- a/.github/workflows/create-next-release-branch.yml
+++ b/.github/workflows/create-next-release-branch.yml
@@ -1,43 +0,0 @@
-name: Create next release branch
-on:
-  workflow_call:
-    inputs:
-      ownerRepo:
-        type: string
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-        required: true
-      source:
-        description: The release branch to increment (eg providing `release-11.2.3` will result in `release-11.2.4` being created)
-        type: string
-        required: true
-    secrets:
-      token:
-        required: true
-    outputs:
-      branch:
-        description: The new branch that was created
-        value: ${{ jobs.main.outputs.branch }}
-  workflow_dispatch:
-    inputs:
-      ownerRepo:
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-      source:
-        description: The release branch to increment (eg providing `release-11.2.3` will result in `release-11.2.4` being created)
-        type: string
-        required: true
-    secrets:
-      token:
-        required: true
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    outputs:
-      branch: ${{ steps.branch.outputs.branch }}
-    steps:
-      - name: Create release branch
-        id: branch
-        uses: grafana/grafana-github-actions-go/bump-release@main
-        with:
-          ownerRepo: ${{ inputs.ownerRepo }}
-          source: ${{ inputs.source }}
-          token: ${{ secrets.token }}
--- a/.github/workflows/create-security-patch-from-security-mirror.yml
+++ b/.github/workflows/create-security-patch-from-security-mirror.yml
@@ -11,7 +11,6 @@ on:
    branches:
      - "main"
      - "v*.*.*"
-      - "release-*.*.*"

 # This is run before the pull request has been merged, so we'll run against the src branch
 jobs:
--- a/.github/workflows/migrate-prs.yml
+++ b/.github/workflows/migrate-prs.yml
@@ -1,50 +0,0 @@
-name: Migrate open PRs
-# Migrate open PRs from a superseded release branch to the current release branch and notify authors
-on: 
-  workflow_call:
-    inputs:
-      from:
-        description: 'The base branch to check for open PRs'
-        required: true
-        type: string
-      to:
-        description: 'The base branch to migrate open PRs to'
-        required: true
-        type: string
-      ownerRepo:
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-        required: true
-        type: string
-    secrets:
-      token:
-        required: true
-  workflow_dispatch:
-    inputs:
-      from:
-        description: 'The base branch to check for open PRs'
-        required: true
-        type: string
-      to:
-        description: 'The base branch to migrate open PRs to'
-        required: true
-        type: string
-      ownerRepo:
-        description: Owner/repo of the repository where the branch is created (e.g. 'grafana/grafana')
-        required: true
-        type: string
-    secrets:
-      token:
-        required: true
-
-jobs:
-  main:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Migrate PRs
-        uses: grafana/grafana-github-actions-go/migrate-open-prs@main
-        with:
-          token: ${{ secrets.token }}
-          ownerRepo: ${{ inputs.ownerRepo }}
-          from: ${{ inputs.from }}
-          to: ${{ inputs.to }}
-          binary_release_tag: 'dev'
--- a/.github/workflows/publish-technical-documentation-release.yml
+++ b/.github/workflows/publish-technical-documentation-release.yml
@@ -3,7 +3,7 @@ name: publish-technical-documentation-release
 on:
  push:
    branches:
-      - release-[0-9]+.[0-9]+.[0-9]+
+      - v[0-9]+.[0-9]+.x
    tags:
      - v[0-9]+.[0-9]+.[0-9]+
    paths:
@@ -23,7 +23,7 @@ jobs:
      - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v2
        with:
          release_tag_regexp: "^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
-          release_branch_regexp: "^release-(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
-          release_branch_with_patch_regexp: "^release-(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
+          release_branch_regexp: "^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.x$"
+          release_branch_with_patch_regexp: "^v(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)$"
          website_directory: content/docs/grafana
          version_suffix: ""
--- a/.github/workflows/release-comms.yml
+++ b/.github/workflows/release-comms.yml
@@ -27,18 +27,10 @@ jobs:
    name: Setup and establish latest
    outputs:
      version: ${{ steps.output.outputs.version }}
-      release_branch: ${{ steps.output.outputs.release_branch }}
      dry_run: ${{ steps.output.outputs.dry_run }}
      latest: ${{ steps.output.outputs.latest }}
-      token: ${{ steps.output.outputs.token }}
    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 }}
      # The github-release action expects a `LATEST` value of a string of either '1' or '0'
    - if: ${{ github.event_name == 'workflow_dispatch' }}
      run: |
@@ -57,51 +49,9 @@ jobs:
        echo "latest: $LATEST"
        echo "version: $VERSION"

-        echo "release_branch=$(echo $VERSION | sed -s 's/^v/release-/g')" >> "$GITHUB_OUTPUT"
-        echo "token=${{ steps.generate_token.outputs.token }}" >> "$GITHUB_OUTPUT"
        echo "dry_run=$DRY_RUN" >> "$GITHUB_OUTPUT"
        echo "latest=$LATEST" >> "$GITHUB_OUTPUT"
        echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-  create_next_release_branch_grafana:
-    name: Create next release branch (Grafana)
-    needs: setup
-    uses: ./.github/workflows/create-next-release-branch.yml
-    with:
-      ownerRepo: 'grafana/grafana'
-      source: ${{ needs.setup.outputs.release_branch }}
-    secrets:
-      token: ${{ needs.setup.outputs.token }}
-  create_next_release_branch_enterprise:
-    name: Create next release branch (Grafana Enterprise)
-    needs: setup
-    uses: ./.github/workflows/create-next-release-branch.yml
-    with:
-      ownerRepo: 'grafana/grafana'
-      source: ${{ needs.setup.outputs.release_branch }}
-    secrets:
-      token: ${{ needs.setup.outputs.token }}
-  migrate_prs_grafana:
-    needs:
-      - setup
-      - create_next_release_branch_grafana
-    uses: ./.github/workflows/migrate-prs.yml
-    with:
-      ownerRepo: 'grafana/grafana'
-      from: ${{ needs.setup.outputs.release_branch }}
-      to: ${{ needs.create_next_release_branch_grafana.outputs.branch }}
-    secrets:
-      token: ${{ needs.setup.outputs.token }}
-  migrate_prs_enterprise:
-    needs:
-      - setup
-      - create_next_release_branch_enterprise
-    uses: ./.github/workflows/migrate-prs.yml
-    with:
-      ownerRepo: 'grafana/grafana-enterprise'
-      from: ${{ needs.setup.outputs.release_branch }}
-      to: ${{ needs.create_next_release_branch_enterprise.outputs.branch }}
-    secrets:
-      token: ${{ needs.setup.outputs.token }}
  post_changelog_on_forum:
    needs: setup
    uses: ./.github/workflows/community-release.yml
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -4,7 +4,7 @@
 # Please refrain from including any processes that do not result in code changes in this workflow. Instead, they should
 # either be triggered in the release promotion process or in the release comms process (that is triggered by merging
 # this PR).
-name: Grafana Release PR
+name: Complete a Grafana release
 on:
  workflow_dispatch:
    inputs:
@@ -19,7 +19,7 @@ on:
      target:
        required: true
        type: string
-        description: The release branch pattern (eg v9.5.x) that these changes are being merged into
+        description: The base branch that these changes are being merged into
      backport:
        required: false
        type: string
@@ -61,17 +61,10 @@ jobs:
        with:
          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-      - name: Get release branch
-        id: branch
-        uses: grafana/grafana-github-actions-go/latest-release-branch@main
-        with:
-          token: ${{ steps.generate_token.outputs.token }}
-          ownerRepo: 'grafana/grafana'
-          pattern: ${{ inputs.target }}
      - name: Checkout Grafana
        uses: actions/checkout@v4
        with:
-          ref: ${{ steps.branch.outputs.branch }}
+          ref: ${{ inputs.target }}
          fetch-depth: 0
          fetch-tags: true
      - name: Checkout Grafana (main)
@@ -131,6 +124,7 @@ jobs:
          rm -f CHANGELOG.part changelog_items.md

          git diff CHANGELOG.md
+          
      - name: "Prettify CHANGELOG.md"
        run: npx prettier --write CHANGELOG.md
      - name: Commit CHANGELOG.md changes
@@ -157,7 +151,7 @@ jobs:
            $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
            -l "no-changelog" \
            --dry-run=${{ inputs.dry_run }} \
-            -B "${{ steps.branch.outputs.branch }}" \
+            -B "${{ inputs.target }}" \
            --title "Release: ${{ inputs.version }}" \
            --body "These code changes must be merged after a release is complete"
        env:
@@ -171,7 +165,7 @@ jobs:
            -l "product-approved" \
            -l "no-changelog" \
            --dry-run=${{ inputs.dry_run }} \
-            -B "${{ steps.branch.outputs.branch }}" \
+            -B "${{ inputs.target }}" \
            --title "Release: ${{ inputs.version }}" \
            --body "These code changes must be merged after a release is complete"
        env:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,42 +1,16 @@
-<!-- 11.4.1 START -->
+<!-- 11.3.2 START -->

-# 11.4.1 (2025-01-28)
+# 11.3.2 (2024-12-04)

 ### Features and enhancements

- **Security:** Update to Go 1.23.5 - Backport to v11.4.x [#99123](https://github.com/grafana/grafana/pull/99123), [@Proximyst](https://github.com/Proximyst)
- **Security:** Update to Go 1.23.5 - Backport to v11.4.x (Enterprise)
+- **Backport:** Announcement Banners: Enable feature for all cloud tiers (Enterprise)

 ### Bug fixes

- **Alerting:** AlertingQueryRunner should skip descendant nodes of invalid queries [#97830](https://github.com/grafana/grafana/pull/97830), [@gillesdemey](https://github.com/gillesdemey)
- **Alerting:** Fix alert rules unpausing after moving rule to different folder [#97583](https://github.com/grafana/grafana/pull/97583), [@santihernandezc](https://github.com/santihernandezc)
- **Alerting:** Fix label escaping in rule export [#98649](https://github.com/grafana/grafana/pull/98649), [@moustafab](https://github.com/moustafab)
- **Alerting:** Fix slack image uploading to use new api [#98066](https://github.com/grafana/grafana/pull/98066), [@moustafab](https://github.com/moustafab)
- **Azure/GCM:** Improve error display [#97594](https://github.com/grafana/grafana/pull/97594), [@aangelisc](https://github.com/aangelisc)
- **Dashboards:** Fix issue where filtered panels would not react to variable changes [#98734](https://github.com/grafana/grafana/pull/98734), [@oscarkilhed](https://github.com/oscarkilhed)
- **Dashboards:** Fixes issue with panel header showing even when hide time override was enabled [#98747](https://github.com/grafana/grafana/pull/98747), [@torkelo](https://github.com/torkelo)
- **Dashboards:** Fixes week relative time ranges when weekStart was changed [#98269](https://github.com/grafana/grafana/pull/98269), [@torkelo](https://github.com/torkelo)
- **Dashboards:** Panel react for `timeFrom` and `timeShift` changes using variables [#98659](https://github.com/grafana/grafana/pull/98659), [@Sergej-Vlasov](https://github.com/Sergej-Vlasov)
- **DateTimePicker:** Fixes issue with date picker showing invalid date [#97971](https://github.com/grafana/grafana/pull/97971), [@torkelo](https://github.com/torkelo)
- **Fix:** Add support for datasource variable queries [#98119](https://github.com/grafana/grafana/pull/98119), [@sunker](https://github.com/sunker)
- **InfluxDB:** Adhoc filters can use template vars as values [#98786](https://github.com/grafana/grafana/pull/98786), [@bossinc](https://github.com/bossinc)
- **LibraryPanel:** Fallback to panel title if library panel title is not set [#99410](https://github.com/grafana/grafana/pull/99410), [@ivanortegaalba](https://github.com/ivanortegaalba)
+- **Fix:** Do not fetch Orgs if the user is authenticated by apikey/sa or render key [#97262](https://github.com/grafana/grafana/pull/97262), [@mgyongyosi](https://github.com/mgyongyosi)

-### Plugin development fixes & changes
-
- **Grafana UI:** Re-add react-router-dom as a dependency [#98422](https://github.com/grafana/grafana/pull/98422), [@leventebalogh](https://github.com/leventebalogh)
-
-<!-- 11.4.1 END -->
-<!-- 11.4.0 START -->
-
-# 11.4.0 (2024-12-05)
-
-### Features and enhancements
-
- **Cloudwatch:** OpenSearch PPL and SQL support in Logs Insights
-
-<!-- 11.4.0 END -->
+<!-- 11.3.2 END -->
 <!-- 11.3.1 START -->

 # 11.3.1 (2024-11-19)
--- a/42
+++ b/42
@@ -1,19 +1,14 @@
 # syntax=docker/dockerfile:1

-# to maintain formatting of multiline commands in vscode, add the following to settings.json:
-# "docker.languageserver.formatter.ignoreMultilineInstructions": true
-
 ARG BASE_IMAGE=alpine:3.19.1
 ARG JS_IMAGE=node:20-alpine
 ARG JS_PLATFORM=linux/amd64
 ARG GO_IMAGE=golang:1.23.5-alpine

-# Default to building locally
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder

-# Javascript build stage
-FROM --platform=${JS_PLATFORM} ${JS_IMAGE} AS js-builder
+FROM --platform=${JS_PLATFORM} ${JS_IMAGE} as js-builder

 ENV NODE_OPTIONS=--max_old_space_size=8000

@@ -38,8 +33,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-# Golang build stage
-FROM ${GO_IMAGE} AS go-builder
+FROM ${GO_IMAGE} as go-builder

 ARG COMMIT_SHA=""
 ARG BUILD_BRANCH=""
@@ -97,8 +91,7 @@ ENV BUILD_BRANCH=${BUILD_BRANCH}

 RUN make build-go GO_BUILD_TAGS=${GO_BUILD_TAGS} WIRE_TAGS=${WIRE_TAGS}

-# From-tarball build stage
-FROM ${BASE_IMAGE} AS tgz-builder
+FROM ${BASE_IMAGE} as tgz-builder

 WORKDIR /tmp/grafana

@@ -110,8 +103,8 @@ COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
 RUN tar x -z -f /tmp/grafana.tar.gz --strip-components=1

 # helpers for COPY --from
-FROM ${GO_SRC} AS go-src
-FROM ${JS_SRC} AS js-src
+FROM ${GO_SRC} as go-src
+FROM ${JS_SRC} as js-src

 # Final stage
 FROM ${BASE_IMAGE}
@@ -146,20 +139,19 @@ RUN if grep -i -q alpine /etc/issue; then \
    fi

 # glibc support for alpine x86_64 only
-# docker run --rm --env STDOUT=1 sgerrand/glibc-builder 2.40 /usr/glibc-compat > glibc-bin-2.40.tar.gz
-ARG GLIBC_VERSION=2.40
-
 RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
-      wget -qO- "https://dl.grafana.com/glibc/glibc-bin-$GLIBC_VERSION.tar.gz" | tar zxf - -C / \
-        usr/glibc-compat/lib/ld-linux-x86-64.so.2 \
-        usr/glibc-compat/lib/libc.so.6 \
-        usr/glibc-compat/lib/libdl.so.2 \
-        usr/glibc-compat/lib/libm.so.6 \
-        usr/glibc-compat/lib/libpthread.so.0 \
-        usr/glibc-compat/lib/librt.so.1 \
-        usr/glibc-compat/lib/libresolv.so.2 && \
-      mkdir /lib64 && \
-      ln -s /usr/glibc-compat/lib/ld-linux-x86-64.so.2 /lib64; \
+      wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
+        -O /tmp/glibc-2.35-r0.apk && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
+        -O /tmp/glibc-bin-2.35-r0.apk && \
+      apk add --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /lib64/ld-linux-x86-64.so.2 && \
+      ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
+      rm -f /tmp/glibc-2.35-r0.apk && \
+      rm -f /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /lib/ld-linux-x86-64.so.2 && \
+      rm -f /etc/ld.so.cache; \
    fi

 COPY --from=go-src /tmp/grafana/conf ./conf
--- a/docs/make-docs
+++ b/docs/make-docs
@@ -1,6 +1,4 @@
 #!/bin/sh
-# shellcheck disable=SC2034
-#
 # The source of this file is https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs.
 # # `make-docs` procedure changelog
 #
@@ -8,12 +6,6 @@
 # [Semantic versioning](https://semver.org/) is used to help the reader identify the significance of changes.
 # Changes are relevant to this script and the support docs.mk GNU Make interface.
 #
-# ## 8.4.0 (2025-01-27)
-#
-# ### Fixed
-#
-# - Correct mount for the /docs/grafana-cloud/send-data/fleet-management/ project.
-#
 # ## 8.3.0 (2024-12-27)
 #
 # ### Added
@@ -312,7 +304,6 @@ PODMAN="$(if command -v podman >/dev/null 2>&1; then echo podman; else echo dock

 if ! command -v curl >/dev/null 2>&1; then
  if ! command -v wget >/dev/null 2>&1; then
-    # shellcheck disable=SC2016
    errr 'either `curl` or `wget` must be installed for this script to work.'

    exit 1
@@ -320,7 +311,6 @@ if ! command -v curl >/dev/null 2>&1; then
 fi

 if ! command -v "${PODMAN}" >/dev/null 2>&1; then
-  # shellcheck disable=SC2016
  errr 'either `podman` or `docker` must be installed for this script to work.'

  exit 1
@@ -367,10 +357,6 @@ EOF
  exit 1
 fi

-# The following variables comprise a pseudo associative array of project names to source repositories.
-# You only need to set a SOURCES variable if the project name does not match the source repository name.
-# You can get a key identifier using the `identifier` function.
-# To look up the value of any pseudo associative array, use the `aget` function.
 SOURCES_as_code='as-code-docs'
 SOURCES_enterprise_metrics='backend-enterprise'
 SOURCES_enterprise_metrics_='backend-enterprise'
@@ -380,16 +366,11 @@ SOURCES_grafana_cloud_alerting_and_irm_slo='slo'
 SOURCES_grafana_cloud_k6='k6-docs'
 SOURCES_grafana_cloud_data_configuration_integrations='cloud-onboarding'
 SOURCES_grafana_cloud_frontend_observability_faro_web_sdk='faro-web-sdk'
-SOURCES_grafana_cloud_send_data_fleet_management='fleet-management'
 SOURCES_helm_charts_mimir_distributed='mimir'
 SOURCES_helm_charts_tempo_distributed='tempo'
 SOURCES_opentelemetry='opentelemetry-docs'
 SOURCES_resources='website'

-# The following variables comprise a pseudo associative array of project names to versions.
-# You only need to set a VERSIONS variable if it is not the default of 'latest'.
-# You can get a key identifier using the `identifier` function.
-# To look up the value of any pseudo associative array, use the `aget` function.
 VERSIONS_as_code='UNVERSIONED'
 VERSIONS_grafana_cloud='UNVERSIONED'
 VERSIONS_grafana_cloud_alerting_and_irm_machine_learning='UNVERSIONED'
@@ -397,17 +378,12 @@ VERSIONS_grafana_cloud_alerting_and_irm_slo='UNVERSIONED'
 VERSIONS_grafana_cloud_k6='UNVERSIONED'
 VERSIONS_grafana_cloud_data_configuration_integrations='UNVERSIONED'
 VERSIONS_grafana_cloud_frontend_observability_faro_web_sdk='UNVERSIONED'
-VERSIONS_grafana_cloud_send_data_fleet_management='UNVERSIONED'
 VERSIONS_opentelemetry='UNVERSIONED'
 VERSIONS_resources='UNVERSIONED'
 VERSIONS_technical_documentation='UNVERSIONED'
 VERSIONS_website='UNVERSIONED'
 VERSIONS_writers_toolkit='UNVERSIONED'

-# The following variables comprise a pseudo associative array of project names to source repository paths.
-# You only need to set a PATHS variable if it is not the default of 'docs/sources'.
-# You can get a key identifier using the `identifier` function.
-# To look up the value of any pseudo associative array, use the `aget` function.
 PATHS_grafana_cloud='content/docs/grafana-cloud'
 PATHS_helm_charts_mimir_distributed='docs/sources/helm-charts/mimir-distributed'
 PATHS_helm_charts_tempo_distributed='docs/sources/helm-charts/tempo-distributed'
@@ -840,9 +816,7 @@ EOF
    case "${OUTPUT_FORMAT}" in
      human)
        if ! command -v jq >/dev/null 2>&1; then
-          # shellcheck disable=SC2016
          errr '`jq` must be installed for the `doc-validator` target to work.'
-          # shellcheck disable=SC2016
          note 'To install `jq`, refer to https://jqlang.github.io/jq/download/,'

          exit 1
--- a/docs/sources/administration/enterprise-licensing/_index.md
+++ b/docs/sources/administration/enterprise-licensing/_index.md
@@ -256,24 +256,14 @@ The system creates a session when a user signs in to Grafana from a new device,

 When a user reaches the session limit, the fourth connection succeeds and the longest inactive session is signed out.

+### Request usage billing
+
+You can request Grafana Labs to activate usage billing which allows an unlimited number of active users. When usage billing is enabled, Grafana does not enforce active user limits or display warning banners. Instead, you are charged for active users that exceed the limit, according to your customer contract.
+
+Usage billing involves a contractual agreement between you and Grafana Labs, and it is only available if Grafana Enterprise is configured to [automatically refresh its license token]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#auto_refresh_license" >}}).
+
 ### Request a change to your license

 To increase the number of licensed users within Grafana, extend a license, or change your licensed URL, contact [Grafana support](/profile/org#support) or your Grafana Labs account team. They will update your license, which you can activate from within Grafana.

 For instructions about how to activate your license after it is updated, refer to [Activate an Enterprise license]({{< relref "#activate-an-enterprise-license" >}}).
-
-## Usage billing
-
-Standard Grafana Enterprise licenses include a certain number of seats that can be used, and prevent more users logging into Grafana than have been licensed. This makes sense if you prefer a predictable bill. It can however be a problem if you anticipate uneven usage patterns over time or when it's critical that no user ever be prevented from logging into Grafana due to capacity constraints.
-
-For those use-cases we support usage-based billing, where your license includes a certain number of included users and you are billed on a monthly basis for any excess active users during the month.
-
-Usage billing involves a contractual agreement between you and Grafana Labs and an update to your license, and it is only available if Grafana Enterprise version 10.0.0 or higher is configured to [automatically refresh its license token]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#auto_refresh_license" >}}).
-
-### User deduplication
-
-If your organization has multiple Grafana Enterprise instances with usage billing enabled, then each active user counts only once toward your license, regardless of how many instances that user signs into. Each Grafana Enterprise instance submits a hashed list of users to Grafana Labs via API every day. Each user email address or anonymous device ID is hashed using a one-way sha256 algorithm, and submitted to Grafana where the hashed users are deduplicated across instances.
-
-### Request usage billing
-
-To request usage billing, contact your Grafana Labs account team or [submit a support ticket](https://grafana.com/profile/org#support).
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -36,7 +36,7 @@ cards:
      description: Choose how, when, and where to send your alert notifications.
      height: 24
    - title: Monitor status
-      href: ./monitor-status/
+      href: ./manage-notifications/
      description: Monitor, respond to, and triage issues within your services.
      height: 24
    - title: Additional configuration
--- a/docs/sources/alerting/alerting-rules/_index.md
+++ b/docs/sources/alerting/alerting-rules/_index.md
@@ -12,59 +12,37 @@ labels:
    - oss
 title: Configure alert rules
 weight: 120
-refs:
-  alert-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/
-  configure-grafana-alerts:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-grafana-managed-rule/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-grafana-managed-rule/
-  configure-ds-alerts:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-data-source-managed-rule/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-data-source-managed-rule/
-  recording-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-recording-rules/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-recording-rules/
-  alert-types-comparison-table:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/#comparison-between-alert-rule-types
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/#comparison-between-alert-rule-types
-  templating-labels-annotations:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/templates/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/templates/
 ---

 # Configure alert rules

-[Alert rules](ref:alert-rules) are the central component of your alerting system.
+An alert rule consists of one or more queries and expressions that select the data you want to measure. It also contains a condition, which is the threshold that an alert rule must meet or exceed in order to fire.

-An alert rule consists of one or more queries and expressions that select the data you want to measure. It contains a condition to trigger the alert, an evaluation period that determines how often the rule is evaluated, and additional options to manage alert events and their notifications.
+Create, manage, view, and adjust alert rules to alert on your metrics data or log entries from multiple data sources — no matter where your data is stored.

-Grafana supports two types of alert rules:
+The main parts of alert rule creation are:

-1. Grafana-managed alert rules: These can query multiple data sources.
+1. Select your data source
+1. Query your data
+1. Normalize your data
+1. Set your threshold

-1. Data source-managed alert rules: These can only query Prometheus-based data sources and support horizontal scaling.
+**Query, expressions, and alert condition**

-We recommend using Grafana-managed alert rules whenever possible, and opting for data source-managed alert rules when horizontal scaling is required. Refer to the [comparison table of alert rule types](ref:alert-types-comparison-table) for a more detailed overview.
+What are you monitoring? How are you measuring it?

-Both types of alert rules can be configured in Grafana using the **+ New alert rule** flow. For step-by-step instructions, refer to:
+{{< admonition type="note" >}}
+Expressions can only be used for Grafana-managed alert rules.
+{{< /admonition >}}

- [Configure Grafana-managed alert rules](ref:configure-grafana-alerts)
- [Configure data source-managed alert rules](ref:configure-ds-alerts)
- [Create and link alert rules to panels](ref:templating-labels-annotations)
+**Evaluation**

-Alert rules can also query metrics generated by recording rules. To learn more, refer to:
+How do you want your alert to be evaluated?

- [Create recording rules](ref:recording-rules)
+**Labels and notifications**
+
+How do you want to route your alert? What kind of additional labels could you add to annotate your alert rules and ease searching?
+
+**Annotations**
+
+Do you want to add more context on the alert in your notification messages, for example, what caused the alert to fire? Which server did it happen on?
--- a/docs/sources/alerting/alerting-rules/create-data-source-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-data-source-managed-rule.md
@@ -1,157 +0,0 @@
---
-aliases:
-  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
-  - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
-  - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
-  - ../alerting-rules/create-mimir-loki-managed-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-mimir-loki-managed-rule/
-canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-data-source-managed-rule/
-description: Configure data source-managed alert rules alert for an external Grafana Mimir or Loki instance
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-  - create
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Configure data source-managed alert rules
-weight: 200
-refs:
-  shared-configure-prometheus-data-source-alerting:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/prometheus/configure-prometheus-data-source/#alerting
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/prometheus/configure-prometheus-data-source/#alerting
-  configure-grafana-managed-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/create-grafana-managed-rule/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/create-grafana-managed-rule/notification-policies/
-  notification-policies:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/
-  pending-period:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/#pending-period
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/#pending-period
-  alert-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/
-  alert-rule-labels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/#labels
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/#labels
-  alert-rule-evaluation:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/
-  shared-provision-alerting-resources:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/
-  shared-alert-rule-template:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/templates/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/templates/
-  shared-annotations:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/#annotations
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/#annotations
-  shared-link-alert-rules-to-panels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/link-alert-rules-to-panels/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/link-alert-rules-to-panels/
---
-
-# Configure data source-managed alert rules
-
-Data source-managed alert rules can only be created using Grafana Mimir or Grafana Loki data sources.
-
-The rules are stored within the data source. In a distributed architecture, they can scale horizontally to provide high-availability. For more details, refer to [alert rule types](ref:alert-rules).
-
-We recommend using [Grafana-managed alert rules](ref:configure-grafana-managed-rules) whenever possible and opting for data source-managed alert rules when scaling your alerting setup is necessary.
-
-{{< docs/shared lookup="alerts/note-prometheus-ds-rules.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-To create or edit data source-managed alert rules, follow these instructions.
-
-## Before you begin
-
-Verify that you have write permission to the Mimir or Loki data source. Otherwise, you cannot create or update data source-managed alert rules.
-
-### Enable the Ruler API
-
-For more information, refer to the [Mimir Ruler API](/docs/mimir/latest/references/http-api/#ruler) or [Loki Ruler API](/docs/loki/latest/api/#ruler).
-
- **Mimir** - use the `/prometheus` prefix. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
-
- **Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
-
-### Permissions
-
-Alert rules for Mimir or Loki instances can be edited or deleted by users with **Editor** or **Admin** roles.
-
-If you do not want to manage alert rules for a particular data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
-
-{{< docs/shared lookup="alerts/configure-provisioning-before-begin.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-{{< docs/shared lookup="alerts/configure-alert-rule-name.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Define query and condition
-
-Define a query to get the data you want to measure and a condition that needs to be met before an alert rule fires.
-
-{{% admonition type="note" %}}
-By default, new alert rules are Grafana-managed. To switch to **Data source-managed**, follow these instructions.
-{{% /admonition %}}
-
-1. Select a Prometheus-based data source from the drop-down list.
-
-   You can also click **Open advanced data source picker** to find more options.
-
-1. Enter a PromQL or LogQL query, including the alert condition.
-1. In the **Rule type** option, select **Data source-managed**.
-1. Click **Preview alerts**.
-
-## Set alert evaluation behavior
-
-Use [alert rule evaluation](ref:alert-rule-evaluation) to determine how frequently an alert rule should be evaluated and how quickly it should change its state.
-
-1. Select a namespace or click **+ New namespace**.
-1. Select an evaluation group or click **+ New evaluation group**.
-
-   If you are creating a new evaluation group, specify the interval for the group.
-
-   All rules within the same group are evaluated sequentially over the same time interval. You can reorder them from the **Alert rules** page.
-
-1. Enter a pending period.
-
-   The [pending period](ref:pending-period) is the period in which an alert rule can be in breach of the condition until it fires.
-
-   Once a condition is met, the alert goes into the **Pending** state. If the condition remains active for the duration specified, the alert transitions to the **Firing** state, else it reverts to the **Normal** state.
-
-## Configure labels and notifications
-
-Add [labels](ref:alert-rule-labels) to your alert rules to set which [notification policy](ref:notification-policies) should handle your firing alert instances.
-
-All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
-
-1. Add labels if you want to change the way your notifications are routed.
-
-   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
-
-{{< docs/shared lookup="alerts/configure-notification-message.md" source="grafana" version="<GRAFANA_VERSION>" >}}
--- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md
@@ -24,144 +24,123 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/use-dashboards/#time-units-and-relative-ranges
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/visualizations/dashboards/use-dashboards/#time-units-and-relative-ranges
+  fundamentals:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/
  alert-instance-state:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
-  modify-the-no-data-or-error-state:
+  keep-last-state:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#modify-the-no-data-or-error-state
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#keep-last-state
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#modify-the-no-data-or-error-state
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#keep-last-state
+  add-a-query:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/#add-a-query
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/#add-a-query
  pending-period:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/#pending-period
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/#pending-period
-  alert-rule-evaluation:
+  alerting-on-numeric-data:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions/#alert-on-numeric-data
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/
-  mute-timings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings/
-  alert-rule-query:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions/
-  alert-rule-labels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/#labels
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/#labels
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions/#alert-on-numeric-data
  expression-queries:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions/#expression-queries
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/expression-queries/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions/#expression-queries
-  alert-condition:
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/expression-queries/
+  annotation-label:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions/#alert-condition
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/queries-conditions/#alert-condition
-  contact-points:
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/
+  link-alert-rules-to-panels:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/contact-points/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/link-alert-rules-to-panels/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/contact-points/
-  notification-policies:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/link-alert-rules-to-panels/
  data-sources:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/
    - pattern: /docs/grafana-cloud/
    - destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/
-  alert-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/
  compatible-data-sources:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/#supported-data-sources
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/#supported-data-sources
-  shared-provision-alerting-resources:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/provision-alerting-resources/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/provision-alerting-resources/
-  shared-alert-rule-template:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/templates/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/templates/
-  shared-annotations:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/#annotations
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/#annotations
-  shared-link-alert-rules-to-panels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/link-alert-rules-to-panels/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/link-alert-rules-to-panels/
 ---

 # Configure Grafana-managed alert rules

-Grafana-managed rules can query data from multiple data sources in a single alert rule. They are the most flexible [alert rule type](ref:alert-rules). You can also add expressions to transform your data, set alert conditions, and images in alert notifications.
+Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of our supported data sources. In addition to supporting multiple data sources, you can also add expressions to transform your data and set alert conditions. Using images in alert notifications is also supported. This is the only type of rule that allows alerting from multiple data sources in a single rule definition.
+
+Multiple alert instances can be created as a result of one alert rule (also known as a multi-dimensional alerting).

 {{% admonition type="note" %}}
-In Grafana Cloud, the number of Grafana-managed alert rules you can create depends on your Grafana Cloud plan.
+For Grafana Cloud Free Forever, you can create up to 100 free Grafana-managed alert rules with each alert rule having a maximum of 1000 alert instances.

- Free Forever plan: You can create up to 100 free alert rules, with each alert rule having a maximum of 1000 alert instances.
- All paid plans (Pro and Advanced): They have a soft limit of 2000 alert rules and support unlimited alert instances. To increase the limit, open a support ticket from the [Cloud portal](/docs/grafana-cloud/account-management/support/).
+For all paid tiers (Cloud Pro and Advanced), there is a soft limit of 2000 alert rules and unlimited alert instances. To increase the limit, open a support ticket from the [Cloud portal](https://grafana.com/docs/grafana-cloud/account-management/support/).

 {{% /admonition %}}

-To create or edit Grafana-managed alert rules, follow the instructions below. For a practical example, check out our [tutorial on getting started with Grafana alerting](http://grafana.com/tutorials/alerting-get-started/).
+Grafana-managed alert rules can only be edited or deleted by users with Edit permissions for the folder storing the rules.
+
+If you delete an alert resource created in the UI, you can no longer retrieve it.
+To make a backup of your configuration and to be able to restore deleted alerting resources, create your alerting resources using file provisioning, Terraform, or the Alerting API.

 ## Before you begin

-Verify that the data sources you plan to query in the alert rule are [compatible with Grafana-managed alert rules](ref:compatible-data-sources) and are properly configured.
+If you are using Grafana OSS:

-### Permissions
+1. Configure your [data sources](ref:data-sources).
+2. Check which [data sources](ref:compatible-data-sources) are compatible with and supported by Grafana Alerting.

-Only users with **Edit** permissions for the folder storing the rules can edit or delete Grafana-managed alert rules.
-
-{{< docs/shared lookup="alerts/configure-provisioning-before-begin.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-### Default vs Advanced options
+If you are using Grafana OSS, Enterprise, or Cloud:

 You can use default or advanced options for Grafana-managed alert rule creation. The default options streamline rule creation with a cleaner header and a single query and condition. For more complex rules, use advanced options to add multiple queries and expressions.

-You can toggle between the two options. Once you have created an alert rule, the system defaults to your previous choice for the next alert rule.
+Default and advanced options are enabled by default for Grafana Cloud users and this feature is being rolled out progressively.

-Switching from advanced to default may result in queries and expressions that cannot be converted. In this case, a warning message asks if you want to continue to reset to default settings.
+For OSS users,enable the `alertingQueryAndExpressionsStepMode` feature toggle.

-Default and advanced options are enabled by default for Grafana Cloud users and this feature is being rolled out progressively. OSS users can enable them via the [`alertingQueryAndExpressionsStepMode` feature toggle](/setup-grafana/configure-grafana/feature-toggles/).
+{{% admonition type="note" %}}
+Once you have created an alert rule using one of the options, the system defaults to this option for the next alert rule you create.

-{{< docs/shared lookup="alerts/configure-alert-rule-name.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+You can toggle between the two options. However, if you want to switch from advanced options to the default, it may be that your query and expressions cannot be converted. In this case, a warning message checks whether you want to continue to reset to default settings.
+{{% /admonition %}}
+
+## Steps
+
+To create a Grafana-managed alert rule, use the in-product alert creation flow and follow these steps.
+
+To get started quickly, refer to our [tutorial on getting started with Grafana alerting](http://grafana.com/tutorials/alerting-get-started/).
+
+## Set alert rule name
+
+1. Click **Alerts & IRM** -> **Alert rules** -> **+ New alert rule**.
+1. Enter a name to identify your alert rule.
+
+   This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.

 ## Define query and condition

 Define a query to get the data you want to measure and a condition that needs to be met before an alert rule fires.

-You can toggle between **Default** and **Advanced** options. If the [Default vs. Advanced feature](#default-vs-advanced-options) is not enabled in your Grafana instance, follow the **Advanced options** instructions.
-
 {{< collapse title="Default options" >}}

-1. Add a [query](ref:alert-rule-query).
-1. Add an [alert condition](ref:alert-condition).
+1. Add a query.
+1. Add an alert condition.

   The **When** input includes the reducer function and the last input is the threshold.

@@ -173,11 +152,15 @@ You can toggle between **Default** and **Advanced** options. If the [Default vs.
 1. Select a data source.
 1. From the **Options** dropdown, specify a [time range](ref:time-units-and-relative-ranges).

-   Note that Grafana Alerting only supports fixed relative time ranges, for example, `now-24hr: now`. It does not support absolute time ranges: `2021-12-02 00:00:00 to 2021-12-05 23:59:592` or semi-relative time ranges: `now/d to: now`.
+{{% admonition type="note" %}}
+Grafana Alerting only supports fixed relative time ranges, for example, `now-24hr: now`.
+
+It does not support absolute time ranges: `2021-12-02 00:00:00 to 2021-12-05 23:59:592` or semi-relative time ranges: `now/d to: now`.
+{{% /admonition %}}

 1. Add a query.

-   To add multiple [queries](ref:alert-rule-query), click **Add query**.
+   To add multiple [queries](ref:add-a-query), click **Add query**.

   All alert rules are managed by Grafana by default. If you want to switch to a data source-managed alert rule, click **Switch to data source-managed alert rule**.

@@ -185,7 +168,9 @@ You can toggle between **Default** and **Advanced** options. If the [Default vs.

   a. For each expression, select either **Classic condition** to create a single alert rule, or choose from the **Math**, **Reduce**, and **Resample** options to generate separate alert for each series.

+   {{% admonition type="note" %}}
   When using Prometheus, you can use an instant vector and built-in functions, so you don't need to add additional expressions.
+   {{% /admonition %}}

   b. Click **Preview** to verify that the expression is successful.

@@ -193,24 +178,12 @@ You can toggle between **Default** and **Advanced** options. If the [Default vs.

   You can only add one recovery threshold in a query and it must be the alert condition.

-1. Click **Set as alert condition** on the query or expression you want to set as your [alert condition](ref:alert-condition).
+1. Click **Set as alert condition** on the query or expression you want to set as your alert condition.
   {{< /collapse >}}

-## Set folder and labels
+## Set alert evaluation behavior

-Organize your alert rule with a folder and set of labels.
-
-In the **Labels** section, you can optionally choose whether to add labels to organize your alert rules and their notifications. For more details, refer to [alert rule labels](ref:alert-rule-labels).
-
-1. Select a folder or click **+ New folder**.
-
-1. Add labels, if required.
-
-   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
-
-## Configure alert evaluation behavior
-
-Use [alert rule evaluation](ref:alert-rule-evaluation) to determine how frequently an alert rule should be evaluated and how quickly it should change its state.
+Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state.

 To do this, you need to make sure that your alert rule is in the right evaluation group and set a pending period time that works best for your use case.

@@ -221,7 +194,7 @@ To do this, you need to make sure that your alert rule is in the right evaluatio

   All rules within the same group are evaluated concurrently over the same time interval.

-1. Enter a [pending period](ref:pending-period).
+1. Enter a pending period.

   The pending period is the period in which an alert rule can be in breach of the condition until it fires.

@@ -229,20 +202,15 @@ To do this, you need to make sure that your alert rule is in the right evaluatio

 1. Turn on pause alert notifications, if required.

+   {{< admonition type="note" >}}
   You can pause alert rule evaluation to prevent noisy alerting while tuning your alerts.
   Pausing stops alert rule evaluation and doesn't create any alert instances.
-   This is different to [mute timings](ref:mute-timings), which stop notifications from being delivered, but still allows for alert rule evaluation and the creation of alert instances.
+   This is different to mute timings, which stop notifications from being delivered, but still allows for alert rule evaluation and the creation of alert instances.
+   {{< /admonition >}}

-1. In **Configure no data and error handling**, you can define the alerting behavior and alerting state for two scenarios:
+1. In **Configure no data and error handling**, configure alerting behavior in the absence of data.

-   - When the evaluation returns **No data** or all values are null.
-   - When the evaluation returns **Error** or timeout.
-
-   ### Configure no data and error handling
-
-   {{< docs/shared lookup="alerts/table-configure-no-data-and-error.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-   For more details, refer to [alert instance states](ref:alert-instance-state) and [modify the no data or error state](ref:modify-the-no-data-or-error-state).
+   Use the guidelines in [No data and error handling](#configure-no-data-and-error-handling).

 ## Configure labels and notifications

@@ -260,7 +228,7 @@ Complete the following steps to set up labels and notifications.

   **Select contact point**

-   1. Choose this option to select an existing [contact point](ref:contact-points).
+   1. Choose this option to select an existing contact point.

      All notifications for this alert rule are sent to this contact point automatically and notification policies are not used.

@@ -271,18 +239,67 @@ Complete the following steps to set up labels and notifications.

   **Use notification policy**

-   1. Choose this option to use the [notification policy tree](ref:notification-policies) to direct your notifications.
+   3. Choose this option to use the notification policy tree to direct your notifications.

      {{< admonition type="note" >}}
      All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
      {{< /admonition >}}

-   2. Preview your alert instance routing set up.
+   4. Preview your alert instance routing set up.

      Based on the labels added, alert instances are routed to the following notification policies displayed.

-   3. Expand each notification policy below to view more details.
+   5. Expand each notification policy below to view more details.

-   4. Click **See details** to view alert routing details and an email preview.
+   6. Click **See details** to view alert routing details and an email preview.

-{{< docs/shared lookup="alerts/configure-notification-message.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+## Add annotations
+
+Add [annotations](ref:annotation-label). to provide more context on the alert in your alert notification message.
+
+Annotations add metadata to provide more information on the alert in your alert notification message. For example, add a **Summary** annotation to tell you which value caused the alert to fire or which server it happened on.
+
+1. Optional: Add a summary.
+
+   Short summary of what happened and why.
+
+1. Optional: Add a description.
+
+   Description of what the alert rule does.
+
+1. Optional: Add a Runbook URL.
+
+   Webpage where you keep your runbook for the alert
+
+1. Optional: Add a custom annotation
+1. Optional: **Link dashboard and panel**.
+
+   [Link the alert rule to a panel](ref:link-alert-rules-to-panels) to facilitate alert investigation.
+
+1. Click **Save rule**.
+
+## Configure no data and error handling
+
+In **Configure no data and error handling**, you can define the alerting behavior when the evaluation returns no data or an error.
+
+For details about alert states, refer to [lifecycle of alert instances](ref:alert-instance-state).
+
+You can configure the alert instance state when its evaluation returns no data:
+
+| No Data configuration | Description                                                                                                                                                                                                                               |
+| --------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| No Data               | The default option. Sets alert instance state to `No data`. <br/> The alert rule also creates a new alert instance `DatasourceNoData` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
+| Alerting              | Sets the alert instance state to `Pending` and then transitions to `Alerting` once the [pending period](ref:pending-period) ends. If you sent the pending period to 0, the alert instance state is immediately set to `Alerting`.         |
+| Normal                | Sets alert instance state to `Normal`.                                                                                                                                                                                                    |
+| Keep Last State       | Maintains the alert instance in its last state. Useful for mitigating temporary issues, refer to [Keep last state](ref:keep-last-state).                                                                                                  |
+
+You can also configure the alert instance state when its evaluation returns an error or timeout.
+
+| Error configuration | Description                                                                                                                                                                                                                            |
+| ------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Error               | The default option. Sets alert instance state to `Error`. <br/> The alert rule also creates a new alert instance `DatasourceError` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
+| Alerting            | Sets alert instance state to `Alerting`. It transitions from `Pending` to `Alerting` after the [pending period](ref:pending-period) has finished.                                                                                      |
+| Normal              | Sets alert instance state to `Normal`.                                                                                                                                                                                                 |
+| Keep Last State     | Maintains the alert instance in its last state. Useful for mitigating temporary issues, refer to [Keep last state](ref:keep-last-state).                                                                                               |
+
+When you configure the No data or Error behavior to `Alerting` or `Normal`, Grafana will attempt to keep a stable set of fields under notification `Values`. If your query returns no data or an error, Grafana re-uses the latest known set of fields in `Values`, but will use `-1` in place of the measured value.
--- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
+++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md
@@ -0,0 +1,144 @@
+---
+aliases:
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
+  - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
+  - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
+canonical: https://grafana.com/docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
+description: Configure data source-managed alert rules alert for an external Grafana Mimir or Loki instance
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - create
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure data source-managed alert rules
+weight: 200
+refs:
+  alerting:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/
+  annotation-label:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/
+  link-alert-rules-to-panels:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/link-alert-rules-to-panels/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/link-alert-rules-to-panels/
+---
+
+# Configure data source-managed alert rules
+
+Create data source-managed alert rules for Grafana Mimir or Grafana Loki data sources, which have been configured to support rule creation.
+
+To configure your Grafana Mimir or Loki data source for alert rule creation, enable either the Loki Ruler API or the Mimir Ruler API.
+
+For more information, refer to [Loki Ruler API](/docs/loki/<GRAFANA_VERSION>/api/#ruler) or [Mimir Ruler API](/docs/mimir/<GRAFANA_VERSION>/references/http-api/#ruler).
+
+**Note**:
+
+Alert rules for a Grafana Mimir or Loki instance can be edited or deleted by users with Editor or Admin roles.
+
+If you delete an alerting resource created in the UI, you can no longer retrieve it.
+To make a backup of your configuration and to be able to restore deleted alerting resources, create your alerting resources using file provisioning, Terraform, or the Alerting API.
+
+## Before you begin
+
+- Verify that you have write permission to the Mimir or Loki data source. Otherwise, you cannot create or update Grafana Mimir or Loki-managed alert rules.
+
+- Enable the Mimir or Loki Ruler API.
+
+  - **Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
+
+  - **Grafana Mimir** - use the `/prometheus` prefix. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
+
+Watch this video to learn more about how to create a Mimir-managed alert rule: {{< vimeo 720001865 >}}
+
+{{% admonition type="note" %}}
+If you do not want to manage alert rules for a particular Loki or Mimir data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
+{{% /admonition %}}
+
+To create a data source-managed alert rule, use the in-product alert creation flow and follow these steps to help you.
+
+## Set alert rule name
+
+1. Click **Alerts & IRM** -> **Alert rules** -> **+ New alert rule**.
+1. Enter a name to identify your alert rule.
+
+   This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
+
+## Define query and condition
+
+Define a query to get the data you want to measure and a condition that needs to be met before an alert rule fires.
+
+**Note**:
+
+All alert rules are managed by Grafana by default. To switch to a data source-managed alert rule, click **Switch to data source-managed alert rule**.
+
+1. Select a data source from the drop-down list.
+
+   You can also click **Open advanced data source picker** to see more options, including adding a data source (Admins only).
+
+1. Enter a PromQL or LogQL query.
+1. Click **Preview alerts**.
+
+## Set alert evaluation behavior
+
+Use alert rule evaluation to determine how frequently an alert rule should be evaluated and how quickly it should change its state.
+
+1. Select a namespace or click **+ New namespace**.
+1. Select an evaluation group or click **+ New evaluation group**.
+
+   If you are creating a new evaluation group, specify the interval for the group.
+
+   All rules within the same group are evaluated sequentially over the same time interval.
+
+1. Enter a pending period.
+
+   The pending period is the period in which an alert rule can be in breach of the condition until it fires.
+
+   Once a condition is met, the alert goes into the **Pending** state. If the condition remains active for the duration specified, the alert transitions to the **Firing** state, else it reverts to the **Normal** state.
+
+## Configure notifications
+
+Add labels to your alert rules to set which notification policy should handle your firing alert instances.
+
+All alert rules and instances, irrespective of their labels, match the default notification policy. If there are no nested policies, or no nested policies match the labels in the alert rule or alert instance, then the default notification policy is the matching policy.
+
+1. Add labels if you want to change the way your notifications are routed.
+
+   Add custom labels by selecting existing key-value pairs from the drop down, or add new labels by entering the new key or value.
+
+## Add annotations
+
+Add [annotations](ref:annotation-label). to provide more context on the alert in your alert notifications.
+
+Annotations add metadata to provide more information on the alert in your alert notifications. For example, add a **Summary** annotation to tell you which value caused the alert to fire or which server it happened on.
+
+1. Optional: Add a summary.
+
+   Short summary of what happened and why.
+
+1. Optional: Add a description.
+
+   Description of what the alert rule does.
+
+1. Optional: Add a Runbook URL.
+
+   Webpage where you keep your runbook for the alert
+
+1. Optional: Add a custom annotation
+1. Optional: **Link dashboard and panel**.
+
+   [Link the alert rule to a panel](ref:link-alert-rules-to-panels) to facilitate alert investigation.
+
+1. Click **Save rule**.
--- a/docs/sources/alerting/alerting-rules/create-recording-rules/create-data-source-managed-recording-rules.md
+++ b/docs/sources/alerting/alerting-rules/create-recording-rules/create-data-source-managed-recording-rules.md
@@ -41,7 +41,7 @@ Note that in data source-managed groups, the alert rules and recording rules wit

  - **Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.

-  - **Mimir** - use the `/prometheus` prefix. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
+  - **Grafana Mimir** - use the `/prometheus` prefix. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.

 ## Add new recording rule

@@ -66,9 +66,7 @@ Select your data source and enter a query. The queries used in data source-manag

 1. From the **Group** dropdown, select an existing group within the selected namespace or add a new one.

-   Rules within a group are run sequentially at a regular interval, with the same evaluation time.
-
-   Newly created rules are appended to the end of the group, and you can reorder them from the **Alert rules** page.
+   Newly created rules are appended to the end of the group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.

 ## Add labels

--- a/docs/sources/alerting/alerting-rules/link-alert-rules-to-panels.md
+++ b/docs/sources/alerting/alerting-rules/link-alert-rules-to-panels.md
@@ -30,9 +30,9 @@ refs:
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/#annotations
  view-alert-state-on-panels:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/monitor-status/view-alert-state/#view-alert-state-on-panels
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-alert-state-on-panels/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/monitor-status/view-alert-state/#view-alert-state-on-panels
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/view-alert-state-on-panels/
 ---

 # Create and link alert rules to panels
--- a/docs/sources/alerting/alerting-rules/templates/_index.md
+++ b/docs/sources/alerting/alerting-rules/templates/_index.md
@@ -63,19 +63,14 @@ refs:
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/reference/#notification-data
  view-alert-state:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/monitor-status/view-alert-state/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-state-health/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/monitor-status/view-alert-state/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/view-state-health/
  preview-notifications:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/manage-notification-templates/#preview-notification-templates
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/manage-notification-templates/#preview-notification-templates
-  labels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/latest/alerting/fundamentals/alert-rules/annotation-label/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/
 ---

 # Template annotations and labels
@@ -218,7 +213,3 @@ For further details on how to template alert rules, refer to:

 - [Annotation and label template reference](ref:alert-rule-template-reference)
 - [Annotation and label examples](ref:alert-rule-template-examples)
-
-{{< admonition type="tip" >}}
-For a practical example of templating, refer to our [Getting Started with Templating tutorial](https://grafana.com/tutorials/alerting-get-started-pt4/).
-{{< /admonition  >}}
--- a/docs/sources/alerting/alerting-rules/templates/examples.md
+++ b/docs/sources/alerting/alerting-rules/templates/examples.md
@@ -193,11 +193,15 @@ For additional functions to display or format data, refer to:
 Here’s an example of creating a `severity` label based on a query value:

 ```go
-{{- if (gt $values.A.Value 90.0) -}}critical
-{{- else if (gt $values.A.Value 80.0) -}}high
-{{- else if (gt $values.A.Value 60.0) -}}medium
-{{- else -}}low
-{{- end -}}
+{{ if (gt $values.A.Value 90.0) -}}
+critical
+{{ else if (gt $values.A.Value 80.0) -}}
+high
+{{ else if (gt $values.A.Value 60.0) -}}
+medium
+{{ else -}}
+low
+{{- end }}
 ```

 In this example, the `severity` label is determined by the query value:
@@ -218,13 +222,10 @@ You should avoid displaying query values in labels, as this may create many aler
 You can use labels to differentiate alerts coming from various environments (e.g., production, staging, dev). For example, you may want to add a label that sets the environment based on the instance’s label. Here’s how you can template it:

 ```go
-{{- if eq $labels.instance "prod-server-1" -}}
-production
-{{- else if eq $labels.instance "staging-server-1" -}}
-staging
-{{- else -}}
-development
-{{- end -}}
+{{ if eq $labels.instance "prod-server-1" }}production
+{{ else if eq $labels.instance "staging-server-1" }}staging
+{{ else }}development
+{{ end }}
 ```

 This would print:
@@ -236,13 +237,10 @@ This would print:
 To make this template more flexible, you can use a regular expression that matches the instance name with the instance name prefix using the [`match()`](ref:reference-match) function:

 ```go
-{{- if match "^prod-server-.*" $labels.instance -}}
-production
-{{- else if match "^staging-server-.*" $labels.instance -}}
-staging
-{{- else -}}
-development
-{{- end -}}
+{{ if match "^prod-server-.*" $labels.instance }}production
+{{ else if match "^staging-server-.*" $labels.instance}}staging
+{{ else }}development
+{{ end }}
 ```

 {{< collapse title="Legacy Alerting templates" >}}
--- a/docs/sources/alerting/alerting-rules/templates/reference.md
+++ b/docs/sources/alerting/alerting-rules/templates/reference.md
@@ -51,11 +51,6 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/templates/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/templates/
-  explore:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/explore/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana/<GRAFANA_VERSION>/explore/
 ---

 # Annotation and label template reference
--- a/docs/sources/alerting/configure-notifications/_index.md
+++ b/docs/sources/alerting/configure-notifications/_index.md
@@ -14,75 +14,29 @@ menuTitle: Configure notifications
 title: Configure notifications
 weight: 125
 refs:
-  intro-notifications:
+  contact-points:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/contact-points/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/
-  configure-contact-points:
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/contact-points/
+  notification-policies:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/
-  configure-notification-policies:
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/
+  templates-page:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-notification-policy/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/templates/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-notification-policy/
-  configure-templates:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/
-  configure-silences:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-silence/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-silence/
-  configure-mute-timings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/templates/
 ---

 # Configure notifications

-Configuring how, when, and where to send alert notifications is an essential part of your alerting system.
+Choose how, when, and where to send your alert notifications.

-By default, Grafana Alerting provides default notification messages with relevant alert information, so you don't need to configure messages initially. In the alert rule, you need to configure how to forward alerts:
+As a first step, define your [contact points](ref:contact-points) where to send your alert notifications to. A contact point is a set of one or more integrations that are used to deliver notifications.

-1. Directly to a contact point.
-2. To a contact point via notification policies (more flexible).
+Next, create a [notification policy](ref:notification-policies) which is a set of rules for where, when and how your alerts are routed to contact points. In a notification policy, you define where to send your alert notifications by choosing one of the contact points you created.

-{{< figure src="/media/docs/alerting/alerting-configure-notifications-v2.png" max-width="750px" alt="In the alert rule, you can configure alert forwarding directly to a contact point or through notification policies" >}}
-
-Notification setup is essential for an effective alerting system to scale across multiple teams and services. For a quick overview about the various components involved in handling notifications, refer to the [introduction about notifications](ref:intro-notifications).
-
-The topics in this section include step-by-step instructions for:
-
- [Configuring contact points](ref:configure-contact-points) to specify where to receive alert notifications.
- [Configuring notification policies](ref:configure-notification-policies) to determine how alerts are routed to contact points.
- [Templating notifications](ref:configure-templates) to customize notification messages.
- [Configuring silences](ref:configure-silences) or [mute timings](ref:configure-mute-timings) to stop notifications.
-
-## Alertmanager architecture
-
-Grafana Alerting is based on the Prometheus Alerting model, whose architecture decouples rule evaluation from notification handling.
-
- The alert rule evaluator, either Grafana or the data source, evaluates alert rules and triggers alerts.
- The alert notification manager, known as the **Alertmanager**, receives alerts and manages their notifications.
-
-{{< figure src="/media/docs/alerting/alerting-alertmanager-architecture.png" max-width="750px" alt="A diagram with the alert generator and alert manager architecture" >}}
-
-In Grafana, you can use different types of alert rules and configure multiple Alertmanagers.
-
-By default, Grafana uses its built-in Alertmanager, and Grafana Cloud instances include an additional Alertmanager.
-
-{{< figure src="/media/docs/alerting/alerting-choose-alertmanager.png" max-width="750px" alt="A screenshot choosing an Alertmanager in the notification policies UI" >}}
-
-When having multiple Alertmanagers, note that each Alertmanager manages its own independent notification resources, such as contact points, templates, policies, silences, mute timings, and active notifications.
-
-These notification resources cannot be shared across different Alertmanagers.
-
-Use the **Choose Alertmanager** dropdown to select the Alertmanager you want to configure.
+Optionally, you can add [notification templates](ref:templates-page) to contact points for reuse and consistent messaging in your notifications.
--- a/docs/sources/alerting/configure-notifications/create-notification-policy.md
+++ b/docs/sources/alerting/configure-notifications/create-notification-policy.md
@@ -20,67 +20,26 @@ labels:
 title: Configure notification policies
 weight: 420
 refs:
-  alertmanager-architecture:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/#alertmanager-architecture
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/#alertmanager-architecture
-  intro-notification-policies:
+  notification-policies:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/
-  configure-mute-timings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings/
-  configure-contact-points:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/
-  policy-routing:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/#routing
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/#routing
-  policy-inheritance:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/#inheritance
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/#inheritance
-  policy-grouping:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/group-alert-notifications/#group-notifications
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/group-alert-notifications/#group-notifications
-  policy-timing-options:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/group-alert-notifications/#timing-options
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/group-alert-notifications/#timing-options
 ---

 # Configure notification policies

 Notification policies determine how alerts are routed to contact points.

-Policies have a tree structure. Each policy can have one or more child policies and a set of label matchers.
+Policies have a tree structure and each policy can have one or more child policies. Each policy, except for the default policy, can also match specific alert labels.

-Each alert (or alert instance) is evaluated by the default policy and subsequently by each child policy. Alerts are routed to the appropriate notification policy by matching alert labels with the policy's label matchers. For further details, refer to [label matching and routing in notification policies](ref:intro-notification-policies).
+Each alert is evaluated by the default policy and subsequently by each child policy.

-{{< figure src="/media/docs/alerting//get-started-notification-policy-tree-combo.png" max-width="750px" alt="A diagram displaying how the notification policy tree routes alerts" >}}
+If the **Continue matching subsequent sibling nodes** option is enabled for a child policy, evaluation continues even after one or more matches. A parent policy’s configuration settings and contact point information govern the behavior of an alert that does not match any of the child policies. A default policy governs any alert that does not match a child policy.

-When an alert instance is assigned to a notification policy, the notification policy is responsible for:
+You can configure Grafana-managed notification policies as well as notification policies for an external Alertmanager data source.

- [Grouping similar alerts](ref:policy-grouping) to minimize the number of notifications.
- Controlling when notifications are sent using the [timing options](ref:policy-timing-options).
- Determining the [contact points](ref:configure-contact-points) that receive the alert notification.
-
-{{% admonition type="note" %}}
-The default notification policy and its child policies are assigned to a [specific Alertmanager](ref:alertmanager-architecture), and they cannot use contact points or mute timings from other Alertmanagers.
-{{% /admonition %}}
+For more information on notification policies, refer to [fundamentals of Notification Policies](ref:notification-policies).

 ## Edit the default notification policy

@@ -88,12 +47,12 @@ The default notification policy and its child policies are assigned to a [specif
 1. Click **Notification policies**.
 1. From the **Choose Alertmanager** dropdown, select an external Alertmanager. By default, the **Grafana Alertmanager** is selected.
 1. In the Default policy section, click **...** -> **Edit**.
-1. In **Default contact point**, update the [contact point](ref:configure-contact-points) for where to send notifications when alert rules do not match any specific policy.
-1. In **Group by**, choose labels to group alerts. If multiple alerts match this policy, they are grouped by the selected labels, and notifications are sent per group. For more details on using this option, refer to [Group notifications](ref:policy-grouping).
-1. In **Timing options**, set the [timing options](ref:policy-timing-options) to configure when notifications are sent.
-   - **Group wait**: the time to wait before sending the first notification for a new group of alerts. Default is 30 seconds.
-   - **Group interval**: the time to wait before sending a notification about changes in the alert group. Default is 5 minutes.
-   - **Repeat interval**: the time to wait before sending a notification if the group has not changed since the last notification. Default is 4 hours.
+1. In **Default contact point**, update the contact point for where to send notifications when alert rules do not match any specific policy.
+1. In **Group by**, choose labels to group alerts by. If multiple alerts are matched for this policy, then they are grouped by these labels. A notification is sent per group. If the field is empty (default), then all notifications are sent in a single group. Use a special label `...` to group alerts by all labels (which effectively disables grouping).
+1. In **Timing options**, select from the following options:
+   - **Group wait** Time to wait to buffer alerts of the same group before sending an initial notification. Default is 30 seconds.
+   - **Group interval** Minimum time interval between two notifications for a group. Default is 5 minutes.
+   - **Repeat interval** Minimum time interval for re-sending a notification if no new alerts were added to the group. Default is 4 hours.
 1. Click **Save** to save your changes.

 ## Add a child policy
@@ -103,18 +62,15 @@ You can create a child policy under a default policy or under an existing child
 If you want to choose where to position your policy, see the section on **Add a sibling 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. Click **+New child policy** from the default policy or an existing child policy.
-1. In the Matching labels section of the child policy, add one or more matching label rules to narrow down a specific case from the parent policy.
-
-   For instance, a child policy of the default policy handles `team=security` alerts, or a child policy handles only the `severity=critical` alerts of a parent policy.
-
-1. In the **Contact point** dropdown, select the [contact point](ref:configure-contact-points) to send notifications. If left empty, the contact point of the parent policy is [inherited](ref:policy-inheritance).
-1. Optionally, enable **Continue matching subsequent sibling nodes** to continue matching sibling policies even after the alert matched the current policy. If enabled, multiple policies can handle the same alert.
-1. Optionally, enable **Override grouping** to set different [grouping](ref:policy-grouping) than the parent policy. If disabled, the grouping of the parent policy is [inherited](ref:policy-inheritance).
-1. Optionally, enable **Override general timings** to set different [timing options](ref:policy-timing-options) than the parent policy. If disabled, the timing options of the parent policy are [inherited](ref:policy-inheritance).
-1. Click **Save policy** to save your changes.
+2. Click **Notification policies**.
+3. From the **Choose Alertmanager** dropdown, select an Alertmanager. By default, the **Grafana Alertmanager** is selected.
+4. Click **+New child policy** from the default policy.
+5. In the Matching labels section, add one or more rules for matching alert labels.
+6. 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 child policies.
+7. 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.
+8. Optionally, enable **Override grouping** to specify the same grouping as the default policy. If this option is not enabled, the default policy grouping is used.
+9. Optionally, enable **Override general timings** to override the timing options configured in the group notification policy.
+10. Click **Save policy** to save your changes.

 ## Add a sibling policy

@@ -123,11 +79,9 @@ If you want to choose where to position your policy, see the section on **Add a
 1. Find the child policy you want to create a sibling for.
 1. Click **Add new policy** -> **New sibling above** or **New sibling below**.

-   It's important to determine which policy receives the alert first and to set the correct order of sibling and child policies.
+   Notification policies are evaluated from top to bottom, so it is key to be able to choose which notification policy receives alerts first. Adding sibling notification policies instead of always inserting a child policy as well as being able to choose where to insert is key to managing where your alerts go.

-   Policies are evaluated from top to bottom. If a matching policy is found, the system continues to evaluate its child policies in the order they are displayed. For more details, refer to [notification policies routing](ref:policy-routing).
-
-1. Follow the instructions from step 5 onward in [adding a child policy](#add-a-child-policy).
+1. Click **Save policy** to save your changes.

 ## Search for policies

@@ -144,7 +98,7 @@ It is important to note that all matched policies are **exact** matches. Grafana

 ## Mute timings

-Mute timings are not inherited from a parent notification policy, and they have to be configured on each level. For instructions, refer to [Configure mute timings](ref:configure-mute-timings).
+Mute timings are not inherited from a parent notification policy. They have to be configured in full on each level.

 ## Example

--- a/docs/sources/alerting/configure-notifications/create-silence.md
+++ b/docs/sources/alerting/configure-notifications/create-silence.md
@@ -22,52 +22,32 @@ labels:
 title: Configure silences
 weight: 440
 refs:
-  configure-alertmanager:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager/
-  silence-url:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/reference/#alert
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/reference/#alert
-  shared-alert-labels:
+  alert-labels:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/
-  shared-notification-policies:
+  notification-policies:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/
-  shared-silences:
+  silences:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-silence/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-silence/
-  shared-mute-timings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings/
-  alertmanager-architecture:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager/
 ---

 # Configure silences

-Silences stop notifications from getting created and last for only a specified window of time. Use them to temporarily prevent alert notifications, such as during incident response or a maintenance window.
+Silences stop notifications from getting created and last for only a specified window of time.

 {{< admonition type="note" >}}
-Silences are assigned to a [specific Alertmanager](ref:alertmanager-architecture) and only suppress notifications for alerts managed by that Alertmanager.
-{{< /admonition >}}

-{{< docs/shared lookup="alerts/mute-timings-vs-silences.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+- Inhibition rules are not supported in the Grafana Alertmanager.
+- The preview of silenced alerts only applies to alerts in firing state.
+  {{< /admonition >}}

 ## Add silences

@@ -79,12 +59,10 @@ To add a silence, complete the following steps.
 1. Click **Create silence** to open the Create silence page.
 1. In **Silence start and end**, select the start and end date to indicate when the silence should go into effect and expire.
 1. Optionally, in **Duration**, specify how long the silence is enforced. This automatically updates the end time in the **Silence start and end** field.
-1. In the **Label** and **Value** fields, enter one or more _Matching Labels_ to determine which alerts the silence applies to.
+1. In the **Label** and **Value** fields, enter one or more _Matching Labels_. Matchers determine which rules the silence will apply to. Any matching alerts (in firing state) will show in the **Silenced alert instances** field

   {{< docs/shared lookup="alerts/how_label_matching_works.md" source="grafana" version="<GRAFANA_VERSION>" >}}

-   Any matching alerts (in the firing state only) will show under **Affected alert rule instances**.
-
 1. In **Comment**, add details about the silence.
 1. Click **Submit**.

@@ -97,6 +75,14 @@ To edit a silence, complete the following steps.
 1. Find the silence you want to edit, then click **Edit** (pen icon).
 1. Make the desired changes, then click **Submit** to save your changes.

+## Create a URL to link to a silence form
+
+When linking to a silence form, provide the default matching labels and comment via `matcher` and `comment` query parameters. The `matcher` parameter should be in the following format `[label][operator][value]` where the `operator` parameter can be one of the following: `=` (equals, not regular expression), `!=` (not equals, not regular expression), `=~` (equals, regular expression), `!~` (not equals, regular expression).
+The URL can contain many query parameters with the key `matcher`.
+For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/alerting/silence/new?matcher=severity%3Dcritical&matcher=cluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
+
+To link to a new silence page for an external Alertmanager, add a `alertmanager` query parameter with the Alertmanager data source name.
+
 ## Remove silences

 To remove a silence, complete the following steps.
@@ -109,30 +95,13 @@ To remove a silence, complete the following steps.

 ## Rule-specific silences

-Rule-specific silences are silences that apply only to a specific alert rule. They're created when you silence an alert rule directly using the **Silence notifications** action in the UI.
+Rule-specific silences are silences that apply only to a specific alert rule.
+They're created when you silence an alert rule directly using the **Silence notifications** action in the UI.

+{{< admonition type="note" >}}
 As opposed to general silences, rule-specific silence access is tied directly to the alert rule they act on. They can be created manually by including the specific label matcher: `__alert_rule_uid__=<alert rule UID>`.
+{{< /admonition >}}

-## URL link to a silence form
+## Useful links

-Default notification messages often include a link to silence alerts.
-
-In custom notification templates, you can use [`.Alert.SilenceURL`](ref:silence-url) to redirect users to the UI where they can silence the given alert.
-
-If [`.Alert.SilenceURL`](ref:silence-url) doesn’t fit your specific use case, you can also create a custom silence link for your custom templates.
-
-{{< collapse title="Create a custom silence link" >}}
-
-When linking to a silence form, provide the default matching labels and comment via `matcher` and `comment` query parameters. The `matcher` parameter should be in the following format `[label][operator][value]` where the `operator` parameter can be one of the following: `=` (equals, not regular expression), `!=` (not equals, not regular expression), `=~` (equals, regular expression), `!~` (not equals, regular expression).
-The URL can contain many query parameters with the key `matcher`.
-For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/alerting/silence/new?matcher=severity%3Dcritical&matcher=cluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
-
-To link to a new silence page for an external Alertmanager, add a `alertmanager` query parameter with the Alertmanager data source name.
-
-{{< /collapse >}}
-
-## Inhibition rules
-
-Inhibition rules are supported in the Prometheus Alertmanager. You can [configure a Prometheus Alertmanager](ref:configure-alertmanager) to handle the notification of alerts and suppress notifications via inhibition rules.
-
-Inhibition rules are not currently supported in the Grafana Alertmanager. For tracking the progress of this feature request, follow [this GitHub issue](https://github.com/grafana/grafana/issues/68822).
+[Aggregation operators](https://prometheus.io/docs/prometheus/latest/querying/operators/#aggregation-operators)
--- a/docs/sources/alerting/configure-notifications/manage-contact-points/_index.md
+++ b/docs/sources/alerting/configure-notifications/manage-contact-points/_index.md
@@ -81,21 +81,16 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/configure-teams/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/configure-teams/
-  mqtt:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/configure-mqtt/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/configure-mqtt/
-  alertmanager-architecture:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/#alertmanager-architecture
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/#alertmanager-architecture
  external-alertmanager:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager/
+  mqtt:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points/integrations/configure-mqtt/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points/integrations/configure-mqtt/
  manage-notification-templates:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/manage-notification-templates/
@@ -118,10 +113,6 @@ On the **Contact Points** tab, you can:
 - Export individual contact points or all contact points in JSON, YAML, or Terraform format.
 - Delete contact points. Note that you cannot delete contact points that are in use by a notification policy. To proceed, either delete the notification policy or update it to use another contact point.

-{{% admonition type="note" %}}
-Contact points are assigned to a [specific Alertmanager](ref:alertmanager-architecture) and cannot be used by notification policies in other Alertmanagers.
-{{% /admonition %}}
-
 ## Add a contact point

 Complete the following steps to add a contact point.
@@ -159,16 +150,6 @@ Testing a contact point is only available for Grafana Alertmanager. Complete the
 1. Choose whether to send a predefined test notification or choose custom to add your own custom annotations and labels to include in the notification.
 1. Click **Send test notification** to fire the alert.

-## Customize notification messages
-
-In contact points, you can also customize notification messages. For example, when setting up an email contact point integration, click **Message** or **Subject** to modify it.
-
-By default, notification messages include common alert details, which are usually sufficient for most cases.
-
-If necessary, you can customize the content and format of notification messages. You can create a custom notification template, which can then be applied to one or more contact points.
-
-On the **Notification templates** tab, you can view, edit, copy or delete notification templates. Refer to [manage notification templates](ref:manage-notification-templates) for instructions on selecting or creating a template for a contact point.
-
 ## List of supported integrations

 Each contact point integration has its own configuration options and setup process. In most cases, this involves providing an API key or a Webhook URL.
@@ -201,3 +182,13 @@ The following table lists the contact point integrations supported by Grafana.
 | WeCom                        | `wecom`                   |

 Some of these integrations are not compatible with [external Alertmanagers](ref:external-alertmanager). For the list of Prometheus Alertmanager integrations, refer to the [Prometheus Alertmanager receiver settings](https://prometheus.io/docs/alerting/latest/configuration/#receiver-integration-settings).
+
+## Customize notification messages
+
+In contact points, you can also customize notification messages. For example, when setting up an email contact point integration, click **Message** or **Subject** to modify it.
+
+By default, notification messages include common alert details, which are usually sufficient for most cases.
+
+If necessary, you can customize the content and format of notification messages. You can create a custom notification template, which can then be applied to one or more contact points.
+
+On the **Notification templates** tab, you can view, edit, copy or delete notification templates. Refer to [manage notification templates](ref:manage-notification-templates) for instructions on selecting or creating a template for a contact point.
--- a/docs/sources/alerting/configure-notifications/mute-timings.md
+++ b/docs/sources/alerting/configure-notifications/mute-timings.md
@@ -18,34 +18,31 @@ labels:
    - enterprise
    - oss
 title: Configure mute timings
-weight: 430
+weight: 450
 refs:
-  alertmanager-architecture:
+  external-alertmanager:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/#alertmanager-architecture
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/#alertmanager-architecture
-  shared-silences:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-silence/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-silence/
-  shared-mute-timings:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/mute-timings/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/mute-timings/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager/
 ---

 # Configure mute timings

-A mute timing is a recurring interval of time when no new notifications for a policy are generated or sent. Use them to prevent alerts from firing a specific and reoccurring period, for example, a regular maintenance period or weekends.
+A mute timing is a recurring interval of time when no new notifications for a policy are generated or sent. Use them to prevent alerts from firing a specific and reoccurring period, for example, a regular maintenance period.

-{{< admonition type="note" >}}
-Mute timings are assigned to a [specific Alertmanager](ref:alertmanager-architecture) and only suppress notifications for alerts managed by that Alertmanager.
-{{< /admonition >}}
+Similar to silences, mute timings do not prevent alert rules from being evaluated, nor do they stop alert instances from being shown in the user interface. They only prevent notifications from being created.

-{{< docs/shared lookup="alerts/mute-timings-vs-silences.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+You can configure Grafana managed mute timings as well as mute timings for an [external Alertmanager](ref:external-alertmanager).
+
+## Mute timings vs silences
+
+The following table highlights the key differences between mute timings and silences.
+
+| Mute timing                                        | Silence                                                                      |
+| -------------------------------------------------- | ---------------------------------------------------------------------------- |
+| Uses time interval definitions that can reoccur    | Has a fixed start and end time                                               |
+| Is created and then added to notification policies | Uses labels to match against an alert to determine whether to silence or not |

 ## Add mute timings

@@ -68,8 +65,6 @@ Mute timings are assigned to a [specific Alertmanager](ref:alertmanager-architec

 A time interval is a specific duration during which alerts are suppressed. The duration typically consists of a specific time range and the days of the week, month, or year.

-A mute timing can contain multiple time intervals.
-
 Supported time interval options are:

 - Time range: The time inclusive of the start and exclusive of the end time (in UTC if no location has been selected, otherwise local time).
@@ -81,13 +76,9 @@ Supported time interval options are:

 All fields are lists; to match the field, at least one list element must be satisfied. Fields also support ranges using `:` (e.g., `monday:thursday`).

-If a field is left blank, any moment of time matches the field. For an instant of time to match a complete time interval, all fields must match.
+If a field is left blank, any moment of time matches the field. For an instant of time to match a complete time interval, all fields must match. A mute timing can contain multiple time intervals.

-If you want to specify an exact duration, specify all the options.
-
-**Example**
-
-If you wanted to create a time interval for the first Monday of the month, for March, June, September, and December, between the hours of 12:00 and 24:00 UTC your time interval specification would be:
+If you want to specify an exact duration, specify all the options. For example, if you wanted to create a time interval for the first Monday of the month, for March, June, September, and December, between the hours of 12:00 and 24:00 UTC your time interval specification would be:

 - Time range:
  - Start time: `12:00`
--- a/docs/sources/alerting/configure-notifications/template-notifications/_index.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/_index.md
@@ -14,7 +14,7 @@ labels:
    - enterprise
    - oss
 title: Template notifications
-weight: 450
+weight: 430
 refs:
  template-annotations-and-labels:
    - pattern: /docs/grafana/
@@ -108,7 +108,3 @@ For further details on how to write notification templates, refer to:
 - [Select, create, and preview a notification template](ref:manage-notification-templates)
 - [Notification template reference](ref:reference)
 - [Notification template examples](ref:examples)
-
-{{< admonition type="tip" >}}
-For a practical example of templating, refer to our [Getting Started with Templating tutorial](https://grafana.com/tutorials/alerting-get-started-pt4/).
-{{< /admonition  >}}
--- a/docs/sources/alerting/configure-notifications/template-notifications/examples.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/examples.md
@@ -111,12 +111,6 @@ The name of the alert is {{ .Labels.alertname }}
 {{ end }}
 ```

-You can then use the template by passing the [notification data (dot `.`)](ref:reference-notification-data):
-
-```go
-{{ template "custom_message" . }}
-```
-
 ```template_output
 The name of the alert is InstanceDown

@@ -146,11 +140,7 @@ In this example:
 - A template (`alert.summary_and_description`) is defined to print the `summary`, `status`, and `description` of one [alert](ref:reference-alert).
 - The main template `custom.alerts` iterates the list of alerts (`.Alerts`) in [notification data](ref:reference-notification-data), executing the `alert.summary_and_description` template to print the details of each alert.

-Execute the template by passing the dot (`.`):
-
-```go
-{{ template "custom.alerts" . }}
-```
+The notification message would look like this:

 ```template_output
 2 alert(s)
@@ -188,11 +178,7 @@ The following example is similar to the previous one, but it separates firing an

 Instead of `.Alerts`, the template accesses `.Alerts.Firing` and `.Alerts.Resolved` separately to print details for each alert.

-Run the template by passing the dot (`.`):
-
-```go
-{{ template "custom.firing_and_resolved_alerts" . }}
-```
+The output might now look like this:

 ```template_output
 1 resolved alert(s)
@@ -229,12 +215,6 @@ Common annotations: {{ len .CommonAnnotations.SortedPairs }}

 Note that `.CommonAnnotations` and `.CommonLabels` are part of [notification data](ref:reference-notification-data).

-Execute the template by passing the dot (`.`) as argument:
-
-```go
-{{ template "custom.common_labels_and_annotations" . }}
-```
-
 ```template_output
 1 resolved alert(s)
 1 firing alert(s)
@@ -277,12 +257,6 @@ In this example:
 - The `custom.alert_labels_and_annotations` template iterates over the list of resolved and firing alerts, similar to previous examples. It then executes `alert.labels_and_annotations` for each alert.
 - The `alert.labels_and_annotations` template prints all the alert labels and annotations by accessing `.Labels.SortedPairs` and `.Annotations.SortedPairs`.

-Run the template by passing the dot (`.`):
-
-```go
-{{ template "custom.alert_labels_and_annotations" . }}
-```
-
 ```template_output
 1 resolved alert(s)

@@ -333,11 +307,7 @@ Note that the following example works only for Grafana-managed alerts. It displa
 {{ end -}}
 ```

-Pass the dot (`.`) to execute the template:
-
-```go
-{{ template "custom.alert_additional_details" . }}
-```
+The output of this template looks like this:

 ```template_output
 1 resolved alert(s)
@@ -369,12 +339,6 @@ Here’s a basic example that displays the number of firing and resolved alerts
 {{ end -}}
 ```

-Execute the template by passing the dot (`.`) as argument:
-
-```go
-{{ template "custom_title" . }}
-```
-
 ```template_output
 🚨 1 firing alerts. ✅ 1 resolved alerts.
 ```
@@ -393,12 +357,6 @@ This is a more advanced example:
 - Outputs `.GroupLabels`, the labels used to [group multiple alerts in one notification](ref:group-alert-notifications).
 - Prints `CommonLabels`, excluding labels in `.GroupLabels`.

-Execute the template by passing the dot (`.`):
-
-```go
-{{ template "copy_of_default_title" . }}
-```
-
 ```template_output
 [FIRING:1, RESOLVED:1] api warning (sql_db)
 ```
--- a/docs/sources/alerting/configure-notifications/template-notifications/images-in-notifications.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/images-in-notifications.md
@@ -1,6 +1,6 @@
 ---
 aliases:
-  - ../../manage-notifications/images-in-notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/images-in-notifications/
+  - ../manage-notifications/images-in-notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/images-in-notifications/
 canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/template-notifications/images-in-notifications/
 description: Use images in notifications to help users better understand why alerts are firing or have been resolved
 keywords:
--- a/docs/sources/alerting/configure-notifications/template-notifications/manage-notification-templates.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/manage-notification-templates.md
@@ -28,11 +28,6 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/reference/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/reference/
-  notification-template-examples:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/template-notifications/examples/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/template-notifications/examples/
 ---

 # Manage notification templates
--- a/docs/sources/alerting/configure-notifications/template-notifications/reference.md
+++ b/docs/sources/alerting/configure-notifications/template-notifications/reference.md
@@ -86,12 +86,6 @@ Here's an example that prints all available notification data from dot (`.`):
 {{ end }}
 ```

-You can execute this template by passing the dot (`.`):
-
-```go
-{{ template "custom_template" . }}
-```
-
 ## Alert

 `Alert` contains data for an individual alert:
@@ -139,12 +133,6 @@ This example iterates over the list of firing and resolved alerts (`.Alerts`) in
 {{ end }}
 ```

-You can run this template by passing the dot (`.`):
-
-```go
-{{ template "custom_template" . }}
-```
-
 ## KV

 `KV` is a set of key value pairs, where each key and value is a string.
--- a/docs/sources/alerting/fundamentals/alert-rule-evaluation/state-and-health.md
+++ b/docs/sources/alerting/fundamentals/alert-rule-evaluation/state-and-health.md
@@ -44,58 +44,35 @@ There are three key components that help you understand how your alerts behave d

 An alert instance can be in either of the following states:

-| State                    | Description                                                                                                                                                                                                                                                                       |
-| ------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Normal**               | The state of an alert when the condition (threshold) is not met.                                                                                                                                                                                                                  |
-| **Pending**              | The state of an alert that has breached the threshold but for less than the [pending period](ref:pending-period).                                                                                                                                                                 |
-| **Alerting**             | The state of an alert that has breached the threshold for longer than the [pending period](ref:pending-period).                                                                                                                                                                   |
-| **No Data<sup>\*</sup>** | The state of an alert whose query returns no data or all values are null. <br/> An alert in this state generates a new [DatasourceNoData alert](#no-data-and-error-alerts). You can [modify the default behavior of the no data state](#modify-the-no-data-or-error-state).       |
-| **Error<sup>\*</sup>**   | The state of an alert when an error or timeout occurred evaluating the alert rule. <br/> An alert in this state generates a new [DatasourceError alert](#no-data-and-error-alerts). You can [modify the default behavior of the error state](#modify-the-no-data-or-error-state). |
-
-{{< admonition type="note" >}}
-
-`No Data` and `Error` states are supported only for Grafana-managed alert rules.
-
-{{< /admonition >}}
+| State        | Description                                                                                                                                                                       |
+| ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Normal**   | The state of an alert when the condition (threshold) is not met.                                                                                                                  |
+| **Pending**  | The state of an alert that has breached the threshold but for less than the [pending period](ref:pending-period).                                                                 |
+| **Alerting** | The state of an alert that has breached the threshold for longer than the [pending period](ref:pending-period).                                                                   |
+| **NoData**   | The state of an alert whose query returns no data or all values are null. You can [change the default behavior of the no data state](#modify-the-no-data-and-error-state).        |
+| **Error**    | The state of an alert when an error or timeout occurred evaluating the alert rule. You can [change the default behavior of the error state](#modify-the-no-data-and-error-state). |

 {{< figure src="/media/docs/alerting/alert-instance-states-v3.png" caption="Alert instance state diagram" alt="A diagram of the distinct alert instance states and transitions." max-width="750px" >}}

-### Notification routing
+### Notifications

 Alert instances will be routed for [notifications](ref:notifications) when they are in the `Alerting` state or have been `Resolved`, transitioning from `Alerting` to `Normal` state.

 {{< figure src="/media/docs/alerting/alert-rule-evaluation-overview-statediagram-v2.png" alt="A diagram of the alert instance states and when to route their notifications." max-width="750px" >}}

-### `No Data` and `Error` alerts
-
-When evaluation of an alert rule produces state `No Data` or `Error`, Grafana Alerting generates a new alert instance that have the following additional labels:
-
- `alertname`: Either `DatasourceNoData` or `DatasourceError` depending on the state.
- `datasource_uid`: The UID of the data source that caused the state.
-
-You can manage these alerts like regular ones by using their labels to apply actions such as adding a silence, routing via notification policies, and more.
-
 ### Lifecycle of stale alert instances

 An alert instance is considered stale if its dimension or series has disappeared from the query results entirely for two evaluation intervals.

-Stale alert instances that are in the **Alerting**, **No Data**, or **Error** states transition to the **Normal** state as **Resolved**. Once transitioned, these resolved alert instances are routed for notifications like other resolved alerts.
+Stale alert instances that are in the **Alerting**, **NoData**, or **Error** states transition to the **Normal** state as **Resolved**. Once transitioned, these resolved alert instances are routed for notifications like other resolved alerts.

-## Modify the `No Data` or `Error` state
+### Modify the no data and error state

 In [Configure no data and error handling](ref:no-data-and-error-handling), you can change the default behaviour when the evaluation returns no data or an error. You can set the alert instance state to `Alerting`, `Normal`, or keep the last state.

-Note that `No Data` and `Error` states are supported only for Grafana-managed alert rules.
-
 {{< figure src="/media/docs/alerting/alert-rule-configure-no-data-and-error.png" alt="A screenshot of the `Configure no data and error handling` option in Grafana Alerting." max-width="500px" >}}

-{{< docs/shared lookup="alerts/table-configure-no-data-and-error.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-Note that when you configure the **No Data** or **Error** behavior to `Alerting` or `Normal`, Grafana attempts to keep a stable set of fields under notification `Values`. If your query returns no data or an error, Grafana reuses the latest known set of fields in `Values`, but will use `-1` in place of the measured value.
-
-### Reduce `No Data` or `Error` alerts
-
-To minimize the number of **No Data** or **Error** state alerts received, try the following.
+To reduce the number of **No Data** or **Error** state alerts received, try the following.

 1. Use the **Keep last state** option. For more information, refer to the section below. This option allows the alert to retain its last known state when there is no data available, rather than switching to a **No Data** state.
 1. For **No Data** alerts, you can optimize your alert rule by expanding the time range of the query. However, if the time range is too big, it affects the performance of the query and can lead to errors due to timeout.
@@ -104,29 +81,38 @@ To minimize the number of **No Data** or **Error** state alerts received, try th

 1. Change the default [evaluation time out](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#evaluation_timeout). The default is set at 30 seconds. To increase the default evaluation timeout, open a support ticket from the [Cloud Portal](https://grafana.com/docs/grafana-cloud/account-management/support/#grafana-cloud-support-options). Note that this should be a last resort, because it may affect the performance of all alert rules and cause missed evaluations if the timeout is too long.

-### Keep last state
+#### Keep last state

 The "Keep Last State" option helps mitigate temporary data source issues, preventing alerts from unintentionally firing, resolving, and re-firing.

 However, in situations where strict monitoring is critical, relying solely on the "Keep Last State" option may not be appropriate. Instead, consider using an alternative or implementing additional alert rules to ensure that issues with prolonged data source disruptions are detected.

-## `grafana_state_reason` for troubleshooting
+### `grafana_state_reason` annotation

 Occasionally, an alert instance may be in a state that isn't immediately clear to everyone. For example:

 - Stale alert instances in the `Alerting` state transition to the `Normal` state when the series disappear.
- If "no data" handling is configured to transition to a state other than `No Data`.
+- If "no data" handling is configured to transition to a state other than `NoData`.
 - If "error" handling is configured to transition to a state other than `Error`.
 - If the alert rule is deleted, paused, or updated in some cases, the alert instance also transitions to the `Normal` state.

 In these situations, the evaluation state may differ from the alert state, and it might be necessary to understand the reason for being in that state when receiving the notification.

-The `grafana_state_reason` annotation is included in these situations, providing the reason that explains why the alert instance transitioned to its current state. For example:
+The `grafana_state_reason` annotation is included in these situations, providing the reason in the notifications that explain why the alert instance transitioned to its current state. For example:

 - Stale alert instances in the `Normal` state include the `grafana_state_reason` annotation with the value **MissingSeries**.
- If "no data" or "error" handling transitions to the `Normal` state, the `grafana_state_reason` annotation is included with the value **No Data** or **Error**, respectively.
+- If "no data" or "error" handling transitions to the `Normal` state, the `grafana_state_reason` annotation is included with the value **NoData** or **Error**, respectively.
 - If the alert rule is deleted or paused, the `grafana_state_reason` is set to **Paused** or **RuleDeleted**. For some updates, it is set to **Updated**.

+### Special alerts for `NoData` and `Error`
+
+When evaluation of an alert rule produces state `NoData` or `Error`, Grafana Alerting generates a new alert instance that have the following additional labels:
+
+- `alertname`: Either `DatasourceNoData` or `DatasourceError` depending on the state.
+- `datasource_uid`: The UID of the data source that caused the state.
+
+You can manage these alerts like regular ones by using their labels to apply actions such as adding a silence, routing via notification policies, and more.
+
 ## Alert rule state

 The alert rule state is determined by the “worst case” state of the alert instances produced. For example, if one alert instance is `Alerting`, the alert rule state is firing.
@@ -147,5 +133,5 @@ An alert rule can have one of the following health statuses:
 | ---------------------- | -------------------------------------------------------------------------------------------------------- |
 | **Ok**                 | No error when evaluating an alerting rule.                                                               |
 | **Error**              | An error occurred when evaluating an alerting rule.                                                      |
-| **No Data**            | The absence of data in at least one time series returned during a rule evaluation.                       |
+| **NoData**             | The absence of data in at least one time series returned during a rule evaluation.                       |
 | **{status}, KeepLast** | The rule would have received another status but was configured to keep the last state of the alert rule. |
--- a/docs/sources/alerting/fundamentals/alert-rules/_index.md
+++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md
@@ -18,11 +18,6 @@ labels:
 title: Alert rules
 weight: 100
 refs:
-  shared-configure-prometheus-data-source-alerting:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/prometheus/configure-prometheus-data-source/#alerting
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/prometheus/configure-prometheus-data-source/#alerting
  queries-and-conditions:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/queries-conditions/
@@ -77,9 +72,8 @@ Grafana-managed alert rules are the most flexible alert rule type. They allow yo

 {{< figure src="/media/docs/alerting/grafana-managed-alerting-architecture.png" max-width="750px" caption="How Grafana-managed alerting works by default" >}}

-1. Alert rules are created and stored within Grafana.
-1. Alert rules can query one or more supported data sources.
-1. Alert rules are evaluated by the Alert Rule Evaluation Engine within Grafana.
+1. Alert rules are created within Grafana and query one or more data sources.
+1. Alert rules are evaluated by the Alert Rule Evaluation Engine from within Grafana.
 1. Firing and resolved alert instances are forwarded to [handle their notifications](ref:notifications).

 ### Supported data sources
@@ -90,38 +84,36 @@ Find the public data sources supporting Alerting in the [Grafana Plugins directo

 ## Data source-managed alert rules

-Data source-managed alert rules can only be created using Grafana Mimir or Grafana Loki data sources. Both data source backends can provide high availability and fault tolerance, enabling you to scale your alerting setup.
+Data source-managed alert rules can query Prometheus-based data sources, such as Grafana Mimir or Grafana Loki. Alert rules are stored within the data source when the Ruler API is enabled (e.g., [Mimir Ruler API](/docs/mimir/<GRAFANA_VERSION>/references/http-api/#ruler) or [Loki Ruler API](/docs/loki/<GRAFANA_VERSION>/api/#ruler)).
+
+In this setup, the distributed architecture can provide high-availability and fault tolerance.

 {{< figure src="/media/docs/alerting/mimir-managed-alerting-architecture-v2.png" max-width="750px" caption="Mimir-managed alerting architecture" >}}

-1. Alert rules are stored within the Mimir or Loki data source.
-1. Alert rules can query only their specific data source.
-1. Alert rules are evaluated by the Alert Rule Evaluation Engine within the data source.
+1. Alert rules are created and stored within the data source itself.
+1. Alert rules can only query Prometheus-based data.
+1. Alert rules are evaluated by the Alert Rule Evaluation Engine.
 1. Firing and resolved alert instances are forwarded to [handle their notifications](ref:notifications).

-{{< docs/shared lookup="alerts/note-prometheus-ds-rules.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Comparison between alert rule types
-
-We recommend using Grafana-managed alert rules whenever possible, and opting for data source-managed alert rules when you need to scale your alerting setup.
-
-The table below compares Grafana-managed and data source-managed alert rules.
-
-| <div style="width:200px">Feature</div>                                                                                  | <div style="width:200px">Grafana-managed alert rule</div>                                                         | <div style="width:200px">Data source-managed alert rule                         |
-| ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------- |
-| Create alert rules<wbr /> that query [data sources supporting Alerting](#supported-data-sources)                        | Yes                                                                                                               | Only supports creating rules for Mimir and Loki.                                |
-| Mix and match data sources                                                                                              | Yes                                                                                                               | No                                                                              |
-| Add [expressions](ref:expression-queries) to transform<wbr /> your data and set [alert conditions](ref:alert-condition) | Yes                                                                                                               | No                                                                              |
-| Use [images in alert notifications](ref:notification-images)                                                            | Yes                                                                                                               | No                                                                              |
-| Support for [recording rules](#recording-rules)                                                                         | Yes                                                                                                               | Yes                                                                             |
-| Organization                                                                                                            | Organize and manage access with folders                                                                           | Use namespaces                                                                  |
-| Alert rule evaluation and delivery                                                                                      | Alert evaluation is done in Grafana, while delivery can be handled by Grafana or an external Alertmanager.        | Alert rule evaluation and alert delivery are distributed.                       |
-| Scaling                                                                                                                 | Alert rules are stored in the Grafana database, which may experience transient errors. It only scales vertically. | Alert rules are stored within the data source and allow for horizontal scaling. |
-
 ## Recording rules

-Similar to alert rules, recording rules are evaluated periodically. A recording rule pre-computes frequently used or computationally expensive queries, and saves the results as a new time series metric.
+A recording rule pre-compute frequently used or computationally expensive queries, and saves the results as a new time series metric.

-The new recording metric can then be used in alert rules and dashboards to optimize their queries.
+The new metric can then be used in alert rules and dashboards to optimize their queries.

-For more details, refer to [Create recording rules](ref:create-recording-rules).
+Similar to alert rules, recording rules are evaluated periodically. For more details, refer to [Create recording rules](ref:create-recording-rules).
+
+## Comparison between alert rule types
+
+When choosing which alert rule type to use, consider the following comparison between Grafana-managed and data source-managed alert rules.
+
+| <div style="width:200px">Feature</div>                                                                                  | <div style="width:200px">Grafana-managed alert rule</div>                                                                    | <div style="width:200px">Data source-managed alert rule                                                                                                 |
+| ----------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Create alert rules<wbr /> that query [data sources supporting Alerting](#supported-data-sources)                        | Yes                                                                                                                          | No. Only query Prometheus-based data sources.                                                                                                           |
+| Mix and match data sources                                                                                              | Yes                                                                                                                          | No                                                                                                                                                      |
+| Add [expressions](ref:expression-queries) to transform<wbr /> your data and set [alert conditions](ref:alert-condition) | Yes                                                                                                                          | No                                                                                                                                                      |
+| Use [images in alert notifications](ref:notification-images)                                                            | Yes                                                                                                                          | No                                                                                                                                                      |
+| Support for [recording rules](#recording-rules)                                                                         | Yes                                                                                                                          | Yes                                                                                                                                                     |
+| Organization                                                                                                            | Organize and manage access with folders                                                                                      | Use namespaces                                                                                                                                          |
+| Scaling                                                                                                                 | More resource intensive, depend on the database, and are likely to suffer from transient errors. They only scale vertically. | Store alert rules within the data source itself and allow for “infinite” scaling. Generate and send alert notifications from the location of your data. |
+| Alert rule evaluation and delivery                                                                                      | Alert rule evaluation and delivery is done from within Grafana, using an external Alertmanager; or both.                     | Alert rule evaluation and alert delivery is distributed, meaning there is no single point of failure.                                                   |
--- a/docs/sources/alerting/fundamentals/notifications/_index.md
+++ b/docs/sources/alerting/fundamentals/notifications/_index.md
@@ -134,4 +134,6 @@ Grafana Alerting is based on the Prometheus model for designing alerting systems

 {{< figure src="/media/docs/alerting/alerting-alertmanager-architecture.png" max-width="750px" alt="A diagram with the alert generator and alert manager architecture" >}}

-Grafana provides a custom Alertmanager, extending the Prometheus Alertmanager, to manage and deliver alert notifications. If you run a Prometheus or Mimir Alertmanager, you can configure Grafana Alerting to manage them and handle notifications for Grafana-managed alerts. For details, refer to [configure Alertmanagers](ref:configure-alertmanager).
+Grafana uses a custom Alertmanager to manage and deliver alert notifications, as detailed in this guide. This custom Alertmanager extends the capabilities of the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/).
+
+If you already run a Prometheus Alertmanager instance, you can configure Grafana Alerting to forward alerts to your [external Alertmanager for handling notifications](ref:configure-alertmanager).
--- a/docs/sources/alerting/fundamentals/notifications/contact-points.md
+++ b/docs/sources/alerting/fundamentals/notifications/contact-points.md
@@ -21,48 +21,19 @@ labels:
 title: Contact points
 weight: 112
 refs:
-  configure-contact-points:
+  contact-point-integrations:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/manage-contact-points#list-of-supported-integrations
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/manage-contact-points#list-of-supported-integrations
 ---

 # Contact points

 Contact points contain the configuration for sending alert notifications. You can assign a contact point either in the alert rule or notification policy options.

-A contact point includes one or more contact point integrations for sending alert notifications, such as:
+A contact point is a [list of integrations](ref:contact-point-integrations), each of which sends a notification to a particular email, webhook, or service such as Slack, Pagerduty, or Grafana OnCall. Each contact point also defines the notification message to be sent, which can use the predefined message, a custom message, or notification templates.

-{{< column-list >}}
+Contact points can have multiple integrations of the same kind, or a combination of integrations of different kinds. For example, a contact point could contain a Pagerduty integration; an email and Slack integration; or a Pagerduty integration, a Slack integration, and two email integrations.

- Alertmanager
- Amazon SNS
- Cisco Webex Teams
- DingDing
- Discord
- Email
- Google Chat
- Grafana Oncall
- Kafka REST Proxy
- Line
- Microsoft Teams
- MQTT
- Opsgenie
- Pagerduty
- Pushover
- Sensu Go
- Slack
- Telegram
- Threema Gateway
- VictorOps
- Webhook
- WeCom
-
-{{< /column-list >}}
-
-For example, a contact point could contain a Pagerduty integration; an email and Slack integration; or a Pagerduty integration, a Slack integration, and two email integrations. You can also configure a contact point with no integrations; in which case no notifications are sent.
-
-Each contact point integration can also define the notification message to be sent, which can use the predefined message, a custom message, or notification templates.
-
-For a complete list of supported integrations and more details about contact points, refer to [Configure contact points](ref:configure-contact-points).
+You can also configure a contact point with no integrations; in which case no notifications are sent.
--- a/docs/sources/alerting/fundamentals/notifications/group-alert-notifications.md
+++ b/docs/sources/alerting/fundamentals/notifications/group-alert-notifications.md
@@ -35,10 +35,6 @@ refs:

 Grouping in Grafana Alerting allows you to batch relevant alerts together into a smaller number of notifications. This is particularly important if notifications are delivered to first-responders, such as engineers on-call, where receiving lots of notifications in a short period of time can be overwhelming. In some cases, it can negatively impact a first-responders ability to respond to an incident. For example, consider a large outage where many of your systems are down. In this case, grouping can be the difference between receiving 1 phone call and 100 phone calls.

-{{< admonition type="tip" >}}
-For a practical example of grouping, refer to our [Getting Started with Grouping tutorial](https://grafana.com/tutorials/alerting-get-started-pt3/).
-{{< /admonition  >}}
-
 ## Group notifications

 Grouping combines similar alert instances within a specific period into a single notification, reducing alert noise.
--- a/docs/sources/alerting/fundamentals/notifications/notification-policies.md
+++ b/docs/sources/alerting/fundamentals/notifications/notification-policies.md
@@ -18,21 +18,6 @@ labels:
 title: Notification policies
 weight: 113
 refs:
-  shared-alert-labels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/annotation-label/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/annotation-label/
-  shared-notification-policies:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/notification-policies/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/notification-policies/
-  shared-silences:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/create-silence/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/create-silence/
  contact-points:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/contact-points/
@@ -75,10 +60,6 @@ Each policy consists of a set of label matchers (0 or more) that specify which a

 {{< figure src="/media/docs/alerting/notification-routing.png" max-width="750px" caption="Matching alert instances with notification policies" alt="Example of a notification policy tree" >}}

-{{< admonition type="tip" >}}
-For a practical example of routing with notification policies, refer to our [Getting Started with Alert Instances and Notification Routing tutorial](https://grafana.com/tutorials/alerting-get-started-pt4/).
-{{< /admonition  >}}
-
 ## Routing

 To determine which notification policies handle an alert instance, the system looks for matching policies starting from the top of the tree—beginning with the default notification policy.
--- a/docs/sources/alerting/fundamentals/templates.md
+++ b/docs/sources/alerting/fundamentals/templates.md
@@ -69,10 +69,6 @@ In Grafana, you have various options to template your alert notification message
   - Template notifications when you want to customize the appearance and information of your notifications.
   - Avoid using notification templates to add extra information to alert instances—use annotations instead.

-{{< admonition type="tip" >}}
-For a practical example of templating, refer to our [Getting Started with Templating tutorial](https://grafana.com/tutorials/alerting-get-started-pt4/).
-{{< /admonition  >}}
-
 This diagram illustrates the entire templating process, from querying labels and templating the alert summary and notification to the final alert notification message.

 {{< figure src="/media/docs/alerting/how-notification-templates-works.png" max-width="1200px" caption="How templating works" >}}
--- a/docs/sources/alerting/manage-notifications/_index.md
+++ b/docs/sources/alerting/manage-notifications/_index.md
@@ -0,0 +1,22 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/
+description: Detect and respond for day-to-day triage and analysis of what’s going on and action you need to take
+keywords:
+  - grafana
+  - detect
+  - respond
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Monitor status
+title: Monitor status
+weight: 130
+---
+
+# Monitor status
+
+Use Grafana Alerting to track and generate alerts and send notifications, providing an efficient way for engineers to monitor, respond, and triage issues within their services.
+
+Alerts and alert notifications provide a lot of value as key indicators to issues during the triage process, providing engineers with the information they need to understand what is going on in their system or service.
--- a/docs/sources/alerting/manage-notifications/declare-incident-from-alert.md
+++ b/docs/sources/alerting/manage-notifications/declare-incident-from-alert.md
@@ -0,0 +1,56 @@
+---
+aliases:
+  - ../../alerting/alerting-rules/declare-incident-from-alert/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/declare-incident-from-alert/
+canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/declare-incident-from-alert/
+description: Declare an incident from a firing alert
+keywords:
+  - grafana
+  - alert rules
+  - incident
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Declare incidents from firing alerts
+weight: 1010
+---
+
+# Declare incidents from firing alerts
+
+Declare an incident from a firing alert to streamline your alert to incident workflow.
+
+## Before you begin
+
+- Ensure you have Grafana Incident installed
+- You must have a firing alert
+
+## Procedure
+
+To declare an incident from a firing alert, complete the following steps.
+
+1. Navigate to Alerts & Incidents -> Alerting -> Alert rules.
+2. From the Alert rules list view, click the firing alert that you want to declare an incident for.
+
+   **Note:**
+
+   You can also access **Declare Incident** from the alert details page.
+
+3. Click **Declare Incident**.
+   The **Declare Incident** pop-up opens in the Grafana Incident application.
+4. In the **Declare Incident** pop-up, enter what's going on.
+
+   **Note**: This field is pre-filled with the name of the alert rule, but you can edit it as required.
+
+   The alert rule is also linked to the incident.
+
+5. Select a severity.
+6. Add labels, as required.
+7. Click **More options** to include a channel prefix and status.
+8. Click **Declare Incident**.
+
+## Next steps
+
+View and track the incident in the Grafana Incident application.
+
+For more information, refer to [Grafana Incident documentation](/docs/grafana-cloud/incident/configure-settings/).
--- a/docs/sources/alerting/monitor-status/view-active-notifications.md
+++ b/docs/sources/alerting/monitor-status/view-active-notifications.md
@@ -5,9 +5,8 @@ aliases:
  - ../../alerting/alert-groups/view-alert-grouping/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alert-groups/view-alert-grouping/
  - ../../alerting/unified-alerting/alert-groups/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alert-groups/
  - ../../alerting/manage-notifications/view-notification-errors/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-notification-errors/
-  - ../../alerting/manage-notifications/view-alert-groups/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-alert-groups/
-canonical: https://grafana.com/docs/grafana/latest/alerting/monitor-status/view-active-notifications/
-description: The Active notifications view lists grouped alerts that are actively triggering notifications.
+canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-alert-groups/
+description: The Groups view lists grouped alerts that are actively triggering notifications.
 keywords:
  - grafana
  - alerting
@@ -20,7 +19,7 @@ labels:
    - cloud
    - enterprise
    - oss
-title: View active notifications
+title: View the status of notifications
 weight: 800
 refs:
  alertmanager:
@@ -35,27 +34,20 @@ refs:
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/group-alert-notifications/
 ---

-# View active notifications
+# View the status of notifications

-The Active notifications page lists groups of alerts (or alert instances) that are actively triggering notifications.
+The Groups view page lists grouped alerts that are actively triggering notifications.

-By default, Grafana Alerting [groups similar alerts into a single notification](ref:grouping).
+By default, Grafana Alerting groups similar firing alerts (or alert instances) to prevent notification overload. For details on how notification grouping works, refer to [Group alert notifications](ref:grouping).

-In this view, you can:
-
- Find alert groups and the state of their notifications.
- Filter for alert instances that match specific criteria.
-
-The Active notifications view is useful for debugging and verifying how notifications are grouped based on your notification policy settings.
+In the Groups view, you can see alert groups, check the state of their notifications, and also filter for alert instances that match specific criteria. This view is useful for debugging and verifying your grouping settings of notification policies.

 ## View alert groups and notification state

 To view alert groups, complete the following steps.

 1. Click **Alerts & IRM** -> **Alerting**.
-1. Click **Active notifications** to view the list of groups firing notifications.
-
-   {{< figure src="/media/docs/alerting/active-notifications-view2.png" max-width="750px" alt="Active notifications view in Grafana Alerting" >}}
+1. Click **Groups** to view the list of groups firing notifications.

   By default, alert groups are grouped by the notification policies grouping.

--- a/docs/sources/alerting/manage-notifications/view-alert-rules.md
+++ b/docs/sources/alerting/manage-notifications/view-alert-rules.md
@@ -0,0 +1,67 @@
+---
+aliases:
+  - ../../alerting/unified-alerting/alerting-rules/rule-list/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/rule-list
+  - ../../alerting/alerting-rules/view-alert-rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/view-alert-rules
+  - ../../alerting/alerting-rules/rule-list/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/rule-list
+canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-alert-rules/
+description: View alert rules
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - view
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: View alert rules
+weight: 410
+---
+
+# View alert rules
+
+The Alert rules list view page lists all existing alert rules. By default, alert rules are grouped by alert rule type: Grafana-managed (Grafana) or data source-managed (Mimir/Cortex/Loki). The Grafana section also contains alert rules for Prometheus-compatible data sources. You can view alert rules for Prometheus compatible data sources, but you cannot edit them.
+
+When managing large volumes of alerts, you can use extended alert rule search capabilities to filter on folders, evaluation groups, and rules. Additionally, you can filter alert rules by their properties like labels, state, type, and health.
+
+From the Alert rule list page, you can duplicate alert rules, silence notifications and pause or resume evaluation. If you pause evaluation, the alert rule state shows as **Paused**.
+
+### Grouped view
+
+Grouped view shows Grafana alert rules grouped by folder and Loki or Prometheus alert rules grouped by `namespace` + `group`. This is the default rule list view, intended for managing alert rules. You can expand each group to view a list of rules in this group.
+
+### State view
+
+State view shows alert rules grouped by state. Use this view to get an overview of which rules are in which state. You can expand each group to view more details.
+
+## View alert rule details
+
+To view alert rule details, complete the following steps.
+
+1. Click **Alerts & IRM** -> **Alert rules**.
+1. Click to expand an alert rule.
+1. In **Actions**, click **View** (the eye icon).
+
+   The namespace and group are shown in the breadcrumb navigation. They are interactive and can be used to filter rules by namespace or group.
+
+   The rest of the alert detail content is split up into tabs:
+
+   **Query and conditions**
+
+   View the details of the query that is used for the alert rule, including the expressions and intermediate values for each step of the expression pipeline. A graph view is included for range queries and data sources that return time series-like data frames.
+
+   **Instances**
+
+   Explore each alert instance, its status, labels and various other metadata for multi-dimensional alert rules.
+
+   Use **Search by label** to enter search criteria using label selectors. For example, `environment=production,region=~US|EU,severity!=warning`.
+
+   **History**
+
+   Explore the recorded history for an alert rule. You can also filter by alert state.
+
+   **Details**
+
+   Debug or audit using the alert rule metadata and view the alert rule annotations.
--- a/docs/sources/alerting/manage-notifications/view-alert-state-on-panels.md
+++ b/docs/sources/alerting/manage-notifications/view-alert-state-on-panels.md
@@ -0,0 +1,54 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-alert-state-on-panels/
+description: View alert rules
+keywords:
+  - grafana
+  - alerting
+  - guide
+  - rules
+  - view
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: View alert state on panels
+weight: 430
+refs:
+  time-series-visualizations:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/time-series/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series/
+  alert-list-panel:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/alert-list/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/alert-list/
+  link-alert-rules-to-panels:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/link-alert-rules-to-panels/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/link-alert-rules-to-panels/
+---
+
+# View alert state on panels
+
+When an [alert rule is linked to a time series panel](ref:link-alert-rules-to-panels), the time series panel displays the alert state and alert events.
+
+A heart icon near the panel title shows the current alert state:
+
+- A broken red heart when the alert is in `Alerting` state.
+- A green heart when the alert is in `Normal` state.
+
+Colored annotations indicate changes in alert state, such as pending, alerting, and resolving.
+
+{{< figure src="/media/docs/alerting/panel-displays-alert-state.png" max-width="1200px" alt="A panel with a firing alert and annotations that display the pending and alerting state changes." >}}
+
+Additionally, Grafana provides an [alert list panel](ref:alert-list-panel) that you can add to a dashboard to display a list of alerts and their states.
+
+{{< figure src="/static/img/docs/alert-list-panel/alert-list-panel.png" max-width="850px" alt="Two alert list panels displaying distinct lists of alerts." >}}
+
+You can configure the alert list panel with various visualization options and filters to control how alerts are displayed. For more details, refer to the [Alert list documentation](ref:alert-list-panel).
+
+{{< docs/play title="this demo dashboard with alert list panels and linked alert rules" url="https://play.grafana.org/d/000000074/" >}}
--- a/docs/sources/alerting/monitor-status/view-alert-state-history.md
+++ b/docs/sources/alerting/monitor-status/view-alert-state-history.md
@@ -1,29 +1,60 @@
 ---
-canonical: https://grafana.com/docs/grafana/latest/alerting/monitor-status/view-alert-state-history/
-description: View alert rules
+aliases:
+  - ../../alerting/alerting-rules/view-state-health/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/view-state-health
+canonical: https://grafana.com/docs/grafana/latest/alerting/manage-notifications/view-state-health/
+description: View the state and health of alert rules
 keywords:
  - grafana
-  - alerting
+  - alert rules
+  - keep last state
  - guide
-  - rules
-  - view
+  - state
+  - health
 labels:
  products:
    - cloud
    - enterprise
    - oss
-title: View alert state history
-weight: 440
+title: View alert state and history
+weight: 420
+refs:
+  alert-rule-state:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-rule-state
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-rule-state
+  alert-rule-evaluation:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/
+  alert-instance-state:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
 ---

-# View alert state history
+# View alert state and history
+
+An alert rule and its corresponding alert instances can transition through distinct states during their [evaluation](ref:alert-rule-evaluation). There are three key components that helps us understand the behavior of our alerts:
+
+- [Alert Instance State](ref:alert-instance-state): Refers to the state of the individual alert instances.
+- [Alert Rule State](ref:alert-rule-state): Determined by the "worst state" among its alert instances.
+- [Alert Rule Health](ref:alert-rule-health): Indicates the status in cases of `Error` or `NoData` events.
+
+To view the state and health of your alert rules:
+
+1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
+1. Click **Alert rules** to view the list of existing alerts.
+1. Click an alert rule to view its state, health, and state history.
+
+## View state history using the History page

 View a history of all alert events generated by your Grafana-managed alert rules from one centralized page. This helps you see patterns in your alerts over time, observe trends, make predictions, and even debug alerts that might be firing too often.

 An alert event is displayed each time an alert instance changes its state over a period of time. All alert events are displayed regardless of whether silences or mute timings are set, so you’ll see a complete set of your data history even if you’re not necessarily being notified.

-## View from the History page
-
 {{% admonition type="note" %}}
 For Grafana Enterprise and OSS users:
 The feature is available starting with Grafana 11.2.
@@ -34,26 +65,22 @@ Users can only see the history and transitions of alert rules they have access t

 To access the History view, complete the following steps.

-1. Navigate to **Alerts & IRM** -> **Alerting** -> **History**.
-
-   {{< figure src="/media/docs/alerting/alert-history-page.png" max-width="750px" alt="History page in Grafana Alerting" >}}
+1. Navigate to **Alerts & IRM** -> **Alerting** -> History.

   An Alert Events chart shows your alert activity within a specific time frame. Each alert event represents an alert instance that changed its state at a particular point in time. The history of the data is displayed over a period of time.

-2. Filter by labels either by entering a label or clicking a label of an instance in the list of events.
-3. Filter by current state and previous state by selecting a state from the drop-down or by clicking the states from the list of events.
+1. Filter by labels either by entering a label or clicking a label of an instance in the list of events.
+1. Filter by current state and previous state by selecting a state from the drop-down or by clicking the states from the list of events.
   Zoom in by dragging on the chart or use the time picker.

   {{% admonition type="note" %}}
   If you exceed the 5000 alerts limit, you may see data missing from the chart. To see complete results, narrow the time frame.
   {{% /admonition %}}

-4. Under the chart, there is a list of events. Each event represents a state change on an alert instance. Expand a row to see the number of transitions for the alert instance, a state graph, and the value in the transition.
-5. Click the alert rule name to jump to the History tab in the Alert Rule view.
+1. Under the chart, there is a list of events. Each event represents a state change on an alert instance. Expand a row to see the number of transitions for the alert instance, a state graph, and the value in the transition.
+1. Click the alert rule name to jump to the History tab in the Alert Rule view.

-   {{< figure src="/media/docs/alerting/alerting-alert-history-tab.png" max-width="750px" alt="Alert History tab in Grafana Alerting" >}}
-
-## View from the State history view
+## View state history using the State history view

 Use the State history view to get insight into how your individual alert instances behave over time.

@@ -69,7 +96,7 @@ To access the State history view, complete the following steps.
 1. Click an alert rule.
 1. Select **Show state history**.

-   {{< figure src="/media/docs/alerting/alerting-state-history-view.png" max-width="750px" alt="State history view in Grafana Alerting" >}}
+   The State history view opens.

   The timeline view at the top displays a timeline of changes for the past hour, so you can track how your alert instances are behaving over time.

--- a/docs/sources/alerting/monitor-status/_index.md
+++ b/docs/sources/alerting/monitor-status/_index.md
@@ -1,42 +0,0 @@
---
-aliases:
-  - ./manage-notifications/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/
-canonical: https://grafana.com/docs/grafana/latest/alerting/monitor-status/
-description: Detect and respond for day-to-day triage and analysis of what’s going on and action you need to take
-keywords:
-  - grafana
-  - detect
-  - respond
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Monitor alerts
-weight: 130
-refs:
-  configure-alert-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/
-  configure-notifications:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/configure-notifications/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/configure-notifications/
---
-
-# Monitor alerts
-
-Alerts and alert notifications should provide key information to help alert responders and incident participants understand what happened in their system and how to respond.
-
-Grafana Alerting offers the ability to monitor your alerts and manage your alerting setup. You can get an overview of your alerts, track the history of alert states, and monitor notification statuses. These can help you start investigating alert issues within Grafana and improve the reliability of your alerting implementation.
-
-{{< figure src="/media/docs/alerting/alert-history-page.png" max-width="750px" alt="History page in Grafana Alerting" >}}
-
-The previous sections explain how to [configure alert rules](ref:configure-alert-rules) and [configure notifications](ref:configure-notifications) to generate alerts and send their notifications.
-
-This section focuses on finding and understanding the state of your alert rules, alert instances, and their notifications. For more details, refer to:
-
-{{< section >}}
--- a/docs/sources/alerting/monitor-status/declare-incident-from-alert.md
+++ b/docs/sources/alerting/monitor-status/declare-incident-from-alert.md
@@ -1,57 +0,0 @@
---
-aliases:
-  - ../../alerting/alerting-rules/declare-incident-from-alert/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/declare-incident-from-alert/
-  - ../../alerting/manage-notifications/declare-incident-from-alert/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/declare-incident-from-alert/
-canonical: https://grafana.com/docs/grafana/latest/alerting/monitor-status/declare-incident-from-alert/
-description: Declare an incident from a firing alert
-keywords:
-  - grafana
-  - alert rules
-  - incident
-labels:
-  products:
-    - cloud
-title: Declare incidents from firing alerts
-weight: 1010
---
-
-# Declare incidents from firing alerts
-
-Declare an incident from a firing alert to streamline your alert to incident workflow.
-
-## Before you begin
-
- Ensure you have [Grafana Incident](/docs/grafana-cloud/incident/) installed.
- You must have a firing alert.
-
-## Procedure
-
-To declare an incident from a firing alert, complete the following steps.
-
-1. Navigate to **Alerts & IRM** -> **Alerting** -> **Alert rules**.
-1. From the Alert rules page, find the firing alert that you want to declare an incident for.
-1. Click **More** -> **Declare Incident**.
-
-   Alternatively, you can declare an incident from the Alert details page.
-
-   The **Declare Incident** pop-up opens in the Grafana Incident application.
-
-1. In the **Declare Incident** pop-up, enter the **What's going on?** field.
-
-   This field is pre-filled with the name of the alert rule, but you can edit it as required.
-
-   The alert rule is also linked to the incident.
-
-1. Select a severity.
-1. Add labels, as required.
-1. Click **More options** to include a channel prefix and status.
-1. Click **Automated options** to enable automated actions configured by admins.
-1. Click **Declare Incident**.
-
-## Next steps
-
-View and manage the incident in the **Grafana Incident** application.
-
-{{< figure src="/media/docs/alerting/incident-response-management-timeline-ui.png" max-width="750px" alt="Incident timeline view in Grafana Incident" >}}
-
-For more information, refer to the [Grafana Incident documentation](/docs/grafana-cloud/incident/configure-settings/).
--- a/docs/sources/alerting/monitor-status/view-alert-rules.md
+++ b/docs/sources/alerting/monitor-status/view-alert-rules.md
@@ -1,58 +0,0 @@
---
-aliases:
-  - ../../alerting/unified-alerting/alerting-rules/rule-list/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/alerting-rules/rule-list
-  - ../../alerting/alerting-rules/view-alert-rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/view-alert-rules
-  - ../../alerting/alerting-rules/rule-list/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/rule-list
-  - ../../alerting/manage-notifications/view-alert-rules/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-alert-rules/
-canonical: https://grafana.com/docs/grafana/latest/alerting/monitor-status/view-alert-rules/
-description: View alert rules
-keywords:
-  - grafana
-  - alerting
-  - guide
-  - rules
-  - view
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: View alert rules
-weight: 410
-refs:
-  view-alert-state:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/monitor-status/view-alert-state/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/monitor-status/view-alert-state/
---
-
-# View alert rules
-
-The Alert rules list view page lists all existing recording and alert rules, including those created in Grafana and those available in configured data sources.
-
-To access the Alert rules page, click **Alerts & IRM** -> **Alerting** -> **Alert rules**.
-
-{{< figure src="/media/docs/alerting/alert-rules-page.png" max-width="750px" alt="Alert rule view page in Grafana Alerting" >}}
-
-By default, alert rules are grouped by alert rule type: Grafana-managed or data source-managed.
-
-In this view, you can find and edit rules created in Grafana. However, rules created in Prometheus-compatible data sources are displayed but cannot be edited.
-
-This view includes filters to simplify managing large volumes of alerts.
-
-You can filter by data sources, dashboards, and alert rule properties such as state, type, health, and contact points. The **Search** input allows you to filter by additional parameters like folders, evaluation groups, labels, and more.
-
-You can also change how the rule list is displayed using the **View as** option.
-
- **Grouped**: Displays Grafana rules grouped by folder and evaluation group, and data-source rules by namespace and evaluation group. This is the default view.
-
- **List**: Displays Grafana rules grouped only by folder.
-
- **State**: Displays rules grouped by state, providing an overview for each state.
-
-Select a group to expand it and view the list of alert rules within that group.
-
-{{< figure src="/media/docs/alerting/view-alert-rule-list-with-actions.png" max-width="750px" alt="View alert rule state and alert rule health in Grafana Alerting" >}}
-
-For details on how rule states and alert instance states are displayed, refer to [View alert state](ref:view-alert-state).
--- a/docs/sources/alerting/monitor-status/view-alert-state.md
+++ b/docs/sources/alerting/monitor-status/view-alert-state.md
@@ -1,138 +0,0 @@
---
-aliases:
-  - ../../alerting/alerting-rules/view-state-health/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/view-state-health
-  - ../../alerting/manage-notifications/view-state-health/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-state-health/
-  - ../../alerting/manage-notifications/view-alert-state-on-panels/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-alert-state-on-panels/
-canonical: https://grafana.com/docs/grafana/latest/alerting/monitor-status/view-alert-state/
-description: View the state and health of alert rules
-keywords:
-  - grafana
-  - alert rules
-  - keep last state
-  - guide
-  - state
-  - health
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: View alert state
-weight: 420
-refs:
-  time-series-visualizations:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/time-series/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/time-series/
-  alert-list-panel:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/alert-list/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/alert-list/
-  link-alert-rules-to-panels:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/link-alert-rules-to-panels/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/alerting-rules/link-alert-rules-to-panels/
-  alert-rule-state:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-rule-state
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-rule-state
-  alert-instance-state:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
-  alert-instance-state:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/#alert-instance-state
-  alert-rule-health:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rule-evaluation/state-and-health/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rule-evaluation/state-and-health/
---
-
-# View alert state
-
-An alert rule and its corresponding alert instances can transition through distinct states during the alert rule evaluation.
-
-{{< figure src="/media/docs/alerting/alert-instance-states-v3.png" alt="A diagram of the distinct alert instance states and transitions." max-width="750px" >}}
-
-There are three key components that helps us understand the behavior of our alerts:
-
- [Alert Instance State](ref:alert-instance-state): Refers to the state of the individual alert instances.
- [Alert Rule State](ref:alert-rule-state): Determined by the "worst state" among its alert instances.
- [Alert Rule Health](ref:alert-rule-health): Indicates the status in cases of `Error` or `NoData` events.
-
-## View alert rule and instance states
-
-To view the state and health of your alert rules and the status of alert instances:
-
-1. Click **Alerts & IRM** -> **Alerting**.
-1. Click **Alert rules** to view the list of existing alert rules.
-
-   {{< figure src="/media/docs/alerting/view-alert-rule-list-with-actions.png" max-width="750px" alt="View alert rule state and alert rule health in Grafana Alerting" >}}
-
-   Each alert rule shows its state, health, summary, next evaluation time, and available actions such as **Pause evaluation**, **Silence notifications**, **Export**, **Delete**, and more.
-
-1. Click on an alert rule to view additional details and its resulting alert instances.
-
-   {{< figure src="/media/docs/alerting/view-alert-instance-state.png" max-width="750px" alt="View alert rule state and alert rule health in Grafana Alerting" >}}
-
-### View from the alert rule details page
-
-To view more alert rule details, complete the following steps.
-
-1. Click **Alerts & IRM** -> **Alerting** -> **Alert rules**.
-1. Click to expand an alert rule.
-1. In **Actions**, click **View** (the eye icon).
-
-   {{< figure src="/media/docs/alerting/alert-rule-view-page-with-breadcrumb.png" max-width="750px" alt="Alert rule view page in Grafana Alerting" >}}
-
-   The namespace and group are shown in the breadcrumb navigation. They are interactive and can be used to filter rules by namespace or group.
-
-   The rest of the alert detail content is split up into tabs:
-
-   **Query and conditions**
-
-   View the details of the query that is used for the alert rule, including the expressions and intermediate values for each step of the expression pipeline. A graph view is included for range queries and data sources that return time series-like data frames.
-
-   **Instances**
-
-   Explore each alert instance, its status, labels and various other metadata for multi-dimensional alert rules.
-
-   Use **Search by label** to enter search criteria using label selectors. For example, `environment=production,region=~US|EU,severity!=warning`.
-
-   **History**
-
-   Explore the recorded history for an alert rule. You can also filter by alert state.
-
-   **Details**
-
-   Debug or audit using the alert rule metadata and view the alert rule annotations.
-
-## View alert state on panels
-
-When an [alert rule is linked to a time series panel](ref:link-alert-rules-to-panels), the time series panel displays the alert state and alert events.
-
-A heart icon near the panel title shows the current alert state:
-
- A broken red heart when the alert is in `Alerting` state.
- A green heart when the alert is in `Normal` state.
-
-Colored annotations indicate changes in alert state, such as pending, alerting, and resolving.
-
-{{< figure src="/media/docs/alerting/panel-displays-alert-state.png" max-width="1200px" alt="A panel with a firing alert and annotations that display the pending and alerting state changes." >}}
-
-Additionally, Grafana provides an [alert list panel](ref:alert-list-panel) that you can add to a dashboard to display a list of alerts and their states.
-
-{{< figure src="/static/img/docs/alert-list-panel/alert-list-panel.png" max-width="850px" alt="Two alert list panels displaying distinct lists of alerts." >}}
-
-You can configure the alert list panel with various visualization options and filters to control how alerts are displayed. For more details, refer to the [Alert list documentation](ref:alert-list-panel).
-
-{{< docs/play title="this demo dashboard with alert list panels and linked alert rules" url="https://play.grafana.org/d/000000074/" >}}
--- a/docs/sources/alerting/set-up/configure-alertmanager/_index.md
+++ b/docs/sources/alerting/set-up/configure-alertmanager/_index.md
@@ -1,108 +0,0 @@
---
-aliases:
-  - ../../configure-alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/configure-alertmanager/
-  - ../unified-alerting/fundamentals/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/fundamentals/alertmanager/
-  - ../manage-notifications/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/alertmanager/
-  - ../fundamentals/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alertmanager/
-  - ../fundamentals/notifications/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/alertmanager
-canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alertmanager/
-description: Learn about Alertmanagers and set up Alerting to use an external Alertmanager
-keywords:
-  - grafana
-  - alerting
-  - set up
-  - configure
-  - external Alertmanager
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: Configure Alertmanagers
-weight: 200
-refs:
-  alertmanager-data-source:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/datasources/alertmanager/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/connect-externally-hosted/data-sources/alertmanager/
-  notifications:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/
---
-
-# Configure Alertmanagers
-
-Grafana Alerting is based on the architecture of the Prometheus alerting system. Grafana sends firing and resolved alerts to an Alertmanager, which is responsible for [handling notifications](ref:notifications). This architecture decouples alert rule evaluation from notification handling, improving scalability.
-
-{{< figure src="/media/docs/alerting/alerting-alertmanager-architecture.png" max-width="750px" alt="A diagram with the alert generator and alert manager architecture" >}}
-
-Grafana can enable one or more Alertmanagers to receive Grafana-managed alerts for notification handling. It’s important to note that each Alertmanager manages its own independent alerting resources, such as:
-
- Contact points and notification templates
- Notification policies and mute timings
- Silences
- Active notifications
-
-Use the `Choose Alertmanager` dropdown on these pages to switch between Alertmanagers and view or manage their resources.
-
-{{< figure src="/media/docs/alerting/alerting-choose-alertmanager.png" max-width="750px" alt="A screenshot choosing an Alertmanager in the notification policies UI" >}}
-
-## Types of Alertmanagers in Grafana
-
-Grafana can be configured to handle alert notifications using various Alertmanagers.
-
- **Grafana Alertmanager**: Grafana includes a built-in Alertmanager that extends the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/). This is the default Alertmanager and is referred to as "Grafana" in the user interface. It can only handle Grafana-managed alerts.
-
- **Cloud Alertmanager**: Each Grafana Cloud instance comes preconfigured with an additional Alertmanager (`grafanacloud-STACK_NAME-ngalertmanager`) from the Mimir (Prometheus) instance running in the Grafana Cloud Stack.
-
-  The Cloud Alertmanager is available exclusively in Grafana Cloud and can handle both Grafana-managed and data source-managed alerts.
-
-  Some Grafana Cloud services, such as **Kubernetes Monitoring** and **Synthetic Monitoring** use the Cloud Alertmanager to create and manage alerts.
-
- **Other Alertmanagers**: Grafana Alerting also supports sending alerts to other Alertmanagers, such as the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/), which can handle both Grafana-managed and data source-managed alerts.
-
-Grafana Alerting supports using a combination of Alertmanagers and can [enable other Alertmanagers to receive Grafana-managed alerts](#enable-an-alertmanager-to-receive-grafana-managed-alerts). The decision often depends on your alerting setup and where your alerts are generated.
-
-For example, if you already have an Alertmanager running in your on-premises or cloud infrastructure to handle Prometheus alerts, you can forward Grafana-managed alerts to the same Alertmanager for unified notification handling.
-
-## Add an Alertmanager
-
-Alertmanagers should be configured as data sources using Grafana Configuration from the main Grafana navigation menu. To add an Alertmanager, complete the following steps.
-
-{{< docs/shared lookup="alerts/add-alertmanager-ds.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-For provisioning instructions, refer to the [Alertmanager data source documentation](ref:alertmanager-data-source).
-
-After adding an Alertmanager, you can use the Grafana Alerting UI to manage notification policies, contact points, silences, and other alerting resources from within Grafana.
-
-{{% admonition type="note" %}}
-When using Prometheus, you can manage silences in the Grafana Alerting UI. However, other Alertmanager resources such as contact points, notification policies, and templates are read-only because the Prometheus Alertmanager HTTP API does not support updates for these resources.
-{{% /admonition %}}
-
-When using multiple Alertmanagers, use the `Choose Alertmanager` dropdown to switch between Alertmanagers.
-
-## Enable an Alertmanager to receive Grafana-managed alerts
-
-After enabling **Receive Grafana Alerts** in the Data Source Settings, you must also configure the Alertmanager in the Alerting Settings page. Grafana supports enabling one or multiple Alertmanagers to receive all generated Grafana-managed alerts.
-
-1. In the left-side menu, click **Alerts & IRM** and then **Alerting**.
-1. Click **Settings** to view the list of configured Alertmanagers.
-1. For the selected Alertmanager, click the **Enable/Disable** button to toggle receiving Grafana-managed alerts. When activated, the Alertmanager displays `Receiving Grafana-managed alerts`.
-
-{{< figure src="/media/docs/alerting/grafana-alerting-settings.png" max-width="750px" alt="Grafana Alerting Settings page" >}}
-
-All Grafana-managed alerts are forwarded to Alertmanagers marked as `Receiving Grafana-managed alerts`.
-
-{{% admonition type="note" %}}
-Grafana Alerting does not support forwarding Grafana-managed alerts to the AlertManager in Amazon Managed Service for Prometheus. For more details, refer to [this GitHub issue](https://github.com/grafana/grafana/issues/64064).
-{{% /admonition %}}
-
-## Manage Alertmanager configurations
-
-On the Settings page, you can also manage your Alertmanager configurations.
-
- Manage version snapshots for the built-in Alertmanager, which allows administrators to roll back unintentional changes or mistakes in the Alertmanager configuration.
- Compare the historical snapshot with the latest configuration to see which changes were made.
--- a/docs/sources/alerting/set-up/configure-alertmanager/index.md
+++ b/docs/sources/alerting/set-up/configure-alertmanager/index.md
@@ -0,0 +1,102 @@
+---
+aliases:
+  - ../../configure-alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/configure-alertmanager/
+  - ../unified-alerting/fundamentals/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/unified-alerting/fundamentals/alertmanager/
+  - ../manage-notifications/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/alertmanager/
+  - ../fundamentals/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alertmanager/
+  - ../fundamentals/notifications/alertmanager/ # /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/alertmanager
+canonical: https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alertmanager/
+description: Learn about Alertmanagers and set up Alerting to use an external Alertmanager
+keywords:
+  - grafana
+  - alerting
+  - set up
+  - configure
+  - external Alertmanager
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Configure Alertmanagers
+weight: 200
+refs:
+  notifications:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/notifications/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/notifications/
+---
+
+# Configure Alertmanagers
+
+Grafana Alerting is based on the architecture of the Prometheus alerting system. Grafana sends firing and resolved alerts to an Alertmanager, which is responsible for [handling notifications](ref:notifications).
+
+{{< figure src="/media/docs/alerting/alerting-alertmanager-architecture.png" max-width="750px" alt="A diagram with the alert generator and alert manager architecture" >}}
+
+This architecture decouples alert rule evaluation from notification handling, allowing alerts to be forwarded to other Alertmanagers.
+
+Grafana can use different Alertmanagers. It’s important to note that each Alertmanager manages its own independent alerting resources, such as:
+
+- Contact points and notification templates
+- Notification policies and mute timings
+- Silences
+- Active notifications
+
+Use the `Choose Alertmanager` on these pages to switch between Alertmanagers.
+
+{{< figure src="/media/docs/alerting/alerting-choose-alertmanager.png" max-width="750px" alt="A screenshot choosing an Alertmanager in the notification policies UI" >}}
+
+## Types of Alertmanagers in Grafana
+
+Grafana can be configured to manage both Grafana-managed and data source-managed alerts using various Alertmanagers, depending on your infrastructure and alerting requirements.
+
+- **Grafana Alertmanager**: Grafana has its own built-in Alertmanager, referred to as "Grafana" in the user interface. It is the default Alertmanager and can only handle Grafana-managed alerts.
+
+- **Cloud Alertmanager**: Each Grafana Cloud instance comes preconfigured with an additional Alertmanager (`grafanacloud-STACK_NAME-ngalertmanager`) from the Mimir (Prometheus) instance running in the Grafana Cloud Stack.
+
+  The Cloud Alertmanager is available exclusively in Grafana Cloud and can handle both Grafana-managed and data source-managed alerts.
+
+  Some Grafana Cloud services, such as **Kubernetes Monitoring** and **Synthetic Monitoring** use the Cloud Alertmanager to create and manage alerts.
+
+- **Other Alertmanagers**: Grafana Alerting also supports sending alerts to other Alertmanagers, such as the [Prometheus Alertmanager](https://prometheus.io/docs/alerting/latest/alertmanager/), which can handle Grafana-managed alerts and data sources-managed alerts such as alerts from Loki, Mimir, and Prometheus.
+
+You can use a combination of Alertmanagers. The decision often depends on your alerting setup and where your alerts are being generated. Here are two examples of when you may want to add an Alertmanager and send your alerts there instead of using the built-in Grafana Alertmanager.
+
+1. You may already have Alertmanagers on-premises in your own Cloud infrastructure that you still want to use because you have other alert generators, such as Prometheus.
+
+2. You want to use both Prometheus on-premises and hosted Grafana to send alerts to the same Alertmanager that runs in your Cloud infrastructure.
+
+## Add an Alertmanager
+
+From Grafana, you can configure and administer your own Alertmanager to receive Grafana alerts.
+
+After adding an Alertmanager, you can use the Grafana Alerting UI to manage notification policies, contact points, and other alerting resources from within Grafana, with support for HTTP basic authentication credentials.
+
+Alertmanagers should be configured as data sources using Grafana Configuration from the main Grafana navigation menu. To add an Alertmanager, complete the following steps.
+
+1. Click **Connections** in the left-side menu.
+1. On the Connections page, search for `Alertmanager`.
+1. Click the **Create a new data source** button.
+
+   If you don't see this button, you may need to install the plugin, relaunch your Cloud instance, and then repeat steps 1 and 2.
+
+1. Fill out the fields on the page, as required.
+
+   If you are provisioning your data source, set the flag `handleGrafanaManagedAlerts` in the `jsonData` field to `true` to send Grafana-managed alerts to this Alertmanager.
+
+   **Note:** Prometheus, Grafana Mimir, and Cortex implementations of Alertmanager are supported. For Prometheus, contact points and notification policies are read-only in the Grafana Alerting UI.
+
+1. Click **Save & test**.
+
+{{% admonition type="note" %}}
+Grafana Alerting does not support sending alerts to the AWS Managed Service for Prometheus due to the lack of sigv4 support in Prometheus.
+{{% /admonition %}}
+
+## Manage Alertmanager configurations
+
+On the Settings page, you can manage your Alertmanager configurations and configure where Grafana-managed alert instances are forwarded.
+
+- Manage which Alertmanagers receive alert instances from Grafana-managed rules without navigating and editing data sources.
+- Manage version snapshots for the built-in Alertmanager, which allows administrators to roll back unintentional changes or mistakes in the Alertmanager configuration.
+- Compare the historical snapshot with the latest configuration to see which changes were made.
--- a/docs/sources/alerting/set-up/configure-high-availability/_index.md
+++ b/docs/sources/alerting/set-up/configure-high-availability/_index.md
@@ -21,9 +21,9 @@ weight: 600
 refs:
  state-history:
    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/monitor-status/view-alert-state-history/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-state-health/
    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/monitor-status/view-alert-state-history/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/manage-notifications/view-state-health/
  meta-monitoring:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/monitor/
--- a/docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md
+++ b/docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md
@@ -100,7 +100,7 @@ When sharing URLs with ad hoc filters, remember to encode the URL. In the preced

 ### Example

-[This dashboard in Grafana Play](https://play.grafana.org/d/p-k6QtkGz/template-redux?var-interval=$__auto&orgId=1&from=now-5m&to=now&timezone=utc&var-query=$__all&var-query2=$__all&var-query3=$__all&var-Filters=job%7C%3D%7Cmetrictank%2Ftsdb-gw&var-textbox=foo&var-custom=lisa&var-datasource=grafanacloud-demoinfra-prom) passes the ad hoc filter variable `Filters` with the filter value `job = metrictank/tsdb-gw`.
+[This dashboard in Grafana Play](https://play.grafana.org/d/000000002/influxdb-templated?orgId=1&var-datacenter=America&var-host=All&var-summarize=1m&var-adhoc=datacenter%7C%3D%7CAmerica) passes the ad hoc filter variable `adhoc` with the filter value `datacenter = America`.

 ## Time range control using the URL

--- a/docs/sources/dashboards/dashboard-public/index.md
+++ b/docs/sources/dashboards/dashboard-public/index.md
@@ -262,7 +262,7 @@ guaranteed because plugin developers can override this functionality. The follow
 ## Limitations

 - Panels that use frontend data sources will fail to fetch data.
- Variables and queries including variables are not supported.
+- Template variables are not supported.
 - Exemplars will be omitted from the panel.
 - Only annotations that query the `-- Grafana --` data source are supported.
 - Organization annotations are not supported.
--- a/docs/sources/dashboards/share-dashboards-panels/index.md
+++ b/docs/sources/dashboards/share-dashboards-panels/index.md
@@ -60,7 +60,7 @@ You must have an authorized viewer permission to see an image rendered by a dire
 The same permission is also required to view embedded links unless you have anonymous access permission enabled for your Grafana instance.

 {{< admonition type="note" >}}
-As of Grafana 8.0, anonymous access permission is not available in Grafana Cloud. This feature is only supported for Grafana Enterprise and Grafana Open Source.
+As of Grafana 8.0, anonymous access permission is not available in Grafana Cloud.
 {{< /admonition >}}

 When you share a panel or dashboard as a snapshot, a snapshot (which is a panel or dashboard at the moment you take the snapshot) is publicly available on the web. Anyone with a link to it can access it. Because snapshots do not require any authorization to view, Grafana removes information related to the account it came from, as well as any sensitive data from the snapshot.
@@ -220,10 +220,10 @@ The snapshot is immediately deleted. You may need to clear your browser cache or

 ### Embed panel

-You can embed a panel using an iframe on another web site. A viewer must be signed into Grafana to view the graph unless you have anonymous access permission enabled for your Grafana instance.
+You can embed a panel using an iframe on another web site. A viewer must be signed into Grafana to view the graph.

 {{< admonition type="note" >}}
-As of Grafana 8.0, anonymous access permission is no longer available for Grafana Cloud even for panels in [Public dashboards](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/dashboard-public/). This feature is only supported for Grafana Enterprise and Grafana Open Source.
+As of Grafana 8.0, anonymous access permission is no longer available for Grafana Cloud.
 {{< /admonition >}}

 Here is an example of the HTML code:
--- a/docs/sources/datasources/alertmanager/_index.md
+++ b/docs/sources/datasources/alertmanager/_index.md
@@ -23,11 +23,6 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana-cloud/alerting-and-irm/alerting/
-  configure-alertmanager:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/set-up/configure-alertmanager/
  data-sources:
    - pattern: /docs/grafana/
      destination: /docs/grafana/<GRAFANA_VERSION>/administration/provisioning/#datasources
@@ -38,22 +33,36 @@ refs:
 # Alertmanager data source

 Grafana includes built-in support for Alertmanager implementations in Prometheus and Mimir.
-
-Once you add an Alertmanager as a data source, you can use the `Choose Alertmanager` drop-down on [Grafana Alerting](ref:alerting) to view and manage Alertmanager resources, such as silences, contact points, and notification policies. Additionally, you can enable the Alertmanager to receive Grafana-managed alerts.
-
-For more details about using other Alertmanagers, refer to [Alertmanagers in the Grafana Alerting documentation](ref:configure-alertmanager).
+Once you add it as a data source, you can use the [Grafana Alerting UI](ref:alerting) to manage silences, contact points, and notification policies.
+To switch between Grafana and any configured Alertmanager data sources, you can select your preference from a drop-down option in those databases' data source settings pages.

 ## Alertmanager implementations

-The data source supports [Prometheus](https://prometheus.io/) and [Grafana Mimir](/docs/mimir/latest/) (default) implementations of Alertmanager. You can specify the implementation in the data source's Settings page.
-
-When using Prometheus, you can manage silences in the Grafana Alerting UI. However, other Alertmanager resources such as contact points, notification policies, and templates are read-only because the Prometheus Alertmanager HTTP API does not support updates for these resources.
+The data source supports [Prometheus](https://prometheus.io/) and [Grafana Mimir](/docs/mimir/latest/) (default) implementations of Alertmanager.
+You can specify the implementation in the data source's Settings page.
+When using Prometheus, contact points and notification policies are read-only in the Grafana Alerting UI, because it doesn't support updates to the configuration using HTTP API.

 ## Configure the data source

 To configure basic settings for the data source, complete the following steps:

-{{< docs/shared lookup="alerts/add-alertmanager-ds.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+1. Click **Connections** in the left-side menu.
+1. Under Your connections, click **Data sources**.
+1. Enter `Alertmanager` in the search bar.
+1. Click **Alertmanager**.
+
+   The **Settings** tab of the data source is displayed.
+
+1. Set the data source's basic configuration options:
+
+   | Name                            | Description                                                                                                                                                                                                   |
+   | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+   | **Name**                        | Sets the name you use to refer to the data source                                                                                                                                                             |
+   | **Default**                     | Sets whether the data source is pre-selected for new panels and queries                                                                                                                                       |
+   | **Alertmanager Implementation** | Alertmanager implementation. **Mimir**, **Cortex,** and **Prometheus** are supported                                                                                                                          |
+   | **Receive Grafana Alerts**      | When enabled the Alertmanager receives alert instances from Grafana-managed alert rules. **Important:** It works only if Grafana alerting is configured to send its alert instances to external Alertmanagers |
+   | **HTTP URL**                    | Sets the HTTP protocol, IP, and port of your Alertmanager instance, such as `https://alertmanager.example.org:9093`                                                                                           |
+   | **Access**                      | Only **Server** access mode is functional                                                                                                                                                                     |

 ## Provision the Alertmanager data source

--- a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
+++ b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
@@ -230,40 +230,17 @@ The label field allows you to override the default name of the metric legend usi
 ## Query CloudWatch Logs

 The logs query editor helps you write CloudWatch Logs Query Language queries across defined regions and log groups.
-It supports querying Cloudwatch logs with Logs Insights Query Language, OpenSearch PPL and OpenSearch SQL.

 ### Create a CloudWatch Logs query

-1. Select the query language you would like to use in the Query Language dropdown.
 1. Select the region and up to 20 log groups to query.
-
-   {{< admonition type="note" >}}
-   Region and log groups are mandatory fields when querying with Logs Insights QL and OpenSearch PPL. Log group selection is not necessary when querying with OpenSearch SQL. However, selecting log groups simplifies writing logs queries by populating syntax suggestions with discovered log group fields.
-   {{< /admonition >}}
-
-1. Use the main input area to write your logs query. AWS Cloudwatch only supports a subset of OpenSearch SQL and PPL commands. To find out more about the syntax supported, consult [Amazon CloudWatch Logs documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_AnalyzeLogData_Languages.html)
-
-   #### Querying Log groups with OpenSearch SQL
-
-   When querying log groups with OpenSearch SQL, the log group identifier or ARN _must_ be explicitly stated in the `FROM` clause:
-
-   ```sql
-   SELECT window.start, COUNT(*) AS exceptionCount
-   FROM `log_group`
-   WHERE `@message` LIKE '%Exception%'
-   ```
-
-   or, when querying multiple log groups:
-
-   ```sql
-   SELECT window.start, COUNT(*) AS exceptionCount
-   FROM `logGroups( logGroupIdentifier: ['LogGroup1', 'LogGroup2'])`
-   WHERE `@message` LIKE '%Exception%'
-   ```
+1. Use the main input area to write your query in [CloudWatch Logs Query Language](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_QuerySyntax.html).

 You can also write queries returning time series data by using the [`stats` command](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_Insights-Visualizing-Log-Data.html).
 When making `stats` queries in [Explore](ref:explore), make sure you are in Metrics Explore mode.

+{{< figure src="/static/img/docs/v70/explore-mode-switcher.png" max-width="500px" class="docs-image--right" caption="Explore mode switcher" >}}
+
 ## Cross-account observability

 The CloudWatch plugin allows monitoring and troubleshooting applications that span multiple accounts within a region. Using cross-account observability, you can seamlessly search, visualize, and analyze metrics and logs without worrying about account boundaries.
--- a/docs/sources/datasources/google-cloud-monitoring/_index.md
+++ b/docs/sources/datasources/google-cloud-monitoring/_index.md
@@ -50,10 +50,6 @@ refs:
 Grafana ships with built-in support for Google Cloud Monitoring.
 This topic describes queries, templates, variables, and other configuration specific to the Google Cloud Monitoring data source.

-{{% admonition type="note" %}}
-Before Grafana v7.1, Google Cloud Monitoring was referred to as Google Stackdriver.
-{{% /admonition %}}
-
 For instructions on how to add a data source to Grafana, refer to the [administration documentation](ref:data-source-management).
 Only users with the organization administrator role can add data sources.

--- a/docs/sources/datasources/prometheus/configure-prometheus-data-source.md
+++ b/docs/sources/datasources/prometheus/configure-prometheus-data-source.md
@@ -31,11 +31,6 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links/#value-variables
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links/#value-variables
-  alerting-alert-rules:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/fundamentals/alert-rules/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/alerting-and-irm/alerting/fundamentals/alert-rules/
 ---

 # Configure Prometheus
@@ -120,7 +115,7 @@ Following are additional configuration options.

 ### Alerting

- **Manage alerts via Alerting UI** - Toggle to enable [data source-managed rules in Grafana Alerting](ref:alerting-alert-rules) for this data source. For `Mimir`, it enables managing data source-managed rules and alerts. For `Prometheus`, it only supports viewing existing rules and alerts, which are displayed as data source-managed.
+- **Manage alerts via Alerting UI** - Toggle to enable `Alertmanager` integration for this data source.

 ### Interval behavior

--- a/docs/sources/datasources/pyroscope/_index.md
+++ b/docs/sources/datasources/pyroscope/_index.md
@@ -6,6 +6,7 @@ aliases:
 description: Horizontally-scalable, highly-available, multi-tenant continuous profiling
  aggregation system. OSS profiling solution from Grafana Labs.
 keywords:
+  - grafana
  - phlare
  - guide
  - profiling
@@ -38,17 +39,11 @@ refs:
      destination: https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/provisioning/#datasources
    - pattern: /docs/grafana-cloud/
      destination: https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/provisioning/#datasources
-  flame-graph-panel:
-    - pattern: /docs/grafana/
-      destination: https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/flame-graph/
-    - pattern: /docs/grafana-cloud/
-      destination: https://grafana.com/docs/grafana-cloud/visualizations/panels-visualizations/visualizations/flame-graph/
 ---

 # Grafana Pyroscope data source

-Grafana Pyroscope is a horizontally scalable, highly available, multi-tenant, OSS, continuous profiling aggregation system.
-Add a Pyroscope data source to query your profiles in [Explore](ref:explore).
+Grafana Pyroscope is a horizontally scalable, highly available, multi-tenant, OSS, continuous profiling aggregation system. Add it as a data source, and you are ready to query your profiles in [Explore](ref:explore).

 Refer to [Introduction to Pyroscope](https://grafana.com/docs/pyroscope/<PYROSCOPE_VERSION>/introduction/) to understand profiling and Pyroscope.

@@ -58,36 +53,9 @@ To use profiling data, you should:
 - [Configure the Grafana Pyroscope data source](./configure-pyroscope-data-source/).
 - [View and query profiling data using Explore Profiles or the query editor ](./query-profile-data/)

-## Continuous profiling
-
-While code profiling has been a long-standing practice, continuous profiling represents a modern and more advanced approach to performance monitoring.
-
-This technique adds two critical dimensions to traditional profiles:
-
-Time
-: Profiling data is collected _continuously_, providing a time-centric view that allows querying performance data from any point in the past.
-
-Metadata
-: Profiles are enriched with metadata, adding contextual depth to the performance data.
-
-These dimensions, coupled with the detailed nature of performance profiles, make continuous profiling a uniquely valuable tool.
-
-### Flame graphs
-
-<!-- vale Grafana.We = NO -->
-
-Flame graphs help you visualize resource allocation and performance bottlenecks, and you even get suggested recommendations and performance fixes via AI-driven flame graph analysis, as well as line-level insights from our GitHub integration.
-
-<!-- vale Grafana.We = YES -->
-
-On views with a flame graph, you can use **Explain flame graph** to provide an AI flame graph analysis that explains the performance bottleneck, root cause, and recommended fix.
-For more information, refer to [Flame graph AI](https://grafana.com/docs/grafana-cloud/monitor-applications/profiles/flamegraph-ai/).
-
 ## Integrate profiles into dashboards

 Using the Pyroscope data source, you can integrate profiles into your dashboards.
-For example, you can embed flame graphs using the [flame graph panel](ref:flame-graph-panel).
-
 In this case, the screenshot shows memory profiles alongside panels for logs and metrics to be able to debug out of memory (OOM) errors alongside the associated logs and metrics.

 ![dashboard](https://grafana.com/static/img/pyroscope/grafana-pyroscope-dashboard-2023-11-30.png)
--- a/docs/sources/datasources/pyroscope/configure-traces-to-profiles.md
+++ b/docs/sources/datasources/pyroscope/configure-traces-to-profiles.md
@@ -1,21 +0,0 @@
---
-title: Configure traces to profiles
-menuTitle: Configure traces to profiles
-description: Learn how to configure the traces to profiles integration in Grafana and Grafana Cloud.
-weight: 300
-keywords:
-  - continuous profiling
-  - tracing
---
-
-# Configure traces to profiles
-
-{{< admonition type="note" >}}
-
-Your application must be instrumented for profiles and traces. For more information, refer to [Link traces to profiles](https://grafana.com/docs/pyroscope/<PYROSCOPE_VERSION>/configure-client/trace-span-profiles/).
-
-{{< /admonition >}}
-
-[//]: # 'Shared content for Trace to profiles in the Tempo data source'
-
-{{< docs/shared source="grafana" lookup="datasources/tempo-traces-to-profiles.md" version="<GRAFANA VERSION>" >}}
--- a/docs/sources/datasources/pyroscope/query-profile-data.md
+++ b/docs/sources/datasources/pyroscope/query-profile-data.md
@@ -11,7 +11,7 @@ labels:
    - oss
 title: Query profile data
 menuTitle: Query profile data
-weight: 400
+weight: 300
 refs:
  configure-tempo-data-source:
    - pattern: /docs/grafana/
@@ -43,24 +43,11 @@ refs:
      destination: /docs/grafana/<GRAFANA_VERSION>/administration/provisioning/#datasources
    - pattern: /docs/grafana-cloud/
      destination: /docs/grafana/<GRAFANA_VERSION>/administration/provisioning/#datasources
-  flame-graph-panel:
-    - pattern: /docs/grafana/
-      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/flame-graph/
-    - pattern: /docs/grafana-cloud/
-      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/flame-graph/
 ---

-https://grafana.com/docs/grafana-cloud/visualizations/panels-visualizations/visualizations/flame-graph/
-
 # Query profile data

-You can query your profile data using the open source Grafana Explore Profiles app or the built-in Grafana Pyroscope data source query editor.
-
- Explore Profiles provides a queryless experience for inspecting your profiling data with opinionated workflows to assist your investigation.
- Data source query editor provides complete control over your data exploration and is recommended for experienced users.
-
-In addition, you can embed flame graph panels in Grafana dashboards.
-Refer to the [Flame graph panel](ref:flame-graph-panel) documentation for details.
+You can query your profile data using the built-in data source query editor or you can use the open source Grafana Explore Profiles app.

 ## Explore Profiles

@@ -69,8 +56,6 @@ Refer to the [Flame graph panel](ref:flame-graph-panel) documentation for detail
 You can use Explore Profiles in Grafana Cloud or in your own Grafana instance.
 For more information, refer to [Access or install Explore Profiles](ref:explore-profiles-install).

-![Explore Profiles home screen](/media/docs/explore-profiles/explore-profiles-homescreen-v0.1.17.png)
-
 ### Use cases

 There are several different modes for viewing, analyzing, and comparing profiling data.
@@ -80,7 +65,7 @@ The main use cases are the following:
 - Proactive: Cutting costs, addressing latency issues, or optimizing memory usage for applications
 - Reactive: Resolving incidents with line-level accuracy or debugging active latency/memory issues

-Explore Profiles provides an intuitive interface to specifically support proactivee and reactive use cases.
+Explore Profiles provides an intuitive interface to specifically support these use cases.
 You get a holistic view of all of your services and how they're functioning, but also the ability to drill down for more targeted root cause analysis.

 Explore Profiles offers a convenient platform to analyze profiles and get insights that are impossible to get from using other traditional signals like logs, metrics, or tracing.
@@ -89,6 +74,31 @@ Explore Profiles offers a convenient platform to analyze profiles and get insigh

 {{< docs/play title="the Grafana Play site" url="https://play.grafana.org/a/grafana-pyroscope-app/profiles-explorer" >}}

+### Continuous profiling
+
+While code profiling has been a long-standing practice, continuous profiling represents a modern and more advanced approach to performance monitoring.
+
+This technique adds two critical dimensions to traditional profiles:
+
+Time
+: Profiling data is collected _continuously_, providing a time-centric view that allows querying performance data from any point in the past.
+
+Metadata
+: Profiles are enriched with metadata, adding contextual depth to the performance data.
+
+These dimensions, coupled with the detailed nature of performance profiles, make continuous profiling a uniquely valuable tool.
+
+### Flame graphs
+
+<!-- vale Grafana.We = NO -->
+
+Flame graphs help you visualize resource allocation and performance bottlenecks, and you even get suggested recommendations and performance fixes via AI-driven flame graph analysis, as well as line-level insights from our GitHub integration.
+
+<!-- vale Grafana.We = YES -->
+
+On views with a flame graph, you can use **Explain flame graph** to provide an AI flame graph analysis that explains the performance bottleneck, root cause, and recommended fix.
+For more information, refer to [Flame graph AI](https://grafana.com/docs/grafana-cloud/monitor-applications/profiles/flamegraph-ai/).
+
 ## Pyroscope query editor

 The Pyroscope data source query editor gives you access to a profile type selector, a label selector, and collapsible options.
@@ -125,9 +135,7 @@ Using **Group by**, you can group metric data by a specified label.
 Without any **Group by** label, metric data aggregates over all the labels into single time series.
 You can use multiple labels to group by. Group by only effects the metric data and doesn't change the profile data results.

-In conjunction with **Group by**, you can set a positive number in the **Limit** input to limit the maximum number of time series returned by the data source. The series returned are always ordered by descending value for the total aggregated data over the time period.
-
-### Profiles query results
+## Profiles query results

 Profiles can be visualized in a flame graph.
 Refer to the [Flame Graph documentation](ref:flame-graph) to learn about the visualization and its features.
@@ -138,7 +146,7 @@ Pyroscope returns profiles aggregated over a selected time range.
 The absolute values in the flame graph grow as the time range gets bigger while keeping the relative values meaningful.
 You can zoom in on the time range to get a higher granularity profile up to the point of a single scrape interval.

-### Metrics query results
+## Metrics query results

 Metrics results represent the aggregated sum value over time of the selected profile type.

--- a/docs/sources/developers/angular_deprecation/_index.md
+++ b/docs/sources/developers/angular_deprecation/_index.md
@@ -60,7 +60,7 @@ We encourage you to locate the repository of the corresponding plugin and create

 ### Links

- [Migrate Angular to React](https://grafana.com/developers/plugin-tools/migration-guides/migrate-angularjs-to-react)
+- [Migrate Angular to React](https://grafana.com/developers/plugin-tools/migration-guides/angular-react/)
 - [Build a panel plugin](https://grafana.com/tutorials/build-a-panel-plugin/)
 - [Build a data source plugin](https://grafana.com/tutorials/build-a-data-source-plugin/)
 - [List of current Angular plugins]({{< relref "./angular-plugins/" >}})
--- a/docs/sources/panels-visualizations/visualizations/traces/index.md
+++ b/docs/sources/panels-visualizations/visualizations/traces/index.md
@@ -51,7 +51,7 @@ refs:
 # Traces

 Traces visualizations let you follow a request as it traverses the services in your infrastructure.
-The traces visualization displays traces data in a diagram that allows you to easily interpret it. Traces visualizations currently render one trace traversal based on the traceID used in TraceQL or using a variable.
+The traces visualization displays traces data in a diagram that allows you to easily interpret it.

 For more information about traces and how to use them, refer to the following documentation:

--- a/docs/sources/setup-grafana/configure-grafana/_index.md
+++ b/docs/sources/setup-grafana/configure-grafana/_index.md
@@ -272,10 +272,6 @@ Path to the certificate file (if `protocol` is set to `https` or `h2`).

 Path to the certificate key file (if `protocol` is set to `https` or `h2`).

-### cert_pass
-
-Optional. Password to decrypt encrypted certificates.
-
 ### certs_watch_interval

 Controls whether `cert_key` and `cert_file` are periodically watched for changes.
@@ -1788,7 +1784,7 @@ Configures the batch size for the annotation clean-up job. This setting is used

 ### tags_length

-Enforces the maximum allowed amount of tags for any newly introduced annotations. This value can be between 500 and 4096 (inclusive). The default value is 500. Setting it to a higher value would impact performance and is therefore not recommended.
+Enforces the maximum allowed length of the tags for any newly introduced annotations. It can be between 500 and 4096 (inclusive). Default value is 500. Setting it to a higher value would impact performance therefore is not recommended.

 ## [annotations.dashboard]

--- a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
+++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md
@@ -77,6 +77,7 @@ Most [generally available](https://grafana.com/docs/release-life-cycle/#general-
 | `pinNavItems`                          | Enables pinning of nav items                                                                                                                                              | Yes                |
 | `openSearchBackendFlowEnabled`         | Enables the backend query flow for Open Search datasource plugin                                                                                                          | Yes                |
 | `cloudWatchRoundUpEndTime`             | Round up end time for metric queries to the next minute to avoid missing data                                                                                             | Yes                |
+| `azureMonitorEnableUserAuth`           | Enables user auth for Azure Monitor datasource only                                                                                                                       | Yes                |

 ## Public preview feature toggles

--- a/docs/sources/setup-grafana/image-rendering/_index.md
+++ b/docs/sources/setup-grafana/image-rendering/_index.md
@@ -20,6 +20,8 @@ weight: 1000

 Grafana supports automatic rendering of panels as PNG images. This allows Grafana to automatically generate images of your panels to include in alert notifications, [PDF export]({{< relref "../../dashboards/create-reports#export-dashboard-as-pdf" >}}), and [Reporting]({{< relref "../../dashboards/create-reports" >}}). PDF Export and Reporting are available only in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise" >}}) and [Grafana Cloud](/docs/grafana-cloud/).

+> **Note:** Image rendering of dashboards is not supported at this time.
+
 While an image is being rendered, the PNG image is temporarily written to the file system. When the image is rendered, the PNG image is temporarily written to the `png` folder in the Grafana `data` folder.

 A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp_data_lifetime]({{< relref "../configure-grafana#temp_data_lifetime" >}}) setting.
--- a/docs/sources/setup-grafana/image-rendering/troubleshooting/index.md
+++ b/docs/sources/setup-grafana/image-rendering/troubleshooting/index.md
@@ -49,7 +49,7 @@ are not installed in your system:

 ```bash
 cd <grafana-image-render plugin directory>
-ldd chrome-linux/chrome
+ldd chrome-headless-shell/linux-132.0.6781.0/chrome-headless-shell-linux64/chrome-headless-shell
      linux-vdso.so.1 (0x00007fff1bf65000)
      libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2047945000)
      libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2047924000)
--- a/docs/sources/setup-grafana/installation/_index.md
+++ b/docs/sources/setup-grafana/installation/_index.md
@@ -46,7 +46,7 @@ Installation of Grafana on other operating systems is possible, but is not recom
 Grafana requires the minimum system resources:

 - Minimum recommended memory: 512 MB
- Minimum recommended CPU: 1 core
+- Minimum recommended CPU: 1

 Some features might require more memory or CPUs, including:

--- a/docs/sources/setup-grafana/installation/debian/index.md
+++ b/docs/sources/setup-grafana/installation/debian/index.md
@@ -18,9 +18,9 @@ This topic explains how to install Grafana dependencies, install Grafana on Linu

 There are multiple ways to install Grafana: using the Grafana Labs APT repository, by downloading a `.deb` package, or by downloading a binary `.tar.gz` file. Choose only one of the methods below that best suits your needs.

-{{< admonition type="note" >}}
+{{% admonition type="note" %}}
 If you install via the `.deb` package or `.tar.gz` file, then you must manually update Grafana for each new version.
-{{< /admonition >}}
+{{% /admonition %}}

 The following video demonstrates how to install Grafana on Debian and Ubuntu as outlined in this document:

@@ -37,9 +37,9 @@ If you install from the APT repository, Grafana automatically updates when you r
 | Grafana OSS               | grafana            | `https://apt.grafana.com stable main` |
 | Grafana OSS (Beta)        | grafana            | `https://apt.grafana.com beta main`   |

-{{< admonition type="note" >}}
+{{% admonition type="note" %}}
 Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
-{{< /admonition >}}
+{{% /admonition %}}

 Complete the following steps to install Grafana from the APT repository:

@@ -89,11 +89,11 @@ Complete the following steps to install Grafana from the APT repository:
   sudo apt-get install grafana-enterprise
   ```

-## Install Grafana using a deb package
+## Install Grafana using a deb package or as a standalone binary

-If you install Grafana manually using the deb package, then you must manually update Grafana for each new version.
+If you choose not to install Grafana using APT, you can download and install Grafana using the deb package or as a standalone binary.

-Complete the following steps to install Grafana using a deb package:
+Complete the following steps to install Grafana using DEB or the standalone binaries:

 1. Navigate to the [Grafana download page](/grafana/download).
 1. Select the Grafana version you want to install.
@@ -105,80 +105,6 @@ Complete the following steps to install Grafana using a deb package:
 1. Depending on which system you are running, click the **Linux** or **ARM** tab on the [download page](/grafana/download).
 1. Copy and paste the code from the [download page](/grafana/download) into your command line and run.

-## Install Grafana as a standalone binary
-
-Complete the following steps to install Grafana using the standalone binaries:
-
-1. Navigate to the [Grafana download page](/grafana/download).
-1. Select the Grafana version you want to install.
-   - The most recent Grafana version is selected by default.
-   - The **Version** field displays only tagged releases. If you want to install a nightly build, click **Nightly Builds** and then select a version.
-1. Select an **Edition**.
-   - **Enterprise:** This is the recommended version. It is functionally identical to the open source version but includes features you can unlock with a license if you so choose.
-   - **Open Source:** This version is functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
-1. Depending on which system you are running, click the **Linux** or **ARM** tab on the [download page](/grafana/download).
-1. Copy and paste the code from the [download page](/grafana/download) page into your command line and run.
-1. Create a user account for Grafana on your system:
-
-   ```shell
-   sudo useradd -r -s /bin/false grafana
-   ```
-
-1. Move the unpacked binary to `/usr/local/grafana`:
-
-   ```shell
-   sudo mv <DOWNLOAD PATH> /usr/local/grafana
-   ```
-
-1. Change the owner of `/usr/local/grafana` to Grafana users:
-
-   ```shell
-   sudo chown -R grafana:users /usr/local/grafana
-   ```
-
-1. Create a Grafana server systemd unit file:
-
-   ```shell
-   sudo touch /etc/systemd/system/grafana-server.service
-   ```
-
-1. Add the following to the unit file in a text editor of your choice:
-
-   ```ini
-   [Unit]
-   Description=Grafana Server
-   After=network.target
-
-   [Service]
-   Type=simple
-   User=grafana
-   Group=users
-   ExecStart=/usr/local/grafana/bin/grafana server --config=/usr/local/grafana/conf/grafana.ini --homepath=/usr/local/grafana
-   Restart=on-failure
-
-   [Install]
-   WantedBy=multi-user.target
-   ```
-
-1. Use the binary to manually start the Grafana server:
-
-   ```shell
-   /usr/local/grafana/bin/grafana-server --homepath /usr/local/grafana
-   ```
-
-   {{< admonition type="note" >}}
-   Manually invoking the binary in this step automatically creates the `/usr/local/grafana/data` directory, which needs to be created and configured before the installation can be considered complete.
-   {{< /admonition >}}
-
-1. Press `CTRL+C` to stop the Grafana server.
-1. Change the owner of `/usr/local/grafana` to Grafana users again to apply the ownership to the newly created `/usr/local/grafana/data` directory:
-
-   ```shell
-   sudo chown -R grafana:users /usr/local/grafana
-   ```
-
-1. [Configure the Grafana server to start at boot time using systemd](https://grafana.com/docs/grafana/latest/setup-grafana/start-restart-grafana/#configure-the-grafana-server-to-start-at-boot-using-systemd).
-
 ## Uninstall on Debian or Ubuntu

 Complete any of the following steps to uninstall Grafana.
--- a/docs/sources/setup-grafana/installation/helm/index.md
+++ b/docs/sources/setup-grafana/installation/helm/index.md
@@ -187,7 +187,7 @@ This section describes the steps you must complete to access Grafana via web bro

 ## Customize Grafana default configuration

-Helm is a popular package manager for Kubernetes. It bundles Kubernetes resource manifests to be reused across different environments. These manifests are written in a templating language, allowing you to provide configuration values via `values.yaml` file, or in-line using Helm, to replace the placeholders in the manifest where these configurations should reside.
+Helm is a popular package manager for Kubernetes. It bundles Kubernetes resource manifests to be re-used across different environments. These manifests are written in a templating language, allowing you to provide configuration values via `values.yaml` file, or in-line using Helm, to replace the placeholders in the manifest where these configurations should reside.

 The `values.yaml` file allows you to customize the chart's configuration by specifying values for various parameters such as image versions, resource limits, service configurations, etc.

--- a/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
+++ b/docs/sources/setup-grafana/installation/redhat-rhel-fedora/index.md
@@ -32,15 +32,15 @@ If you install from the RPM repository, then Grafana is automatically updated ev
 | Grafana OSS               | grafana            | `https://rpm.grafana.com`      |
 | Grafana OSS (Beta)        | grafana            | `https://rpm-beta.grafana.com` |

-{{< admonition type="note" >}}
+{{% admonition type="note" %}}
 Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
-{{< /admonition >}}
+{{% /admonition %}}

 To install Grafana from the RPM repository, complete the following steps:

-{{< admonition type="note" >}}
+{{% admonition type="note" %}}
 If you wish to install beta versions of Grafana, substitute the repository URL for the beta URL listed above.
-{{< /admonition >}}
+{{% /admonition %}}

 1. Import the GPG key:

@@ -96,8 +96,6 @@ If you install Grafana manually using YUM or RPM, then you must manually update

 ## Install Grafana as a standalone binary

-If you install Grafana manually using the standalone binaries, then you must manually update Grafana for each new version.
-
 Complete the following steps to install Grafana using the standalone binaries:

 1. Navigate to the [Grafana download page](/grafana/download).
@@ -105,70 +103,10 @@ Complete the following steps to install Grafana using the standalone binaries:
   - The most recent Grafana version is selected by default.
   - The **Version** field displays only tagged releases. If you want to install a nightly build, click **Nightly Builds** and then select a version.
 1. Select an **Edition**.
-   - **Enterprise:** This is the recommended version. It is functionally identical to the open source version but includes features you can unlock with a license if you so choose.
+   - **Enterprise:** This is the recommended version. It is functionally identical to the open-source version but includes features you can unlock with a license if you so choose.
   - **Open Source:** This version is functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
 1. Depending on which system you are running, click the **Linux** or **ARM** tab on the [download page](/grafana/download).
 1. Copy and paste the code from the [download page](/grafana/download) page into your command line and run.
-1. Create a user account for Grafana on your system:
-
-   ```shell
-   sudo useradd -r -s /bin/false grafana
-   ```
-
-1. Move the unpacked binary to `/usr/local/grafana`:
-
-   ```shell
-   sudo mv <DOWNLOAD PATH> /usr/local/grafana
-   ```
-
-1. Change the owner of `/usr/local/grafana` to Grafana users:
-
-   ```shell
-   sudo chown -R grafana:users /usr/local/grafana
-   ```
-
-1. Create a Grafana server systemd unit file:
-
-   ```shell
-   sudo touch /etc/systemd/system/grafana-server.service
-   ```
-
-1. Add the following to the unit file in a text editor of your choice:
-
-   ```ini
-   [Unit]
-   Description=Grafana Server
-   After=network.target
-
-   [Service]
-   Type=simple
-   User=grafana
-   Group=users
-   ExecStart=/usr/local/grafana/bin/grafana server --config=/usr/local/grafana/conf/grafana.ini --homepath=/usr/local/grafana
-   Restart=on-failure
-
-   [Install]
-   WantedBy=multi-user.target
-   ```
-
-1. Use the binary to manually start the Grafana server:
-
-   ```shell
-   /usr/local/grafana/bin/grafana-server --homepath /usr/local/grafana
-   ```
-
-   {{< admonition type="note" >}}
-   Manually invoking the binary in this step automatically creates the `/usr/local/grafana/data` directory, which needs to be created and configured before the installation can be considered complete.
-   {{< /admonition >}}
-
-1. Press `CTRL+C` to stop the Grafana server.
-1. Change the owner of `/usr/local/grafana` to Grafana users again to apply the ownership to the newly created `/usr/local/grafana/data` directory:
-
-   ```shell
-   sudo chown -R grafana:users /usr/local/grafana
-   ```
-
-1. [Configure the Grafana server to start at boot time using systemd]({{< relref "../../start-restart-grafana#configure-the-grafana-server-to-start-at-boot-using-systemd" >}}).

 ## Uninstall on RHEL or Fedora

--- a/docs/sources/setup-grafana/installation/suse-opensuse/index.md
+++ b/docs/sources/setup-grafana/installation/suse-opensuse/index.md
@@ -30,9 +30,9 @@ If you install from the RPM repository, then Grafana is automatically updated ev
 | Grafana Enterprise | grafana-enterprise | `https://rpm.grafana.com` |
 | Grafana OSS        | grafana            | `https://rpm.grafana.com` |

-{{< admonition type="note" >}}
+{{% admonition type="note" %}}
 Grafana Enterprise is the recommended and default edition. It is available for free and includes all the features of the OSS edition. You can also upgrade to the [full Enterprise feature set](/products/enterprise/?utm_source=grafana-install-page), which has support for [Enterprise plugins](/grafana/plugins/?enterprise=1&utcm_source=grafana-install-page).
-{{< /admonition >}}
+{{% /admonition %}}

 To install Grafana using the RPM repository, complete the following steps:

@@ -84,8 +84,6 @@ If you install Grafana manually using RPM, then you must manually update Grafana

 ## Install Grafana as a standalone binary

-If you install Grafana manually using the standalone binaries, then you must manually update Grafana for each new version.
-
 Complete the following steps to install Grafana using the standalone binaries:

 1. Navigate to the [Grafana download page](/grafana/download).
@@ -93,70 +91,10 @@ Complete the following steps to install Grafana using the standalone binaries:
   - The most recent Grafana version is selected by default.
   - The **Version** field displays only tagged releases. If you want to install a nightly build, click **Nightly Builds** and then select a version.
 1. Select an **Edition**.
-   - **Enterprise:** This is the recommended version. It is functionally identical to the open source version but includes features you can unlock with a license if you so choose.
+   - **Enterprise:** This is the recommended version. It is functionally identical to the open-source version but includes features you can unlock with a license if you so choose.
   - **Open Source:** This version is functionally identical to the Enterprise version, but you will need to download the Enterprise version if you want Enterprise features.
 1. Depending on which system you are running, click the **Linux** or **ARM** tab on the [download page](/grafana/download).
 1. Copy and paste the code from the [download page](/grafana/download) into your command line and run.
-1. Create a user account for Grafana on your system:
-
-   ```shell
-   sudo useradd -r -s /bin/false grafana
-   ```
-
-1. Move the unpacked binary to `/usr/local/grafana`:
-
-   ```shell
-   sudo mv <DOWNLOAD PATH> /usr/local/grafana
-   ```
-
-1. Change the owner of `/usr/local/grafana` to Grafana users:
-
-   ```shell
-   sudo chown -R grafana:users /usr/local/grafana
-   ```
-
-1. Create a Grafana server systemd unit file:
-
-   ```shell
-   sudo touch /etc/systemd/system/grafana-server.service
-   ```
-
-1. Add the following to the unit file in a text editor of your choice:
-
-   ```ini
-   [Unit]
-   Description=Grafana Server
-   After=network.target
-
-   [Service]
-   Type=simple
-   User=grafana
-   Group=users
-   ExecStart=/usr/local/grafana/bin/grafana server --config=/usr/local/grafana/conf/grafana.ini --homepath=/usr/local/grafana
-   Restart=on-failure
-
-   [Install]
-   WantedBy=multi-user.target
-   ```
-
-1. Use the binary to manually start the Grafana server:
-
-   ```shell
-   /usr/local/grafana/bin/grafana-server --homepath /usr/local/grafana
-   ```
-
-   {{< admonition type="note" >}}
-   Manually invoking the binary in this step automatically creates the `/usr/local/grafana/data` directory, which needs to be created and configured before the installation can be considered complete.
-   {{< /admonition >}}
-
-1. Press `CTRL+C` to stop the Grafana server.
-1. Change the owner of `/usr/local/grafana` to Grafana users again to apply the ownership to the newly created `/usr/local/grafana/data` directory:
-
-   ```shell
-   sudo chown -R grafana:users /usr/local/grafana
-   ```
-
-1. [Configure the Grafana server to start at boot time using systemd](https://grafana.com/docs/grafana/latest/setup-grafana/start-restart-grafana/#configure-the-grafana-server-to-start-at-boot-using-systemd).

 ## Uninstall on SUSE or openSUSE

--- a/docs/sources/setup-grafana/set-up-https.md
+++ b/docs/sources/setup-grafana/set-up-https.md
@@ -244,8 +244,6 @@ To configure Grafana HTTPS and restart Grafana, complete the following steps.

   > **Note**: The standard port for SSL traffic is 443, which you can use instead of Grafana's default port 3000. This change might require additional operating system privileges or configuration to bind to lower-numbered privileged ports.

-1. Optional. From Grafana v11.2, edit the `cert_pass` configuration option with the decryption password if you are using encrypted certificates.
-
 1. [Restart the Grafana server]({{< relref "./start-restart-grafana#linux" >}}) using `systemd`, `init.d`, or the binary as appropriate for your environment.

 ## Troubleshooting
--- a/docs/sources/shared/alerts/add-alertmanager-ds.md
+++ b/docs/sources/shared/alerts/add-alertmanager-ds.md
@@ -1,26 +0,0 @@
---
-labels:
-  products:
-    - cloud
-    - enterprise
-    - oss
-title: 'Add an alertmanager data source'
---
-
-1. Click **Connections** in the left-side menu.
-1. Under Your connections, click **Data sources**.
-1. Enter `Alertmanager` in the search bar.
-1. Click **Alertmanager**.
-
-   The **Settings** tab of the data source is displayed.
-
-1. Set the data source's basic configuration options:
-
-   | Name                            | Description                                                                                                                                                                                 |
-   | ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-   | **Name**                        | Sets the name you use to refer to the data source                                                                                                                                           |
-   | **Default**                     | Sets whether the data source is pre-selected for new panels and queries                                                                                                                     |
-   | **Alertmanager Implementation** | Alertmanager implementation. **Mimir**, **Cortex,** and **Prometheus** are supported                                                                                                        |
-   | **Receive Grafana Alerts**      | When enabled, the Alertmanager can receive Grafana-managed alerts. **Important:** This works only if receiving alerts is enabled for the Alertmanager in the Grafana Alerting Settings page |
-   | **HTTP URL**                    | Sets the HTTP protocol, IP, and port of your Alertmanager instance, such as `https://alertmanager.example.org:9093`                                                                         |
-   | **Access**                      | Only **Server** access mode is functional                                                                                                                                                   |
--- a/docs/sources/shared/alerts/alerting_provisioning.md
+++ b/docs/sources/shared/alerts/alerting_provisioning.md
@@ -384,7 +384,7 @@ To reset the notification policy tree to the default and unlock it for editing i

 | Code                              | Status     | Description                            | Has headers | Schema                                      |
 | --------------------------------- | ---------- | -------------------------------------- | :---------: | ------------------------------------------- |
-| [204](#route-delete-template-204) | No Content | The template was deleted successfully. |             | [schema](#route-delete-template-204-schema) |
+| [204](#route-delete-template-204) | No Content | The template was deleted successfully. |             | [schema](#route-delete-template-204-schema) |
 | [409](#route-delete-template-409) | Conflict   | GenericPublicError                     |             | [schema](#route-delete-template-409-schema) |

 #### Responses
--- a/docs/sources/shared/alerts/configure-alert-rule-name.md
+++ b/docs/sources/shared/alerts/configure-alert-rule-name.md
@@ -1,13 +0,0 @@
---
-labels:
-  products:
-    - oss
-title: 'Set alert rule name'
---
-
-## Set alert rule name
-
-1. Click **Alerts & IRM** -> **Alert rules** -> **+ New alert rule**.
-1. Enter a name to identify your alert rule.
-
-   This name is displayed in the alert rule list. It is also the `alertname` label for every alert instance that is created from this rule.
--- a/docs/sources/shared/alerts/configure-notification-message.md
+++ b/docs/sources/shared/alerts/configure-notification-message.md
@@ -1,36 +0,0 @@
---
-labels:
-  products:
-    - oss
-title: 'Configure notification message'
---
-
-## Configure notification message
-
-Use [annotations](ref:shared-annotations) to add information to alert messages that can help respond to the alert.
-
-Annotations are included by default in notification messages, and can use text or [templates](ref:shared-alert-rule-template) to display dynamic data from queries.
-
-Grafana provides several optional annotations.
-
-1. Optional: Add a summary.
-
-   Short summary of what happened and why.
-
-1. Optional: Add a description.
-
-   Description of what the alert rule does.
-
-1. Optional: Add a Runbook URL.
-
-   Webpage where you keep your runbook for the alert
-
-1. Optional: Add a custom annotation.
-
-   Add any additional information that could help address the alert.
-
-1. Optional: **Link dashboard and panel**.
-
-   [Link the alert rule to a panel](ref:shared-link-alert-rules-to-panels) to facilitate alert investigation.
-
-1. Click **Save rule**.
--- a/docs/sources/shared/alerts/configure-provisioning-before-begin.md
+++ b/docs/sources/shared/alerts/configure-provisioning-before-begin.md
@@ -1,12 +0,0 @@
---
-labels:
-  products:
-    - oss
-title: 'Provisioning'
---
-
-### Provisioning
-
-Note that if you delete an alert resource created in the UI, you can no longer retrieve it.
-
-To backup and manage alert rules, you can [provision alerting resources](ref:shared-provision-alerting-resources) using options such as configuration files, Terraform, or the Alerting API.
--- a/docs/sources/shared/alerts/how_label_matching_works.md
+++ b/docs/sources/shared/alerts/how_label_matching_works.md
@@ -8,7 +8,7 @@ title: 'How label matching works'

 {{< collapse title="How label matching works" >}}

-Use [labels](ref:shared-alert-labels) and label matchers to link alert rules to [notification policies](ref:shared-notification-policies) and [silences](ref:shared-silences). This allows for a flexible way to manage your alert instances, specify which policy should handle them, and which alerts to silence.
+Use [labels](ref:alert-labels) and label matchers to link alert rules to [notification policies](ref:notification-policies) and [silences](ref:silences). This allows for a flexible way to manage your alert instances, specify which policy should handle them, and which alerts to silence.

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

--- a/docs/sources/shared/alerts/mute-timings-vs-silences.md
+++ b/docs/sources/shared/alerts/mute-timings-vs-silences.md
@@ -1,17 +0,0 @@
---
-labels:
-  products:
-    - oss
-title: 'Mute timings vs silences'
---
-
-## Mute timings vs silences
-
-[Mute timings](ref:shared-mute-timings) and [silences](ref:shared-silences) are distinct methods to suppress notifications. They do not prevent alert rules from being evaluated or stop alert instances from appearing in the user interface; they only prevent notifications from being created.
-
-The following table highlights the key differences between mute timings and silences.
-
-|            | Mute timing                                                 | Silence                                                          |
-| ---------- | ----------------------------------------------------------- | ---------------------------------------------------------------- |
-| **Setup**  | Created and then added to notification policies             | Matches alerts using labels to determine whether to silence them |
-| **Period** | Uses time interval definitions that can repeat periodically | Has a fixed start and end time                                   |
--- a/docs/sources/shared/alerts/note-prometheus-ds-rules.md
+++ b/docs/sources/shared/alerts/note-prometheus-ds-rules.md
@@ -1,10 +0,0 @@
---
-labels:
-  products:
-    - oss
-title: 'Note Prometheus data source-managed rules'
---
-
-> Rules from a Prometheus data source appear in the **Data source-managed** section of the **Alert rules** page when [Manage alerts via Alerting UI](ref:shared-configure-prometheus-data-source-alerting) is enabled.
->
-> However, Grafana can only create and edit data source-managed rules for Mimir and Loki, not for a Prometheus instance.
--- a/docs/sources/shared/alerts/table-configure-no-data-and-error.md
+++ b/docs/sources/shared/alerts/table-configure-no-data-and-error.md
@@ -1,14 +0,0 @@
---
-labels:
-  products:
-    - oss
-title: 'Table configure no data and error'
---
-
-| Configure        | Set alert state | Description                                                                                                                                                                                                                                                          |
-| ---------------- | --------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| No Data          | No Data         | The default option for **No Data** events.<br/>Sets alert instance state to `No Data`. <br/> The alert rule also creates a new alert instance `DatasourceNoData` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels. |
-| Error            | Error           | The default option for **Error** events.<br/>Sets alert instance state to `Error`. <br/> The alert rule also creates a new alert instance `DatasourceError` with the name and UID of the alert rule, and UID of the datasource that returned no data as labels.      |
-| No Data or Error | Alerting        | Sets the alert instance state to `Pending` and then transitions to `Alerting` once the pending period ends. If you sent the pending period to 0, the alert instance state is immediately set to `Alerting`.                                                          |
-| No Data or Error | Normal          | Sets alert instance state to `Normal`.                                                                                                                                                                                                                               |
-| No Data or Error | Keep Last State | Maintains the alert instance in its last state. Useful for mitigating temporary issues.                                                                                                                                                                              |
--- a/docs/sources/upgrade-guide/upgrade-v11.4/index.md
+++ b/docs/sources/upgrade-guide/upgrade-v11.4/index.md
@@ -1,22 +0,0 @@
---
-description: Guide for upgrading to Grafana v11.4
-keywords:
-  - grafana
-  - configuration
-  - documentation
-  - upgrade
-  - '11.4'
-title: Upgrade to Grafana v11.4
-menuTitle: Upgrade to v11.4
-weight: 800
---
-
-# Upgrade to Grafana v11.4
-
-{{< docs/shared lookup="upgrade/intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-{{< docs/shared lookup="back-up/back-up-grafana.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
-
-{{< docs/shared lookup="upgrade/upgrade-common-tasks.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Technical notes
--- a/docs/sources/upgrade-guide/when-to-upgrade/index.md
+++ b/docs/sources/upgrade-guide/when-to-upgrade/index.md
@@ -42,22 +42,41 @@ We provide release documentation in multiple places to address different needs:

 ## When to expect releases

-Currently, Grafana is on a monthly release cycle. Here’s a look at scheduled releases for the first half of 2025:
+Currently, Grafana is on a monthly release cycle. Here’s a look at scheduled releases for 2024-early 2025:

-| **Anticipated release date** | **Grafana versions**              | **Release type** |
-| ---------------------------- | --------------------------------- | ---------------- |
-| Jan. 28, 2025                | 11.5 & Supported versions         | Minor & patching |
-| Feb. 18, 2025                | Supported versions                | Patching         |
-| March 25, 2025               | 11.6 & Supported versions         | Minor & patching |
-| April 15, 2025               | Supported versions                | Patching         |
-| May 5, 2025                  | Grafana 12.0 & Supported versions | Major & patching |
+| **Anticipated release date** | **Grafana versions** | **Release type**   |
+| ---------------------------- | -------------------- | ------------------ |
+| May 14, 2024                 | 11                   | Major and patching |
+| June 25, 2024                | 11.1                 | Minor and patching |
+| July 23, 2024                | Supported versions   | Patching           |
+| Aug. 27, 2024                | 11.2                 | Minor and patching |
+| Sept. 24, 2024               | Supported versions   | Patching           |
+| Oct. 22, 2024                | 11.3                 | Minor and patching |
+| Nov. 19, 2024                | Supported versions   | Patching           |
+| Dec. 5, 2024                 | 11.4                 | Minor and patching |
+| Jan. 28, 2025                | 11.5                 | Minor and patching |

 ### A few important notes

 - The schedule above outlines how we plan release dates. However, unforeseen events and circumstances may cause dates to change.
 - High severity security and feature degradation incidents will result in ad-hoc releases that are not scheduled ahead of time.
 - Patching releases are for the current (last released) minor version of Grafana. Additional older versions of Grafana may be included if there is a critical bug or security vulnerability that needs to be patched.
- Release freezes: Each year Grafana implements two release freezes to accommodate for the holiday season, these dates will be announced as the holiday season approaches. During these times, no scheduled releases will be executed. However, this does not apply to changes that may be required during the course of an operational or security incident.
+- Each year Grafana implements two release freezes to accommodate for the holiday season. This year our release freezes will be implemented as outlined below:
+
+**Freeze dates:**
+
+- November 25, 2024 - December 2, 2024
+- December 19, 2024 - January 2, 2025
+
+**Impacted products:**
+
+- Grafana in Grafana Cloud’s Grafana
+- Grafana OSS
+- Grafana Enterprise
+- Grafana query service
+- Multi-tenant data source services
+
+During these times, no scheduled releases will be executed. However, this does not apply to changes that may be required during the course of an operational or security incident.

 ## Grafana security releases: improved version naming convention

@@ -94,7 +113,6 @@ Here is an overview of projected version support through 2024:
 | 11.1                      | June 2024        | March 2025                             |
 | 11.2                      | August 2024      | May 2025                               |
 | 11.3                      | October 2024     | July 2025                              |
-| 11.4                      | December 2024    | September 2025                         |

 {{< admonition type="note" >}}
 Grafana 9.5.x was the last supported minor for the 9.0 major release and is no longer supported as of July 2024.
--- a/docs/sources/whatsnew/_index.md
+++ b/docs/sources/whatsnew/_index.md
@@ -76,7 +76,6 @@ For a complete list of every change, with links to pull requests and related iss

 ## Grafana 11

- [What's new in 11.4](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-4/)
 - [What's new in 11.3](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-3/)
 - [What's new in 11.2](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-2/)
 - [What's new in 11.1](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/whatsnew/whats-new-in-v11-1/)
--- a/docs/sources/whatsnew/whats-new-in-v11-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v11-4.md
@@ -1,45 +0,0 @@
---
-description: Feature and improvement highlights for Grafana v11.4
-keywords:
-  - grafana
-  - new
-  - documentation
-  - '11.4'
-  - release notes
-labels:
-products:
-  - cloud
-  - enterprise
-  - oss
-title: What's new in Grafana v11.4
-weight: -46
---
-
-<!-- vale GoogleWe = NO -->
-<!-- vale We = NO -->
-
-# What’s new in Grafana v11.4
-
-Welcome to Grafana 11.4! This is a special release with one new feature, created in partnership with AWS. We’ve made improvements to Cloudwatch so you can query your logs using two additional query languages: Opensearch PPL and Opensearch SQL. We’ve also updated the querying experience by providing a sample of commonly-used queries, syntax highlighting in the query editor, and auto-completion suggestions for complex queries. Read on to learn more about this new feature.
-
-For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v11.4, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v11.4/).
-
-## Query Cloudwatch Logs Insights with PPL and SQL
-
-<!-- Ida Štambuk, Zoe Chou -->
-
-_Generally available in all editions of Grafana_
-
-The AWS CloudWatch data source plugin now offers two new query languages for searching through logs: OpenSearch PPL and OpenSearch SQL. You now have increased flexibility to choose a more familiar query language and to take advantage of their unique features (like the SQL JOIN command) when querying AWS CloudWatch Logs Insights. In addition to the already supported **Logs Insights QL** option, you can find the added query language options in the new **Query language** drop-down list.
-
-![CloudWatch logs explore query languages drop-down list opened](/media/docs/grafana/data-sources/screenshot-awscw-query-languages-v11.4.png)
-
-We’ve also updated the query editor to support syntax highlighting and to provide suggestions while you type, which simplifies writing complex queries. When you select log groups, the suggestions also include [discovered fields](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_AnalyzeLogData-discoverable-fields.html).
-
-Not sure where to start? We’ve also updated our **CloudWatch Logs cheat sheet** with the most commonly used queries so you can paste and customize to fit exactly what you need. Clicking on any of the example queries prefills the query input field.
-
-![CloudWatch Logs cheat sheet with help icon highlighted](/media/docs/grafana/data-sources/screenshot-cwl-cheat-sheet-v11.4.png)
-
-For the complete list of commands supported for OpenSearch PPL and SQL, refer to the [Cloudwatch Logs Insights documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_AnalyzeLogData_Languages.html).
-
-{{< youtube id="g1BfokyzF4Q" >}}
--- a/e2e/dashboards-suite/dashboard-keybindings.spec.ts
+++ b/e2e/dashboards-suite/dashboard-keybindings.spec.ts
@@ -21,12 +21,4 @@ describe('Dashboard keybindings', () => {
    e2e.components.Panels.Panel.title('server = A, pod = Bob').should('be.visible');
    e2e.components.Panels.Panel.title('server = B, pod = Bob').should('be.visible');
  });
-
-  it('should open panel inspect', () => {
-    e2e.flows.openDashboard({ uid: 'edediimbjhdz4b/a-tall-dashboard' });
-    e2e.components.Panels.Panel.title('Panel #1').type('i');
-    e2e.components.PanelInspector.Json.content().should('be.visible');
-    cy.get('body').type('{esc}');
-    e2e.components.PanelInspector.Json.content().should('not.exist');
-  });
 });
--- a/e2e/test-plugins/grafana-extensionstest-app/package.json
+++ b/e2e/test-plugins/grafana-extensionstest-app/package.json
@@ -12,7 +12,7 @@
  "license": "Apache-2.0",
  "devDependencies": {
    "@grafana/eslint-config": "7.0.0",
-    "@grafana/plugin-configs": "workspace:*",
+    "@grafana/plugin-configs": "11.3.2",
    "@types/lodash": "4.17.7",
    "@types/node": "20.14.14",
    "@types/prismjs": "1.26.4",
--- a/go.mod
+++ b/go.mod
@@ -73,7 +73,7 @@ require (
 	github.com/googleapis/gax-go/v2 v2.13.0 // @grafana/grafana-backend-group
 	github.com/gorilla/mux v1.8.1 // @grafana/grafana-backend-group
 	github.com/gorilla/websocket v1.5.0 // @grafana/grafana-app-platform-squad
-	github.com/grafana/alerting v0.0.0-20250123200557-d08d1a8c6d83 // @grafana/alerting-backend
+	github.com/grafana/alerting v0.0.0-20250123200839-b4623c6a41a0 // @grafana/alerting-backend
 	github.com/grafana/authlib v0.0.0-20240919120951-58259833c564 // @grafana/identity-access-team
 	github.com/grafana/authlib/claims v0.0.0-20240827210201-19d5347dd8dd // @grafana/identity-access-team
 	github.com/grafana/codejen v0.0.3 // @grafana/dataviz-squad
--- a/go.sum
+++ b/go.sum
@@ -2252,10 +2252,10 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grafana/alerting v0.0.0-20241216200650-863916c31666 h1:yT+hJkmegtRnpHMYhXbm32D9gqKveXetXd9YFzQy2TI=
-github.com/grafana/alerting v0.0.0-20241216200650-863916c31666/go.mod h1:QsnoKX/iYZxA4Cv+H+wC7uxutBD8qi8ZW5UJvD2TYmU=
-github.com/grafana/alerting v0.0.0-20250123200557-d08d1a8c6d83 h1:My4siUgC1Fsxw4xIUlUVLOk70W2oHMkV1TyHNzIvXh8=
-github.com/grafana/alerting v0.0.0-20250123200557-d08d1a8c6d83/go.mod h1:QsnoKX/iYZxA4Cv+H+wC7uxutBD8qi8ZW5UJvD2TYmU=
+github.com/grafana/alerting v0.0.0-20240930154843-22cee00b280e h1:RttFYx5+RTNuMPlaftx8i9f91kwUi9LdxsoPLHnticU=
+github.com/grafana/alerting v0.0.0-20240930154843-22cee00b280e/go.mod h1:QsnoKX/iYZxA4Cv+H+wC7uxutBD8qi8ZW5UJvD2TYmU=
+github.com/grafana/alerting v0.0.0-20250123200839-b4623c6a41a0 h1:6C4sCdsM/TPKNom1tlR0wFBiFfSbEmSTEKS6q7MeqpU=
+github.com/grafana/alerting v0.0.0-20250123200839-b4623c6a41a0/go.mod h1:QsnoKX/iYZxA4Cv+H+wC7uxutBD8qi8ZW5UJvD2TYmU=
 github.com/grafana/authlib v0.0.0-20240919120951-58259833c564 h1:zYF/RBulpvMqPYR3gbzJZ8t/j/Eymn5FNidSYkueNCA=
 github.com/grafana/authlib v0.0.0-20240919120951-58259833c564/go.mod h1:PFzXbCrn0GIpN4KwT6NP1l5Z1CPLfmKHnYx8rZzQcyY=
 github.com/grafana/authlib/claims v0.0.0-20240827210201-19d5347dd8dd h1:sIlR7n38/MnZvX2qxDEszywXdI5soCwQ78aTDSARvus=
@@ -3473,6 +3473,8 @@ golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1m
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -3721,7 +3723,8 @@ golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -3862,7 +3865,8 @@ golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/telemetry v0.0.0-20240208230135-b75ee8823808/go.mod h1:KG1lNk5ZFNssSZLrpVb4sMXKMpGwGXOxSG3rnu2gZQQ=
 golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
@@ -3887,7 +3891,8 @@ golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
-golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
+golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
 golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -3910,7 +3915,8 @@ golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
--- a/go.work.sum
+++ b/go.work.sum
@@ -710,8 +710,6 @@ github.com/microcosm-cc/bluemonday v1.0.25 h1:4NEwSfiJ+Wva0VxN5B8OwMicaJvD8r9tlJ
 github.com/microcosm-cc/bluemonday v1.0.25/go.mod h1:ZIOjCQp1OrzBBPIJmfX4qDYFuhU02nx4bn030ixfHLE=
 github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81TI5Es90b2t/MwX5KqY=
 github.com/microsoft/ApplicationInsights-Go v0.4.4/go.mod h1:fKRUseBqkw6bDiXTs3ESTiU/4YTIHsQS4W3fP2ieF4U=
-github.com/microsoft/go-mssqldb v1.8.0 h1:7cyZ/AT7ycDsEoWPIXibd+aVKFtteUNhDGf3aobP+tw=
-github.com/microsoft/go-mssqldb v1.8.0/go.mod h1:6znkekS3T2vp0waiMhen4GPU1BiAsrP+iXHcE7a7rFo=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
  "npmClient": "yarn",
-  "version": "11.4.2"
+  "version": "11.3.2"
 }
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "grafana",
-  "version": "11.4.2",
+  "version": "11.3.2",
  "repository": "github:grafana/grafana",
  "scripts": {
    "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
@@ -65,7 +65,7 @@
    "generate-apis": "rtk-query-codegen-openapi ./scripts/generate-rtk-apis.ts"
  },
  "grafana": {
-    "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v11-4/",
+    "whatsNewUrl": "https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v11-3/",
    "releaseNotesUrl": "https://grafana.com/docs/grafana/next/release-notes/"
  },
  "devDependencies": {
--- a/packages/grafana-data/package.json
+++ b/packages/grafana-data/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/data",
-  "version": "11.4.2",
+  "version": "11.3.2",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
@@ -36,7 +36,7 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "7.0.1",
-    "@grafana/schema": "11.4.2",
+    "@grafana/schema": "11.3.2",
    "@types/d3-interpolate": "^3.0.0",
    "@types/string-hash": "1.1.3",
    "d3-interpolate": "3.0.1",
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -221,4 +221,5 @@ export interface FeatureToggles {
  rolePickerDrawer?: boolean;
  unifiedStorageSearch?: boolean;
  pluginsSriChecks?: boolean;
+  azureMonitorEnableUserAuth?: boolean;
 }
--- a/packages/grafana-e2e-selectors/package.json
+++ b/packages/grafana-e2e-selectors/package.json
@@ -2,7 +2,7 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "name": "@grafana/e2e-selectors",
-  "version": "11.4.2",
+  "version": "11.3.2",
  "description": "Grafana End-to-End Test Selectors Library",
  "keywords": [
    "cli",
--- a/packages/grafana-eslint-rules/package.json
+++ b/packages/grafana-eslint-rules/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@grafana/eslint-plugin",
  "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "11.4.2",
+  "version": "11.3.2",
  "main": "./index.cjs",
  "author": "Grafana Labs",
  "license": "Apache-2.0",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
github-actions[bot]	918be0713e	apply security patch: v11.3.x/307-202501232116.patch commit c5ca3ef17ad8afe659afe3c315ed3e78bf262764 Author: Matt Jacobson <matthew.jacobson@grafana.com> Date: Thu Jan 23 16:14:28 2025 -0500 linting commit f37e0a854ede2d24216bbec976f00e6f9ab6b145 Author: Matt Jacobson <matthew.jacobson@grafana.com> Date: Thu Jan 23 15:17:48 2025 -0500 CVE-2024-11741 - victorops url (cherry picked from commit 53ea127dd6575460618bb6dac3377cdd86846795)	2025-01-24 14:56:44 -06:00
Jack Baldry	d796e44fee	[v11.3.x] Remove codespell (#99430 )	2025-01-23 13:03:54 +00:00
Victor Marin	a7fc5daee1	[v11.3.x] DashboardScenes: Fix issue where relative time does not pass properly (#99299 ) DashboardScenes: Fix issue where relative time does not pass properly (#99282) fix issue where relative time does not pass properly (cherry picked from commit `bf1a0837af`)	2025-01-21 10:18:40 +02:00
grafana-delivery-bot[bot]	d4a744c8d5	[v11.3.x] Add Apache instructions (#99209 ) Co-authored-by: Joseph Perez <45749060+josmperez@users.noreply.github.com> Co-authored-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: Irene Rodriguez <irene.rodriguez@grafana.com> Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com> Co-authored-by: Ronald McCollam <mccollam@gmail.com>	2025-01-17 12:12:03 -06:00
grafana-delivery-bot[bot]	e5c3b8a937	[v11.3.x] Docs: Updated unsupported and unconfirmed lists (#99189 ) Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>	2025-01-17 09:40:39 -05:00
Mariell Hoversholm	4605a8e751	Security: Update to Go 1.23.5 - Backport to v11.3.x (#99124 ) * feat: update to Go 1.23.5 * chore: make drone * chore: make update-workspace * CI: Force re-build * build: update mariadb connection The new Alpine base that the Golang images are built on no longer trust the CA of MySQL. This is a backport of: https://github.com/grafana/grafana/pull/98857 (cherry picked from commit `e1bb8ccb79`)	2025-01-17 09:33:25 +01:00
grafana-delivery-bot[bot]	98b1f860c8	[v11.3.x] setDashboardPanelContext: Allow to add filters from the table with the same key (#99088 ) setDashboardPanelContext: Allow to add filters from the table with the same key (#99004) * always add filters for elastic seach ds when filtering table value * simplify update filter logic and restore behaviour from old arch * remove unnecessary modifications * adjust namig (cherry picked from commit `3df1fa86ae`) Co-authored-by: Sergej-Vlasov <37613182+Sergej-Vlasov@users.noreply.github.com>	2025-01-16 15:21:39 +00:00
Sergej-Vlasov	f522a54ae1	Update scenes to v5.37.0 (#98958 ) (#99083 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit `2594b4f7af`) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-01-16 14:14:27 +00:00
Larissa Wandzura	be599c43f9	[v11.3.x] Docs: MySQL data source updates/revamp (#98907 ) Docs: MySQL data source updates/revamp (#98652) * made initial edits * continued updates * finished initial config doc updates * updates * updates to query editor * edits to query editor * final edits prior to PR * more final edits :-) * edits based on feedback meeting * fixed some spelling and grammar issues * final edits * ran prettier * minor change to intro description * Fix prettier * Update docs/sources/datasources/mysql/query-editor/_index.md Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com> * Update docs/sources/datasources/mysql/query-editor/_index.md Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com> * Update docs/sources/datasources/mysql/query-editor/_index.md Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com> * edits based on feedback * fixed mistake * Fix prettier * fixed ref UIs, edits based on feedback * one minor change * ran prettier again --------- Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com> (cherry picked from commit `ab6d82a33c`)	2025-01-13 16:32:35 -06:00
grafana-delivery-bot[bot]	578f49a7f6	[v11.3.x] OAuth: Return SocialError on membership check failure (#98860 ) OAuth: Return SocialError on membership check failure (#98330) use socialerror (cherry picked from commit `ddca09fb02`) Co-authored-by: Daniel-Davies <33356828+Daniel-Davies@users.noreply.github.com>	2025-01-13 12:05:54 +02:00
grafana-delivery-bot[bot]	2d8c7ea350	[v11.3.x] InfluxDB: Adhoc filters can use template vars as values (#98785 ) InfluxDB: adhoc filters can use template vars as values (#98567) --------- Co-authored-by: Ivan Ortega <ivanortegaalba@gmail.com> (cherry picked from commit `be1505f2fb`) Co-authored-by: Andrew Hackmann <5140848+bossinc@users.noreply.github.com>	2025-01-10 15:08:23 +01:00
grafana-delivery-bot[bot]	8c94782840	[v11.3.x] ContactPoints: Remove blank lines prefixes in contact point types (#98765 ) ContactPoints: Remove blank lines prefixes in contact point types (#98590) Remove blank lines prefixes in contact point types (cherry picked from commit `7cad430ca7`) Co-authored-by: Selene <selenepinillos@gmail.com>	2025-01-10 11:37:17 +01:00
grafana-delivery-bot[bot]	df60e9f905	[v11.3.x] Grafana UI: Re-add react-router-dom as a dependency (#98421 ) Grafana UI: Re-add react-router-dom as a dependency (#97540) * chore(grafana/ui): add react-router-dom v5 as a dependency * chore(grafana-ui): align version of react-router with core --------- Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com> (cherry picked from commit `7e4b05c268`) Co-authored-by: Levente Balogh <balogh.levente.hu@gmail.com>	2025-01-10 09:50:47 +01:00
Oscar Kilhed	27dfafe1c8	[v11.3.x] Dashboards: Fix issue where filtered panels would not react to variable changes (#98733 ) * Dashboards: Fix issue where filtered panels would not react to variable changes (#98718) * Make sure we activate the parent and tree even if current panel is active * force activate full scene object tree --------- Co-authored-by: Sergej-Vlasov <sergej.s.vlasov@gmail.com> (cherry picked from commit `56be39ed4f`) * Fix bad merge	2025-01-10 01:26:16 -06:00
grafana-delivery-bot[bot]	82e7325214	[v11.3.x] Use v2 of publishing workflow that checks out HEAD of version branch on tag events (#98585 ) Co-authored-by: Jack Baldry <jack.baldry@grafana.com>	2025-01-07 13:21:42 +02:00
Jay	7f0a01fa98	Update index.md (#95707 )	2025-01-06 11:45:08 -05:00
grafana-delivery-bot[bot]	6e824e5f5b	[v11.3.x] EmbedPanel: Add url sync and fix refresh (#98526 ) EmbedPanel: Add url sync and fix refresh (#98390) (cherry picked from commit `4631707276`) Co-authored-by: Juan Cabanas <juan.cabanas@grafana.com>	2025-01-06 11:12:30 -03:00
grafana-delivery-bot[bot]	1bdfc4c017	[v11.3.x] OptionsPicker: Fix matching non-latin template vars in filter (#98424 ) OptionsPicker: Fix matching non-latin template vars in filter (#98416) (cherry picked from commit `e43e86376e`) Co-authored-by: Leon Sorokin <leeoniya@gmail.com>	2024-12-31 14:24:08 +02:00
grafana-delivery-bot[bot]	d6727bea41	[v11.3.x] Update `make docs` procedure (#98401 ) Co-authored-by: grafanabot <bot@grafana.com> Co-authored-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-12-30 12:16:15 +02:00
grafana-delivery-bot[bot]	f1995f23aa	[v11.3.x] Update `make docs` procedure (#98383 ) Co-authored-by: grafanabot <bot@grafana.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2024-12-27 14:23:36 +02:00
grafana-delivery-bot[bot]	5fef0fe76a	[v11.3.x] Docs: Updated Grafana Enterprise page with missing data sources (#98291 ) Docs: Updated Grafana Enterprise page with missing data sources (#98286) added 5 missing data sources, changed one name (cherry picked from commit `c172bbba50`) Co-authored-by: Larissa Wandzura <126723338+lwandz13@users.noreply.github.com>	2024-12-19 14:32:18 -06:00
grafana-delivery-bot[bot]	eda141bde1	[v11.3.x] Dashboards: Fixes week relative time ranges when weekStart was changed (#98268 ) Dashboards: Fixes week relative time ranges when weekStart was changed (#98167) * Dashborads: Fixes week relative time ranges when weekStart was changed * Fix * Update (cherry picked from commit `02aded2743`) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	2024-12-19 16:46:00 +02:00
grafana-delivery-bot[bot]	ca070a1792	[v11.3.x] Update configure-tempo-data-source.md (#98267 ) Update configure-tempo-data-source.md (#98228) (cherry picked from commit `848f03928c`) Co-authored-by: Kim Nylander <104772500+knylander-grafana@users.noreply.github.com>	2024-12-19 09:24:18 -05:00
grafana-delivery-bot[bot]	a8a86f35d3	[v11.3.x] Docs: Gauge visualization refactor (#98218 ) Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>	2024-12-18 12:57:09 -05:00
Erik Sundell	cb4368cbb9	[v11.3.x] Fix: Add support for datasource variable queries (#98118 ) Fix: Add support for datasource variable queries	2024-12-18 14:07:53 +01:00
Sergej-Vlasov	9cc0bfea57	Dependencies: Scenes bump 5.30 (#97745 ) (#97750 ) Dependencies: Scenes bump 5.40 (cherry picked from commit `4cbb56256c`) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	2024-12-18 11:25:13 +00:00
grafana-delivery-bot[bot]	6d9925ba21	[v11.3.x] Fix: Show organization attribute path only for GrafanaAdmins on the UI (#98044 ) Fix: Show organization attribute path only for GrafanaAdmins on the UI (#98002) * Show organization attribute path only for GrafanaAdmins * prettier (cherry picked from commit `7b24c4404d`) Co-authored-by: Misi <mgyongyosi@users.noreply.github.com>	2024-12-16 17:20:09 +02:00
grafana-delivery-bot[bot]	7d003d7394	[v11.3.x] Docs: fixing angular migration link (#96432 ) Docs: fixing angular migration link (#96431) fixing docs link (cherry picked from commit `c5320e2ae7`) Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>	2024-12-16 10:23:04 +01:00
grafana-delivery-bot[bot]	1b020db8b5	[v11.3.x] DateTimePicker: Fixes issue with date picker showing invalid date (#97970 ) DateTimePicker: Fixes issue with date picker showing invalid date (#97888) * DateTimePicker: Fixes issue with date picker showing invalid date * Fix lint (cherry picked from commit `d93a5a7c53`) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	2024-12-16 10:19:28 +01:00
Adam Yeats	c5000228dc	[v11.3.x] MSSQL: Bump `go-mssqldb` to v1.8.0 (#97834 ) MSSQL: Bump `go-mssqldb` to v1.8.0 (#97773) (cherry picked from commit `60f093e3d3`)	2024-12-13 16:19:01 +00:00
grafana-delivery-bot[bot]	7710a1cd1e	[v11.3.x] GrafanaData: Add now parameter to dateMath.parse to subsitute now string (#97910 ) GrafanaData: Add now parameter to dateMath.parse to subsitute now string (#97151) * Add now parameter to dateMath.parse to subsitute now string * Create new function, deprecate the old * Add docstring * Typo (cherry picked from commit `e3e7086a91`) Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>	2024-12-13 15:45:59 +01:00
grafana-delivery-bot[bot]	1f25f8af42	[v11.3.x] Docs: Fix broken link (#97905 ) Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com> Fix broken link (#97891)	2024-12-13 14:34:40 +01:00
grafana-delivery-bot[bot]	53f1f71aed	[v11.3.x] Azure: Add documentation for Basic Logs (#97876 ) Azure: Add documentation for Basic Logs (#97193) * Add documentation for Basic Logs * Lint * Update docs/sources/datasources/azure-monitor/query-editor/index.md Co-authored-by: Larissa Wandzura <126723338+lwandz13@users.noreply.github.com> --------- Co-authored-by: Larissa Wandzura <126723338+lwandz13@users.noreply.github.com> (cherry picked from commit `dbe2d7ac47`) Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	2024-12-12 18:43:59 +02:00
Gilles De Mey	706392e357	[v11.3.x] Alerting: AlertingQueryRunner should skip descendant nodes of invalid queries (#97829 ) Alerting: AlertingQueryRunner should skip descendant nodes of invalid queries (#97528) (cherry picked from commit `9c396b74f9`)	2024-12-12 16:58:07 +01:00
Mariell Hoversholm	d0a31e48d9	Backport `0a390cc069` from #97823 (#97860 )	2024-12-12 16:10:38 +01:00
grafana-delivery-bot[bot]	90aad8cfe7	[v11.3.x] Docs: Added clarification to Azure monitor config doc (#97809 ) Co-authored-by: Larissa Wandzura <126723338+lwandz13@users.noreply.github.com>	2024-12-11 19:00:51 +02:00
Andreas Christou	cc30b2fbb1	[v11.3.x] Azure Monitor: Add a feature flag to toggle user auth for Azure Monitor only (#97576 ) * Azure Monitor: Add a feature flag to toggle user auth for Azure Monitor only (#96858) * Azure Monitor: Add a feature flag to toggle user auth for Azure Monitor only * Fix condition for userIdentityEnabled * Re-add removed test * Remove unused prop * Refactor onAuthTypeChange in AzureCredentialsForm * Add frontend unit tests * Lint (cherry picked from commit `b898a4540d`) # Conflicts: # docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md # packages/grafana-data/src/types/featureToggles.gen.ts # pkg/services/featuremgmt/registry.go # pkg/services/featuremgmt/toggles_gen.csv # pkg/services/featuremgmt/toggles_gen.go # pkg/services/featuremgmt/toggles_gen.json * Update test * Fix lint --------- Co-authored-by: Adam Yeats <16296989+adamyeats@users.noreply.github.com>	2024-12-10 11:20:17 +00:00
Sergej-Vlasov	0e6bcba4a8	Dashboards: Fixes issue with panel header showing even when hide time override was enabled (#97389 ) Dashboards: Fixes issue with panel header showing even when hide time override was enabled (#95814) * Dashboards: Fixes issue with panel header showing even when hide time override was enabled * fixes * fixed test (cherry picked from commit `6fd3620d50`) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	2024-12-10 10:06:07 +00:00
grafana-delivery-bot[bot]	ed48cf0851	[v11.3.x] Docs: pie chart visualization refactor (#97706 ) Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>	2024-12-09 15:53:44 -05:00
Isabel Matwawana	e7584b9339	[v11.3.x] Docs: heatmap visualization refactor (#97685 )	2024-12-09 11:53:01 -05:00
grafana-delivery-bot[bot]	bcfa03ba39	[v11.3.x] Docs: alert list visualization refactor (#97670 ) Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>	2024-12-09 10:59:56 -05:00
grafana-delivery-bot[bot]	34da17fcb7	[v11.3.x] Docs: state timeline visualization refactor (#97666 ) Co-authored-by: Isabel Matwawana <76437239+imatwawana@users.noreply.github.com>	2024-12-09 10:50:24 -05:00
grafana-delivery-bot[bot]	3d545a989f	[v11.3.x] DashboardScenes: Fix panel links to update on variable or timerange change (#97633 ) DashboardScenes: Fix panel links to update on variable or timerange change (#94865) * Fix panel links to update on variable or timerange change * refactor --------- Co-authored-by: alexandra vargas <alexa1866@gmail.com> (cherry picked from commit `beac7de4df`) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>	2024-12-09 13:34:47 +02:00
grafana-delivery-bot[bot]	0709fad9e6	[v11.3.x] Azure/GCM: Improve error display (#97593 ) * Azure/GCM: Improve error display (#96921) Improve handling of errors (cherry picked from commit `9f75a448d4`) * Update import and var name --------- Co-authored-by: Andreas Christou <andreas.christou@grafana.com>	2024-12-06 22:03:03 +02:00
grafana-delivery-bot[bot]	a01883f0d0	[v11.3.x] Docs: Updating ldd example command for image renderer troubleshooting (#97550 ) Docs: Updating ldd example command for image renderer troubleshooting (#97443) (cherry picked from commit `0025876659`) Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>	2024-12-06 06:37:46 -06:00
grafana-delivery-bot[bot]	09793d8ce7	[v11.3.x] docs: update Logs in Explore topic (#97525 ) docs: update Logs in Explore topic (#97517) * docs: update Logs in Explore topic * Fixes from prettier --------- Co-authored-by: Kim Nylander <kim.nylander@grafana.com> (cherry picked from commit `bf5fef8b64`) Co-authored-by: J Stickler <julie.stickler@grafana.com>	2024-12-05 17:51:59 -05:00
grafana-delivery-bot[bot]	5b5b9269a4	[v11.3.x] CI: Fix `latest` tag not being correctly applied to releases (#97520 ) CI: Fix `latest` tag not being correctly applied to releases (#96497) * baldm0mma/tag_latest_bug/ update github-release.yml default values * baldm0mma/tag_latest_bug/ update release-comms.yml * baldm0mma/tag_latest_bug/ update logic * baldm0mma/tag_latest_bug/ update logic * baldm0mma/tag_latest_bug/ update logic * baldm0mma/tag_latest_bug/ update logic for both cases * baldm0mma/tag_latest_bug/ update comment (cherry picked from commit `d8c19136bf`) Co-authored-by: Jev Forsberg <46619047+baldm0mma@users.noreply.github.com>	2024-12-05 15:32:19 -07:00
grafana-delivery-bot[bot]	61c930162f	[v11.3.x] Dashboard: Fixes issue with compatability of old DashboardModel.annotations (#97467 ) Dashboard: Fixes issue with compatability of old DashboardModel.annotations (#97328) * Dashboard: Fixes issue with compatability of old DashboardModel.annotations * let's lint this thing --------- Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> (cherry picked from commit `53cdbd8a2d`) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	2024-12-05 14:10:59 +01:00
grafana-delivery-bot[bot]	5db3aacd81	[v11.3.x] Loki query option: fix step validation (#97416 ) Loki query option: fix step validation (#96977) (cherry picked from commit `f78cd0761b`) Co-authored-by: Matias Chomicki <matyax@gmail.com>	2024-12-05 11:17:12 +01:00
grafana-delivery-bot[bot]	6a203fa621	[v11.3.x] removing outdated versioning info from GCM data source docs (#97444 ) removing outdated versioning info from GCM data source docs (#96854) * removing outdated versioning info from GCM data source docs * deleting missed admonition closure (cherry picked from commit `3724ffd858`) Co-authored-by: Jacob Valdez <jacob.valdez@grafana.com>	2024-12-04 16:38:41 -06:00
github-actions[bot]	ad7fd4ea2b	Release: 11.3.2 (#97437 ) * Update changelog * Update version to 11.3.2 * bump @grafana/plugin-configs to 11.3.2 in grafana-extensionstest-app/package.json --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Kevin Yu <kevinwcyu@users.noreply.github.com>	2024-12-04 12:50:11 -08:00
grafana-delivery-bot[bot]	4a8b4d2496	[v11.3.x] Unified Storage: Use tls preferred when grafana db using ssl (#97379 ) Unified Storage: Use tls preferred when grafana db using ssl (#97378) When unified storage is using the grafana db (default case for on-prem), if the db is using ssl then set tls=preferred. This fixes an on-prem bug in 11.3.1. (cherry picked from commit `9642eedce6`) Co-authored-by: owensmallwood <owen.smallwood@grafana.com>	2024-12-04 10:16:52 -06:00