apply security patch: v11.1.x/309-202501232104.patch

commit c4ee6f4b2c1d9388013a952e87d12181d68665e7
Author: Matt Jacobson <matthew.jacobson@grafana.com>
Date:   Thu Jan 23 15:55:00 2025 -0500

    CVE-2024-11741 - victorops url

.betterer.results

@@ -2952,7 +2952,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "14"]
     ],
     "public/app/features/dashboard-scene/serialization/transformSceneToSaveModel.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],

.drone.star

@@ -17,18 +17,10 @@ load(
     "publish_npm_pipelines",
     "publish_packages_pipeline",
 )
-load(
-    "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_windows_test_image_pipeline",
-)
 load(
     "scripts/drone/pipelines/publish_images.star",
     "publish_image_pipelines_public",
 )
-load(
-    "scripts/drone/pipelines/windows.star",
-    "windows_test_backend",
-)
 load(
     "scripts/drone/rgm.star",
     "rgm",
@@ -44,12 +36,7 @@ def main(_ctx):
         publish_npm_pipelines() +
         publish_packages_pipeline() +
         rgm() +
-        [windows_test_backend({
-            "event": ["promote"],
-            "target": ["test-windows"],
-        }, "oss", "testing")] +
         integration_test_pipelines() +
-        publish_ci_windows_test_image_pipeline() +
         cronjobs() +
         secrets()
     )

.github/CODEOWNERS

@@ -43,12 +43,12 @@
 /docs/sources/dashboards/                                                         @imatwawana
 /docs/sources/datasources/                                                        @jdbaldry
 /docs/sources/explore/                                                            @grafana/explore-squad @lwandz13
-/docs/sources/fundamentals                                                        @chri2547
-/docs/sources/getting-started/                                                    @chri2547
-/docs/sources/introduction/                                                       @chri2547
+/docs/sources/fundamentals                                                        @irenerl24
+/docs/sources/getting-started/                                                    @irenerl24
+/docs/sources/introduction/                                                       @irenerl24
 /docs/sources/panels-visualizations/                                              @imatwawana
 /docs/sources/release-notes/                                                      @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/                                                      @chri2547
+/docs/sources/setup-grafana/                                                      @irenerl24
 /docs/sources/upgrade-guide/                                                      @imatwawana
 /docs/sources/whatsnew/                                                           @imatwawana
 

.github/workflows/changelog.yml

@@ -3,6 +3,7 @@ on:
   workflow_call:
     inputs:
       version:
+        type: string
         required: true
         description: 'Target release version (semver, git tag, branch or commit)'
       target:
@@ -12,14 +13,21 @@ on:
       dry_run:
         required: false
         default: false
-        type: bool
+        type: boolean
       latest:
         required: false
         default: false
-        type: bool
+        type: boolean
+    secrets:
+      GRAFANA_DELIVERY_BOT_APP_ID:
+        required: true
+      GRAFANA_DELIVERY_BOT_APP_PEM:
+        required: true
+
   workflow_dispatch:
     inputs:
       version:
+        type: string
         required: true
         description: 'Target release version (semver, git tag, branch or commit)'
       target:
@@ -29,13 +37,14 @@ on:
       dry_run:
         required: false
         default: false
-        type: bool
+        type: boolean
       latest:
         required: false
         default: false
-        type: bool
+        type: boolean
 
 permissions:
+  contents: write
   pull-requests: write
 
 jobs:
@@ -53,18 +62,26 @@ jobs:
       - name: "Checkout Grafana repo"
         uses: "actions/checkout@v4"
         with:
+          ref: main
           sparse-checkout: |
             .github/workflows
             CHANGELOG.md
+            .nvmrc
+            .prettierignore
+            .prettierrc.js
           fetch-depth: 0
           fetch-tags: true
+      - name: Setup nodejs environment
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
       - name: "Configure git user"
         run: |
           git config --local user.name "github-actions[bot]"
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local --add --bool push.autoSetupRemote true
       - name: "Create branch"
-        run: git checkout -b "release/${{ github.run_id }}/${{ inputs.version }}"
+        run: git checkout -b "changelog/${{ github.run_id }}/${{ inputs.version }}"
       - name: "Generate changelog"
         id: changelog
         uses: ./.github/workflows/actions/changelog
@@ -101,20 +118,22 @@ jobs:
           fi
 
           git diff CHANGELOG.md
-          git add CHANGELOG.md
+
+      - name: "Prettify CHANGELOG.md"
+        run: npx prettier --write CHANGELOG.md
       - name: "Commit changelog changes"
-        run: git commit --allow-empty -m "Update changelog" CHANGELOG.md
+        run: git add CHANGELOG.md && git commit --allow-empty -m "Update changelog" CHANGELOG.md
       - name: "git push"
         if: ${{ inputs.dry_run }} != true
         run: git push
       - name: "Create changelog PR"
-        if: "${{ inputs.backport == '' }}"
         run: >
           gh pr create \
-            $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
             --dry-run=${{ inputs.dry_run }} \
+            --label "no-backport" \
+            --label "no-changelog" \
             -B "${{ inputs.target }}" \
-            --title "Release: ${{ inputs.version }}" \
+            --title "Release: update changelog for ${{ inputs.version }}" \
             --body "Changelog changes for release ${{ inputs.version }}"
         env:
           GH_TOKEN: ${{ steps.generate_token.outputs.token }}

.github/workflows/doc-validator.yml

@@ -1,13 +1,18 @@
 name: "doc-validator"
 on:
-  pull_request:
-    paths: ["docs/sources/**"]
   workflow_dispatch:
+    inputs:
+      include:
+        description: |
+          Regular expression that matches paths to include in linting.
+
+          For example: docs/sources/(?:alerting|fundamentals)/.+\.md
+        required: true
 jobs:
   doc-validator:
     runs-on: "ubuntu-latest"
     container:
-      image: "grafana/doc-validator:v5.0.0"
+      image: "grafana/doc-validator:v5.2.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -15,15 +20,7 @@ jobs:
         # Only run doc-validator on specific directories.
         run: >
           doc-validator
-          '--include=^docs/sources/(?:alerting|fundamentals|getting-started|introduction|setup-grafana|upgrade-guide|whatsnew/whats-new-in-v(?:9|10))/.+\.md$'
+          '--include=${{ inputs.include }}'
           '--skip-checks=^(?:image.+|canonical-does-not-match-pretty-URL)$'
           ./docs/sources
           /docs/grafana/latest
-          | reviewdog
-          -f=rdjsonl
-          --fail-on-error
-          --filter-mode=nofilter
-          --name=doc-validator
-          --reporter=github-pr-review
-        env:
-          REVIEWDOG_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/github-release.yml

@@ -8,7 +8,7 @@ on:
         type: string
       latest:
         required: false
-        default: false
+        default: "0"
         description: Mark this release as latest (`1`) or not (`0`, default)
         type: string
       dry_run:
@@ -23,6 +23,7 @@ on:
         type: string
       latest:
         required: false
+        default: "0"
         description: Mark this release as latest (`1`) or not (`0`, default)
         type: string
       dry_run:

.github/workflows/publish-technical-documentation-next.yml

@@ -1,38 +1,21 @@
-name: "publish-technical-documentation-next"
+name: publish-technical-documentation-next
 
 on:
   push:
     branches:
-      - "main"
+      - main
     paths:
       - "docs/sources/**"
   workflow_dispatch:
 jobs:
   sync:
     if: github.repository == 'grafana/grafana'
-    runs-on: "ubuntu-latest"
+    permissions:
+      contents: read
+      id-token: write
+    runs-on: ubuntu-latest
     steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v4"
-
-      - name: "Clone website-sync Action"
-        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-        # GitHub administrator to update the organization secret.
-        # The IT helpdesk can update the organization secret.
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to website repository (next)"
-        uses: "./.github/actions/website-sync"
-        id: "publish-next"
+      - uses: actions/checkout@v4
+      - uses: grafana/writers-toolkit/publish-technical-documentation@publish-technical-documentation/v1
         with:
-          repository: "grafana/website"
-          branch: "master"
-          host: "github.com"
-          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-          # GitHub administrator to update the organization secret.
-          # The IT helpdesk can update the organization secret.
-          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
-          source_folder: "docs/sources"
-          target_folder: "content/docs/grafana/next"
+          website_directory: content/docs/grafana/next

.github/workflows/publish-technical-documentation-release.yml

@@ -1,4 +1,4 @@
-name: "publish-technical-documentation-release"
+name: publish-technical-documentation-release
 
 on:
   push:
@@ -12,63 +12,18 @@ on:
 jobs:
   sync:
     if: github.repository == 'grafana/grafana'
-    runs-on: "ubuntu-latest"
+    permissions:
+      contents: read
+      id-token: write
+    runs-on: ubuntu-latest
     steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v4"
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
-      - name: "Checkout Actions library"
-        uses: "actions/checkout@v4"
+      - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v2
         with:
-          repository: "grafana/grafana-github-actions"
-          path: "./actions"
-
-      - name: "Install Actions from library"
-        run: "npm install --production --prefix ./actions"
-
-      - name: "Determine if there is a matching release tag"
-        id: "has-matching-release-tag"
-        uses: "./actions/has-matching-release-tag"
-        with:
-          ref_name: "${{ github.ref_name }}"
-          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
-          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
-
-      - name: "Determine technical documentation version"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./actions/docs-target"
-        id: "target"
-        with:
-          ref_name: "${{ github.ref_name }}"
-
-      - name: "Clone website-sync Action"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-        # GitHub administrator to update the organization secret.
-        # The IT helpdesk can update the organization secret.
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Switch to HEAD of version branch for tags"
-        # Tags aren't necessarily made to the HEAD of the version branch.
-        # The documentation to be published is always on the HEAD of the version branch.
-        if: "steps.has-matching-release-tag.outputs.bool == 'true' && github.ref_type == 'tag'"
-        run: "git switch --detach origin/${{ steps.target.outputs.target }}.x"
-
-      - name: "Publish to website repository (release)"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./.github/actions/website-sync"
-        id: "publish-release"
-        with:
-          repository: "grafana/website"
-          branch: "master"
-          host: "github.com"
-          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-          # GitHub administrator to update the organization secret.
-          # The IT helpdesk can update the organization secret.
-          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
-          source_folder: "docs/sources"
-          target_folder: "content/docs/grafana/${{ steps.target.outputs.target }}"
+          release_tag_regexp: "^v(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: ""

.github/workflows/release-comms.yml

@@ -8,10 +8,11 @@ on:
       dry_run:
         required: false
         default: true
+        type: boolean
       version:
         required: true
       latest:
-        type: bool
+        type: boolean
         default: false
   pull_request:
     types:
@@ -30,17 +31,18 @@ jobs:
       latest: ${{ steps.output.outputs.latest }}
     runs-on: ubuntu-latest
     steps:
+      # The github-release action expects a `LATEST` value of a string of either '1' or '0'
     - if: ${{ github.event_name == 'workflow_dispatch' }}
       run: |
         echo setting up GITHUB_ENV for ${{ github.event_name }}
         echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
         echo "DRY_RUN=${{ inputs.dry_run }}" >> $GITHUB_ENV
-        echo "LATEST=${{ inputs.latest }}" >> $GITHUB_ENV
+        echo "LATEST=${{ inputs.latest && '1' || '0' }}" >> $GITHUB_ENV
     - if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') }}
       run: |
-        echo "VERSION=$(echo ${{ github.head_ref }} | sed -e 's/release\///g')" >> $GITHUB_ENV
-        echo "DRY_RUN=true" >> $GITHUB_ENV
-        echo "LATEST=${{ contains(github.event.pull_request.labels.*.name, 'release/latest') }}" >> $GITHUB_ENV
+        echo "VERSION=$(echo ${{ github.head_ref }} | sed -e 's/release\/.*\///g')" >> $GITHUB_ENV
+        echo "DRY_RUN=${{ contains(github.event.pull_request.labels.*.name, 'release/dry-run') }}" >> $GITHUB_ENV
+        echo "LATEST=${{ contains(github.event.pull_request.labels.*.name, 'release/latest') && '1' || '0' }}" >> $GITHUB_ENV
     - id: output
       run: |
         echo "dry_run: $DRY_RUN"
@@ -68,6 +70,7 @@ jobs:
     with:
       version: ${{ needs.setup.outputs.version }}
       dry_run: ${{ needs.setup.outputs.dry_run == 'true' }}
+      latest: ${{ needs.setup.outputs.latest }}
   post_on_slack:
     needs: setup
     runs-on: ubuntu-latest

.github/workflows/release-pr.yml

@@ -23,11 +23,11 @@ on:
       dry_run:
         required: false
         default: false
-        type: bool
+        type: boolean
       latest:
         required: false
         default: false
-        type: bool
+        type: boolean
 
 permissions:
   contents: write
@@ -42,6 +42,9 @@ jobs:
       latest: ${{ inputs.latest }}
       dry_run: ${{ inputs.dry_run }}
       target: main
+    secrets:
+      GRAFANA_DELIVERY_BOT_APP_ID: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+      GRAFANA_DELIVERY_BOT_APP_PEM: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
   create-prs:
     name: Create Release PR
     runs-on: ubuntu-latest
@@ -53,13 +56,23 @@ jobs:
         with:
           app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
           private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
-
       - name: Checkout Grafana
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.target }}
           fetch-depth: 0
           fetch-tags: true
-
+      - name: Checkout Grafana (main)
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: '0'
+          fetch-tags: 'false'
+          path: .grafana-main
+      - name: Setup nodejs environment
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
       - name: Configure git user
         run: |
           git config --local user.name "github-actions[bot]"
@@ -68,15 +81,13 @@ jobs:
 
       - name: Create branch
         run: git checkout -b "release/${{ github.run_id }}/${{ inputs.version }}"
-
       - name: Generate changelog
         id: changelog
-        uses: ./.github/workflows/actions/changelog
+        uses: ./.grafana-main/.github/workflows/actions/changelog
         with:
           github_token: ${{ steps.generate_token.outputs.token }}
           target: v${{ inputs.version }}
           output_file: changelog_items.md
-
       - name: Patch CHANGELOG.md
         run: |
           # Prepare CHANGELOG.md content with version delimiters
@@ -108,29 +119,32 @@ 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
-        run: git commit --allow-empty -m "Update changelog placeholder" CHANGELOG.md
+        run: git add CHANGELOG.md && git commit --allow-empty -m "Update changelog" CHANGELOG.md
 
       - name: Update package.json versions
-        uses: ./pkg/build/actions/bump-version
+        uses: ./.grafana-main/pkg/build/actions/bump-version
         with:
-          version: ${{ inputs.version }}
+          version: 'patch'
 
       - name: Add package.json changes
         run: |
-          git add .
+          git add package.json lerna.json yarn.lock packages public
           git commit -m "Update version to ${{ inputs.version }}"
 
       - name: Git push
         if: ${{ inputs.dry_run }} != true
-        run: git push
+        run: git push --set-upstream origin release/${{ github.run_id }}/${{ inputs.version }}
 
       - name: Create PR without backports
         if: "${{ inputs.backport == '' }}"
         run: >
           gh pr create \
             $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
+            -l "no-changelog" \
             --dry-run=${{ inputs.dry_run }} \
             -B "${{ inputs.target }}" \
             --title "Release: ${{ inputs.version }}" \
@@ -143,8 +157,8 @@ jobs:
         run: >
           gh pr create \
             $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
-            -l "backport ${{ inputs.backport }}" \
             -l "product-approved" \
+            -l "no-changelog" \
             --dry-run=${{ inputs.dry_run }} \
             -B "${{ inputs.target }}" \
             --title "Release: ${{ inputs.version }}" \

CHANGELOG.md

@@ -1,3 +1,162 @@
+<!-- 11.1.10 START -->
+
+# 11.1.10 (2024-12-04)
+
+### Bug fixes
+
+- **Fix:** Do not fetch Orgs if the user is authenticated by apikey/sa or render key [#97261](https://github.com/grafana/grafana/pull/97261), [@mgyongyosi](https://github.com/mgyongyosi)
+
+<!-- 11.1.10 END -->
+<!-- 11.1.9 START -->
+
+# 11.1.9 (2024-11-19)
+
+### Features and enhancements
+
+- **Alerting:** Make context deadline on AlertNG service startup configurable [#96132](https://github.com/grafana/grafana/pull/96132), [@fayzal-g](https://github.com/fayzal-g)
+- **User:** Check SignedInUser OrgID in RevokeInvite [#95488](https://github.com/grafana/grafana/pull/95488), [@mgyongyosi](https://github.com/mgyongyosi)
+
+### Bug fixes
+
+- **Alerting:** Force refetch prom rules when refreshing panel [#96123](https://github.com/grafana/grafana/pull/96123), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Anonymous User:** Adds validator service for anonymous users [#94992](https://github.com/grafana/grafana/pull/94992), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **Anonymous User:** Adds validator service for anonymous users (Enterprise)
+- **Azure Monitor:** Support metric namespaces fallback [#95153](https://github.com/grafana/grafana/pull/95153), [@aangelisc](https://github.com/aangelisc)
+- **Azure:** Fix duplicated traces in multi-resource trace query [#95245](https://github.com/grafana/grafana/pull/95245), [@aangelisc](https://github.com/aangelisc)
+- **Azure:** Handle namespace request rejection [#95907](https://github.com/grafana/grafana/pull/95907), [@aangelisc](https://github.com/aangelisc)
+- **Migration:** Remove table aliasing in delete statement to make it work for mariadb [#95230](https://github.com/grafana/grafana/pull/95230), [@kalleep](https://github.com/kalleep)
+- **Prometheus:** Fix interpolating adhoc filters with template variables [#95977](https://github.com/grafana/grafana/pull/95977), [@cazeaux](https://github.com/cazeaux)
+- **ServerLock:** Fix pg concurrency/locking issue [#95933](https://github.com/grafana/grafana/pull/95933), [@mgyongyosi](https://github.com/mgyongyosi)
+- **ServerSideExpressions:** Disable SQL Expressions to prevent RCE and LFI vulnerability [#94969](https://github.com/grafana/grafana/pull/94969), [@scottlepp](https://github.com/scottlepp)
+
+<!-- 11.1.9 END -->
+<!-- 11.1.8 START -->
+
+# 11.1.8 (2024-10-22)
+
+### Bug fixes
+
+- **Alerting:** Fix incorrect permission on POST external rule groups endpoint [CVE-2024-8118] [#93948](https://github.com/grafana/grafana/pull/93948), [@alexweav](https://github.com/alexweav)
+- **AzureMonitor:** Fix App Insights portal URL for multi-resource trace queries [#94474](https://github.com/grafana/grafana/pull/94474), [@aangelisc](https://github.com/aangelisc)
+- **OrgSync:** Do not set default Organization for a user to a non-existent Organization [#94551](https://github.com/grafana/grafana/pull/94551), [@mgyongyosi](https://github.com/mgyongyosi)
+- **ServerSideExpressions:** Disable SQL Expressions to prevent RCE and LFI vulnerability [#94969](https://github.com/grafana/grafana/pull/94969), [@scottlepp](https://github.com/scottlepp)
+
+<!-- 11.1.8 END -->
+<!-- 11.1.7+security-01 START -->
+
+# 11.1.7+security-01 (2024-10-17)
+
+### Bug fixes
+
+- **SQL Expressions**: Fixes CVE-2024-9264
+
+<!-- 11.1.7+security-01 END -->
+<!-- 11.1.7 START -->
+
+# 11.1.7 (2024-10-01)
+
+### Features and enhancements
+
+- **Chore:** Bump Go to 1.22.7 [#93355](https://github.com/grafana/grafana/pull/93355), [@hairyhenderson](https://github.com/hairyhenderson)
+- **Chore:** Bump Go to 1.22.7 (Enterprise)
+
+### Bug fixes
+
+- **Alerting:** Fix preview of silences when label name contains spaces [#93050](https://github.com/grafana/grafana/pull/93050), [@tomratcliffe](https://github.com/tomratcliffe)
+- **Alerting:** Make query wrapper match up datasource UIDs if necessary [#93115](https://github.com/grafana/grafana/pull/93115), [@tomratcliffe](https://github.com/tomratcliffe)
+- **AzureMonitor:** Deduplicate resource picker rows [#93704](https://github.com/grafana/grafana/pull/93704), [@aangelisc](https://github.com/aangelisc)
+- **AzureMonitor:** Improve resource picker efficiency [#93439](https://github.com/grafana/grafana/pull/93439), [@aangelisc](https://github.com/aangelisc)
+- **AzureMonitor:** Remove Basic Logs retention warning [#93122](https://github.com/grafana/grafana/pull/93122), [@aangelisc](https://github.com/aangelisc)
+- **Correlations:** Limit access to correlations page to users who can access Explore [#93675](https://github.com/grafana/grafana/pull/93675), [@ifrost](https://github.com/ifrost)
+- **Plugins:** Avoid returning 404 for `AutoEnabled` apps [#93487](https://github.com/grafana/grafana/pull/93487), [@wbrowne](https://github.com/wbrowne)
+
+<!-- 11.1.7 END -->
+<!-- 11.1.6+security-01 START -->
+
+# 11.1.6+security-01 (2024-10-17)
+
+### Bug fixes
+
+- **SQL Expressions**: Fixes CVE-2024-9264
+
+<!-- 11.1.6+security-01 END -->
+<!-- 11.1.6 START -->
+
+# 11.1.6 (2024-09-26)
+
+### Features and enhancements
+
+- **Chore:** Update swagger ui (4.3.0 to 5.17.14) [#92341](https://github.com/grafana/grafana/pull/92341), [@ryantxu](https://github.com/ryantxu)
+
+### Bug fixes
+
+- **Templating:** Fix searching non-latin template variables [#92892](https://github.com/grafana/grafana/pull/92892), [@leeoniya](https://github.com/leeoniya)
+- **TutorialCard:** Fix link to tutorial not opening [#92646](https://github.com/grafana/grafana/pull/92646), [@eledobleefe](https://github.com/eledobleefe)
+- **Alerting:** Fixed CVE-2024-8118.
+
+### Plugin development fixes & changes
+
+- **Bugfix:** QueryField typeahead missing background color [#92316](https://github.com/grafana/grafana/pull/92316), [@mckn](https://github.com/mckn)
+
+<!-- 11.1.6 END -->
+<!-- 11.1.5 START -->
+
+# 11.1.5 (2024-08-27)
+
+### Bug fixes
+
+- **Alerting:** Fix permissions for prometheus rule endpoints [#91414](https://github.com/grafana/grafana/pull/91414), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Fix persisting result fingerprint that is used by recovery threshold [#91290](https://github.com/grafana/grafana/pull/91290), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Auditing:** Fix a possible crash when audit logger parses responses for failed requests (Enterprise)
+- **RBAC:** Fix an issue with server admins not being able to manage users in orgs that they don't belong to [#92273](https://github.com/grafana/grafana/pull/92273), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **RBAC:** Fix an issue with server admins not being able to manage users in orgs that they dont belong to (Enterprise)
+- **RBAC:** Fix seeder failures when inserting duplicated permissions (Enterprise)
+- **Snapshots:** Fix panic when snapshot_remove_expired is true [#91232](https://github.com/grafana/grafana/pull/91232), [@ryantxu](https://github.com/ryantxu)
+- **VizTooltip:** Fix positioning at bottom and right edges on mobile [#92137](https://github.com/grafana/grafana/pull/92137), [@leeoniya](https://github.com/leeoniya)
+
+### Plugin development fixes & changes
+
+- **Bugfix:** QueryField typeahead missing background color [#92316](https://github.com/grafana/grafana/pull/92316), [@mckn](https://github.com/mckn)
+
+<!-- 11.1.5 END -->
+<!-- 11.1.4 START -->
+
+# 11.1.4 (2024-08-14)
+
+### Bug fixes
+
+- **Swagger:** Fixed CVE-2024-6837.
+
+<!-- 11.1.4 END -->
+<!-- 11.1.3 START -->
+
+# 11.1.3 (2024-07-26)
+
+### Bug fixes
+
+- **RBAC**: Allow plugins to use scoped actions [#90946](https://github.com/grafana/grafana/pull/90946), [@gamab](https://github.com/gamab)
+
+<!-- 11.1.3 END -->
+<!-- 11.1.2 START -->
+
+# 11.1.2 (2024-07-26)
+
+<!-- 11.1.2 END -->
+<!-- 11.1.1 START -->
+
+# 11.1.1 (2024-07-25)
+
+### Bug fixes
+
+- **Alerting:** Skip fetching alerts for unsaved dashboards [#90074](https://github.com/grafana/grafana/pull/90074), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Skip loading alert rules for dashboards when disabled [#89905](https://github.com/grafana/grafana/pull/89905), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Support `utf8_strict_mode: false` in Mimir [#90148](https://github.com/grafana/grafana/pull/90148), [@gillesdemey](https://github.com/gillesdemey)
+- **Scenes:** Fixes issue with panel repeat height calculation [#90232](https://github.com/grafana/grafana/pull/90232), [@kaydelaney](https://github.com/kaydelaney)
+- **Table Panel:** Fix Image hover without datalinks [#89922](https://github.com/grafana/grafana/pull/89922), [@codeincarnate](https://github.com/codeincarnate)
+- **Tempo:** Fix grpc streaming support over pdc-agent [#90055](https://github.com/grafana/grafana/pull/90055), [@taylor-s-dean](https://github.com/taylor-s-dean)
+- **RBAC**: Allow plugins to use scoped actions [#90946](https://github.com/grafana/grafana/pull/90946), [@gamab](https://github.com/gamab)
+
+<!-- 11.1.1 END -->
 <!-- 11.1.0 START -->
 
 # 11.1.0 (2024-06-21)

Dockerfile

@@ -3,7 +3,7 @@
 ARG BASE_IMAGE=alpine:3.19.1
 ARG JS_IMAGE=node:20-alpine
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.22.4-alpine
+ARG GO_IMAGE=golang:1.22.11-alpine
 
 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder

Makefile

@@ -9,7 +9,7 @@ include .bingo/Variables.mk
 
 
 GO = go
-GO_VERSION = 1.22.4
+GO_VERSION = 1.22.11
 GO_FILES ?= ./pkg/... ./pkg/apiserver/... ./pkg/apimachinery/... ./pkg/promlib/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
 GO_RACE  := $(shell [ -n "$(GO_RACE)" -o -e ".go-race-enabled-locally" ] && echo 1 )

apps/.gitkeep

@@ -0,0 +1 @@
+# workaround for grafana-build quirk

conf/defaults.ini

@@ -1175,6 +1175,9 @@ enabled =
 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
 disabled_orgs =
 
+# Specify how long to wait for the alerting service to initialize
+initialization_timeout = 30s
+
 # Specify the frequency of polling for admin config changes.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 admin_config_poll_interval = 60s
@@ -1689,6 +1692,9 @@ ha_engine_address = "127.0.0.1:6379"
 # ha_engine_password allows setting an optional password to authenticate with the engine
 ha_engine_password = ""
 
+# ha_prefix is a prefix for keys in the HA engine. It's used to separate keys for different Grafana instances.
+ha_prefix =
+
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
 # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.

conf/sample.ini

@@ -1101,6 +1101,9 @@
 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
 ;disabled_orgs =
 
+# Specify how long to wait for the alerting service to initialize
+;initialization_timeout = 30s
+
 # Specify the frequency of polling for admin config changes.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;admin_config_poll_interval = 60s
@@ -1546,6 +1549,9 @@ max_annotations_to_keep =
 # ha_engine_password allows setting an optional password to authenticate with the engine
 ;ha_engine_password = ""
 
+# ha_prefix is a prefix for keys in the HA engine. It's used to separate keys for different Grafana instances.
+;ha_prefix =
+
 #################################### Grafana Image Renderer Plugin ##########################
 [plugin.grafana-image-renderer]
 # Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.

docs/.codespellignore

@@ -1,6 +0,0 @@
-aks
-eror
-iam
-wan
-[Operato Windrose](https://grafana.com/grafana/plugins/operato-windrose-panel/)
-sergent

docs/make-docs

@@ -6,6 +6,15 @@
 # [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.1.0 (2024-08-22)
+#
+# ### Added
+#
+# - Additional website mounts for projects that use the website repository.
+#
+#   Mounts are required for `make docs` to work in the website repository or with the website project.
+#   The Makefile is also mounted for convenient development of the procedure that repository.
+#
 # ## 8.0.1 (2024-07-01)
 #
 # ### Fixed
@@ -727,6 +736,9 @@ POSIX_HERESTRING
 
     _repo="$(repo_path website)"
     volumes="--volume=${_repo}/config:/hugo/config:z"
+    volumes="${volumes} --volume=${_repo}/content/guides:/hugo/content/guides:z"
+    volumes="${volumes} --volume=${_repo}/content/whats-new:/hugo/content/whats-new:z"
+    volumes="${volumes} --volume=${_repo}/Makefile:/hugo/Makefile:z"
     volumes="${volumes} --volume=${_repo}/layouts:/hugo/layouts:z"
     volumes="${volumes} --volume=${_repo}/scripts:/hugo/scripts:z"
   fi

docs/sources/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/index.md

@@ -15,6 +15,8 @@ weight: 250
 
 Team LBAC is available in private preview on Grafana Cloud for Loki created with basic authentication. Loki datasources for Team LBAC can only be created, provisioning is currently not available.
 
+You cannot configure LBAC rules for Grafana-provisioned data sources from the UI. Alternatively, you can replicate the setting of the provisioned data source in a new data source as described in [LBAC Configuration for New Loki Data Source](https://grafana.com/docs/grafana/latest/administration/data-source-management/teamlbac/configure-teamlbac-for-loki/#task-1-lbac-configuration-for-new-loki-data-source) and then add the LBAC configuration to the new data source.
+
 ## Before you begin
 
 To be able to use Team LBAC rules, you need to enable the feature toggle `teamHttpHeaders` on your Grafana instance. Contact support to enable the feature toggle for you.
@@ -42,4 +44,4 @@ We recommend that you remove all permissions for roles and teams that are not re
 1. Navigate to Data Source Permissions
    - Go to the permissions tab of the newly created Loki data source. Here, you'll find the Team LBAC rules section.
 
-For more information on how to setup Team LBAC rules for a Loki data source, [Add Team LBAC rules]({{< relref "./../create-teamlbac-rules/" >}}).
+For more information on how to setup Team LBAC rules for a Loki data source, refer to [Create Team LBAC rules for the Loki data source](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/data-source-management/teamlbac/create-teamlbac-rules/).

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

@@ -83,11 +83,8 @@ Grafana-managed rules are the most flexible alert rule type. They allow you to c
 Multiple alert instances can be created as a result of one alert rule (also known as a multi-dimensional alerting).
 
 {{% admonition type="note" %}}
-For Grafana Cloud, there are limits on how many Grafana-managed alert rules you can create. These are as follows:
-
-- Free: 100 alert rules
-- Paid: 2000 alert rules
-  {{% /admonition %}}
+For Grafana Cloud, you can create 100 free Grafana-managed alert rules.
+{{% /admonition %}}
 
 Grafana managed alert rules can only be edited or deleted by users with Edit permissions for the folder storing the rules.
 
@@ -256,7 +253,7 @@ 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 alert instance state to `Alerting`. It waits until the [pending period](ref:pending-period) has finished.                                                                                                                            |
+| 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).                                                                                                  |
 
@@ -265,7 +262,7 @@ You can also configure the alert instance state when its evaluation returns an e
 | 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 waits until the [pending period](ref:pending-period) has finished.                                                                                                                         |
+| 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).                                                                                               |
 

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

@@ -43,33 +43,35 @@ refs:
 
 # Configure data source-managed alert rules
 
-Create alert rules for an external Grafana Mimir or Loki instance that has ruler API enabled; these are called 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 an external Grafana Mimir or Loki instance can be edited or deleted by users with Editor or Admin roles.
+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 Prometheus or Loki data source. Otherwise, you will not be able to create or update Grafana Mimir managed alert rules.
+- 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.
 
-- For Grafana Mimir and Loki data sources, enable the Ruler API by configuring their respective services.
+- 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 >}}
+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 Prometheus data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
+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 %}}
 
-In the following sections, we’ll guide you through the process of creating your data source-managed alert rules.
-
 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

docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-amazon-sns.md

@@ -0,0 +1,57 @@
+---
+canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/configure-amazon-sns/
+description: Configure the Grafana Alerting - Amazon SNS integration to receive alert notifications when your alerts are firing.
+keywords:
+  - grafana
+  - alerting
+  - Amazon SNS
+  - integration
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+menuTitle: Amazon SNS
+title: Configure Amazon SNS for Alerting
+weight: 0
+---
+
+# Configure Amazon SNS for Alerting
+
+Use the Grafana Alerting - Amazon SNS integration to send notifications to Amazon SNS when your alerts are firing.
+
+## Before you begin
+
+To configure Amazon SNS to receive alert notifications, complete the following steps.
+
+1. Create a new topic in https://console.aws.amazon.com/sns.
+1. Open the topic and create a new subscription.
+1. Choose the protocol HTTPS.
+1. Copy the URL.
+
+For more information, refer to [Amazon SNS documentation](https://docs.aws.amazon.com/sns/latest/dg/welcome.html).
+
+## Procedure
+
+To create your Amazon SNS integration in Grafana Alerting, complete the following steps.
+
+1. Navigate to **Alerts & IRM** -> **Alerting** -> **Contact points**.
+1. Click **+ Add contact point**.
+1. Enter a contact point name.
+1. From the Integration list, select **AWS SNS**.
+1. Copy in the URL from above into the **The Amazon SNS API URL** field.
+1. Click **Test** to check that your integration works.
+1. Click **Save contact point**.
+
+## Next steps
+
+The Amazon SNS contact point is ready to receive alert notifications.
+
+To add this contact point to your alert, complete the following steps.
+
+1. In Grafana, navigate to **Alerting** > **Alert rules**.
+1. Edit or create a new alert rule.
+1. Scroll down to the **Configure labels and notifications** section.
+1. Under Notifications click **Select contact point**.
+1. From the drop-down menu, select the previously created contact point.
+1. **Click Save rule and exit**.

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

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Discord
 title: Configure Discord for Alerting
-weight: 10
+weight: 0
 ---
 
 # Configure Discord for Alerting

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

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Email
 title: Configure email for Alerting
-weight: 20
+weight: 0
 ---
 
 # Configure email for Alerting
@@ -75,6 +75,9 @@ To set up email integration, complete the following steps.
 1. Enter a contact point name.
 1. From the Integration list, select **Email**.
 1. Enter the email addresses you want to send notifications to.
+
+   E-mail addresses are case sensitive. Ensure that the e-mail address entered is correct.
+
 1. Click **Test** to check that your integration works.
 1. Click **Save contact point**.
 

docs/sources/alerting/configure-notifications/manage-contact-points/integrations/configure-google-chat.md

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Google Chat
 title: Configure Google Chat for Alerting
-weight: 30
+weight: 0
 ---
 
 # Configure Google Chat for Alerting

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

@@ -2,6 +2,7 @@
 aliases:
   - ../../../alerting-rules/manage-contact-points/configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/
   - ../../../alerting-rules/manage-contact-points/integrations/configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/integrations/configure-oncall/
+  - ../configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/
 canonical: https://grafana.com/docs/grafana/latest/alerting/configure-notifications/manage-contact-points/integrations/configure-oncall/
 description: Configure the Alerting - Grafana OnCall integration to connect alerts generated by Grafana Alerting with Grafana OnCall
 keywords:
@@ -9,8 +10,6 @@ keywords:
   - alerting
   - oncall
   - integration
-aliases:
-  - ../configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/
 labels:
   products:
     - cloud
@@ -18,7 +17,7 @@ labels:
     - oss
 menuTitle: Grafana OnCall
 title: Configure Grafana OnCall for Alerting
-weight: 40
+weight: 0
 ---
 
 # Configure Grafana OnCall for Alerting

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

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Opsgenie
 title: Configure Opsgenie for Alerting
-weight: 60
+weight: 0
 ---
 
 # Configure Opsgenie for Alerting

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

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Slack
 title: Configure Slack for Alerting
-weight: 80
+weight: 0
 refs:
   nested-policy:
     - pattern: /docs/grafana/

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

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Microsoft Teams
 title: Configure Microsoft Teams for Alerting
-weight: 50
+weight: 0
 ---
 
 # Configure Microsoft Teams for Alerting
@@ -22,15 +22,16 @@ Use the Grafana Alerting - Microsoft Teams integration to receive notifications
 
 ## Before you begin
 
-To set up Microsoft Teams for integration with Grafana Alerting, you need to create an incoming Webhook. This allows Grafana to send alert notifications to Microsoft Teams channels.
+To set up Microsoft Teams for integration with Grafana Alerting, create a new workflow that accepts Webhook requests. This allows Grafana to send alert notifications to Microsoft Teams channels.
 
-### Create an incoming Webhook in Microsoft Teams
+### Create a workflow in Microsoft Teams
 
-1. To add an incoming Webhook to a Teams channel, follow the steps in the [Create an Incoming Webhook guide](https://learn.microsoft.com/en-us/microsoftteams/platform/webhooks-and-connectors/how-to/add-incoming-webhook?tabs=newteams%2Cdotnet#create-an-incoming-webhook).
+1. To create a new workflow, follow the steps in [Create flows in Microsoft Teams](https://learn.microsoft.com/en-us/power-automate/teams/teams-app-create).
+1. Microsoft provides a template library. You can use the template **Post to a channel when a webhook request is received**.
+1. At the end of workflow creation wizard, copy the URL that is provided.
 
-   Note: The steps to create incoming Webhooks may vary depending on the version of Microsoft Teams you are using. You can switch between the "New Teams" and "Classic Teams" tabs to view the relevant instructions for your version.
-
-1. Copy the Webhook URL.
+**Note**
+If you chose a private channel for the target of the workflow, you need to edit workflow before using it. Expand the step "Send each adaptive card", and then expand action "Post your own adaptive card as the Flow bot to a channel". Change "Post as" to User, and save the workflow.
 
 ## Procedure
 
@@ -57,3 +58,7 @@ To add this contact point to your alert, complete the following steps.
 1. Under Notifications click **Select contact point**.
 1. From the drop-down menu, select the previously created contact point.
 1. **Click Save rule and exit**.
+
+## Troubleshooting
+
+- If Grafana reports that notification was sent successfully but it was not delivered to the channel, check the workflow's run history. You can find it in the workflow details page.

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

@@ -13,7 +13,7 @@ labels:
     - oss
 menuTitle: Telegram
 title: Configure Telegram for Alerting
-weight: 90
+weight: 0
 ---
 
 # Configure Telegram for Alerting

docs/sources/alerting/configure-notifications/manage-contact-points/integrations/pager-duty.md

@@ -14,7 +14,7 @@ labels:
     - oss
 menuTitle: PagerDuty
 title: Configure PagerDuty for Alerting
-weight: 70
+weight: 0
 ---
 
 # Configure PagerDuty for Alerting

docs/sources/alerting/configure-notifications/manage-contact-points/integrations/webhook-notifier.md

@@ -21,7 +21,7 @@ labels:
     - oss
 menuTitle: Webhook notifier
 title: Configure the webhook notifier for Alerting
-weight: 100
+weight: 0
 ---
 
 # Configure the webhook notifier for Alerting

docs/sources/alerting/configure-notifications/template-notifications/create-notification-templates.md

@@ -53,7 +53,7 @@ To create a notification template that contains more than one template:
 
 ## Preview notification templates
 
-Preview how your notification templates will look before using them in your contact points, helping you understand the result of the template you are creating as well as enabling you to fix any errors before saving it.
+Preview how your notification templates should look before using them in your contact points, helping you understand the result of the template you are creating as well as enabling you to fix any errors before saving it.
 
 **Note:** This feature is only for Grafana Alertmanager.
 
@@ -81,7 +81,7 @@ To preview your notification templates:
 
    c. Click **Add alert data**.
 
-   d. Click **Refresh preview** to see what your template content will look like and the corresponding payload data.
+   d. Click **Refresh preview** to see what your template content should look like and the corresponding payload data.
 
    If there are any errors in your template, they are displayed in the Preview and you can correct them before saving.
 
@@ -162,6 +162,86 @@ Resolved alerts:
    {{ template "email.message" . }}
    ```
 
+## Group multiple alert instances into one email notification
+
+To make alerts more concise, you can group multiple instances of a firing alert into a single email notification in a table format. This way, you avoid long, repetitive emails and make alerts easier to digest.
+
+Follow these steps to create a custom notification template that consolidates alert instances into a table.
+
+1. Modify the alert rule to include an annotation that is referenced in the notification template later on.
+1. Enter a name for the **custom annotation**: In this example, _ServerInfo_.
+1. Enter the following code as the value for the annotation. It retrieves the server's instance name and a corresponding metric value, formatted as a table row:
+
+   ```
+   {{ index $labels "instance" }}{{- "\t" -}}{{ index $values "A"}}{{- "\n" -}}
+   ```
+
+   This line of code returns the labels and their values in the form of a table. Assuming $labels has `{"instance": "node1"}` and $values has `{"A": "123"}`, the output would be:
+
+   ```
+   node1    123
+   ```
+
+1. Create a notification template that references the _ServerInfo_ annotation.
+
+   ```go
+   {{ define "Table" }}
+   {{- "\nHost\t\tValue\n" -}}
+   {{ range .Alerts -}}
+   {{ range .Annotations.SortedPairs -}}
+   {{ if (eq .Name  "ServerInfo") -}}
+   {{ .Value -}}
+   {{- end }}
+   {{- end }}
+   {{- end }}
+   {{ end }}
+   ```
+
+   The notification template outputs a list of server information from the "ServerInfo" annotation for each alert instance.
+
+1. Navigate to your contact point in Grafana
+1. In the **Message** field, reference the template by name (see **Optional Email settings** section):
+
+   ```
+   {{ template "Table" . }}
+   ```
+
+   This generates a neatly formatted table in the email, grouping information for all affected servers into a single notification.
+
+## Conditional notification template
+
+Template alert notifications based on a label. In this example the label represents a namespace.
+
+1. Use the following code in your notification template to display different messages based on the namespace:
+
+   ```go
+   {{ define "my_conditional_notification" }}
+   {{ if eq .CommonLabels.namespace "namespace-a" }}
+   Alert: CPU limits have reached 80% in namespace-a.
+   {{ else if eq .CommonLabels.namespace "namespace-b" }}
+   Alert: CPU limits have reached 80% in namespace-b.
+   {{ else if eq .CommonLabels.namespace "namespace-c" }}
+   Alert: CPU limits have reached 80% in namespace-c.
+   {{ else }}
+   Alert: CPU limits have reached 80% for {{ .CommonLabels.namespace }} namespace.
+   {{ end }}
+   {{ end }}
+   ```
+
+   `.CommonLabels` is a map containing the labels that are common to all the alerts firing.
+
+   Make sure to replace the `.namespace` label with a label that exists in your alert rule.
+
+1. Replace `namespace-a`, `namespace-b`, and `namespace-c` with your specific namespace values.
+1. Navigate to your contact point in Grafana
+1. In the **Message** field, reference the template by name (see **Optional settings** section):
+
+   ```
+   {{ template "my_conditional_notification" . }}
+   ```
+
+   This template alters the content of alert notifications depending on the namespace value.
+
 ## Template the title of a Slack message
 
 Template the title of a Slack message to contain the number of firing and resolved alerts:

docs/sources/alerting/fundamentals/_index.md

@@ -57,7 +57,11 @@ refs:
 
 # Introduction to Alerting
 
-Whether you’re just starting out or you're a more experienced user of Grafana Alerting, learn more about the fundamentals and available features that help you create, manage, and respond to alerts; and improve your team’s ability to resolve issues quickly. For a hands-on introduction, refer to our [tutorial to get started with Grafana Alerting](http://grafana.com/tutorials/alerting-get-started/).
+Whether you’re just starting out or you're a more experienced user of Grafana Alerting, learn more about the fundamentals and available features that help you create, manage, and respond to alerts; and improve your team’s ability to resolve issues quickly.
+
+{{< admonition type="tip" >}}
+For a hands-on introduction, refer to our [tutorial to get started with Grafana Alerting](http://grafana.com/tutorials/alerting-get-started/).
+{{< /admonition  >}}
 
 The following diagram gives you an overview of Grafana Alerting and introduces you to some of the fundamental features that are the principles of how Grafana Alerting works.
 

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

@@ -44,13 +44,13 @@ 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).                                                                                                                           |
-| **NoData**   | The state of an alert whose query returns no data or all values are null. You can [change the default behavior](/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/#configure-no-data-and-error-handling).          |
-| **Error**    | The state of an alert when an error or timeout occurred evaluating the alert rule. You can [change the default behavior](/docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/#configure-no-data-and-error-handling). |
+| 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" >}}
 
@@ -64,18 +64,46 @@ Alert instances will be routed for [notifications](ref:notifications) when they
 
 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**, **NoData**, or **Error** states transition to the **Normal** state as **Resolved**, and include the `grafana_state_reason` annotation with the value **MissingSeries**. They are routed for notifications like other resolved alert instances.
+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.
 
-### Keep last state
+### Modify the no data and error state
 
-The "Keep Last State" option helps mitigate temporary data source issues, preventing alerts from unintentionally firing, resolving, and re-firing.
-
-In [Configure no data and error handling,](ref:no-data-and-error-handling) you can decide to keep the last state of the alert instance when a `NoData` and/or `Error` state is encountered. Just like normal evaluation, the alert instance transitions from `Pending` to `Alerting` after the pending period has elapsed.
+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.
 
 {{< 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" >}}
 
+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.
+
+   To minimize timeouts resulting in the **Error** state, reduce the time range to request less data every evaluation cycle.
+
+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
+
+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` 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 `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 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 **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:

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

@@ -69,7 +69,7 @@ Grafana supports two different alert rule types: Grafana-managed alert rules and
 
 ## Grafana-managed alert rules
 
-Grafana-managed alert rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of the [supported data sources](#supported-data-sources), and use multiple data sources in a single alert rule.
+Grafana-managed alert rules are the most flexible alert rule type. They allow you to create alert rules that can act on data from any of the [supported data sources](#supported-data-sources), and use multiple data sources in a single alert rule. You can also add expressions to transform your data and set alert conditions. Using images in alert notifications is also supported.
 
 Additionally, you can also add [expressions to transform your data](ref:expression-queries), set custom alert conditions, and include [images in alert notifications](ref:notification-images).
 
@@ -87,9 +87,11 @@ Find the public data sources supporting Alerting in the [Grafana Plugins directo
 
 ## Data source-managed alert rules
 
-Data source-managed alert rules can improve query performance via [recording rules](#recording-rules) and ensure high-availability and fault tolerance when implementing a distributed architecture.
+Data source-managed alert rules can be used for Grafana Mimir or Grafana Loki data sources which have been configured to support rule creation.
 
-They are only supported for Prometheus-based or Loki data sources with the Ruler API enabled. For more information, refer to the [Loki Ruler API](/docs/loki/<GRAFANA_VERSION>/api/#ruler) or [Mimir Ruler API](/docs/mimir/<GRAFANA_VERSION>/references/http-api/#ruler).
+They can improve query performance via [recording rules](#recording-rules) and ensure high-availability and fault tolerance when implementing a distributed architecture.
+
+They are only supported for Grafana Mimir or Grafana Loki data sources with the Ruler API enabled. For more information, refer to the [Loki Ruler API](/docs/loki/<GRAFANA_VERSION>/api/#ruler) or [Mimir Ruler API](/docs/mimir/<GRAFANA_VERSION>/references/http-api/#ruler).
 
 {{< figure src="/media/docs/alerting/mimir-managed-alerting-architecture-v2.png" max-width="750px" caption="Mimir-managed alerting architecture" >}}
 

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

@@ -43,7 +43,7 @@ refs:
 
 In Grafana, queries fetch and transform data from [data sources,](ref:data-sources) which include databases like MySQL or PostgreSQL, time series databases like Prometheus or InfluxDB, and services like Amazon CloudWatch or Azure Monitor.
 
-A query specifies the desired data to retrieve from a data source and applies relevant filters or transformations. Query languages or syntax specific to the chosen data source are utilized for constructing these queries.
+A query specifies the data to extract from a data source, with the syntax varying based on the type of data source used.
 
 In Alerting, an alert rule defines of one or more queries and expressions that select the data you want to measure and a [condition](#alert-condition) that needs to be met before an alert rule fires.
 

docs/sources/alerting/set-up/configure-high-availability/_index.md

@@ -18,6 +18,17 @@ labels:
     - oss
 title: Configure high availability
 weight: 600
+refs:
+  state-history:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/alerting/manage-notifications/view-state-health/
+    - pattern: /docs/grafana-cloud/
+      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/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/alerting-and-irm/alerting/monitor/
 ---
 
 # Configure high availability
@@ -28,18 +39,13 @@ Grafana Alerting uses the Prometheus model of separating the evaluation of alert
 
 When running multiple instances of Grafana, all alert rules are evaluated on all instances. You can think of the evaluation of alert rules as being duplicated by the number of running Grafana instances. This is how Grafana Alerting makes sure that as long as at least one Grafana instance is working, alert rules are still be evaluated and notifications for alerts are still sent.
 
-You can find this duplication in state history and it is a good way to confirm if you are using high availability.
+You can find this duplication in state history and it is a good way to [verify your high availability setup](#verify-your-high-availability-setup).
 
-While the alert generator evaluates all alert rules on all instances, the alert receiver makes a best-effort attempt to avoid sending duplicate notifications. Alertmanager chooses availability over consistency, which may result in occasional duplicated or out-of-order notifications. It takes the opinion that duplicate or out-of-order notifications are better than no notifications.
+While the alert generator evaluates all alert rules on all instances, the alert receiver makes a best-effort attempt to avoid duplicate notifications. The alertmanagers use a gossip protocol to share information between them to prevent sending duplicated notifications.
 
-The Alertmanager uses a gossip protocol to share information about notifications between Grafana instances. It also gossips silences, which means a silence created on one Grafana instance is replicated to all other Grafana instances. Both notifications and silences are persisted to the database periodically, and during graceful shut down.
+Alertmanager chooses availability over consistency, which may result in occasional duplicated or out-of-order notifications. It takes the opinion that duplicate or out-of-order notifications are better than no notifications.
 
-{{% admonition type="note" %}}
-
-If using a mix of `execute_alerts=false` and `execute_alerts=true` on the HA nodes, since the alert state is not shared amongst the Grafana instances, the instances with `execute_alerts=false` do not show any alert status.
-This is because the HA settings (`ha_peers`, etc) only apply to the alert notification delivery (i.e. de-duplication of alert notifications, and silences, as mentioned above).
-
-{{% /admonition %}}
+Alertmanagers also gossip silences, which means a silence created on one Grafana instance is replicated to all other Grafana instances. Both notifications and silences are persisted to the database periodically, and during graceful shut down.
 
 ## Enable alerting high availability using Memberlist
 
@@ -54,8 +60,11 @@ Since gossiping of notifications and silences uses both TCP and UDP port `9094`,
    You must have at least one (1) Grafana instance added to the `ha_peers` section.
 1. Set `[ha_listen_address]` to the instance IP address using a format of `host:port` (or the [Pod's](https://kubernetes.io/docs/concepts/workloads/pods/) IP in the case of using Kubernetes).
    By default, it is set to listen to all interfaces (`0.0.0.0`).
+1. Set `[ha_advertise_address]` to the instance's hostname or IP address in the format "host:port". Use this setting when the instance is behind NAT (Network Address Translation), such as in Docker Swarm or Kubernetes service, where external and internal addresses differ. This address helps other cluster instances communicate with it. The setting is optional.
 1. Set `[ha_peer_timeout]` in the `[unified_alerting]` section of the custom.ini to specify the time to wait for an instance to send a notification via the Alertmanager. The default value is 15s, but it may increase if Grafana servers are located in different geographic regions or if the network latency between them is high.
 
+For a demo, see this [example using Docker Compose](https://github.com/grafana/alerting-ha-docker-examples/tree/main/memberlist).
+
 ## Enable alerting high availability using Redis
 
 As an alternative to Memberlist, you can use Redis for high availability. This is useful if you want to have a central
@@ -67,20 +76,9 @@ database for HA and cannot support the meshing of all Grafana servers.
 1. Optional: Set the username and password if authentication is enabled on the Redis server using `ha_redis_username` and `ha_redis_password`.
 1. Optional: Set `ha_redis_prefix` to something unique if you plan to share the Redis server with multiple Grafana instances.
 1. Optional: Set `ha_redis_tls_enabled` to `true` and configure the corresponding `ha_redis_tls_*` fields to secure communications between Grafana and Redis with Transport Layer Security (TLS).
+1. Set `[ha_advertise_address]` to `ha_advertise_address = "${POD_IP}:9094"` This is required if the instance doesn't have an IP address that is part of RFC 6890 with a default route.
 
-The following metrics can be used for meta monitoring, exposed by the `/metrics` endpoint in Grafana:
-
-| Metric                                               | Description                                                                                                    |
-| ---------------------------------------------------- | -------------------------------------------------------------------------------------------------------------- |
-| alertmanager_cluster_messages_received_total         | Total number of cluster messages received.                                                                     |
-| alertmanager_cluster_messages_received_size_total    | Total size of cluster messages received.                                                                       |
-| alertmanager_cluster_messages_sent_total             | Total number of cluster messages sent.                                                                         |
-| alertmanager_cluster_messages_sent_size_total        | Total number of cluster messages received.                                                                     |
-| alertmanager_cluster_messages_publish_failures_total | Total number of messages that failed to be published.                                                          |
-| alertmanager_cluster_members                         | Number indicating current number of members in cluster.                                                        |
-| alertmanager_peer_position                           | Position the Alertmanager instance believes it's in. The position determines a peer's behavior in the cluster. |
-| alertmanager_cluster_pings_seconds                   | Histogram of latencies for ping messages.                                                                      |
-| alertmanager_cluster_pings_failures_total            | Total number of failed pings.                                                                                  |
+For a demo, see this [example using Docker Compose](https://github.com/grafana/alerting-ha-docker-examples/tree/main/redis).
 
 ## Enable alerting high availability using Kubernetes
 
@@ -148,3 +146,58 @@ The following metrics can be used for meta monitoring, exposed by the `/metrics`
    ha_advertise_address = "${POD_IP}:9094"
    ha_peer_timeout = 15s
    ```
+
+## Verify your high availability setup
+
+When running multiple Grafana instances, all alert rules are evaluated on every instance. This multiple evaluation of alert rules is visible in the [state history](ref:state-history) and provides a straightforward way to verify that your high availability configuration is working correctly.
+
+{{% admonition type="note" %}}
+
+If using a mix of `execute_alerts=false` and `execute_alerts=true` on the HA nodes, since the alert state is not shared amongst the Grafana instances, the instances with `execute_alerts=false` do not show any alert status.
+
+The HA settings (`ha_peers`, etc.) apply only to communication between alertmanagers, synchronizing silences and attempting to avoid duplicate notifications, as described in the introduction.
+
+{{% /admonition %}}
+
+You can also confirm your high availability setup by monitoring Alertmanager metrics exposed by Grafana.
+
+| Metric                                               | Description                                                                                                                                                |
+| ---------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| alertmanager_cluster_members                         | Number indicating current number of members in cluster.                                                                                                    |
+| alertmanager_cluster_messages_received_total         | Total number of cluster messages received.                                                                                                                 |
+| alertmanager_cluster_messages_received_size_total    | Total size of cluster messages received.                                                                                                                   |
+| alertmanager_cluster_messages_sent_total             | Total number of cluster messages sent.                                                                                                                     |
+| alertmanager_cluster_messages_sent_size_total        | Total number of cluster messages received.                                                                                                                 |
+| alertmanager_cluster_messages_publish_failures_total | Total number of messages that failed to be published.                                                                                                      |
+| alertmanager_cluster_pings_seconds                   | Histogram of latencies for ping messages.                                                                                                                  |
+| alertmanager_cluster_pings_failures_total            | Total number of failed pings.                                                                                                                              |
+| alertmanager_peer_position                           | The position an Alertmanager instance believes it holds, which defines its role in the cluster. Peers should be numbered sequentially, starting from zero. |
+
+You can confirm the number of Grafana instances in your alerting high availability setup by querying the `alertmanager_cluster_members` and `alertmanager_peer_position` metrics.
+
+Note that these alerting high availability metrics are exposed via the `/metrics` endpoint in Grafana, and are not automatically collected or displayed. If you have a Prometheus instance connected to Grafana, add a `scrape_config` to scrape Grafana metrics and then query these metrics in Explore.
+
+```yaml
+- job_name: grafana
+  honor_timestamps: true
+  scrape_interval: 15s
+  scrape_timeout: 10s
+  metrics_path: /metrics
+  scheme: http
+  follow_redirects: true
+  static_configs:
+    - targets:
+        - grafana:3000
+```
+
+For more information on monitoring alerting metrics, refer to [Alerting meta-monitoring](ref:meta-monitoring). For a demo, see [alerting high availability examples using Docker Compose](https://github.com/grafana/alerting-ha-docker-examples/).
+
+## Prevent duplicate notifications
+
+In high-availability mode, each Grafana instance runs its own pre-configured alertmanager to handle alert notifications.
+
+When multiple Grafana instances are running, all alert rules are evaluated on each instance. By default, each instance sends firing alerts to its respective alertmanager. This results in notification handling being duplicated across all running Grafana instances.
+
+Alertmanagers in HA mode communicate with each other to coordinate notification delivery. However, this setup can sometimes lead to duplicated or out-of-order notifications. By design, HA prioritizes sending duplicate notifications over the risk of missing notifications.
+
+To avoid duplicate notifications, you can configure a shared alertmanager to manage notifications for all Grafana instances. For more information, refer to [add an external alertmanager](/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-alertmanager/).

docs/sources/alerting/set-up/configure-rbac/access-roles/index.md

@@ -43,19 +43,19 @@ Fixed roles provide users more granular access to create, view, and update Alert
 
 Details of the fixed roles and the access they provide for Grafana Alerting are below.
 
-| Fixed role                                   | Permissions                                                                                                                                                                                                                                                                 | Description                                                                                                                          |
-| -------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
-| `fixed:alerting.instances:writer`            | All permissions from `fixed:alerting.instances:reader` and<br> `alert.instances:create`<br>`alert.instances:write` for organization scope <br> `alert.instances.external:write` for scope `datasources:*`                                                                   | Create, update and expire all silences.                                                                                              |
-| `fixed:alerting.instances:reader`            | `alert.instances:read` for organization scope <br> `alert.instances.external:read` for scope `datasources:*`                                                                                                                                                                | Read all alerts and silences.                                                                                                        |
-| `fixed:alerting.notifications:writer`        | All permissions from `fixed:alerting.notifications:reader` and<br>`alert.notifications:write`for organization scope<br>`alert.notifications.external:read` for scope `datasources:*`                                                                                        | Create, update, and delete contact points, templates, mute timings and notification policies for Grafana and external Alertmanager.  |
-| `fixed:alerting.notifications:reader`        | `alert.notifications:read` for organization scope<br>`alert.notifications.external:read` for scope `datasources:*`                                                                                                                                                          | Read all Grafana and Alertmanager contact points, templates, and notification policies.                                              |
-| `fixed:alerting.rules:writer`                | All permissions from `fixed:alerting.rules:reader` and <br> `alert.rule:create` <br> `alert.rule:write` <br> `alert.rule:delete` <br> `alert.silences:create` <br> `alert.silences:write` for scope `folders:*` <br> `alert.rules.external:write` for scope `datasources:*` | Create, update, and delete all alert rules and manage rule-specific silences.                                                        |
-| `fixed:alerting.rules:reader`                | `alert.rule:read`, `alert.silences:read` for scope `folders:*` <br> `alert.rules.external:read` for scope `datasources:*` <br> `alert.notifications.time-intervals:read` <br> `alert.notifications.receivers:list`                                                          | Read all alert rules and read rule-specific silences.                                                                                |
-| `fixed:alerting:writer`                      | All permissions from `fixed:alerting.rules:writer` <br>`fixed:alerting.instances:writer`<br>`fixed:alerting.notifications:writer`                                                                                                                                           | Create, update, and delete all alert rules, silences, contact points, templates, mute timings, and notification policies.            |
-| `fixed:alerting:reader`                      | All permissions from `fixed:alerting.rules:reader` <br>`fixed:alerting.instances:reader`<br>`fixed:alerting.notifications:reader`                                                                                                                                           | Read-only permissions for all alert rules, alerts, contact points, and notification policies.                                        |
-| `fixed:alerting.provisioning.secrets:reader` | `alert.provisioning:read` and `alert.provisioning.secrets:read`                                                                                                                                                                                                             | Read-only permissions for Provisioning API and let export resources with decrypted secrets.                                          |
-| `fixed:alerting.provisioning:writer`         | `alert.provisioning:read` and `alert.provisioning:write`                                                                                                                                                                                                                    | Create, update and delete Grafana alert rules, notification policies, contact points, templates, etc via provisioning API.           |
-| `fixed:alerting.provisioning.status:writer`  | `alert.provisioning.provenance:write`                                                                                                                                                                                                                                       | Set provenance status to alert rules, notification policies, contact points, etc. Should be used together with regular writer roles. |
+| Display name in UI / Fixed role                                                          | Permissions                                                                                                                                                                                                                                                                 | Description                                                                                                                                              |
+| ---------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Silences Writer: `fixed:alerting.instances:writer`                                       | All permissions from `fixed:alerting.instances:reader` and<br> `alert.instances:create`<br>`alert.instances:write` for organization scope <br> `alert.instances.external:write` for scope `datasources:*`                                                                   | Add and update silences in Grafana and external providers.                                                                                               |
+| Instances and Silences Reader: `fixed:alerting.instances:reader`                         | `alert.instances:read` for organization scope <br> `alert.instances.external:read` for scope `datasources:*`                                                                                                                                                                | Read alert instances and silences in Grafana and external providers.                                                                                     |
+| Notifications Writer: `fixed:alerting.notifications:writer`                              | All permissions from `fixed:alerting.notifications:reader` and<br>`alert.notifications:write`for organization scope<br>`alert.notifications.external:read` for scope `datasources:*`                                                                                        | Add, update, and delete notification policies and contact points in Grafana and external providers.                                                      |
+| Notifications Reader: `fixed:alerting.notifications:reader`                              | `alert.notifications:read` for organization scope<br>`alert.notifications.external:read` for scope `datasources:*`                                                                                                                                                          | Read notification policies and contact points in Grafana and external providers.                                                                         |
+| Rules Writer: `fixed:alerting.rules:writer`                                              | All permissions from `fixed:alerting.rules:reader` and <br> `alert.rule:create` <br> `alert.rule:write` <br> `alert.rule:delete` <br> `alert.silences:create` <br> `alert.silences:write` for scope `folders:*` <br> `alert.rules.external:write` for scope `datasources:*` | Create, update, and delete all alert rules and manage rule-specific silences.                                                                            |
+| Rules Reader: `fixed:alerting.rules:reader`                                              | `alert.rule:read`, `alert.silences:read` for scope `folders:*` <br> `alert.rules.external:read` for scope `datasources:*` <br> `alert.notifications.time-intervals:read` <br> `alert.notifications.receivers:list`                                                          | Read all alert rules and rule-specific silences in Grafana and external providers.                                                                       |
+| Full access: `fixed:alerting:writer`                                                     | All permissions from `fixed:alerting.rules:writer` <br>`fixed:alerting.instances:writer`<br>`fixed:alerting.notifications:writer`                                                                                                                                           | Add, update, and delete alert rules, silences, contact points, and notification policies in Grafana and external providers.                              |
+| Full read-only access: `fixed:alerting:reader`                                           | All permissions from `fixed:alerting.rules:reader` <br>`fixed:alerting.instances:reader`<br>`fixed:alerting.notifications:reader`                                                                                                                                           | Read alert rules, alert instances, silences, contact points, and notification policies in Grafana and external providers.                                |
+| Read via Provisioning API + Export Secrets: `fixed:alerting.provisioning.secrets:reader` | `alert.provisioning:read` and `alert.provisioning.secrets:read`                                                                                                                                                                                                             | Read alert rules, alert instances, silences, contact points, and notification policies using the provisioning API and use export with decrypted secrets. |
+| Access to alert rules provisioning API: `fixed:alerting.provisioning:writer`             | `alert.provisioning:read` and `alert.provisioning:write`                                                                                                                                                                                                                    | Manage all alert rules, notification policies, contact points, templates, in the organization using the provisioning API.                                |
+| Set provisioning status: `fixed:alerting.provisioning.status:writer`                     | `alert.provisioning.provenance:write`                                                                                                                                                                                                                                       | Set provisioning rules for Alerting resources. Should be used together with other regular roles (Notifications Writer and/or Rules Writer.)              |
 
 ## Create custom roles
 

docs/sources/dashboards/build-dashboards/annotate-visualizations/index.md

@@ -70,7 +70,11 @@ Watch the following video for a quick tutorial on creating annotations:
 
 To add an annotation, complete the following steps:
 
-1. In the dashboard click the panel to which you're adding the annotation. A context menu will appear.
+1. If you've just saved a dashboard, refresh the page.
+1. In the dashboard click the panel to which you're adding the annotation.
+
+   A context menu will appear.
+
 1. In the context menu, click **Add annotation**.
    ![Add annotation context menu](/static/img/docs/time-series-panel/time-series-annotations-context-menu.png)
 1. Add an annotation description and tags (optional).
@@ -80,6 +84,7 @@ Alternatively, to add an annotation, press Ctrl/Cmd and click the panel, and the
 
 ### Add a region annotation
 
+1. If you've just saved a dashboard, refresh the page.
 1. In the dashboard press Ctrl/Cmd and click and drag on the panel.
    ![Add annotation popover](/static/img/docs/time-series-panel/time-series-annotations-add-region-annotation.gif)
 1. Add an annotation description and tags (optional).

docs/sources/dashboards/build-dashboards/view-dashboard-json-model/index.md

@@ -57,7 +57,6 @@ In the following JSON, id is shown as null which is the default value assigned t
     "to": "now"
   },
   "timepicker": {
-    "time_options": [],
     "refresh_intervals": []
   },
   "templating": {
@@ -136,17 +135,6 @@ The grid has a negative gravity that moves panels up if there is empty space abo
     "now": true,
     "hidden": false,
     "nowDelay": "",
-    "time_options": [
-      "5m",
-      "15m",
-      "1h",
-      "6h",
-      "12h",
-      "24h",
-      "2d",
-      "7d",
-      "30d"
-    ],
     "refresh_intervals": [
       "5s",
       "10s",
@@ -174,7 +162,6 @@ Usage of the fields is explained below:
 | **now**               |                                                                                                                                       |
 | **hidden**            | whether timepicker is hidden or not                                                                                                   |
 | **nowDelay**          | override the now time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values. |
-| **time_options**      | options available in the time picker dropdown                                                                                         |
 | **refresh_intervals** | interval options available in the refresh picker dropdown                                                                             |
 | **status**            |                                                                                                                                       |
 | **type**              |                                                                                                                                       |

docs/sources/dashboards/create-manage-playlists/index.md

@@ -26,6 +26,10 @@ Grafana automatically scales dashboards to any resolution, which makes them perf
 
 You can access the Playlist feature from Grafana's side menu, in the Dashboards submenu.
 
+{{< admonition type="note" >}}
+You must have at least Editor role permissions to create and manage playlists.
+{{< /admonition >}}
+
 ## Access, share, and control a playlist
 
 Use the information in this section to access existing playlists. Start and control the display of a playlist using one of the five available modes.

docs/sources/dashboards/create-reports/index.md

@@ -129,6 +129,7 @@ Only organization administrators can create reports by default. You can customiz
    - If you selected the PDF format option:
      - Select an orientation for the report: **Portrait** or **Landscape**.
      - Select a layout for the generated report: **Simple** or **Grid**. The simple layout renders each panel as full-width across the PDF. The grid layout renders the PDF with the same panel arrangement and width as the source dashboard.
+     - Select a zoom level for the report. Zoom in to enlarge text in your PDF, or zoom out to see more data (like table columns) per panel.
      - Click **Preview PDF** to view a rendered PDF with the options you selected.
 1. Schedule report.
    - Enter scheduling information. Options vary depending on the frequency selected.
@@ -334,11 +335,11 @@ You can customize the branding options.
 
 Report branding:
 
-- **Company logo:** Company logo displayed in the report PDF. It can be configured by specifying a URL, or by uploading a file. Defaults to the Grafana logo.
+- **Company logo:** Company logo displayed in the report PDF. It can be configured by specifying a URL, or by uploading a file. The maximum file size is 16 MB. Defaults to the Grafana logo.
 
 Email branding:
 
-- **Company logo:** Company logo displayed in the report email. It can be configured by specifying a URL, or by uploading a file. Defaults to the Grafana logo.
+- **Company logo:** Company logo displayed in the report email. It can be configured by specifying a URL, or by uploading a file. The maximum file size is 16 MB. Defaults to the Grafana logo.
 - **Email footer:** Toggle to enable the report email footer. Select **Sent by** or **None**.
 - **Footer link text:** Text of the link in the report email footer. Defaults to `Grafana`.
 - **Footer link URL:** Link of the report email footer.

docs/sources/dashboards/dashboard-public/index.md

@@ -1,7 +1,4 @@
 ---
-aliases:
-  - ../features/dashboard/dashboards/
-  - dashboard-manage/
 labels:
   products:
     - cloud
@@ -193,7 +190,10 @@ guaranteed because plugin developers can override this functionality. The follow
   <tr>
     <td>
       <ul>
+        <li>DynamoDB</li>
+        <li>Dynatrace</li>
         <li>Graphite</li>
+        <li>Google Sheets</li>
       </ul>
     </td>
   </tr>
@@ -223,7 +223,6 @@ guaranteed because plugin developers can override this functionality. The follow
     </td>
     <td>
       <ul>
-        <li>Dynatrace</li>
         <li>GitHub</li>
         <li>Google BigQuery</li>
         <li>Grafana for YNAB</li>

docs/sources/dashboards/manage-dashboards/index.md

@@ -1,6 +1,5 @@
 ---
 aliases:
-  - ../features/dashboard/dashboards/
   - ../panels/working-with-panels/organize-dashboard/
   - ../reference/dashboard_folders/
   - dashboard-folders/

docs/sources/dashboards/use-dashboards/index.md

@@ -1,6 +1,5 @@
 ---
 aliases:
-  - ../features/dashboard/dashboards/
   - ../reference/search/
   - dashboard-ui/
   - dashboard-ui/dashboard-header/

docs/sources/dashboards/variables/add-template-variables/index.md

@@ -223,7 +223,7 @@ groupByNode(summarize(movingAverage(apps.$app.$server.counters.requests.count, 5
 _Ad hoc filters_ enable you to add key/value filters that are automatically added to all metric queries that use the specified data source. Unlike other variables, you do not use ad hoc filters in queries. Instead, you use ad hoc filters to write filters for existing queries.
 
 {{% admonition type="note" %}}
-Ad hoc filter variables only work with Prometheus, Loki, InfluxDB, and Elasticsearch data sources.
+Not all data sources support ad hoc filters. Examples of those that do include Prometheus, Loki, InfluxDB, and Elasticsearch.
 {{% /admonition %}}
 
 1. [Enter general options](#enter-general-options).

docs/sources/datasources/aws-cloudwatch/_index.md

@@ -238,6 +238,10 @@ You can attach these permissions to the IAM role or IAM user you configured in [
 }
 ```
 
+{{< admonition type="note" >}}
+Cross-account observability lets you to retrieve metrics and logs across different accounts in a single region but you can't query EC2 Instance Attributes across accounts because those come from the EC2 API and not the CloudWatch API.
+{{< /admonition >}}
+
 ### Configure CloudWatch settings
 
 #### Namespaces of Custom Metrics

docs/sources/datasources/azure-monitor/_index.md

@@ -116,6 +116,7 @@ For details, refer to [Configuring using Workload Identity](#configuring-using-w
 | **Application (client) ID** | Sets the application/client ID for the Azure AD app registration to use for authentication.                                                                                                                                                                                                           |
 | **Client secret**           | Sets the application client secret for the Azure AD app registration to use for authentication. For details, see the [Azure application secret docs](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal#option-2-create-a-new-application-secret). |
 | **Default subscription**    | _(Optional)_ Sets a default subscription for template variables to use.                                                                                                                                                                                                                               |
+| **Enable Basic Logs**       | Allows this data source to execute queries against [Basic Logs tables](https://learn.microsoft.com/en-us/azure/azure-monitor/logs/basic-logs-query?tabs=portal-1) in supported Log Analytics Workspaces. These queries may incur additional costs.                                                    |
 
 ### Provision the data source
 

docs/sources/datasources/azure-monitor/query-editor/index.md

@@ -126,6 +126,8 @@ Azure Monitor Logs collects and organises log and performance data from [support
 While Azure Monitor Metrics stores only simplified numerical data, Logs can store different data types, each with their own structure.
 You can also perform complex analysis of Logs data by using KQL.
 
+The Azure Monitor data source also supports querying of [Basic Logs](https://learn.microsoft.com/en-us/azure/azure-monitor/logs/basic-logs-query?tabs=portal-1) tables (if they exist in your Log Analytics workspace). This feature must be enabled in the data source configuration.
+
 {{< figure src="/static/img/docs/azure-monitor/query-editor-logs.png" max-width="800px" class="docs-image--no-shadow" caption="Azure Monitor Logs sample query comparing successful requests to failed requests" >}}
 
 ### Create a Logs query
@@ -146,6 +148,21 @@ You can also perform complex analysis of Logs data by using KQL.
 
 You can also augment queries by using [template variables]({{< relref "./template-variables" >}}).
 
+**To create a Basic Logs query:**
+
+1. Ensure that the data source has the `Enable Basic Logs` toggle enabled.
+1. In a Grafana panel, select the **Azure Monitor** data source.
+1. Select the **Logs** service.
+1. Select a resource to query. Multiple resources can be selected as long as they are of the same type.
+1. Switch the `Logs` toggle from `Analytics` to `Basic`. A modal will display to notify users of potential additional costs.
+   {{% admonition type="note" %}}
+   Basic Logs queries do not support time-ranges specified in the query. The time-range will be hardcoded to the dashboard time-range. There are also other query limitations. See the
+   [documentation for details.](https://learn.microsoft.com/en-us/azure/azure-monitor/logs/basic-logs-query?tabs=portal-1#limitations)
+   {{% /admonition %}}
+1. Enter your KQL query.
+
+You can also augment queries by using [template variables](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/azure-monitor/template-variables/).
+
 ### Logs query examples
 
 Azure Monitor Logs queries are written using the Kusto Query Language (KQL), a rich language similar to SQL.

docs/sources/datasources/loki/_index.md

@@ -76,7 +76,7 @@ Once you've added the Loki data source, you can [configure it](#configure-the-da
 To troubleshoot configuration and other issues, check the log file located at `/var/log/grafana/grafana.log` on Unix systems, or in `<grafana_install_dir>/data/log` on other platforms and manual installations.
 {{% /admonition %}}
 
-## Provision the Loki data source
+## Provision the data source
 
 You can define and configure the data source in YAML files as part of Grafana's provisioning system.
 For more information about provisioning, and for available configuration options, refer to [Provisioning Grafana](ref:provisioning-data-sources).

docs/sources/datasources/loki/query-editor/index.md

@@ -171,6 +171,8 @@ The following options are the same for both **Builder** and **Code** mode:
 
 - **Line limit** -Defines the upper limit for the number of log lines returned by a query. The default is `1000`
 
+- **Direction** - Determines the search order. **Backward** is a backward search starting at the end of the time range. **Forward** is a forward search starting at the beginning of the time range. The default is **Backward**
+
 - **Step** Sets the step parameter of Loki metrics queries. The default value equals to the value of `$__interval` variable, which is calculated using the time range and the width of the graph (the number of pixels).
 
 - **Resolution** Deprecated. Sets the step parameter of Loki metrics range queries. With a resolution of `1/1`, each pixel corresponds to one data point. `1/2` retrieves one data point for every other pixel, `1/10` retrieves one data point per 10 pixels, and so on. Lower resolutions perform better.

docs/sources/datasources/mssql/query-editor/index.md

@@ -247,6 +247,10 @@ The resulting table panel:
 
 ## Use time series queries
 
+{{< admonition type="note" >}}
+Store timestamps in UTC to avoid issues with time shifts in Grafana when using non-UTC timezones.
+{{< /admonition >}}
+
 If you set the **Format** setting in the query editor to **Time series**, then the query must have a column named `time` that returns either a SQL datetime or any numeric datatype representing Unix epoch in seconds.
 Result sets of time series queries must also be sorted by time for panels to properly visualize the result.
 

docs/sources/datasources/mysql/_index.md

@@ -73,7 +73,7 @@ For instructions on how to add a data source to Grafana, refer to the [administr
 Only users with the organization administrator role can add data sources.
 Administrators can also [configure the data source via YAML](#provision-the-data-source) with Grafana's provisioning system.
 
-{{< docs/play title="MySQL: Cities of the World Sample Data Set" url="https://play.grafana.org/d/8JOvPQr7k/" >}}
+{{< docs/play title="MySQL Overview" url="https://play.grafana.org/d/edyh1ib7db6rkb/mysql-overview" >}}
 
 ## Configure the data source
 

docs/sources/datasources/prometheus/_index.md

@@ -155,7 +155,7 @@ We also bundle a dashboard within Grafana so you can start viewing your metrics
 1. Navigate to the data source's [configuration page](ref:configure-prometheus-data-source).
 1. Select the **Dashboards** tab.
 
-This displays dashboards for Grafana and Prometheus.
+   This displays dashboards for Grafana and Prometheus.
 
 1. Select **Import** for the dashboard to import.
 

docs/sources/datasources/prometheus/configure-prometheus-data-source.md

@@ -63,15 +63,19 @@ The first option to configure is the name of your connection:
 
 - **Default** - Toggle to select as the default name in dashboard panels. When you go to a dashboard panel this will be the default selected data source.
 
-### HTTP section
+### Connection section
 
-- **URL** - The URL of your Prometheus server. If your Prometheus server is local, use `<http://localhost:9090>`. If it is on a server within a network, this is the URL with port where you are running Prometheus. Example: `<http://prometheus.example.orgname:9090>`.
+- **Prometheus server URL** - The URL of your Prometheus server. If your Prometheus server is local, use `http://localhost:9090`. If it is on a server within a network, this is the URL with port where you are running Prometheus. Example: `http://prometheus.example.orgname:9090`.
 
-- **Allowed cookies** - Specify cookies by name that should be forwarded to the data source. The Grafana proxy deletes all forwarded cookies by default.
+{{< admonition type="note" >}}
 
-- **Timeout** - The HTTP request timeout. This must be in seconds. There is no default, so this setting is up to you.
+If you're running Grafana and Prometheus together in different container environments, each localhost refers to its own container - if the server URL is localhost:9090, that means port 9090 inside the Grafana container, not port 9090 on the host machine.
 
-### Auth section
+You should use the IP address of the Prometheus container, or the hostname if you are using Docker Compose. Alternatively, you can consider `http://host.docker.internal:9090`.
+
+{{< /admonition >}}
+
+### Authentication section
 
 There are several authentication methods you can choose in the Authentication section.
 
@@ -99,10 +103,16 @@ Use TLS (Transport Layer Security) for an additional layer of security when work
 
 - **Value** - The value of the header.
 
-## Additional settings
+## Advanced settings
 
 Following are additional configuration options.
 
+### Advanced HTTP settings
+
+- **Allowed cookies** - Specify cookies by name that should be forwarded to the data source. The Grafana proxy deletes all forwarded cookies by default.
+
+- **Timeout** - The HTTP request timeout. This must be in seconds. The default is 30 seconds.
+
 ### Alerting
 
 - **Manage alerts via Alerting UI** - Toggle to enable `Alertmanager` integration for this data source.
@@ -121,12 +131,14 @@ Following are additional configuration options.
 
 ### Performance
 
-- **Prometheus type** - The type of your Prometheus server. There are four options: `Prometheus`, `Cortex`, `Thanos`, `Mimir`.
+- **Prometheus type** - The type of your Prometheus server. There are four options: `Prometheus`, `Cortex`, `Mimir`, and `Thanos`.
 
-- **Version** Select the version you are using. Once the Prometheus type has been selected, a list of versions auto-populates using the Prometheus [buildinfo](https://semver.org/) API. The `Cortex` Prometheus type does not support this API so you will need to manually add the version.
+- **Cache level** - The browser caching level for editor queries. There are four options: `Low`, `Medium`, `High`, or `None`.
 
 - **Incremental querying (beta)** - Changes the default behavior of relative queries to always request fresh data from the Prometheus instance. Enable this option to decrease database and network load.
 
+- **Disable recording rules (beta)** - Toggle on to disable the recording rules. Enable this option to improve dashboard performance.
+
 ### Other
 
 - **Custom query parameters** - Add custom parameters to the Prometheus query URL. For example `timeout`, `partial_response`, `dedup`, or `max_source_resolution`. Multiple parameters should be concatenated together with an '&amp;'.

docs/sources/datasources/tempo/configure-tempo-data-source.md

@@ -84,9 +84,9 @@ This video explains how to add data sources, including Loki, Tempo, and Mimir, t
 
 ## Trace to logs
 
-![Trace to logs settings](/media/docs/tempo/tempo-trace-to-logs-9-4.png)
+The **Trace to logs** setting configures [trace to logs](ref:explore-trace-integration) that's available when you integrate Grafana with Tempo.
 
-The **Trace to logs** setting configures the [trace to logs feature](ref:explore-trace-integration) that is available when you integrate Grafana with Tempo.
+![Trace to logs settings](/media/docs/tempo/tempo-trace-to-logs-9-4.png)
 
 There are two ways to configure the trace to logs feature:
 
@@ -100,8 +100,9 @@ There are two ways to configure the trace to logs feature:
    You can also click **Open advanced data source picker** to see more options, including adding a data source.
 
 1. Set start and end time shift. As the logs timestamps may not exactly match the timestamps of the spans in trace it may be necessary to search in larger or shifted time range to find the desired logs.
-1. Select which tags to use in the logs query. The tags you configure must be present in the span's attributes or resources for a trace to logs span link to appear. You can optionally configure a new name for the tag. This is useful, for example, if the tag has dots in the name and the target data source does not allow using dots in labels. In that case, you can for example remap `http.status` (the span attribute) to `http_status` (the data source field). "Data source" in this context can refer to Loki, or another log data source.
-1. Optionally switch on the **Filter by trace ID** and/or **Filter by span ID** setting to further filter the logs if your logs consistently contain trace or span IDs.
+1. Select which tags to use in the logs query.
+   The tags you configure must be present in the span's attributes or resources for a trace to logs span link to appear. You can optionally configure a new name for the tag. This is useful, for example, if the tag has dots in the name and the target data source does not allow using dots in labels. In that case, you can for example remap `http.status` (the span attribute) to `http_status` (the data source field). "Data source" in this context can refer to Loki, or another log data source.
+1. Optional: If your logs consistently trace or span IDs, you can use one or both of the **Filter by trace ID** and **Filter by span ID** settings.
 
 ### Configure a custom query
 
@@ -141,19 +142,33 @@ There are two ways to configure the trace to metrics feature:
 - Use a basic configuration with a default query, or
 - Configure one or more custom queries where you can use a [template language](ref:variable-syntax) to interpolate variables from the trace or span.
 
-### Simple config
+Refer to the Trace to metrics configuration options section to learn about the available options.
+
+### Set up a simple configuration
 
 To use a simple configuration, follow these steps:
 
 1. Select a metrics data source from the **Data source** drop-down.
+1. Optional: Change **Span start time shift** and **Span end time shift**. You can change one or both of these settings. The default start time shift is -2 minutes and 2 minutes for end time shift.
 1. Optional: Choose any tags to use in the query. If left blank, the default values of `cluster`, `hostname`, `namespace`, `pod`, `service.name` and `service.namespace` are used.
 
    The tags you configure must be present in the spans attributes or resources for a trace to metrics span link to appear. You can optionally configure a new name for the tag. This is useful for example if the tag has dots in the name and the target data source doesn't allow using dots in labels. In that case you can for example remap `service.name` to `service_name`.
 
-1. Do not select **Add query**.
+1. Don't select **Add query**.
 1. Select **Save and Test**.
 
-### Custom queries
+### Set up custom queries
+
+To use custom queries, you need to configure the tags you’d like to include in the linked queries.
+For each tag, the key is the span attribute name.
+In cases where the attribute name would result in an invalid metrics query or doesn’t exactly match the desired label name, you can enter the label name as the second value.
+For example, you could map the attribute `k8s.pod` to the label `pod`.
+
+You can interpolate the configured tags using the `$__tags` keyword.
+For example, when you configure the query `requests_total{$__tags}` with the tags `k8s.pod=pod` and `cluster`, it results in `requests_total{pod="nginx-554b9", cluster="us-east-1"}`.
+The label values are dynamically inserted based on the span attributes’ values.
+
+You can link to any metric you’d like, but metrics for span durations, counts, and errors filtered by service or span are a great starting point.
 
 To use custom queries with the configuration, follow these steps:
 
@@ -174,7 +189,7 @@ To use custom queries with the configuration, follow these steps:
 
 1. Select **Save and Test**.
 
-### Configure trace to metrics
+### Trace to metrics configuration options
 
 | Setting name              | Description                                                                                                                                                                                                                                                     |
 | ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |

docs/sources/developers/http_api/_index.md

@@ -80,40 +80,41 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
 - [Admin API]({{< relref "admin/" >}})
 - [Alerting API (unstable)](https://editor.swagger.io/?url=https://raw.githubusercontent.com/grafana/grafana/main/pkg/services/ngalert/api/tooling/post.json)
-- [Alerting Provisioning API]({{< relref "alerting_provisioning/" >}})
+- [Alerting provisioning API]({{< relref "alerting_provisioning/" >}})
 - [Annotations API]({{< relref "annotations/" >}})
 - [Correlations API]({{< relref "correlations/" >}})
 - [Dashboard API]({{< relref "dashboard/" >}})
-- [Dashboard Permissions API]({{< relref "dashboard_permissions/" >}})
-- [Dashboard Versions API]({{< relref "dashboard_versions/" >}})
+- [Dashboard permissions API]({{< relref "dashboard_permissions/" >}})
+- [Dashboard versions API]({{< relref "dashboard_versions/" >}})
 - [Data source API]({{< relref "data_source/" >}})
 - [Folder API]({{< relref "folder/" >}})
-- [Folder Permissions API]({{< relref "folder_permissions/" >}})
-- [Folder/Dashboard Search API]({{< relref "folder_dashboard_search/" >}})
-- [Library Element API]({{< relref "library_element/" >}})
+- [Folder permissions API]({{< relref "folder_permissions/" >}})
+- [Folder/Dashboard search API]({{< relref "folder_dashboard_search/" >}})
+- [Library element API]({{< relref "library_element/" >}})
 - [Organization API]({{< relref "org/" >}})
 - [Other API]({{< relref "other/" >}})
 - [Playlists API]({{< relref "playlist/" >}})
 - [Preferences API]({{< relref "preferences/" >}})
-- [Short URL API]({{< relref "short_url/" >}})
+- [Public dashboard API]({{< relref "dashboard_public/" >}})
 - [Query history API]({{< relref "query_history/" >}})
+- [Service account API]({{< relref "serviceaccount/" >}})
+- [Short URL API]({{< relref "short_url/" >}})
 - [Snapshot API]({{< relref "snapshot/" >}})
+- [SSO settings API]({{< relref "sso-settings/" >}})
 - [Team API]({{< relref "team/" >}})
 - [User API]({{< relref "user/" >}})
 
 ## Deprecated HTTP APIs
 
-- [Alerting Notification Channels API]({{< relref "alerting_notification_channels/" >}})
-- [Alerting API]({{< relref "alerting/" >}})
 - [Authentication API]({{< relref "auth/" >}})
 
 ## Grafana Enterprise HTTP APIs
 
 Grafana Enterprise includes all of the Grafana OSS APIs as well as those that follow:
 
-- [Role-based access control API]({{< relref "access_control/" >}})
 - [Data source permissions API]({{< relref "datasource_permissions/" >}})
-- [Team sync API]({{< relref "team_sync/" >}})
 - [License API]({{< relref "licensing/" >}})
-- [Reporting API]({{< relref "reporting/" >}})
 - [Query and resource caching API]({{< relref "query_and_resource_caching/" >}})
+- [Reporting API]({{< relref "reporting/" >}})
+- [Role-based access control API]({{< relref "access_control/" >}})
+- [Team sync API]({{< relref "team_sync/" >}})

docs/sources/developers/http_api/dashboard_versions.md

@@ -217,31 +217,7 @@ Content-Length: 1300
 Content-Length: 46
 
 ```
-
-JSON response body schema:
-
-- **message** - Message explaining the reason for the request failure.
-
-## Restore dashboard by dashboard UID
-
-`POST /api/dashboards/uid/:uid/restore`
-
-Restores a dashboard to a given dashboard version using `uid`.
-
-**Example request for restoring a dashboard version**:
-
-```http
-POST /api/dashboards/uid/QA7wKklGz/restore
-Accept: application/json
-Content-Type: application/json
-Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
-
-{
-  "version": 1
-}
-```
-
-JSON body schema:
+
 JSON response body schema:
 
 - **message** - Message explaining the reason for the request failure.
@@ -328,31 +304,7 @@ Content-Length: 1300
 
 **Example response (JSON diff)**:
 
-
-Status Codes:
-
-- **200** - OK
-- **400** - Bad request (invalid JSON sent)
-- **401** - Unauthorized
-- **404** - Not found
-        "15m",
-        "30m",
-        "1h",
-        "2h",
-        "1d"
-      ],
-      "time_options": [
-        "5m",
-        "15m",
-        "1h",
-        "6h",
-        "12h",
-        "24h",
-        "2d",
-        "7d",
-        "30d"
-      ]
-    },
+```http
 HTTP/1.1 200 OK
 Content-Type: text/html; charset=UTF-8
 

docs/sources/developers/http_api/preferences.md

@@ -13,7 +13,7 @@ labels:
   products:
     - enterprise
     - oss
-title: 'HTTP Preferences API '
+title: 'Preferences API'
 ---
 
 # User and Org Preferences API

docs/sources/developers/http_api/snapshot.md

@@ -13,7 +13,7 @@ labels:
   products:
     - enterprise
     - oss
-title: 'HTTP Snapshot API '
+title: 'Snapshot API'
 ---
 
 # Snapshot API

docs/sources/explore/_index.md

@@ -10,141 +10,53 @@ labels:
     - cloud
     - enterprise
     - oss
+menuTitle: Explore
 title: Explore
 weight: 90
+hero:
+  title: Explore
+  level: 1
+  width: 110
+  height: 110
+  description: >-
+    Use Explore to query, collect, and analyze data for detailed real-time data analysis.
+cards:
+  title_class: pt-0 lh-1
+  items:
+    - title: Get started with Explore
+      href: ./get-started-with-explore/
+      description: Get started using Explore to create queries and do real-time analysis on your data.
+      height: 24
+    - title: Query management
+      href: ./query-management/
+      description: Learn how to manage queries in Explore.
+      height: 24
+    - title: Query inspector in Explore
+      href: ./explore-inspector/
+      description: Learn how to use the Query inspector to troubleshoot issues with your queries.
+      height: 24
+    - title: Logs in Explore
+      href: ./logs-integration/
+      description: Learn about working with logs and log data in Explore.
+      height: 24
+    - title: Traces in Explore
+      href: ./trace-integration/
+      description: Learn about working with traces and tracing data in Explore.
+      height: 24
+    - title: Correlations editor in Explore
+      href: ./correlations-editor-in-explore/
+      description: Learn how to create and use Correlations.
+      height: 24
 ---
 
-# Explore
+{{< docs/hero-simple key="hero" >}}
 
-Grafana's dashboard UI is all about building dashboards for visualization. Explore strips away the dashboard and panel options so that you can focus on the query. It helps you iterate until you have a working query and then think about building a dashboard.
+---
 
-> Refer to [Role-based access control]({{< relref "../administration/roles-and-permissions/access-control/" >}}) in Grafana Enterprise to understand how you can control access with role-based permissions.
+## Overview
 
-If you just want to explore your data and do not want to create a dashboard, then Explore makes this much easier. If your data source supports graph and table data, then Explore shows the results both as a graph and a table. This allows you to see trends in the data and more details at the same time. See also:
+Explore is your starting point for querying, analyzing, and aggregating data in Grafana. You can quickly begin creating queries to start analyzing data without having to create a dashboard or customize a visualization.
 
-- [Query management in Explore]({{< relref "query-management/" >}})
-- [Logs integration in Explore]({{< relref "logs-integration/" >}})
-- [Trace integration in Explore]({{< relref "trace-integration/" >}})
-- [Explore metrics]({{< relref "explore-metrics/" >}})
-- [Correlations Editor in Explore]({{< relref "correlations-editor-in-explore/" >}})
-- [Inspector in Explore]({{< relref "explore-inspector/" >}})
+## Explore
 
-## Start exploring
-
-{{< youtube id="1q3YzX2DDM4" >}}
-
-> Refer to [Role-based access Control]({{< relref "../administration/roles-and-permissions/access-control/" >}}) in Grafana Enterprise to understand how you can manage Explore with role-based permissions.
-
-In order to access Explore, you must have an editor or an administrator role, unless the [viewers_can_edit option]({{< relref "../setup-grafana/configure-grafana/#viewers_can_edit" >}}) is enabled. Refer to [About users and permissions]({{< relref "../administration/roles-and-permissions/" >}}) for more information on what each role has access to.
-
-{{% admonition type="note" %}}
-If you are using Grafana Cloud, open a [support ticket in the Cloud Portal](/profile/org#support) to enable the `viewers_can_edit` option
-{{% /admonition %}}
-
-To access Explore:
-
-1. Click on the Explore icon on the menu bar.
-
-   An empty Explore tab opens.
-
-   Alternately to start with an existing query in a panel, choose the Explore option from the Panel menu. This opens an Explore tab with the query from the panel and allows you to tweak or iterate in the query outside of your dashboard.
-
-   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-panel-menu-10.1.png" class="docs-image--no-shadow" max-width= "650px" caption="Screenshot of the panel menu including the Explore option" >}}
-
-1. Choose your data source from the drop-down in the top left.
-
-   You can also click **Open advanced data source picker** to see more options, including adding a data source (Admins only).
-
-1. Write the query using a query editor provided by the selected data source. Please check [data sources documentation]({{< relref "../datasources" >}}) to see how to use various query editors.
-1. For general documentation on querying data sources in Grafana, see [Query and transform data]({{< relref "../panels-visualizations/query-transform-data" >}}).
-1. Run the query using the button in the top right corner.
-
-## Split and compare
-
-The split view provides an easy way to compare visualizations side-by-side or to look at related data together on one page.
-
-To open the split view:
-
-1. Click the split button to duplicate the current query and split the page into two side-by-side queries.
-
-It is possible to select another data source for the new query which for example, allows you to compare the same query for two different servers or to compare the staging environment to the production environment.
-
-{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-explore-split-10.1.png" max-width= "950px" caption="Screenshot of Explore screen split" >}}
-
-In split view, timepickers for both panels can be linked (if you change one, the other gets changed as well) by clicking on one of the time-sync buttons attached to the timepickers. Linking of timepickers helps with keeping the start and the end times of the split view queries in sync. It ensures that you’re looking at the same time interval in both split panels.
-
-To close the newly created query, click on the Close Split button.
-
-## Content outline
-
-The content outline is a side navigation bar that keeps track of the queries and visualization panels you created in Explore. It allows you to navigate between them quickly.
-
-The content outline also works in a split view. When you are in split view, the content outline is generated for each pane.
-
-To open the content outline:
-
-1. Click the Outline button in the top left corner of the Explore screen.
-
-You can then click on any panel icon in the content outline to navigate to that panel.
-
-## Share Explore URLs
-
-When using Explore, the URL in the browser address bar updates as you make changes to the queries. You can share or bookmark this URL.
-
-{{% admonition type="note" %}}
-Explore may generate relatively long URLs, some tools, like messaging or videoconferencing apps, may truncate messages to a fixed length. In such cases Explore will display a warning message and load a default state. If you encounter issues when sharing Explore links in such apps, you can generate shortened links. See [Share shortened link](#share-shortened-link) for more information.
-{{% /admonition %}}
-
-### Generating Explore URLs from external tools
-
-Because Explore URLs have a defined structure, you can build a URL from external tools and open it in Grafana. The URL structure is:
-
-```
-http://<grafana_url>/explore?panes=<panes>&schemaVersion=<schema_version>&orgId=<org_id>
-```
-
-where:
-
-- `org_id` is the organization ID
-- `schema_version` is the schema version (should be set to the latest version which is `1`)
-- `panes` is a url-encoded JSON object of panes, where each key is the pane ID and each value is an object matching the following schema:
-
-```
-{
-  datasource: string; // the pane's root datasource UID, or `-- Mixed --` for mixed datasources
-  queries: {
-    refId: string; // an alphanumeric identifier for this query, must be unique within the pane, i.e. "A", "B", "C", etc.
-    datasource: {
-      uid: string; // the query's datasource UID ie: "AD7864H6422"
-      type: string; // the query's datasource type-id, i.e: "loki"
-    }
-    // ... any other datasource-specific query parameters
-  }[]; // array of queries for this pane
-  range: {
-    from: string; // the start time, in milliseconds since epoch
-    to: string; // the end time, in milliseconds since epoch
-  }
-}
-```
-
-{{% admonition type="note" %}}
-The `from` and `to` also accept relative ranges defined in [Time units and relative ranges]({{< relref "../dashboards/use-dashboards/#time-units-and-relative-ranges" >}}).
-{{% /admonition %}}
-
-## Share shortened link
-
-{{% admonition type="note" %}}
-Available in Grafana 7.3 and later versions.
-{{% /admonition %}}
-
-The Share shortened link capability allows you to create smaller and simpler URLs of the format /goto/:uid instead of using longer URLs with query parameters. To create a shortened link to the executed query, click the **Share** option in the Explore toolbar.
-
-A shortened link that is not accessed will automatically get deleted after a [configurable period](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#short_links) (defaulting to seven days). If a link is used at least once, it won't be deleted.
-
-### Sharing shortened links with absolute time
-
-{{% admonition type="note" %}}
-Available in Grafana 10.3 and later versions.
-{{% /admonition %}}
-
-Short links have two options - keeping relative time (for example, from two hours ago to now) or absolute time (for example, from 8am to 10am). Sharing a shortened link by default will copy the time range selected, relative or absolute. Clicking the dropdown button next to the share shortened link button and selecting one of the options under "Time-Sync URL Links" will allow you to create a short link with the absolute time - meaning anyone receiving the link will see the same data you are seeing, even if they open the link at another time. This will not affect your selected time range.
+{{< card-grid key="cards" type="simple" >}}

docs/sources/explore/correlations-editor-in-explore.md

@@ -4,7 +4,7 @@ labels:
     - enterprise
     - oss
 title: Correlations Editor in Explore
-weight: 400
+weight: 20
 ---
 
 # Correlations Editor in Explore

docs/sources/explore/explore-inspector.md

@@ -8,7 +8,7 @@ labels:
 keywords:
   - Explore
 title: Query inspector in Explore
-weight: 40
+weight: 15
 ---
 
 # Query inspector in Explore

docs/sources/explore/get-started-with-explore.md

@@ -0,0 +1,208 @@
+---
+aliases:
+  -
+keywords:
+  - explore
+  - loki
+  - logs
+labels:
+  products:
+    - cloud
+    - enterprise
+    - oss
+title: Get started with Explore
+weight: 5
+---
+
+# Get started with Explore
+
+Explore is your gateway for querying, analyzing, and aggregating data in Grafana. It allows you to visually explore and iterate until you develop a working query or set of queries for building visualizations and conducting data analysis. If your data source supports graph and table data, there's no need to create a dashboard, as Explore can display the results in both formats. This facilitates quick, detailed, real-time data analysis.
+
+With Explore you can:
+
+- Create visualizations to integrate into your dashboards.
+- Create queries using mixed data sources.
+- Create multiple queries within a single interface.
+- Understand the shape of your data across various data sources.
+- Perform real time data exploration and analysis.
+
+Key features include:
+
+- Query editor, based on specific data source, to create and iterate queries.
+- [Query history](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/query-management/) to track and maintain your queries.
+- [Query inspector](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/explore-inspector/) to help troubleshoot query performance.
+
+Watch the following video to get started using Explore:
+
+{{< youtube id="1q3YzX2DDM4" >}}
+
+## Before you begin
+
+In order to access Explore, you must have either the `editor` or `administrator` role, unless the [`viewers_can_edit` option](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#viewers_can_edit) is enabled. Refer to [Role and permissions](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/) for more information on what each role can access.
+
+Refer to [Role-based access control (RBAC)](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/administration/roles-and-permissions/access-control/) in Grafana Enterprise to understand how you can manage Explore with role-based permissions.
+
+{{< admonition type="note" >}}
+If you are using Grafana Cloud, open a [support ticket in the Cloud Portal](/https://grafana.com/auth/sign-in) to enable the `viewers_can_edit` option.
+{{< /admonition >}}
+
+## Explore elements
+
+Explore consists of a toolbar, outline, query editor, the ability to add multiple queries, a query history and a query inspector.
+
+- **Outline** - Keeps track of the queries and visualization panels created in Explore. Refer to [Content outline](#content-outline) for more detail.
+
+- **Toolbar** - Provides quick access to frequently used tools and settings.
+
+  - **Data source picker** - Select a data source from the dropdown menu, or use absolute time.
+  - **Split** - Click to compare visualizations side by side. Refer to [Split and compare](#split-and-compare) for additional detail.
+  - **Add** - Click to add your exploration to a dashboard. You can also use this to declare an incident,create a forecast, detect outliers and to run an investigation.
+  - **Time picker** - Select a time range form the time picker. You can also enter an absolute time range. Refer to [Time picker](#time-picker) for more information.
+  - **Run query** - Click to run your query.
+
+- **Query editor** - Interface where you construct the query for a specific data source. Query editor elements differ based on data source. In order to run queries across multiple data sources you need to select **Mixed** from the data source picker.
+
+- **+Add query** - Add additional queries.
+- **Query history** - Query history contains the list of queries that you created in Explore. Refer to [Query history](/docs/grafana/<GRAFANA_VERSION>/explore/query-management/#query-history) for detailed information on working with your query history.
+- **Query inspector** - Provides detailed statistics regarding your query. Inspector functions as a kind of debugging tool that "inspects" your query. It provides query statistics under **Stats**, request response time under **Query**, data frame details under **{} JSON**, and the shape of your data under **Data**. Refer to [Query inspector in Explore](/docs/grafana/latest/explore/explore-inspector/) for additional information.
+
+## Access Explore
+
+To access Explore:
+
+1. Click on **Explore** in the left side menu.
+
+   To start with an existing query from a dashboard panel, select the Explore option from the Panel menu in the upper right. This opens an Explore page with the panel's query, enabling you to tweak or iterate the query outside your dashboard.
+
+   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-panel-menu-10.1.png" class="docs-image--no-shadow" caption="Panel menu with Explore option" >}}
+
+1. Select a data source from the drop-down in the upper left.
+
+1. Using the query editor provided for the specific data source, begin writing your query. Each query editor differs based on each data source's unique elements.
+
+Some query editors provide a **Kick start your query** option, which gives you a list of basic pre-written queries. Refer to [Use query editors](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/#use-query-editors) to see how to use various query editors. For general information on querying data sources in Grafana, refer to [Query and transform data](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/).
+
+Based on specific data source, certain query editors allow you to select the label or labels to add to your query. Labels are fields that consist of key/value pairs representing information in the data. Some data sources allow for selecting fields.
+
+1. Click **Run query** in the upper right to run your query.
+
+## Content outline
+
+The content outline is a side navigation bar that keeps track of the queries and visualizations you created in Explore. It allows you to navigate between them quickly.
+
+The content outline works in a split view, with a separate outline generated for each pane.
+
+To open the content outline:
+
+1. Click the Outline button in the top left corner of the Explore screen.
+
+You can then click on any panel icon in the content outline to navigate to that panel.
+
+## Split and compare
+
+The split view enables easy side-by-side comparison of visualizations or simultaneous viewing of related data on a single page.
+
+To open the split view:
+
+1. Click the split button to duplicate the current query and split the page into two side-by-side queries.
+1. Run and re-run queries as often as needed.
+
+You can select a different data source, or different metrics and label filters for the new query, allowing you to compare the same query across two different servers or compare the staging environment with the production environment.
+
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-explore-split-10.1.png" max-width= "950px" caption="Screenshot of Explore screen split" >}}
+
+You can also link the time pickers for both panels by clicking on one of the time-sync buttons attached to the time pickers. When linked, changing the time in one panel automatically updates the other, keeping the start and end times synchronized. This ensures that both split panels display data for the same time interval.
+
+Click **Close** to quit split view.
+
+## Time picker
+
+Use the time picker to select a time range for your query. The default is **last hour**. You can select a different option from the dropdown or use an absolute time range. You can also change the timezone associated with the query, or use a fiscal year.
+
+1. Click **Change time settings** to change the timezone or apply a fiscal year.
+
+Refer to [Set dashboard time range](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/use-dashboards/#set-dashboard-time-range) for more information on absolute and relative time ranges. You can also [control the time range using a URL](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/use-dashboards/#control-the-time-range-using-a-url).
+
+## Mixed data source
+
+Select **Mixed** from the data source dropdown to run queries across multiple data sources in the same panel. When you select Mixed, you can select a different data source for each new query that you add.
+
+## Share Explore URLs
+
+When using Explore, the URL in the browser address bar updates as you make changes to the queries. You can share or bookmark this URL.
+
+{{% admonition type="note" %}}
+Explore may generate long URLs, which some tools, like messaging or videoconferencing applications, might truncate due to fixed message lengths. In such cases, Explore displays a warning and loads a default state.
+If you encounter issues when sharing Explore links in these applications, you can generate shortened links. See [Share shortened link](#share-shortened-link) for more information.
+{{% /admonition %}}
+
+### Generate Explore URLs from external tools
+
+Because Explore URLs have a defined structure, you can build a URL from external tools and open it in Grafana. The URL structure is:
+
+```
+http://<grafana_url>/explore?panes=<panes>&schemaVersion=<schema_version>&orgId=<org_id>
+```
+
+where:
+
+- `org_id` is the organization ID
+- `schema_version` is the schema version (should be set to the latest version which is `1`)
+- `panes` is a URL-encoded JSON object of panes, where each key is the pane ID and each value is an object matching the following schema:
+
+```
+{
+  datasource: string; // the pane's root datasource UID, or `-- Mixed --` for mixed datasources
+  queries: {
+    refId: string; // an alphanumeric identifier for this query, must be unique within the pane, i.e. "A", "B", "C", etc.
+    datasource: {
+      uid: string; // the query's datasource UID ie: "AD7864H6422"
+      type: string; // the query's datasource type-id, i.e: "loki"
+    }
+    // ... any other datasource-specific query parameters
+  }[]; // array of queries for this pane
+  range: {
+    from: string; // the start time, in milliseconds since epoch
+    to: string; // the end time, in milliseconds since epoch
+  }
+}
+```
+
+{{< admonition type="note" >}}
+The `from` and `to` also accept relative ranges defined in [Time units and relative ranges](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/use-dashboards/#time-units-and-relative-ranges).
+{{< /admonition >}}
+
+## Share shortened link
+
+{{< admonition type="note" >}}
+Available in Grafana 7.3 and later versions.
+{{< /admonition >}}
+
+The Share shortened link capability allows you to create smaller and simpler URLs of the format `/goto/:uid` instead of using longer URLs with query parameters. To create a shortened link to the executed query, click the **Share** option in the Explore toolbar.
+
+A shortened link that's not accessed automatically gets deleted after a [configurable period](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/setup-grafana/configure-grafana/#short_links), which defaults to seven days. However, if the link is accessed at least once, it will not be deleted.
+
+### Share shortened links with absolute time
+
+{{< admonition type="note" >}}
+Available in Grafana 10.3 and later versions.
+{{< /admonition >}}
+
+Shortened links have two options: relative time (e.g., from two hours ago to now) or absolute time (e.g., from 8am to 10am). By default, sharing a shortened link copies the selected time range, whether it's relative or absolute.
+
+To create a short link with an absolute time:
+
+1. Click the dropdown button next to the share shortened link button.
+1. Select one of the options under **Time-Sync URL Links**.
+
+This ensures that anyone receiving the link will see the same data you see, regardless of when they open it. Your selected time range will remain unaffected.
+
+## Next steps
+
+Now that you are familiar with Explore you can:
+
+- [Build dashboards](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/)
+- Create a wide variety of [visualizations](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/)
+- [Work with logs](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/logs-integration/)
+- [Work with traces](https://grafana.com/docs/grafana/<GRAFANA_VERSION>)
+- [Create and use correlations](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/explore/correlations-editor-in-explore/)

docs/sources/explore/logs-integration.md

@@ -9,88 +9,96 @@ labels:
     - enterprise
     - oss
 title: Logs in Explore
-weight: 15
+weight: 25
 ---
 
 # Logs in Explore
 
 Explore is a powerful tool for logging and log analysis. It allows you to investigate logs from different data sources including:
 
-- [Loki]({{< relref "../datasources/loki" >}})
-- [Elasticsearch]({{< relref "../datasources/elasticsearch" >}})
-- [Cloudwatch]({{< relref "../datasources/aws-cloudwatch" >}})
-- [InfluxDB]({{< relref "../datasources/influxdb" >}})
-- [Azure Monitor]({{< relref "../datasources/azure-monitor" >}})
+- [Loki](/docs/grafana/<GRAFANA_VERSION>/datasources/loki/)
+- [Elasticsearch](/docs/grafana/<GRAFANA_VERSION>/datasources/elasticsearch/)
+- [Cloudwatch](/docs/grafana/<GRAFANA_VERSION>/datasources/aws-cloudwatch/)
+- [InfluxDB](/docs/grafana/<GRAFANA_VERSION>/datasources/influxdb/)
+- [Azure Monitor](/docs/grafana/<GRAFANA_VERSION>/datasources/azure-monitor/)
 - [ClickHouse](https://github.com/grafana/clickhouse-datasource)
 
 With Explore, you can efficiently monitor, troubleshoot, and respond to incidents by analyzing your logs and identifying the root causes. It also helps you to correlate logs with other telemetry signals such as metrics, traces or profiles, by viewing them side-by-side.
 
-The results of log queries are displayed as individual log lines and as a graph showing the logs volume for the selected time period.
+The results of log queries display as individual log lines and as a graph showing the logs volume for the selected time period.
 
 ## Logs volume
 
-When working with data sources that support a full range logs volume, Explore automatically displays a graph showing the log distribution for all the entered log queries. This feature is currently supported by Elasticsearch and Loki data sources.
+When working with data sources that support a full range logs volume, Explore automatically displays a graph showing the log distribution for all submitted log queries. This feature is currently supported by the Elasticsearch and Loki data sources.
 
-> **Note:** In Loki, this full range log volume is rendered by a metric query which can be expensive depending on time range queried. This query can be particularly challenging to process for smaller Loki installations. To mitigate this, we recommend using a proxy like [nginx](https://www.nginx.com/) in front of Loki to set a custom timeout (for example, 10 seconds) for these queries. Log volume histogram queries can be identified by looking for queries with the HTTP header `X-Query-Tags` with value `Source=logvolhist`; these headers are added by Grafana to all log volume histogram queries.
+{{< admonition type="note" >}}
+In Loki, generating the full range log volume via a metric query can be resource-intensive, depending on the time range queried. This is especially challenging for smaller Loki installations. To mitigate this, we recommend that you use a proxy like [nginx](https://www.nginx.com/) in front of Loki with a timeout like 10ss. Log volume histogram queries can be identified by looking for queries with the HTTP header `X-Query-Tags` with value `Source=logvolhist`; these headers are added by Grafana to all log volume histogram queries.
+{{< /admonition >}}
 
-If the data source does not support loading the full range logs volume, the logs model calculates a time series by counting log rows and organizing them into buckets based on an automatically calculated time interval. The timestamp of the first log row is used to anchor the start of the logs volume in the results. The end of the time series is anchored to the time picker's **To** range. This way, you can still analyze and visualize log data efficiently even when the data source doesn't offer full range support.
+If the data source doesn't support loading the full range logs volume, the logs model calculates a time series by counting log rows and organizing them into buckets based on an automatically calculated time interval. The timestamp of the first log row is used to anchor the start of the logs volume in the results. The end of the time series is anchored to the time picker's **To** range. This way, you can still analyze and visualize log data efficiently even when the data source doesn't offer full range support.
 
 ## Logs
 
-In the following sections, you will find detailed explanations of how to visualize and interact with individual logs in Explore.
+The following sections provide detailed explanations on how to visualize and interact with individual logs in Explore.
 
 ### Logs navigation
 
-Logs navigation, at the right side of the log lines, can be used to easily request additional logs. You can do this by clicking the **Older logs** button at the bottom of the navigation. This is especially useful when you reach the line limit and you want to see more logs. Each request that is run from the navigation is then displayed in the navigation as separate page. Every page shows `from` and `to` timestamps of the incoming log lines. You can see previous results by clicking on each page. Explore caches the last five requests run from the logs navigation, so you're not re-running the same queries when clicking on the pages, saving time and resources.
+Logs navigation, located at the right side of the log lines, can be used to easily request additional logs by clicking **Older logs** at the bottom of the navigation. This is especially useful when you reach the line limit and you want to see more logs. Each request run from the navigation displays in the navigation as separate page. Every page shows `from` and `to` timestamps of the incoming log lines. You can see previous results by clicking on each page. Explore caches the last five requests run from the logs navigation so you're not re-running the same queries when clicking on the pages, saving time and resources.
 
 ![Navigate logs in Explore](/static/img/docs/explore/navigate-logs-8-0.png)
 
 ### Visualization options
 
-You can customize how logs are displayed and select which columns are shown.
+You have the option to customize the display of logs and choose which columns to show. Following is a list of available options.
 
-| Option                    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
-| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Time**                  | Shows or hides the time column. This is the timestamp associated with the log line as reported from the data source.                                                                                                                                                                                                                                                                                                                                                                           |
-| **Unique labels**         | Shows or hides the unique labels column that includes only non-common labels. All common labels are displayed above.                                                                                                                                                                                                                                                                                                                                                                           |
-| **Wrap lines**            | Set this to `true` if you want the display to use line wrapping. If set to `false`, it will result in horizontal scrolling.                                                                                                                                                                                                                                                                                                                                                                    |
-| **Prettify JSON**         | Set this to `true` to pretty print all JSON logs. This setting does not affect logs in any format other than JSON.                                                                                                                                                                                                                                                                                                                                                                             |
-| **Deduplication**         | Log data can be very repetitive and Explore can help by hiding duplicate log lines. There are a few different deduplication algorithms that you can use **Exact** matches are done on the whole line except for date fields. **Numbers** matches are done on the line after stripping out numbers such as durations, IP addresses, and so on. **Signature** is the most aggressive deduplication as it strips all letters and numbers and matches on the remaining whitespace and punctuation. |
-| **Display results order** | You can change the order of received logs from the default descending order (newest first) to ascending order (oldest first).                                                                                                                                                                                                                                                                                                                                                                  |
+| Option                    | Description                                                                                                                                                                                                                                                                                                                                                                                                                                               |
+| ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Time**                  | Shows or hides the time column. This is the timestamp associated with the log line as reported from the data source.                                                                                                                                                                                                                                                                                                                                      |
+| **Unique labels**         | Shows or hides the unique labels column that includes only non-common labels. All common labels are displayed above.                                                                                                                                                                                                                                                                                                                                      |
+| **Wrap lines**            | Set this to `true` if you want the display to use line wrapping. If set to `false`, it will result in horizontal scrolling.                                                                                                                                                                                                                                                                                                                               |
+| **Prettify JSON**         | Set this to `true` to pretty print all JSON logs. This setting does not affect logs in any format other than JSON.                                                                                                                                                                                                                                                                                                                                        |
+| **Deduplication**         | Log data can be very repetitive. Explore hides duplicate log lines using a few different deduplication algorithms. **Exact** matches are done on the whole line except for date fields. **Numbers** matches are done on the line after stripping out numbers such as durations, IP addresses, and so on. **Signature** is the most aggressive deduplication as it strips all letters and numbers and matches on the remaining whitespace and punctuation. |
+| **Display results order** | You can change the order of received logs from the default descending order (newest first) to ascending order (oldest first).                                                                                                                                                                                                                                                                                                                             |
 
 ### Download log lines
 
-To download log results in either `txt` or `json` format, simply use the **Download** button. This feature allows you to save the log data for further analysis or to share it with others in a convenient and accessible format.
+Click **Download** to download log results in either `TXT` or `JSON` format. This feature allows you to save log data for further analysis or to share it with others in a convenient and accessible format.
 
 ### Log result meta information
 
-Above the received log lines you can find essential meta information, including:
+The following meta information displays above the retrieved log lines:
 
-- **Number of received logs**: Indicates the total count of logs received for the current query or time range.
-- **Error**: Displays possible error in your log results
-- **Common labels**: Shows common labels.
-- **Total bytes processed**: Represents the cumulative size of the log data processed in bytes.
+- **Number of received logs -** Indicates the total count of logs received for the current query or time range.
+- **Error -** Displays any errors in your log results.
+- **Common labels -** Displays common labels.
+- **Total bytes processed -** Represents the cumulative size of the log data processed in bytes.
 
-> **Note:** The availability of certain meta information may depend on the data source, and as a result, you may only see some of these details for specific data sources.
+{{< admonition type="note" >}}
+The availability of certain metadata may vary depending on the data source, so you might only see details related to those specific data sources.
+{{< /admonition >}}
 
 ### Escaping newlines
 
-Explore automatically detects some incorrectly escaped sequences in log lines, such as newlines (`\n`, `\r`) or tabs (`\t`). When it detects such sequences, Explore provides an "Escape newlines" option.
+Explore automatically detects some incorrectly escaped sequences in log lines, such as newlines (`\n`, `\r`) or tabs (`\t`). When it detects such sequences, Explore provides an **Escape newlines** option.
 
 To automatically fix incorrectly escaped sequences that Explore has detected:
 
-1. Click "Escape newlines" to replace the sequences.
-2. Manually review the replacements to confirm their correctness.
+1. Click **Escape newlines** to replace the sequences.
+2. Review returned log lines.
 
-Explore replaces these sequences. When it does so, the option will change from "Escape newlines" to "Remove escaping". Evaluate the changes as the parsing may not be accurate based on the input received. You can revert the replacements by clicking "Remove escaping".
+Explore replaces these sequences, changing the option from **Escape newlines** to **Remove escaping**. Assess the changes, as the parsing may not be accurate based on the input. To revert the replacements, click **Remove escaping**.
 
 ### Log level
 
-For the logs where a `level` label is specified, we use the value of this label to determine the log level and update color of each log line accordingly. If the log doesn't have specified level label, we try to find out if its content matches any of the supported expressions (see below for more information). The log level is always determined by the first match. In the case where Grafana is not able to infer a log level field, it will be visualized with an unknown log level.
+For logs where a `level` label is specified, the value of this label is used to determine the log level and update the color of each log line accordingly.
+If the log doesn't have a specified level label, Grafana attempts to determine if its content matches any of the supported expressions.
+Refer to the following table for more information. The log level is always determined by the first match. If Grafana isn't able to infer a log level field, it gets visualized as an unknown log level.
 
-> **Tip:** If you use a Loki data source and the "level" is part of your log line, you can use parsers (JSON, logfmt, regex,..) to extract the level information into a level label that is used to determine the level value. This will allow the histogram to show the various log levels as separate bars.
+{{< admonition type="tip" >}}
+When using the Loki data source, if `level` is part of your log line, you can use parsers such as `json`, `logfmt`, or `regex` to extract the level information into a level label. This label is used to determine the level value, allowing the histogram to display the various log levels as separate bars.
+{{< /admonition >}}
 
-**Supported log levels and mapping of log level abbreviation and expressions:**
+**Log levels supported and mapping of log level abbreviation and expressions:**
 
 | Log level | Color      | Supported expressions                          |
 | :-------- | :--------- | ---------------------------------------------- |
@@ -104,66 +112,76 @@ For the logs where a `level` label is specified, we use the value of this label
 
 ### Highlight searched words
 
-When your query includes specific words or expressions to search for, Explore will highlight these in the log lines for better visibility. This highlighting feature makes it easier to identify and focus on the relevant content in your logs.
+When your query includes specific words or expressions for keyword search, Explore highlights them in log lines to enhance visibility. This highlighting feature facilitates easier identification and focus on the relevant content within your logs.
 
-> **Note:** The ability to highlight search words may vary depending on the data source. For some data sources, the highlighting of search words may not be available.
+{{< admonition type="note" >}}
+The ability to highlight search words varies depending on data source. For some data sources, the highlighting of search words may not be available.
+{{< /admonition >}}
 
 ### Log details view
 
-In Explore, each log line has an expandable section called **Log details** that can be opened by clicking on the log line. The Log details view provides additional information and exploration options in the form of **Fields** and **Links** attached to the log lines, enabling a more robust interaction and analysis.
+In Explore, each log line has an expandable section called **Log details** that you open by clicking on the log line. The Log details view provides additional information and exploration options in the form of **Fields** and **Links** attached to the log lines, enabling a more robust interaction and analysis.
 
 #### Fields
 
-Within the Log details view, you have the ability to filter displayed fields in two ways: a positive filter (to focus on an specific field) and a negative filter (to exclude certain fields). These filters will update the corresponding query that produced the log line, adding equality and inequality expressions accordingly. If the data source has support, as it's the case for Loki and Elasticsearch, log details will check if the field is already present in the current query showing and active state (for positive filters only), allowing you to toggle it off the query, or changing the filter expression from positive to negative.
+Within the **Log details** view, you have the ability to filter the displayed fields in two ways: a positive filter, which focuses on an specific field and a negative filter, which excludes certain fields.
+These filters modify the corresponding query that generated the log line, incorporating equality and inequality expressions accordingly.
 
-Additionally, you can select a subset of fields to visualize in the logs list instead of the complete log line by clicking on the eye icon. Finally, each field has a stats icon to display ad-hoc statistics in relation to all displayed logs.
+If the data source supports it, as is the case with Loki and Elasticsearch, log details will verify whether the field is already included in the current query, indicating an active state for positive filters. This enables you to toggle it off from the query or convert the filter expression from positive to negative as necessary.
+
+Click the **eye icon** to select a subset of fields to visualize in the logs list instead of the complete log line.
+
+Each field has a **stats icon**, which displays ad-hoc statistics in relation to all displayed logs.
 
 #### Links
 
-Grafana offers the functionality of data links or correlations, enabling you to convert any part of a log message into an internal or external link. These links can be used to navigate to related data or external resources, providing a seamless and convenient way to explore further information.
+Grafana provides data links or correlations, allowing you to convert any part of a log message into an internal or external link. These links enable you to navigate to related data or external resources, offering a seamless and convenient way to explore additional information.
+
 {{< figure src="/static/img/docs/explore/data-link-9-4.png" max-width="800px" caption="Data link in Explore" >}}
 
 ### Log context
 
-Log context is a feature that allows you to display additional lines of context surrounding a log entry that matches a particular search query. This can be helpful in understanding the log entry's context, and is similar to the `-C` parameter in the `grep` command.
+Log context is a feature that displays additional lines of context surrounding a log entry that matches a specific search query. This helps in understanding the context of the log entry and is similar to the `-C` parameter in the `grep` command.
 
-You may encounter long lines of text that make it difficult to read and analyze the context around each log entry. This is where the **Wrap lines** toggle can come in handy. By enabling this toggle, Grafana will automatically wrap long lines of text so that they fit within the visible width of the viewer. This can make it easier to read and understand the log entries.
+Toggle **Wrap lines** if you encounter long lines of text that make it difficult to read and analyze the context around log entries. By enabling this toggle, Grafana automatically wraps long lines of text to fit within the visible width of the viewer, making the log entries easier to read and understand.
 
-The **Open in split view** button allows you to execute the context query for a log entry in a split screen in the Explore view. Clicking this button will open a new Explore pane with the context query displayed alongside the log entry, making it easier to analyze and understand the surrounding context.
+Click **Open in split view** to execute the context query for a log entry in a split screen in the Explore view. Clicking this button opens a new Explore pane with the context query displayed alongside the log entry, making it easier to analyze and understand the surrounding context.
 
-The log context query can also be opened in a new browser tab by pressing the Cmd/Ctrl button while clicking on the button to open the context modal. When opened in a new tab, the previously selected filters are applied as well.
+Use Command-click or Ctrl+click to open the log context query in a new browser to view the context model. All previously selected filters get applied.
 
 ### Copy log line
 
-You can easily copy the content of a selected log line to your clipboard by clicking on the `Copy log line` button.
+Click **Copy log line** to copy the content of a selected log line to the clipboard.
 
 ### Copy link to log line
 
-Linking of log lines in Grafana allows you to quickly navigate to specific log entries for precise analysis. By clicking the **Copy shortlink** button for a log line, you can generate and copy a [short URL]({{< relref "../developers/http_api/short_url/" >}}) that provides direct access to the exact log entry within an absolute time range. When you open the link, Grafana will automatically scroll to the corresponding log line and highlight it with a blue background, making it easy to identify and focus on the relevant information.
+Linking log lines in Grafana allows you to quickly navigate to specific log entries for detailed and precise analysis. Click **Copy shortlink** to generate and copy a [short URL](/docs/grafana/<GRAFANA_VERSION>/developers/http_api/short_url/) that provides direct access to the exact log entry within an absolute time range. When you open the link, Grafana automatically scrolls to the corresponding log line and highlights it in blue, making it easy to identify and focus on relevant information.
 
-> **Note:** This is currently only supported in Loki and other data sources that provide an `id` field.
+{{< admonition type="note" >}}
+The short URL feature is currently only supported in Loki and other data sources that provide an `id` field.
+{{< /admonition >}}
 
 ## Live tailing
 
-To view real-time logs from supported data sources, you can leverage the Live tailing feature in Explore.
+Use the **Live tail** feature to view real-time logs from data sources.
 
-1. Click the **Live** button in the Explore toolbar to switch to Live tail view.
-2. While in Live tail view, new logs will appear from the bottom of the screen, and they will have a fading contrasting background, allowing you to easily track what's new.
-3. If you wish to pause the Live tailing and explore previous logs without any interruptions, you can do so by clicking the **Pause** button or simply scrolling through the logs view.
-4. To clear the view and remove all logs from the display, click on the **Clear logs** button. This action will reset the log view and provide you with a clean slate to continue your log analysis.
-5. To resume Live tailing and continue viewing real-time logs, click the **Resume** button.
-6. If you want to exit Live tailing and return to the standard Explore view, click the **Stop** button.
+1. Click **Live** in the Explore toolbar to switch to Live tail view.
+1. In **Live tail view**, new logs appear at the bottom of the screen, and have a contrasting background, allowing you to easily track what's new.
+1. Click **Pause** to pause live tailing and explore previous logs without interruptions. or simply scroll through the logs view.
+1. Click **Clear logs** to remove all displayed logs. This action resets the log view and provides a clean slate to continue your log analysis
+1. Click **Resume** to resume live tailing and continue viewing real-time logs.
+1. Click **Stop** to exit live tailing and return to the standard Explore view.
 
-Using the Live tailing feature, you can keep a close eye on the latest logs as they come in, making it easier to monitor real-time events and detect issues promptly.
+The **Live tailing feature** allows you to monitor the latest logs in real-time, making it easier to track events as they occur and promptly detect issues.
 
 {{< video-embed src="/static/img/docs/v95/explore_live_tailing.mp4" >}}
 
 ### Logs sample
 
-If the selected data source implements logs sample, and supports both log and metric queries, then for metric queries you will be able to automatically see samples of log lines that contributed to visualized metrics. This feature is currently supported by Loki data sources.
+If the selected data source supports log samples and both log and metric queries, you will automatically see log line samples that contribute to the visualized metrics for metric queries. **This feature is currently only supported by the Loki data source.**
 
 ### Switch from metrics to logs
 
-If you are coming from a metrics data source that implements `DataSourceWithQueryExportSupport` (such as Prometheus) to a logging data source that supports `DataSourceWithQueryImportSupport` (such as Loki), then it will keep the labels from your query that exist in the logs and use those to query the log streams.
+If you are transitioning from a metrics data source that implements `DataSourceWithQueryExportSupport` (such as Prometheus) to a logging data source that supports `DataSourceWithQueryImportSupport` (such as Loki), Explore retains the labels from your query that exist in the logs and use them to query the log streams.
 
-For example, the following Prometheus query `grafana_alerting_active_alerts{job="grafana"}` after switching to the Loki data source, will change to `{job="grafana"}`. This will return a chunk of logs in the selected time range that can be grepped/text searched.
+For example, after switching to the Loki data source, the Prometheus query `grafana_alerting_active_alerts{job="grafana"}` changes to `{job="grafana"}`. This will retrieve a set of logs within the specified time range, which can be searched using grep or text search.

docs/sources/explore/simplified-exploration/_index.md

@@ -0,0 +1,18 @@
+---
+description: Use your telemetry data to explore and determine the root cause of issues without performing queries.
+keywords:
+  - Simplified exploration
+  - queryless
+  - Explore apps
+title: Simplified exploration
+menuTitle: Simplified exploration
+weight: 100
+---
+
+# Simplified exploration
+
+Introducing the Grafana Explore apps, designed for effortless data exploration through intuitive, queryless interactions.
+
+Easily explore telemetry signals with these specialized tools, tailored specifically for the Grafana databases to provide quick and accurate insights.
+
+{{< section >}}

docs/sources/explore/simplified-exploration/metrics/index.md

@@ -6,7 +6,9 @@ labels:
     - oss
 title: Explore Metrics
 aliases:
-description: This topic describes the Explore Metrics feature
+  - ../explore-metrics/ # /docs/grafana/latest/explore/explore-metrics/
+canonical: https://grafana.com/docs/grafana/latest/explore/simplified-exploration/metrics/
+description: Explore Metrics lets you browse Prometheus-compatible metrics using an intuitive, queryless experience.
 weight: 200
 ---
 
@@ -14,18 +16,16 @@ weight: 200
 
 Grafana Explore Metrics is a query-less experience for browsing **Prometheus-compatible** metrics. Quickly find related metrics with just a few simple clicks, without needing to write PromQL queries to retrieve metrics.
 
-{{% admonition type="caution" %}}
-Explore Metrics is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
-{{% /admonition %}}
-
 With Explore Metrics, you can:
 
-- easily slice and dice metrics based on their labels, so you can immediately see anomalies and identify issues
-- see the right visualization for your metric based on its type (gauge vs. counter, for example) without building it yourself
-- surface other metrics relevant to the current metric
-- “explore in a drawer” - expand a drawer over a dashboard with more content so you don’t lose your place
-- view a history of user steps when navigating through metrics and their filters
-<!-- - easily pivot to other related telemetry, including logs or traces -->
+- Easily segment metrics based on their labels, so you can immediately spot anomalies and identify issues.
+- Automatically display the optimal visualization for each metric type (gauge vs. counter, for example) without manual setup.
+- Uncover related metrics relevant to the one you're viewing.
+- “Explore in a drawer” - overlay additional content on your dashboard without losing your current view.
+- View a history of user steps when navigating through metrics and their filters.
+- Seamlessly pivot to related telemetry, including log data.
+
+{{< docs/play title="Explore Metrics" url="https://play.grafana.org/explore/metrics/trail?from=now-1h&to=now&var-ds=grafanacloud-demoinfra-prom&var-filters=&refresh=&metricPrefix=all" >}}
 
 You can access Explore Metrics either as a standalone experience or as part of Grafana dashboards.
 

docs/sources/explore/trace-integration.md

@@ -1,5 +1,4 @@
 ---
-description: Tracing in Explore
 keywords:
   - explore
   - trace
@@ -8,167 +7,161 @@ labels:
     - cloud
     - enterprise
     - oss
-title: Tracing in Explore
-weight: 20
+title: Traces in Explore
+weight: 40
 ---
 
-# Tracing in Explore
+# Traces in Explore
 
-You can use Explore to query and visualize traces from tracing data sources.
+You can use Explore to query and visualize traces from tracing data sources. Supported data sources include:
 
-Supported data sources are:
-
-- [Tempo]({{< relref "../datasources/tempo/" >}}) (supported ingestion formats: OpenTelemetry, Jaeger, and Zipkin)
-- [Jaeger]({{< relref "../datasources/jaeger/" >}})
-- [Zipkin]({{< relref "../datasources/zipkin/" >}})
+- [Tempo](/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/)
+- [Jaeger](/docs/grafana/<GRAFANA_VERSION>/datasources/jaeger/)
+- [Zipkin](/docs/grafana/<GRAFANA_VERSION>/datasources/zipkin/)
 - [X-Ray](https://grafana.com/grafana/plugins/grafana-x-ray-datasource)
-- [Azure Monitor Application Insights]({{< relref "../datasources/azure-monitor/" >}})
+- [Azure Monitor](/docs/grafana/latest/datasources/azure-monitor/)
 - [ClickHouse](https://github.com/grafana/clickhouse-datasource)
-- [New Relic](https://grafana.com/grafana/plugins/grafana-newrelic-datasource)
-- [Infinity](https://grafana.com/grafana/plugins/yesoreyeram-infinity-datasource)
+- [New Relic](/docs/plugins/grafana-newrelic-datasource/latest/)
+- [Infinity](/docs/plugins/yesoreyeram-infinity-datasource/latest/)
 
-For information on how to configure queries for the data sources listed above, refer to the documentation for specific data source.
+Here are some references to learn more about traces and how you can use them:
 
-## Query editor
+- [Introduction to tracing](https://grafana.com/docs/tempo/<TEMPO_VERSION>/introduction/)
+- [Trace structure](https://grafana.com/docs/tempo/<TEMPO_VERSION>/traceql/trace-structure/#trace-structure)
+- [Traces and telemetry](https://grafana.com/docs/tempo/<TEMPO_VERSION>/introduction/telemetry/)
+- [Using traces to find solutions to problems](https://grafana.com/docs/tempo/<TEMPO_VERSION>/introduction/solutions-with-traces/)
+- [Best practices for tracing](/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/tracing-best-practices/)
 
-You can query and search tracing data using a data source's query editor.
+## Query editors
 
-Each data source can have it's own query editor. The query editor for the Tempo data source is slightly different than the query editor for the Jaeger data source.
+You can query and search tracing data using a data source's query editor. Note that data sources in Grafana have unique query editors.
 
-For information on querying each data source, refer to their documentation:
-
-- [Tempo query editor]({{< relref "../datasources/tempo/query-editor" >}})
-- [Jaeger query editor]({{< relref "../datasources/jaeger/#query-the-data-source" >}})
-- [Zipkin query editor]({{< relref "../datasources/zipkin/#query-the-data-source" >}})
-- [Azure Monitor Application Insights query editor]({{< relref "../datasources/azure-monitor/query-editor/#query-application-insights-traces" >}})
-- [ClickHouse query editor](https://clickhouse.com/docs/en/integrations/grafana/query-builder#traces)
+For information on how to use the query editor to create queries for tracing data sources, refer to the documentation for each individual data source.
 
 ## Trace view
 
-This section explains the elements of the Trace View.
+Grafana's trace view provides an overview of a request as it travels through your system. The following sections provide detail on various elements of the trace view.
 
-{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the trace view" >}}
+{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view.png" class="docs-image--no-shadow" max-width= "900px" caption="Trace view" >}}
 
 ### Header
 
-{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-header.png" class="docs-image--no-shadow" max-width= "750px" caption="Screenshot of the trace view header" >}}
+The trace view header includes the following:
 
-- Header title: Shows the name of the root span and trace ID.
-- Search: Highlights spans containing the searched text.
-- Metadata: Various metadata about the trace.
+- **Header title** - Shows the name of the root span and trace ID.
+- **Search** - Highlights spans containing the searched text.
+- **Metadata** - Various metadata about the trace.
+
+{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-header.png" class="docs-image--no-shadow" max-width= "750px" caption="Trace view header" >}}
 
 ### Minimap
 
-{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-minimap.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the trace view minimap" >}}
+**Minimap** displays a condensed view of the trace timeline. Drag your mouse over the minimap to zoom into a smaller time range. This also updates the main timeline, making it easier to view shorter spans
+When zoomed in, hovering over the minimap displays **Reset selection**, which resets the zoom.
 
-Shows condensed view or the trace timeline. Drag your mouse over the minimap to zoom into smaller time range. Zooming will also update the main timeline, so it is easy to see shorter spans. Hovering over the minimap, when zoomed, will show Reset Selection button which resets the zoom.
-
-### Span filters
-
-![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters-v10-1.png)
-
-Using span filters, you can filter your spans in the trace timeline viewer. The more filters you add, the more specific are the filtered spans.
-
-You can add one or more of the following filters:
-
-- Resource service name
-- Span name
-- Duration
-- Tags (which include tags, process tags, and log fields)
-
-To only show the spans you have matched, you can press the `Show matches only` toggle.
-
-{{< youtube id="VP2XV3IIc80" >}}
+{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-minimap.png" class="docs-image--no-shadow" max-width= "900px" caption="Trace view minimap example" >}}
 
 ### Timeline
 
-{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-timeline.png" class="docs-image--no-shadow" max-width= "900px"  caption="Screenshot of the trace view timeline" >}}
+Timeline shows list of spans within the trace. Each span row consists of the following components:
 
-Shows list of spans within the trace. Each span row consists of these components:
+- **Expand children** - Expands or collapses all the children spans of the selected span.
+- **Service name** - Name of the service logged the span.
+- **Operation name** - Name of the operation that this span represents.
+- **Span duration bar** - Visual representation of the operation duration within the trace.
 
-- Expand children button: Expands or collapses all the children spans of selected span.
-- Service name: Name of the service logged the span.
-- Operation name: Name of the operation that this span represents.
-- Span duration bar: Visual representation of the operation duration within the trace.
+Click anywhere on the span row to reveal span details.
 
-Clicking anywhere on the span row shows span details.
+{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-timeline.png" class="docs-image--no-shadow" max-width= "900px"  caption="Trace view timeline" >}}
 
 ### Span details
 
-{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-span-details.png" class="docs-image--no-shadow" max-width= "900px"  caption="Screenshot of the trace view span details" >}}
+Traces are composed of one or more spans.
+A span is a unit of work within a trace that has a start time relative to the beginning of the trace, a duration and an operation name for the unit of work.
+It usually has a reference to a parent span, unless it’s the first span, the root span, in a trace.
+It frequently includes key/value attributes that are relevant to the span itself, for example the HTTP method used in the request, as well as other metadata such as the service name, sub-span events, or links to other spans.
 
-- Operation name.
-- Span metadata.
-- Tags: Any tags associated with this span.
-- Process metadata: Metadata about the process that logged this span.
-- Logs: List of logs logged by this span and associated key values. In case of Zipkin logs section shows Zipkin annotations.
+You can expand any span in a trace and view the details, including the span and resource attributes.
+
+For more information about spans and traces, refer to [Introduction to tracing](https://grafana.com/docs/tempo/latest/introduction/) in the Tempo documentation.
+
+Span details include:
+
+- **Span attributes** - Key/value pairs that provides context for spans. For example, if the span deals with calling another service via HTTP, an attribute could include the HTTP URL (maybe as the span attribute key `http.url`) and the HTTP status code returned (as the span attribute `http.status_code`).
+
+- **Resource attributes** - Key/value pairs that describe the context of how the span was collected.
+
+Refer to [Span and resource attributes](/docs/tempo/<TEMPO_VERSION>/operations/best-practices/#span-and-resource-attributes) for more detail.
+
+{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-span-details.png" class="docs-image--no-shadow" max-width= "900px"  caption="Trace view span details" >}}
+
+### Span filters
+
+Span filters allow you to refine the spans displayed in the trace timeline viewer.
+The more filters you add, the more specific the filtered spans become.
+Click on a trace to access Span filters.
+
+![Screenshot of span filtering](/media/docs/tempo/screenshot-grafana-tempo-span-filters-v10-1.png)
+
+You can add one or more of the following filters:
+
+- **Service name** - Filter by selecting a service name from the dropdown.
+- **Span name** - Filter by selecting a span name from the dropdown.
+- **Duration** - Filter by duration. Accepted units include ns, us, ms, s, m, h.
+- **Tags** - Filter by tags, process tags, or log fields in your span.
+
+To only show the spans you have matched, toggle **Show matches only**.
+
+Refer to [Span filters](/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/span-filters/) for more in depth information.
+
+Watch the following video to learn more about filtering trace spans in Grafana:
+{{< youtube id="VP2XV3IIc80" >}}
 
 ### Trace to logs
 
-You can navigate from a span in a trace view directly to logs relevant for that span. This feature is available for Tempo, Jaeger, and Zipkin data sources. Refer to their [relevant documentation](/docs/grafana/latest/datasources/tempo/#trace-to-logs) for configuration instructions.
-
-{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-trace-to-logs.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the trace view in Explore with icon next to the spans" >}}
+You can navigate from a span in a trace view directly to logs relevant for that span.
+This feature is available for the Tempo, Jaeger, and Zipkin data sources.
+Refer to each individual data source's documentation for configuration instructions.
 
 Click the document icon to open a split view in Explore with the configured data source and query relevant logs for the span.
 
+{{< figure src="/media/docs/tempo/screenshot-grafana-trace-view-trace-to-logs.png" class="docs-image--no-shadow" max-width= "900px" caption="Trace to logs" >}}
+
 ### Trace to metrics
 
-{{% admonition type="note" %}}
-This feature is currently in beta and behind the `traceToMetrics` feature toggle.
-{{% /admonition %}}
+You can navigate from a span in a trace view directly to metrics relevant for that span.
+This feature is available for the Tempo, Jaeger, and Zipkin data sources.
 
-You can navigate from a span in a trace view directly to metrics relevant for that span. This feature is available for Tempo, Jaeger, and Zipkin data sources. Refer to their [relevant documentation](/docs/grafana/latest/datasources/tempo/configure-tempo-data-source/#trace-to-metrics) for configuration instructions.
+Refer to each individual data source's documentation for configuration instructions.
+For Tempo, refer to [Trace to metrics configuration](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/configure-tempo-data-source/#trace-to-metrics).
 
 ### Trace to profiles
 
 Using Trace to profiles, you can use Grafana’s ability to correlate different signals by adding the functionality to link between traces and profiles.
-Refer to the [relevant documentation](/docs/grafana/latest/datasources/tempo/configure-tempo-data-source#trace-to-profiles) for configuration instructions.
+
+For Tempo refer to [Trace to profiles](/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/configure-tempo-data-source#trace-to-profiles) for configuration instructions.
 
 {{< figure src="/static/img/docs/tempo/profiles/tempo-trace-to-profile.png" max-width="900px" class="docs-image--no-shadow" alt="Selecting a link in the span queries the profile data source" >}}
 
 ## Node graph
 
-You can optionally expand the node graph for the displayed trace. Depending on the data source, this can show spans of the trace as nodes in the graph, or as some additional context like service graph based on the current trace.
+You can also expand the node graph for a displayed trace. If the data source supports it, this displays spans of the trace as nodes in the graph, or provides additional context, such as a service graph based on the current trace.
 
-{{< figure src="/media/docs/tempo/screenshot-grafana-node-graph.png" class="docs-image--no-shadow" max-width= "900px"  caption="Screenshot of the node graph" >}}
+Refer to [Node graph](/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/node-graph/) for additional information.
 
-## Service Graph
+{{< admonition type="note" >}}
+The node graph requires data to be returned from the data source in a specific format to display correctly. Refer to [Data API](/docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/node-graph/#data-api), [Nodes data frame structure](/docs/grafana/latest/panels-visualizations/visualizations/node-graph/#nodes-data-frame-structure) and [Node graph data requirements](/docs/grafana/latest/panels-visualizations/visualizations/node-graph/#data-requirements) for additional information and configuration instructions.
+{{< /admonition >}}
 
-The Service Graph visualizes the span metrics (traces data for rates, error rates, and durations (RED)) and service graphs.
-Once the requirements are set up, this pre-configured view is immediately available.
+{{< figure src="/media/docs/tempo/screenshot-grafana-node-graph.png" class="docs-image--no-shadow" max-width= "900px"  caption="Node graph" >}}
 
-For more information, refer to the [Service Graph view section]({{< relref "../datasources/tempo/#open-the-service-graph-view" >}}) of the Tempo data source page and the [service graph view page](/docs/tempo/latest/metrics-generator/service-graph-view/) in the Tempo documentation.
+## Service graph
 
-{{< figure src="/static/img/docs/grafana-cloud/apm-overview.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the Service Graph view" >}}
+A service graph visualizes span metrics, including rates, error rates, and durations (RED), along with service relationships. Once the requirements are configured, this pre-configured view is immediately available.
 
-## Data API
+For additional information refer to the following documentation:
 
-This visualization needs a specific shape of the data to be returned from the data source in order to correctly display it.
+- [Service Graph and Service Graph view](/docs/grafana/<GRAFANA_VERSION>/datasources/tempo/service-graph/)
+- [Service graph view](/docs/tempo/<TEMPO_VERSION>/metrics-generator/service-graph-view/) in Tempo documentation
 
-Data source needs to return data frame and set `frame.meta.preferredVisualisationType = 'trace'`.
-
-### Data frame structure
-
-Required fields:
-
-| Field name   | Type                | Description                                                                                                                         |
-| ------------ | ------------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| traceID      | string              | Identifier for the entire trace. There should be only one trace in the data frame.                                                  |
-| spanID       | string              | Identifier for the current span. SpanIDs should be unique per trace.                                                                |
-| parentSpanID | string              | SpanID of the parent span to create child parent relationship in the trace view. Can be `undefined` for root span without a parent. |
-| serviceName  | string              | Name of the service this span is part of.                                                                                           |
-| serviceTags  | TraceKeyValuePair[] | List of tags relevant for the service.                                                                                              |
-| startTime    | number              | Start time of the span in millisecond epoch time.                                                                                   |
-| duration     | number              | Duration of the span in milliseconds.                                                                                               |
-
-Optional fields:
-
-| Field name     | Type                | Description                                                        |
-| -------------- | ------------------- | ------------------------------------------------------------------ |
-| logs           | TraceLog[]          | List of logs associated with the current span.                     |
-| tags           | TraceKeyValuePair[] | List of tags associated with the current span.                     |
-| warnings       | string[]            | List of warnings associated with the current span.                 |
-| stackTraces    | string[]            | List of stack traces associated with the current span.             |
-| errorIconColor | string              | Color of the error icon in case span is tagged with `error: true`. |
-
-For details about the types see [TraceSpanRow](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/trace.ts#L28), [TraceKeyValuePair](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/trace.ts#L4) and [TraceLog](https://github.com/grafana/grafana/blob/main/packages/grafana-data/src/types/trace.ts#L12).
+{{< figure src="/static/img/docs/grafana-cloud/apm-overview.png" class="docs-image--no-shadow" max-width= "900px" caption="Service graph view" >}}

docs/sources/panels-visualizations/configure-data-links/index.md

@@ -143,14 +143,26 @@ If there's only one data link in the visualization, clicking anywhere on the vis
 
 You can configure data links for the following visualizations:
 
-|                                |                                      |                                      |
-| ------------------------------ | ------------------------------------ | ------------------------------------ |
-| [Bar chart](ref:bar-chart)     | [Heatmap](ref:heatmap)               | [Status history](ref:status-history) |
-| [Bar gauge](ref:bar-gauge)     | [Histogram](ref:histogram)           | [Table](ref:table)                   |
-| [Candlestick](ref:candlestick) | [Pie chart](ref:pie-chart)           | [Time series](ref:time-series)       |
-| [Canvas](ref:canvas)           | [Stat](ref:stat)                     | [Trend](ref:trend)                   |
-| [Gauge](ref:gauge)             | [State timeline](ref:state-timeline) | [XY chart](ref:xy-chart)             |
-| [Geomap](ref:geomap)           |                                      |                                      |
+{{< column-list >}}
+
+- [Bar chart](ref:bar-chart)
+- [Bar gauge](ref:bar-gauge)
+- [Candlestick](ref:candlestick)
+- [Canvas](ref:canvas)
+- [Gauge](ref:gauge)
+- [Geomap](ref:geomap)
+- [Heatmap](ref:heatmap)
+- [Histogram](ref:histogram)
+- [Pie chart](ref:pie-chart)
+- [Stat](ref:stat)
+- [State timeline](ref:state-timeline)
+- [Status history](ref:status-history)
+- [Table](ref:table)
+- [Time series](ref:time-series)
+- [Trend](ref:trend)
+- [XY chart](ref:xy-chart)
+
+{{< /column-list >}}
 
 ## Data link variables
 

docs/sources/panels-visualizations/configure-overrides/index.md

@@ -121,14 +121,26 @@ After you've set them, your overrides appear in both the **All** and **Overrides
 
 You can configure field overrides for the following visualizations:
 
-|                                |                                      |                                      |
-| ------------------------------ | ------------------------------------ | ------------------------------------ |
-| [Bar chart](ref:bar-chart)     | [Heatmap](ref:heatmap)               | [Status history](ref:status-history) |
-| [Bar gauge](ref:bar-gauge)     | [Histogram](ref:histogram)           | [Table](ref:table)                   |
-| [Candlestick](ref:candlestick) | [Pie chart](ref:pie-chart)           | [Time series](ref:time-series)       |
-| [Canvas](ref:canvas)           | [Stat](ref:stat)                     | [Trend](ref:trend)                   |
-| [Gauge](ref:gauge)             | [State timeline](ref:state-timeline) | [XY chart](ref:xy-chart)             |
-| [Geomap](ref:geomap)           |                                      |                                      |
+{{< column-list >}}
+
+- [Bar chart](ref:bar-chart)
+- [Bar gauge](ref:bar-gauge)
+- [Candlestick](ref:candlestick)
+- [Canvas](ref:canvas)
+- [Gauge](ref:gauge)
+- [Geomap](ref:geomap)
+- [Heatmap](ref:heatmap)
+- [Histogram](ref:histogram)
+- [Pie chart](ref:pie-chart)
+- [Stat](ref:stat)
+- [State timeline](ref:state-timeline)
+- [Status history](ref:status-history)
+- [Table](ref:table)
+- [Time series](ref:time-series)
+- [Trend](ref:trend)
+- [XY chart](ref:xy-chart)
+
+{{< /column-list >}}
 
 ## Override rules
 

docs/sources/panels-visualizations/configure-standard-options/index.md

@@ -126,13 +126,25 @@ For more granular control over the display of fields, refer to [Configure overri
 
 You can configure standard options for the following visualizations:
 
-|                                |                                      |                                      |
-| ------------------------------ | ------------------------------------ | ------------------------------------ |
-| [Bar chart](ref:bar-chart)     | [Geomap](ref:geomap)                 | [Status history](ref:status-history) |
-| [Bar gauge](ref:bar-gauge)     | [Histogram](ref:histogram)           | [Table](ref:table)                   |
-| [Candlestick](ref:candlestick) | [Pie chart](ref:pie-chart)           | [Time series](ref:time-series)       |
-| [Canvas](ref:canvas)           | [Stat](ref:stat)                     | [Trend](ref:trend)                   |
-| [Gauge](ref:gauge)             | [State timeline](ref:state-timeline) | [XY chart](ref:xy-chart)             |
+{{< column-list >}}
+
+- [Bar chart](ref:bar-chart)
+- [Bar gauge](ref:bar-gauge)
+- [Candlestick](ref:candlestick)
+- [Canvas](ref:canvas)
+- [Gauge](ref:gauge)
+- [Geomap](ref:geomap)
+- [Histogram](ref:histogram)
+- [Pie chart](ref:pie-chart)
+- [Stat](ref:stat)
+- [State timeline](ref:state-timeline)
+- [Status history](ref:status-history)
+- [Table](ref:table)
+- [Time series](ref:time-series)
+- [Trend](ref:trend)
+- [XY chart](ref:xy-chart)
+
+{{< /column-list >}}
 
 ## Standard options
 

docs/sources/panels-visualizations/configure-thresholds/index.md

@@ -110,13 +110,23 @@ You can also use thresholds to:
 
 You can set thresholds in the following visualizations:
 
-|                                |                                      |                                      |
-| ------------------------------ | ------------------------------------ | ------------------------------------ |
-| [Bar chart](ref:bar-chart)     | [Geomap](ref:geomap)                 | [Status history](ref:status-history) |
-| [Bar gauge](ref:bar-gauge)     | [Histogram](ref:histogram)           | [Table](ref:table)                   |
-| [Candlestick](ref:candlestick) | [Stat](ref:stat)                     | [Time series](ref:time-series)       |
-| [Canvas](ref:canvas)           | [State timeline](ref:state-timeline) | [Trend](ref:trend)                   |
-| [Gauge](ref:gauge)             |
+{{< column-list >}}
+
+- [Bar chart](ref:bar-chart)
+- [Bar gauge](ref:bar-gauge)
+- [Candlestick](ref:candlestick)
+- [Canvas](ref:canvas)
+- [Gauge](ref:gauge)
+- [Geomap](ref:geomap)
+- [Histogram](ref:histogram)
+- [Stat](ref:stat)
+- [State timeline](ref:state-timeline)
+- [Status history](ref:status-history)
+- [Table](ref:table)
+- [Time series](ref:time-series)
+- [Trend](ref:trend)
+
+{{< /column-list >}}
 
 ## Default thresholds
 
@@ -125,7 +135,7 @@ On visualizations that support thresholds, Grafana has the following default thr
 - 80 = red
 - Base = green
 - Mode = Absolute
-- Show thresholds = Off (for some visualizations); for more information, see the [Show thresholds](#show-threshold) option.
+- Show thresholds = Off (for some visualizations); for more information, see the [Show thresholds](#show-thresholds) option.
 
 ## Thresholds options
 

docs/sources/panels-visualizations/configure-tooltips/index.md

@@ -84,13 +84,19 @@ When you hover your cursor over a visualization, Grafana can display tooltips th
 
 You can configure tooltips for the following visualizations:
 
-|                                      |                                      |
-| ------------------------------------ | ------------------------------------ |
-| [Bar chart](ref:bar-chart)           | [Status history](ref:status-history) |
-| [Candlestick](ref:candlestick)       | [Time series](ref:time-series)       |
-| [Heatmap](ref:heatmap)               | [Trend](ref:trend)                   |
-| [Pie chart](ref:pie-chart)           | [XY chart](ref:xy-chart)             |
-| [State timeline](ref:state-timeline) |                                      |
+{{< column-list >}}
+
+- [Bar chart](ref:bar-chart)
+- [Candlestick](ref:candlestick)
+- [Heatmap](ref:heatmap)
+- [Pie chart](ref:pie-chart)
+- [State timeline](ref:state-timeline)
+- [Status history](ref:status-history)
+- [Time series](ref:time-series)
+- [Trend](ref:trend)
+- [XY chart](ref:xy-chart)
+
+{{< /column-list >}}
 
 Some visualizations, for example [candlestick](ref:candlestick) and [flame graph](ref:flame-graph), have tooltips, but they aren't configurable. These visualizations don't have a **Tooltip** section in the panel editor pane. [Geomaps](ref:geomaps) provide you the option to have tooltips triggered upon click or hover under the **Map controls** options in the panel editor pane.
 

docs/sources/panels-visualizations/configure-value-mappings/index.md

@@ -105,13 +105,24 @@ Value mappings bypass unit formatting set in the **Standard options** section of
 
 You can configure value mappings for the following visualizations:
 
-|                                |                                      |                                      |
-| ------------------------------ | ------------------------------------ | ------------------------------------ |
-| [Bar chart](ref:bar-chart)     | [Geomap](ref:geomap)                 | [Status history](ref:status-history) |
-| [Bar gauge](ref:bar-gauge)     | [Histogram](ref:histogram)           | [Table](ref:table)                   |
-| [Candlestick](ref:candlestick) | [Pie chart](ref:pie-chart)           | [Time series](ref:time-series)       |
-| [Canvas](ref:canvas)           | [Stat](ref:stat)                     | [Trend](ref:trend)                   |
-| [Gauge](ref:gauge)             | [State timeline](ref:state-timeline) |                                      |
+{{< column-list >}}
+
+- [Bar chart](ref:bar-chart)
+- [Bar gauge](ref:bar-gauge)
+- [Candlestick](ref:candlestick)
+- [Canvas](ref:canvas)
+- [Gauge](ref:gauge)
+- [Geomap](ref:geomap)
+- [Histogram](ref:histogram)
+- [Pie chart](ref:pie-chart)
+- [Stat](ref:stat)
+- [State timeline](ref:state-timeline)
+- [Status history](ref:status-history)
+- [Table](ref:table)
+- [Time series](ref:time-series)
+- [Trend](ref:trend)
+
+{{< /column-list >}}
 
 ## Types of value mappings
 

docs/sources/panels-visualizations/panel-editor-overview/index.md

@@ -2,7 +2,6 @@
 aliases:
   - ../dashboards/add-organize-panels/
   - ../dashboards/dashboard-create/
-  - ../features/dashboard/dashboards/
   - ../panels/add-panels-dynamically/about-repeating-panels-rows/
   - ../panels/add-panels-dynamically/configure-repeating-panels/
   - ../panels/add-panels-dynamically/configure-repeating-rows/

docs/sources/panels-visualizations/visualizations/alert-list/index.md

@@ -24,13 +24,23 @@ refs:
       destination: /docs/grafana/<GRAFANA_VERSION>/alerting/
     - pattern: /docs/grafana-cloud/
       destination: /docs/grafana-cloud/alerting-and-irm/alerting/
+  create-dashboard:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard/
+  alert-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/
 ---
 
 # Alert list
 
 Alert lists allow you to display a list of important alerts that you want to track. You can configure the alert list to show the current state of your alert, such as firing, pending, or normal. Learn more about alerts in [Grafana Alerting overview](ref:grafana-alerting-overview).
 
-{{< figure src="/static/img/docs/alert-list-panel/alert-list-panel.png" max-width="850px" alt="An alert list visualization" >}}
+![An alert list visualization](/media/docs/grafana/panels-visualizations/screenshot-alert-list-v11.3.png)
 
 On each dashboard load, this visualization queries the alert list, always providing the most up-to-date results.
 
@@ -38,33 +48,41 @@ On each dashboard load, this visualization queries the alert list, always provid
 
 ## Configure an alert list
 
-Once you’ve created a [dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure an alert list visualization:
+Once you’ve [created a dashboard](ref:create-dashboard), the following video shows you how to configure an alert list visualization:
 
 {{< youtube id="o4rK7_AXZ9Y" >}}
 
-## Panel options
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Options
+### Options
 
 Use the following options to refine your alert list visualization.
 
-### Group mode
+<!-- prettier-ignore-start -->
 
-Choose between **Default grouping** to show alert instances grouped by their alert rule, or **Custom grouping** to show alert instances grouped by a custom set of labels.
+| Option     | Description                                                                                               |
+| ---------- | --------------------------------------------------------------------------------------------------------- |
+| View mode  | Choose between **List** to display alerts in a detailed list format with comprehensive information, or **Stat** to show alerts as a summarized single-value statistic.  |
+| Group mode | Choose between **Default grouping** to show alert instances grouped by their alert rule, or **Custom grouping** to show alert instances grouped by a custom set of labels. |
+| Max items | Sets the maximum number of alerts to list. By default, Grafana sets this value to 10. |
+| [Sort order](#sort-order) | Select how to order the alerts displayed. |
+| Alerts linked to this dashboard | Toggle the switch on to only show alerts from the dashboard the alert list is in. |
 
-### Max items
+<!-- prettier-ignore-end -->
 
-Sets the maximum number of alerts to list. By default, Grafana sets this value to 10.
-
-### Sort order
+#### Sort order
 
 Select how to order the alerts displayed. Choose from:
 
-- **Alphabetical (asc) -** Alphabetical order.
-- **Alphabetical (desc) -** Reverse alphabetical order.
-- **Importance -** By importance according to the following values, with 1 being the highest:
+- **Alphabetical (asc)** - Alphabetical order.
+- **Alphabetical (desc)** - Reverse alphabetical order.
+- **Importance** - By importance according to the following values, with 1 being the highest:
   - alerting: 1
   - firing: 1
   - no_data: 2
@@ -72,39 +90,34 @@ Select how to order the alerts displayed. Choose from:
   - ok: 4
   - paused: 5
   - inactive: 5
-- **Time (asc) -** Newest active alert instances first.
-- **Time (desc) -** Oldest active alert instances first.
+- **Time (asc)** - Newest active alert instances first.
+- **Time (desc)** - Oldest active alert instances first.
 
-### Alerts linked to this dashboard
-
-Toggle the switch on to only show alerts from the dashboard the alert list is in.
-
-## Filter
+### Filter options
 
 These options allow you to limit alerts shown to only those that match the query, folder, or tags you choose.
 
-### Alert name
+<!-- prettier-ignore-start -->
 
-Filter alerts by name.
+| Option     | Description                                                                                               |
+| ---------- | --------------------------------------------------------------------------------------------------------- |
+| Alert name | Filter alerts by name. |
+| Alert instance label | Filter alert instances using [label](ref:alert-label) querying. For example,`{severity="critical", instance=~"cluster-us-.+"}`. |
+| Datasource | Filter alerts from the selected data source. |
+| Folder | Filter alerts by the selected folder. Only alerts from dashboards in this folder are displayed. |
 
-### Alert instance label
-
-Filter alert instances using [label](https://grafana.com/docs/grafana/latest/alerting/fundamentals/alert-rules/annotation-label/) querying. For example,`{severity="critical", instance=~"cluster-us-.+"}`.
-
-### Datasource
-
-Filter alerts from the selected data source.
-
-### Folder
-
-Filter alerts by the selected folder. Only alerts from dashboards in this folder are displayed.
-
-## Alert state filter
+### Alert state filter options
 
 Choose which alert states to display in this visualization.
 
-- Alerting / Firing
-- Pending
-- No Data
-- Normal
-- Error
+<!-- prettier-ignore-start -->
+
+| Option     | Description                                                                                               |
+| ---------- | --------------------------------------------------------------------------------------------------------- |
+| Alerting / Firing | Shows alerts that are currently active and triggering an alert condition. |
+| Pending | Shows alerts that are in a transitional state, waiting for conditions to be met before triggering. |
+| No Data | Shows alerts where the data source is not returning any data, which could indicate an issue with data collection. |
+| Normal | Shows alerts that are in a normal or resolved state, where no alert condition is currently met. |
+| Error | Shows alerts where an error has occurred, typically related to an issue in the alerting process. |
+
+<!-- prettier-ignore-end -->

docs/sources/panels-visualizations/visualizations/bar-chart/index.md

@@ -37,192 +37,155 @@ refs:
       destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-data-links/
     - pattern: /docs/grafana-cloud/
       destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-data-links/
+  time-series:
+    - 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/
 ---
 
 # Bar chart
 
-Bar charts allow you to graph categorical data.
+A bar chart is a visual representation that uses rectangular bars, where the length of each bar represents each value.
+You can use the bar chart visualization when you want to compare values over different categories or time periods. The visualization can display the bars horizontally or vertically, and can be customized to group or stack bars for more complex data analysis.
 
-{{< figure src="/static/img/docs/bar-chart-panel/barchart_small_example.png" max-width="1000px" caption="Bar chart" >}}
+![Bar chart visualizations](/media/docs/grafana/panels-visualizations/screenshot-bar-charts-v11.3.png)
+
+You can use the bar chart visualization if you need to show:
+
+- Population distribution by age or location
+- CPU usage per application
+- Sales per division
+- Server cost distribution
+
+## Configure a bar chart
+
+The following video shows you how to create and configure a bar chart visualization:
+
+{{< youtube id="qyKE9-71KkE" >}}
 
 {{< docs/play title="Grafana Bar Charts and Pie Charts" url="https://play.grafana.org/d/ktMs4D6Mk/" >}}
 
 ## Supported data formats
 
-Only one data frame is supported and it must have at least one string field that will be used as the category for an X or Y axis and one or more numerical fields.
+To create a bar chart visualization, you need a dataset containing one string or time field (or column) and at least one numeric field, though preferably more than one to make best use of the visualization.
 
-Example:
+The text or time field is used to label the bars or values in each row of data and the numeric fields are represented by proportionally sized bars.
 
-| Browser | Market share |
-| ------- | ------------ |
-| Chrome  | 50           |
-| IE      | 17.5         |
+### Example 1
 
-If you have more than one numerical field the visualization will show grouped bars.
+| Group | Value1 | Value2 | Value3 |
+| ----- | ------ | ------ | ------ |
+| uno   | 5      | 3      | 2      |
 
-### Visualizing time series or multiple result sets
+![Bar chart single row example](/media/docs/grafana/panels-visualizations/screenshot-grafana-11.1-barchart-example1.png 'Bar chart single row example')
 
-If you have multiple time series or tables you first need to join them using a join or reduce transform. For example if you
-have multiple time series and you want to compare their last and max value add the **Reduce** transform and specify **Max** and **Last** as options under **Calculations**.
+If you have more than one text or time field, by default, the visualization uses the first one, but you can change this in the x-axis option as described in the [Bar chart options](#bar-chart-options) section.
 
-{{< figure src="/static/img/docs/bar-chart-panel/bar-chart-time-series-v8-0.png" max-width="1025px" caption="Bar chart time series example" >}}
+### Example 2
 
-## Panel options
+If your dataset contains multiple rows, the visualization displays multiple bar chart groups where each group contains multiple bars representing all the numeric values for a row.
+
+| Group | Value1 | Value2 | Value3 |
+| ----- | ------ | ------ | ------ |
+| uno   | 5      | 3      | 2      |
+| dos   | 10     | 6      | 4      |
+| tres  | 20     | 8      | 2      |
+
+![Bar chart multiple row example](/media/docs/grafana/panels-visualizations/screenshot-grafana-11.1-barchart-example2.png 'Bar chart multiple row example')
+
+While the first field can be time-based and you can use a bar chart to plot time-series data, for large amounts of time-series data, we recommend that you use the [time series visualization](ref:time-series) and configure it to be displayed as bars.
+
+We recommend that you only use one dataset in a bar chart because using multiple datasets can result in unexpected behavior.
+
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Bar chart options
+### Bar chart options
 
 Use these options to refine your visualization.
 
-### Orientation
+<!-- prettier-ignore-start -->
 
-- **Auto** - Grafana decides the bar orientation based on what the panel dimensions.
-- **Horizontal** - Will make the X axis the category axis.
-- **Vertical** - Will make the Y axis the category axis.
+| Option                           | Description                                                                                      |
+| -------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| X Axis                           | Specify which field is used for the x-axis.          |
+| Orientation                      | Choose from: <ul><li>**Auto** - Grafana decides the bar orientation based on the panel dimensions.</li><li>**Horizontal** - Will make the X axis the category axis.</li><li>**Vertical** - Will make the Y axis the category axis.</li></ul> |
+| Rotate x-axis tick labels        | When the graph is vertically oriented, this setting rotates the labels under the bars. This setting is useful when bar chart labels are long and overlap.  |
+| X-axis tick label max length | Sets the maximum length of bar chart labels. Labels longer than the maximum length are truncated, and appended with `...`. |
+| X-axis labels minimum spacing | Sets the minimum spacing between x-axis labels. Depending on your choice, you can select the **RTL** checkbox to require space from the right side. Choose from: <ul><li>**None** - All tick marks are shown.</li><li>**Small** - 100 px of space is required between labels.</li><li>**Medium** - 200 px of space is required between labels.</li><li>**Large** - 300 px of space is required between labels.</li></ul>  |
+| Show values                      | This controls whether values are shown. Values are shown on top or to the left of bars. Choose from: <ul><li>**Auto** Values will be shown if there is space.</li><li>**Always** Always show values.</li><li>**Never** Never show values.</li></ul>                                                               |
+| Stacking                         | Controls bar chart stacking. Choose from: <ul><li>**Off**: Bars will not be stacked.</li><li>**Normal**: Bars will be stacked on each other.</li><li>**Percent**: Bars will be stacked on each other, and the height of each bar is the percentage of the total height of the stack.</li></ul> |
+| Group width                      | Controls the width of groups. 1 = Max with, 0 = Min width.       |
+| Bar width                        | Controls the width of bars. 1 = Max width, 0 = Min width.    |
+| Bar radius                       | Controls the radius of the bars. Choose from: <ul><li>0 = Minimum radius</li><li>0.5 = Maximum radius</li></ul>     |
+| Highlight full area on cover     | Controls if the entire surrounding area of the bar is highlighted when you hover over the bar.    |
+| Color by field    | Use the color value for a sibling field to color each bar value. |
+| Line width                       | Controls line width of the bars.    |
+| Fill opacity                     | Controls the fill opacity bars.                    |
+| [Gradient mode](#gradient-mode)  | Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option. Gradient appearance is influenced by the **Fill opacity** setting.                                                                               |
 
-### Rotate x-axis tick labels
+<!-- prettier-ignore-end -->
 
-When the graph is vertically oriented, this setting rotates the labels under the bars. This setting is useful when bar chart labels are long and overlap.
+#### Gradient mode
 
-### X-axis tick label maximum length
+Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option. Gradient appearance is influenced by the **Fill opacity** setting. Choose from:
 
-Sets the maximum length of bar chart labels. Labels longer than the maximum length are truncated, and appended with `...`.
+- **None** - No gradient fill. This is the default setting.
+- **Opacity** - Transparency of the gradient is calculated based on the values on the y-axis. Opacity of the fill is increasing with the values on the Y-axis.
+- **Hue** - Gradient color is generated based on the hue of the line color.
+- **Scheme** - The bar receives a gradient color defined by the **Standard options > Color scheme** selection.
 
-### Bar labels minimum spacing
+  - **From thresholds** - If the **Color scheme** selection is **From thresholds (by value)**, then each bar is the color of the defined threshold.
 
-Sets the minimum spacing between bar labels.
+    {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-colors-by-thresholds-v11.3.png" alt="Color scheme From thresholds" caption="Color scheme: From thresholds" >}}
 
-### Show values
+  - **Gradient color schemes** - The following image shows a bar chart with the **Green-Yellow-Red (by value)** color scheme option selected.
 
-This controls whether values are shown on top or to the left of bars.
+    {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-colors-by-value-v11.3.png" alt="Color scheme Green-Yellow-Red" caption="Color scheme: Green-Yellow-Red" >}}
 
-- **Auto** Values will be shown if there is space
-- **Always** Always show values.
-- **Never** Never show values.
+### Tooltip options
 
-### Stacking
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
 
-Controls bar chart stacking.
-
-- **Off**: Bars will not be stacked.
-- **Normal**: Bars will be stacked on each other.
-- **Percent**: Bars will be stacked on each other, and the height of each bar is the percentage of the total height of the stack.
-
-### Group width
-
-Controls the width of groups. 1 = max with, 0 = min width.
-
-### Bar width
-
-Controls the width of bars. 1 = Max width, 0 = Min width.
-
-### Bar radius
-
-Controls the radius of the bars.
-
-- 0 = Minimum radius
-- 0.5 = Maximum radius
-
-### Highlight full area on cover
-
-Controls if the entire surrounding area of the bar is highlighted when you hover over the bar.
-
-### Line width
-
-Controls line width of the bars.
-
-### Fill opacity
-
-Controls the fill opacity bars.
-
-### Gradient mode
-
-Set the mode of the gradient fill. Fill gradient is based on the line color. To change the color, use the standard color scheme field option.
-
-Gradient appearance is influenced by the **Fill opacity** setting.
-
-#### None
-
-No gradient fill. This is the default setting.
-
-#### Opacity
-
-Transparency of the gradient is calculated based on the values on the y-axis. Opacity of the fill is increasing with the values on the Y-axis.
-
-#### Hue
-
-Gradient color is generated based on the hue of the line color.
-
-#### Scheme gradient mode
-
-The **Gradient mode** option located under the **Graph styles** has a mode named **Scheme**. When you enable **Scheme**, the bar receives a gradient color defined from the selected **Color scheme**.
-
-##### From thresholds
-
-If the **Color scheme** is set to **From thresholds (by value)** and **Gradient mode** is set to **Scheme**, then the bar color changes as they cross the defined thresholds.
-
-{{< figure src="/static/img/docs/time-series-panel/gradient_mode_scheme_thresholds_bars.png" max-width="1200px" caption="Color scheme: From thresholds" >}}
-
-##### Gradient color schemes
-
-The following image shows a bar chart with the **Green-Yellow-Red (by value)** color scheme option selected.
-
-{{< figure src="/static/img/docs/time-series-panel/gradient_mode_scheme_bars.png" max-width="1200px" caption="Color scheme: Green-Yellow-Red" >}}
-
-## Tooltip options
-
-{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Legend options
+### Legend options
 
 {{< docs/shared lookup="visualizations/legend-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Text size
+### Text size
 
 Enter a **Value** to change the size of the text on your bar chart.
 
-## Axis
+### Axis
 
 Use the following field settings to refine how your axes display.
 
+For guidance on configuring more than one y-axis, refer to [Multiple y-axes](#multiple-y-axes).
+
 Some field options will not affect the visualization until you click outside of the field option box you are editing or press Enter.
 
-### Placement
+<!-- prettier-ignore-start -->
 
-Select the placement of the Y-axis.
+| Option | Description |
+| ------ | ----------- |
+| Placement | Select the placement of the Y-axis. Choose from: <ul><li>**Auto** - Grafana automatically assigns Y-axis to the series. When there are two or more series with different units, then Grafana assigns the left axis to the first unit and right to the following units.</li><li>**Left** - Display all Y-axes on the left side.</li><li>**Right** - Display all Y-axes on the right side.</li><li>**Hidden** - Hide all axes. To selectively hide axes, [add a field override](ref:add-a-field-override) that targets specific fields.</li></ul> |
+| Label | Set a Y-axis text label. If you have more than one Y-axis, then you can assign different labels with an override. |
+| Width | Set a fixed width of the axis. By default, Grafana dynamically calculates the width of an axis.<br></br>By setting the width of the axis, data whose axes types are different can share the same display proportions. This makes it easier to compare more than one graph’s worth of data because the axes are not shifted or stretched within visual proximity of each other. |
+| Show grid lines | Set whether grid lines are displayed in the chart. Choose from: <ul><li>**Auto** - Grafana automatically determines whether grid lines are displayed.</li><li>**On** - Grid lines are always displayed.</li><li>**Off** - Grid lines are never displayed</li></ul> |
+| Color | Choose whether the axis color is the **Text** or **Series** color. |
+| Show border | Toggle the switch to hide or display the border. |
+| Scale | Set how the y-axis is split. Choose from: <ul><li>**Linear**</li><li>**Logarithmic** - Choose between log base 2 or log base 10.</li><li>**Symlog** - Uses a symmetrical logarithmic scale. Choose between log base 2 or log base 10, allowing for negative values.</li></ul> |
+| Centered zero | Set the y-axis so it's centered on zero. |
+| [Soft min and soft max](#soft-min-and-soft-max) | Set a **Soft min** or **soft max** option for better control of Y-axis limits. By default, Grafana sets the range for the Y-axis automatically based on the dataset. |
 
-#### Auto
+<!-- prettier-ignore-end -->
 
-Grafana automatically assigns Y-axis to the series. When there are two or more series with different units, then Grafana assigns the left axis to the first unit and right to the following units.
-
-#### Left
-
-Display all Y-axes on the left side.
-
-#### Right
-
-Display all Y-axes on the right side.
-
-#### Hidden
-
-Hide all axes.
-
-To selectively hide axes, [Add a field override](ref:add-a-field-override) that targets specific fields.
-
-### Label
-
-Set a Y-axis text label.
-
-If you have more than one Y-axis, then you can give assign different labels with an override.
-
-### Width
-
-Set a fixed width of the axis. By default, Grafana dynamically calculates the width of an axis.
-
-By setting the width of the axis, data whose axes types are different can share the same display proportions. This makes it easier to compare more than one graph’s worth of data because the axes are not shifted or stretched within visual proximity of each other.
-
-### Soft min and soft max
+#### Soft min and soft max
 
 Set a **Soft min** or **soft max** option for better control of Y-axis limits. By default, Grafana sets the range for the Y-axis automatically based on the dataset.
 
@@ -230,24 +193,24 @@ Set a **Soft min** or **soft max** option for better control of Y-axis limits. B
 
 You can set standard min/max options to define hard limits of the Y-axis. For more information, refer to [Standard options definitions](ref:standard-options-definitions).
 
-{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+3" >}}
 
-## Standard options
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Data links
+### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Thresholds
-
-{{< docs/shared lookup="visualizations/thresholds-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/bar-gauge/index.md

@@ -25,14 +25,76 @@ refs:
 
 # Bar gauge
 
-Bar gauges simplify your data by reducing every field to a single value. You choose how Grafana calculates the reduction.
-
-This panel can show one or more bar gauges depending on how many series, rows, or columns your query returns.
+Bar gauges simplify your data by reducing every field to a single value. You choose how Grafana calculates the reduction. This visualization can show one or more bar gauges depending on how many series, rows, or columns your query returns.
 
 {{< figure src="/static/img/docs/v66/bar_gauge_cover.png" max-width="1025px" alt="Bar gauge panel" >}}
 
+The bar gauge visualization displays values as bars with various lengths or fills proportional to the values they represent. They differ from traditional bar charts in that they act as gauges displaying metrics between ranges. One example is a thermometer displaying body temperature in a bar filling up.
+
+You can use a bar gauge visualization when you need to show:
+
+- Key performance indicators (KPIs)
+- System health
+- Savings goals
+- Attendance
+- Process completion rates
+
+## Configure a bar gauge visualization
+
+The following video shows you how to create and configure a bar gauge visualization:
+
+{{< youtube id="7PhDysObEXA" >}}
+
 {{< docs/play title="Bar Gauge" url="https://play.grafana.org/d/vmie2cmWz/" >}}
 
+## Supported data formats
+
+To create a bar gauge visualization, you need a dataset querying at least one numeric field. Every numeric field in the dataset is displayed as a bar gauge. Text or time fields aren't required but if they're present, they're used for labeling.
+
+### Example 1
+
+| Label | Value1 | Value2 | Value3 |
+| ----- | ------ | ------ | ------ |
+| Row1  | 5      | 3      | 2      |
+
+![Bar gauge with single row of data](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-bargauge-example1.png)
+
+The minimum and maximum range for the bar gauges is automatically pulled from the largest and smallest numeric values in the dataset. You can also manually define the minimum and maximum values as indicated in the [Standard options](#standard-options) section.
+
+You can also define the minimum and maximum from the dataset provided.
+
+### Example 2
+
+| Label | Value | Max | Min |
+| ----- | ----- | --- | --- |
+| Row1  | 3     | 6   | 1   |
+
+![Bar gauge with single row of data including maximum and minimum](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-bargauge-example2.png)
+
+If you don’t want to show gauges for the min and max values, you can configure only one field to be displayed as described in the [Value options](#value-options) section.
+
+![Bar gauge, single row of data with max and min displaying value](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-bargauge-example3.png)
+
+Even if the min and max aren’t displayed, the visualization still pulls the range from the data set.
+
+### Example 3
+
+The bar gauge visualization also supports multiple records (rows) in the dataset.
+
+| Label | Value1 | Value2 | Value3 |
+| ----- | ------ | ------ | ------ |
+| Row1  | 5      | 3      | 2      |
+| Row2  | 10     | 6      | 4      |
+| Row3  | 20     | 8      | 2      |
+
+![Bar gauge with multiple rows of data displaying last row](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-bargauge-example4.png)
+
+By default, the visualization is configured to [calculate](#value-options) a single value per column or series and to display only the last set of data. However, it derives the minimum and maximum from the full dataset even if those values aren’t visible. In this example, that means only the last row of data is displayed in the gauges and the minimum and maximum values are defined as 2 and 20, pulled from the whole dataset.
+
+If you want to show one gauge per cell you can change the [Show](#show) setting from [Calculate](#calculate) to [All values](#all-values) and each bar is labeled by concatenating the text column with each value's column name.
+
+![Bar gauge with multiple rows of data displaying all the values](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-bargauge-example5.png)
+
 ## Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
@@ -156,6 +218,10 @@ This option only applies when bar size is set to manual.
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
+Last, colors of the bar gauge thresholds can be configured as described above.
+
+![Bar gauge with colored thresholds configured](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-bargauge-example6.png)
+
 ## Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/canvas/index.md

@@ -30,23 +30,65 @@ refs:
 
 # Canvas
 
-Canvases combine the power of Grafana with the flexibility of custom elements. Canvases are extensible form-built visualizations that allow you to explicitly place elements within static and dynamic layouts. This empowers you to design custom visualizations and overlay data in ways that aren't possible with standard Grafana panels, all within Grafana's UI. If you've used popular UI and web design tools, then designing canvases will feel very familiar.
+Canvases combine the power of Grafana with the flexibility of custom elements.
+They are extensible visualizations that allow you to add and arrange elements wherever you want within unstructured static and dynamic layouts.
+This lets you design custom visualizations and overlay data in ways that aren't possible with standard Grafana visualizations, all within the Grafana UI.
 
-> We would love your feedback on Canvas. Please check out the [open Github issues](https://github.com/grafana/grafana/issues?page=1&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fpanel%2Fcanvas) and [submit a new feature request](https://github.com/grafana/grafana/issues/new?assignees=&labels=type%2Ffeature-request,area%2Fpanel%2Fcanvas&title=Canvas:&projects=grafana-dataviz&template=1-feature_requests.md) as needed.
+{{< video-embed src="/static/img/docs/canvas-panel/canvas-beta-overview-9-2-0.mp4" max-width="750px" alt="Canvas beta overview" >}}
 
-{{< video-embed src="/static/img/docs/canvas-panel/canvas-beta-overview-9-2-0.mp4" max-width="750px" caption="Canvas beta overview" >}}
+If you've used popular UI and web design tools, then designing canvases will feel very familiar.
+With all of these dynamic elements, there's almost no limit to what a canvas can display.
+
+{{< admonition type="note" >}}
+We'd love your feedback on the canvas visualization. Please check out the [open Github issues](https://github.com/grafana/grafana/issues?page=1&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fpanel%2Fcanvas) and [submit a new feature request](https://github.com/grafana/grafana/issues/new?assignees=&labels=type%2Ffeature-request,area%2Fpanel%2Fcanvas&title=Canvas:&projects=grafana-dataviz&template=1-feature_requests.md) as needed.
+{{< /admonition >}}
+
+## Configure a canvas visualization
+
+The following video shows you how to create and configure a canvas visualization:
+
+{{< youtube id="b7AYKoFcPpY" >}}
+
+## Supported data formats
+
+The canvas visualization is unique in that it doesn't have any specific data requirements. You can even start adding and configuring visual elements without providing any data. However, any data you plan to consume should be accessible through supported Grafana data sources and structured in a way that ensures smooth integration with your custom elements.
+
+If your canvas is going to update in real time, your data should support refreshes at your desired intervals without degrading the user experience.
+
+You can tie [Elements](#elements) and [Connections](#connections) to data through options like text, colors, and background pattern images, etc. available in the canvas visualization.
 
 ## Elements
 
 Elements are the basic building blocks of a canvas and they help you visualize data with different shapes and options. You can rotate and move elements around the canvas. When you move elements, snapping and alignment guides help you create more precise layouts.
 
+Add elements in the [Layer](#layer-options) section of canvas options.
+
 {{% admonition type="note" %}}
 Element snapping and alignment only works when the canvas is not zoomed in.
 {{% /admonition %}}
 
-When you select an element that you've added to a canvas, you can access editing options for it that are dependent on the element type. The following sections describe the different elements available.
+### Element types
 
-### Basic shapes
+When you select an element that you've added to a canvas, you can access [configuration options](#selected-element-options) for it that are dependent on the element type.
+
+The following sections describe the different elements available.
+
+{{< column-list >}}
+
+- [Metric value](#metric-value)
+- [Text](#text)
+- [Ellipse](#basic-shapes)
+- [Rectangle](#basic-shapes)
+- [Icon](#icon)
+- [Server](#server)
+- [Triangle](#basic-shapes)
+- [Cloud](#basic-shapes)
+- [Parallelogram](#basic-shapes)
+- [Button](#button)
+
+{{< /column-list >}}
+
+#### Basic shapes
 
 A basic shape element can display text (both fixed and field data) and its background color can be changed based on data thresholds. You can add the following basic shapes to a canvas:
 
@@ -56,83 +98,169 @@ A basic shape element can display text (both fixed and field data) and its backg
 - Rectangle
 - Triangle
 
-### Metric value
+#### Metric value
 
-The metric value element lets you easily select the data you want to display on a canvas. This element has a unique “edit” mode that can be triggered either through the context menu “Edit” option or by double clicking. When in edit mode you can select which field data that you want to display.
+The metric value element lets you select the data you want to display on a canvas. This element has a unique “edit” mode that can be triggered either through the context menu “Edit” option or by double clicking. When in edit mode you can select which field data that you want to display.
 
-{{< video-embed src="/static/img/docs/canvas-panel/canvas-metric-value-9-2-0.mp4" max-width="750px" caption="Metric value element demo" >}}
+#### Text
 
-### Text
+The text element lets you add text to the canvas. The element also supports an editing mode, triggered via either double clicking or the edit menu option in the context menu.
 
-The text element lets you easily add text to the canvas. The element also supports an editing mode, triggered via either double clicking or the edit menu option in the context menu.
+#### Icon
 
-{{< video-embed src="/static/img/docs/canvas-panel/canvas-text-9-2-0.mp4" max-width="750px" caption="Text element demo" >}}
+The icon element lets you add a supported icon to the canvas. Icons can have their color set based on thresholds or value mappings.
 
-### Icon
+##### Add a custom icon
 
-The icon element lets you add a supported icon to the canvas. Icons can have their color set based on thresholds / value mappings.
+You can add a custom icon by referencing an SVG file. To add a custom icon, follow these steps:
 
-### Server
+1. Under **Icon > SVG Path**, if it's not already selected, select **Fixed** as your file source.
+1. Click **Select a value** in the field below.
+1. In the dialog box that opens, click the **URL** tab.
+1. Enter the URL in the field below the **URL** tab.
+
+   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-canvas-custom-image-v11.3.png" max-width="250px" alt="Add a custom image URL" >}}
+
+1. Click **Select**.
+1. (Optional) Add a background image to your icon with the **Background (icon)** option by following the steps to [add a custom image](#add-custom-images-to-elements).
+
+If you don't have an SVG file, you can use a rectangle element instead of an icon and set its background image to an image file type. To add a custom image for another element type, follow the steps to [add a custom image](#add-custom-images-to-elements).
+
+#### Server
 
 The server element lets you easily represent a single server, a stack of servers, a database, or a terminal. Server elements support status color, bulb color, and a bulb blink rate all configurable by fixed or field values.
 
-{{< figure src="/media/docs/grafana/canvas-server-element-9-4-0.png" max-width="750px" caption="Canvas server element" >}}
+{{< figure src="/media/docs/grafana/canvas-server-element-9-4-0.png" max-width="650px" alt="Canvas server element" >}}
 
-### Button
+#### Button
 
-The button element lets you add a basic button to the canvas. Button elements support triggering basic, unauthenticated API calls. API settings are found in the button element editor. You can also pass template variables in the API editor.
+The button element lets you add a basic button to the canvas. Button elements support triggering basic, unauthenticated API calls. [API settings](#button-api-options) are found in the button element editor. You can also pass template variables in the API editor.
 
 {{% admonition type="note" %}}
 A button click will only trigger an API call when [inline editing](#inline-editing) is disabled.
 {{% /admonition %}}
 
-{{< video-embed src="/media/docs/grafana/2023-20-10-Canvas-Button-Element-Enablement-Video.mp4" max-width="750px" caption="Canvas button element demo" >}}
+{{< video-embed src="/media/docs/grafana/2023-20-10-Canvas-Button-Element-Enablement-Video.mp4" max-width="650px" alt="Canvas button element demo" >}}
 
 {{< docs/play title="Canvas Visualization: Buttons" url="https://play.grafana.org/d/c9ea65f5-ed5a-45cf-8fb7-f82af7c3afdf/" >}}
 
+##### Button API options
+
+The following options let you configure basic, unauthenticated API calls:
+
+<!-- prettier-ignore-start -->
+| Option  | Description  |
+| ------- | ------------ |
+| Endpoint | Enter the endpoint URL. |
+| Method | Choose from **GET**, **POST**, and **PUT**. |
+| Content-Type | Select an option in the drop-down list. Choose from: JSON, Text, JavaScript, HTML, XML, and x-www-form-urlencoded. |
+| Query parameters | Enter as many **Key**, **Value** pairs as you need. |
+| Header parameters | Enter as many **Key**, **Value** pairs as you need. |
+| Payload | Enter the body of the API call. |
+
+<!-- prettier-ignore-end -->
+
+### Add custom images to elements
+
+You can add custom background images to all elements except **Button** by referencing an image URL.
+The image must be hosted at a URL that allows requests from your Grafana instance.
+
+To upload a custom image, follow these steps:
+
+1. Under **Background (\<ELEMENT TYPE\>)**, if it's not already selected, select **Fixed** as your image source.
+
+   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-canvas-custom-image-src-v11.3.png" max-width="300px" alt="Custom image source selection" >}}
+
+1. Click **Select a value** in the field below.
+1. In the dialog box that opens, click the **URL** tab.
+1. Enter the URL in the field below the **URL** tab.
+
+   {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-canvas-custom-image-v11.3.png" max-width="250px" alt="Add a custom image URL" >}}
+
+1. Click **Select**.
+
 ## Connections
 
-When building a canvas, you can connect elements together to create more complex visualizations. Connections are created by dragging from the connection anchor of one element to the connection anchor of another element. You can also create connections to the background of the canvas. Connection anchors are displayed when you hover over an element and inline editing is turned on.
+When building a canvas, you can connect elements together to create more complex visualizations. You can also create connections to the background of the canvas.
 
-To remove a connection, simply click on the connection directly and then press the "Delete" or "Backspace" key.
+To create a connection, follow these steps:
 
-{{< video-embed src="/media/docs/grafana/canvas-connections-9-4-0.mp4" max-width="750px" caption="Canvas connections demo" >}}
+1. In the panel edit pane, expand the **Canvas** options section.
+1. Toggle on the **Inline editing** switch.
+1. Hover the cursor over an element you want to connect to display the connection anchors:
 
-### Adjust connectors
+   ![Element with connection anchors displayed](/media/docs/grafana/panels-visualizations/screenshot-connection-anchors-v11.3.png)
 
-You can adjust connectors, adding angles to them, to fit the canvas you're working in. When you move connected elements, the connector resizes to fit the space. To adjust a connector, click it to display the midpoint controls and move those as needed. To make a connector a straight line again, move the midpoint back until the midpoint controls disappear.
+1. Drag the cursor from a connection anchor on that element to one on another element.
 
-If you move a connector so that it's almost a right angle or a straight line, the connector snaps into that angle or into a straight line.
+To remove a connection, click the connection and then press the `Delete` or `Backspace` key.
 
-<!-- TODO: Use updated demo from what's new when uploaded to YouTube -->
+### Connection adjustments
 
-{{< video-embed src="/media/docs/grafana/panels-visualizations/gif-canvas-connector-vertex-control-v11.0.mp4" alt="Changing a connector from a straight line to a right angle" >}}
+You can adjust connections, adding angles to them, to fit the canvas you're working in. When you move connected elements, the connection resizes to fit the space.
 
-### Style connectors
+- To adjust a connection, click it to display the midpoint controls and move those as needed.
+- To make a connection a straight line again, move the midpoint back until the midpoint controls disappear.
 
-You can set the size, color, direction, and style of connections based on fixed or field values. To do so, enter into panel edit mode, select the connection, and modify the connection's properties in the panel editor.
+If you move a connection so that it's almost a right angle or a straight line, the connection snaps into that angle or into a straight line.
 
-{{< figure src="/media/docs/grafana/screenshot-grafana-10-0-canvas-service-graph.png" max-width="750px" caption="Canvas service graph" >}}
+### Connection styles
+
+You can set the size, color, direction, and style of connections based on fixed or field values. To do so, enter into panel edit mode, select the connection, and modify the connection's properties in the panel editor. For more information on connection styles, refer to [Selected connection options](#selected-connection-options).
+
+{{< youtube id="0iO2gqv0XNA" >}}
 
 ## Canvas editing
 
+You can make changes to a canvas visualization while in the context of the dashboard, or in dashboard mode. The following sections describe the editing options available in dashboard mode.
+
 ### Inline editor
 
-You can edit your canvas inline while in the context of dashboard mode.
+You can edit your canvas inline while in dashboard mode. The inline editor menu displays the options relevant to the part of the canvas that you've selected. You can also move the editor window around.
 
-{{< video-embed src="/static/img/docs/canvas-panel/canvas-inline-editor-9-2-0.mp4" max-width="750px" caption="Inline editor demo" >}}
+{{< video-embed src="/static/img/docs/canvas-panel/canvas-inline-editor-9-2-0.mp4" max-width="750px" alt="Inline editor demo" >}}
 
-### Pan and zoom
+### Context menu
+
+The context menu lets you perform common tasks quickly and efficiently. Supported functionality includes opening and closing the inline editor, duplicating an element, deleting an element, and more.
+
+The context menu is triggered by a right click action over the panel or over a given canvas element. When right clicking the panel, you are able to set a background image and easily add elements to the canvas.
+
+{{< figure src="/static/img/docs/canvas-panel/canvas-panel-context-menu-9-3-0.png" max-width="350px" alt="Canvas panel context menu" >}}
+
+When right clicking an element, you are able to edit, delete, duplicate, and modify the element's layer positioning.
+
+{{< figure src="/static/img/docs/canvas-panel/canvas-context-menu-9-2-0.png" max-width="250px"  alt="Canvas element context menu" >}}
+
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
+
+{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Canvas options
+
+#### Inline editing
+
+The inline editing toggle lets you lock or unlock the canvas. When turned off the canvas becomes “locked”, freezing elements in place and preventing unintended modifications.
+
+{{< video-embed src="/static/img/docs/canvas-panel/canvas-inline-editing-toggle-9-2-0.mp4" max-width="750px" alt="Inline editing toggle demo" >}}
+
+#### Experimental Element types
+
+Toggle the switch to include experimental element types in the available selections.
+
+#### Pan and zoom
 
 You can enable panning and zooming in a canvas. This allows you to both create and navigate more complex designs.
 
 {{< docs/public-preview product="Canvas pan and zoom" featureFlag="`canvasPanelPanZoom`" >}}
 
-{{< figure src="/media/docs/grafana/screenshot-grafana-10-3-canvas-pan-zoom-setting.png" max-width="300px" alt="Canvas pan zoom control" >}}
+{{< video-embed src="/media/docs/grafana/2024-01-05-Canvas-Pan-&-Zoom-Enablement-Video.mp4" max-width="750px" alt="Canvas pan and zoom enablement video" >}}
 
-{{< video-embed src="/media/docs/grafana/2024-01-05-Canvas-Pan-&-Zoom-Enablement-Video.mp4" max-width="750px" caption="Canvas pan and zoom enablement video" >}}
-
-#### Infinite panning
+##### Infinite panning
 
 You can enable infinite panning in a canvas when pan and zoom is enabled. This allows you to pan and zoom the canvas and uncover larger designs.
 
@@ -140,29 +268,137 @@ You can enable infinite panning in a canvas when pan and zoom is enabled. This a
 Infinite panning is an experimental feature that may not work as expected in all scenarios. For example, elements that are not top-left constrained may experience unexpected movement when panning.
 {{% /admonition %}}
 
-<!-- TODO: Add gif -->
+### Layer options
 
-### Context menu
+The **Layer** options let you add elements to the canvas and control its appearance:
 
-The context menu lets you perform common tasks quickly and efficiently. Supported functionality includes opening / closing the inline editor, duplicating an element, deleting an element, and more.
+- [Elements](#elements-layer)
+- [Background](#background-canvas)
+- [Border](#border-canvas)
 
-The context menu is triggered by a right click action over the panel / over a given canvas element. When right clicking the panel, you are able to set a background image and easily add elements to the canvas.
+#### Elements (layer)
 
-{{< figure src="/static/img/docs/canvas-panel/canvas-panel-context-menu-9-3-0.png" max-width="750px" caption="Canvas panel context menu" >}}
+Use the **Add item** button to open the [element type](#element-types) drop-down list. Elements are listed in the reverse order that you add them to the canvas:
 
-When right clicking an element, you are able to edit, delete, duplicate, and modify the element's layer positioning.
+![Canvas elements added in the Layer options](/media/docs/grafana/panels-visualizations/screenshot-canvas-elements-v11.3.png)
 
-{{< figure src="/static/img/docs/canvas-panel/canvas-context-menu-9-2-0.png" max-width="750px" caption="Canvas element context menu" >}}
+By default, elements have numbered names, like "Element 1", and those numbers correspond to the order in which the elements were added, but you can [change the default names](#rename-an-element).
 
-## Canvas options
+You can also take the following actions on elements:
 
-### Inline editing
+- Change the order of elements by clicking and holding the row of the element while moving it up and down in the element list.
+- Duplicate or remove elements by clicking the icons on the element row.
+- Access the element editing options by clicking the element row. This displays the [Selected element](#selected-element-options) section of options. Click **Clear selection** to remove the element from focus and stop displaying that section of options.
 
-The inline editing toggle lets you lock or unlock the canvas. When turned off the canvas becomes “locked”, freezing elements in place and preventing unintended modifications.
+##### Rename an element
 
-{{< video-embed src="/static/img/docs/canvas-panel/canvas-inline-editing-toggle-9-2-0.mp4" max-width="750px" caption="Inline editing toggle demo" >}}
+To update the name of an element, follow these steps:
 
-### Data links
+1. Hover the cursor over the element name so the **Edit layer name** (pencil) icon is displayed.
+1. Click the **Edit layer name** icon.
+1. Enter a new name.
+1. Click outside of the name field.
+
+#### Background (canvas)
+
+Use the following options to control the background of the canvas:
+
+| Option     | Description                                                                                               |
+| ---------- | --------------------------------------------------------------------------------------------------------- |
+| Color      | Set the background color.                                                                                 |
+| Image      | Use one of the provided background images or [add your own custom image](#add-custom-images-to-elements). |
+| Image size | Control the size of the image or set it as a tile.                                                        |
+
+#### Border (canvas)
+
+Use the following options to control the border of the canvas:
+
+| Option | Description                                                                                     |
+| ------ | ----------------------------------------------------------------------------------------------- |
+| Width  | Set the border width in pixels.                                                                 |
+| Color  | Set the border color. This option is only displayed when the border width is greater than zero. |
+| Radius | Add rounded corners to the border and control the degree of curve.                              |
+
+### Selected element options
+
+The following options allow you to control the appearance of the element you've selected. To access an element so that you can edit it, expand the **Layer** section and select the desired element.
+
+| Option                                      | Description                                                                                     |
+| ------------------------------------------- | ----------------------------------------------------------------------------------------------- |
+| [Element type](#element-type)               | Change the selected element type.                                                               |
+| [Element](#element)                         | Control the appearance of text on the element. This section is named based on the element type. |
+| [Layout](#layout)                           | Control the placement of elements on the canvas.                                                |
+| [Background (element)](#background-element) | Set the background of the element.                                                              |
+| [Border (element)](#border-element)         | Set the border of the element.                                                                  |
+| [Data links](#data-links)                   | Configure data links for elements.                                                              |
+
+#### Element type
+
+You can change element type by making a new selection in the drop-down list:
+
+![Cursor on the element type selection drop-down](/media/docs/grafana/panels-visualizations/screenshot-element-type-select-v11.3.png)
+
+#### Element
+
+This section is named based on the element type. Control the appearance of text on the element with the following options:
+
+<!-- prettier-ignore-start -->
+
+| Option         | Description                                               |
+| -------------- | --------------------------------------------------------- |
+| Style          | Buttons only. Select an option in the **Variant** drop-down list to indicate what kind of action the button initiates. Choose from **primary**, **secondary**, **success**, and **destructive**. |
+| Text           | Select a **Source**. Choose from **Fixed** or **Field**. If you selected **Fixed**, enter text in the **Value** field. If you selected **Field**, choose the field. |
+| Text color     | Choose a text color.     |
+| Align text     | Set the horizontal alignment of text within the element. Choose from **Left**, **Center**, and **Right**.  |
+| Vertical align | Set the vertical alignment of the text within the element. Choose from **Top**, **Middle**, and **Bottom**. |
+| Text size      | Set the text size. Leave the field empty to allow Grafana to automatically set the text size. |
+| API      | Buttons only. Configure API options. For more information, refer to [Button API options](#button-api-options).   |
+
+<!--prettier-ignore-end -->
+
+<!-- prettier-ignore-start -->
+
+Icons don't have text, so they have different options:
+
+| Option         | Description                                               |
+| -------------- | --------------------------------------------------------- |
+| SVG Path     | Choose whether the icon SVG file source is **Fixed** or **Field**. If you selected **Fixed**, choose a provided option or [add a custom icon](#add-a-custom-icon). If you selected **Field**, choose a field. |
+| Fill color     | Choose a fill color for the icon.   |
+
+<!--prettier-ignore-end -->
+
+#### Layout
+
+Control the placement of elements on the canvas with the following options:
+
+<!-- prettier-ignore-start -->
+
+| Option          | Description     |
+| --------------- | --------------- |
+| Quick placement | Select an alignment option to automatically place the element. Choose from:<ul><li>Align left</li><li>Align horizontal centers</li><li>Align right</li><li>Align top</li><li>Align vertical centers</li><li>Align bottom</li></ul> |
+| Constraints     | Set element constraints. Choose from: **Left**, **Right**, **Left & Right**, **Center**, and **Scale**.<br></br>Use the **Scale** option to ensure that elements are automatically resized when the panel size changes. |
+| Position        | Use these settings to manually set the position of an element. Set any or all of the following options: **top**, **left**, **width**, **height**, and **rotation**. |
+
+<!-- prettier-ignore-end -->
+
+#### Background (element)
+
+Use the following options to set the background of the element:
+
+- **Color** - Set the background color.
+- **Image** - Use one of the provided background images or [add your own custom image](#add-custom-images-to-elements).
+
+This option doesn't apply to the button element.
+
+#### Border (element)
+
+Use the following options to set the border of the element:
+
+- **Width** - Set the border width in pixels.
+- **Color** - Set the border color. This option is only displayed when the border width is greater than zero.
+- **Radius** - Add rounded corners to the element border and control the degree of curve.
+
+#### Data links
 
 Canvases support [data links](ref:data-links) for all elements except drone and button elements. You can add a data link by following these steps:
 
@@ -186,22 +422,34 @@ If multiple elements use the same field name, and you want to control which elem
 
 {{< video-embed src="/media/docs/grafana/canvas-data-links-9-4-0.mp4" max-width="750px" caption="Data links demo" >}}
 
-## Panel options
+### Selected connection options
 
-{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+You can style the selected connection using the following options:
 
-## Standard options
+- **Color** - Set the connection color.
+- **Size** - Control the size of the connection by entering a number in the **Value** field.
+- **Radius** - Add curve to the connection by entering a value to represent the degree.
+- **Arrow Direction** - Control the appearance of the arrow head. Choose from:
+
+  - **Forward** - The arrow head points in the direction in which the connection was drawn.
+  - **Reverse** - The arrow head points in the opposite direction of which the connection was drawn.
+  - **Both** - Adds arrow heads to both ends of the connection.
+  - **None** - Removes the arrow head.
+
+- **Line style** - Choose from the following line styles: **Solid**, **Dashed**, and **Dotted**.
+
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Thresholds
-
-{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Thresholds
+
+{{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/gauge/index.md

@@ -25,116 +25,164 @@ refs:
 
 # Gauge
 
-Gauges are single-value visualizations that can repeat a gauge for every series, column or row.
+Gauges are single-value visualizations that allow you to quickly visualize where a value falls within a defined or calculated min and max range. With repeat options, you can display multiple gauges, each corresponding to a different series, column, or row.
 
-{{< figure src="/static/img/docs/v66/gauge_panel_cover.png" max-width="1025px" alt="A gauge visualization">}}
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-gauge-visualization-v11.4.png" alt="A gauge visualization">}}
 
-{{< docs/play title="Grafana Gauge Visualization" url="https://play.grafana.org/d/KIhkVD6Gk/" >}}
+You can use gauges if you need to track:
+
+- Service level objectives (SLOs)
+- How full a piece of equipment is
+- How fast a vehicle is moving within a set of limits
+- Network latency
+- Equipment state with set point and alarm thresholds
+- CPU consumption (0-100%)
+- RAM availability
+
+## Configure a gauge visualization
 
 The following video provides beginner steps for creating gauge panels. You'll learn the data requirements and caveats, special customizations, and much more:
 
 {{< youtube id="QwXj3y_YpnE" >}}
 
-## Panel options
+{{< docs/play title="Grafana Gauge Visualization" url="https://play.grafana.org/d/KIhkVD6Gk/" >}}
+
+## Supported data formats
+
+To create a gauge visualization you need a dataset containing at least one numeric field. These values are identified by the field name. Additional text fields aren’t required but can be used for identification and labeling.
+
+### Example - One value
+
+| GaugeName | GaugeValue |
+| --------- | ---------- |
+| MyGauge   | 5          |
+
+![Gauge with single numeric value](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example1.png)
+
+This dataset generates a visualization with one empty gauge showing the numeric value. This is because the gauge visualization automatically defines the upper and lower range from the minimum and maximum values in the dataset. This dataset has only one value, so it’s set as both minimum and maximum.
+
+If you only have one value, but you want to define a different minimum and maximum, you can set them manually in the [Standard options](#standard-options) settings to generate a more typical looking gauge.
+
+![Gauge with single numeric value and hardcoded max and min](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example2.png)
+
+### Example - One row, multiple values
+
+The gauge visualization can support multiple fields in a dataset. <!-- In this case, multiple gauges are displayed. -->
+
+| Identifier | value1 | value2 | value3 |
+| ---------- | ------ | ------ | ------ |
+| Gauges     | 5      | 3      | 10     |
+
+![Gauge visualization with multiple numeric values in a single row](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example3.png)
+
+When there are multiple values in the dataset, the visualization displays multiple gauges and automatically defines the minimum and maximum. In this case, those are 3 and 10. Because the minimum and maximum values are defined, each gauge is shaded in to show that value in relation to the minimum and maximum.
+
+### Example - Multiple rows and values
+
+The gauge visualization can display datasets with multiple rows of data or even multiple datasets.
+
+| Identifier | value1 | value2 | value3 |
+| ---------- | ------ | ------ | ------ |
+| Gauges     | 5      | 3      | 10     |
+| Indicators | 6      | 9      | 15     |
+| Defaults   | 1      | 4      | 8      |
+
+![Gauge visualization with multiple rows and columns of numeric values showing the last row](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example6.png)
+
+By default, the visualization is configured to [calculate](#value-options) a single value per column or series and to display only the last row of data. However, it derives the minimum and maximum from the full dataset, even if those values aren’t visible.
+
+In this example, that means only the last row of data is displayed in the gauges and the minimum and maximum values are 1 and 10. The value 1 is displayed because it’s in the last row, while 10 is not.
+
+If you want to show one gauge per table cell, you can change the **Show** setting from **Calculate** to **All values**, and each gauge is labeled by concatenating the text column with each value's column name.
+
+![Gauge visualization with multiple rows and columns of numeric values showing all the values](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example7.png)
+
+### Example - Defined min and max
+
+You can also define minimum and maximum values as part of the dataset.
+
+| Identifier | value | max | min |
+| ---------- | ----- | --- | --- |
+| Gauges     | 5     | 10  | 2   |
+
+![Gauge visualization with numeric values defining max and minimum](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example4.png)
+
+If you don’t want to display gauges for the `min` and `max` values, you can configure only one field to be displayed as described in the [value options](#value-options) section.
+
+![Gauge visualization with numeric values defining max and minimum but hidden](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example5.png)
+
+Even when minimum and maximum values aren’t displayed, the visualization still pulls the range from them.
+
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value options
+### Value options
 
 Use the following options to refine how your visualization displays the value:
 
-### Show
+<!-- prettier-ignore-start -->
 
-Choose how Grafana displays your data.
+| Option | Description |
+| ------ | ----------- |
+| Show | Set how Grafana displays your data. Choose from:<ul><li>**Calculate** - Show a calculated value based on all rows.</li><li>**All values** - Show a separate value for every row. If you select this option, then you can also limit the number of rows to display.</li></ul> |
+| Calculation | If you chose **Calculate** as your **Show** option, select a reducer function that Grafana will use to reduce many fields to a single value. For a list of available calculations, refer to [Calculation types](ref:calculation-types). |
+| Limit | If you chose **All values** as your **Show** option, enter the maximum number of rows to display. The default is 5,000. |
+| Fields | Select the fields display in the panel. |
 
-#### Calculate
+<!-- prettier-ignore-end -->
 
-Show a calculated value based on all rows.
-
-- **Calculation -** Select a reducer function that Grafana will use to reduce many fields to a single value. For a list of available calculations, refer to [Calculation types](ref:calculation-types).
-- **Fields -** Select the fields display in the panel.
-
-#### All values
-
-Show a separate stat for every row. If you select this option, then you can also limit the number of rows to display.
-
-- **Limit -** The maximum number of rows to display. Default is 5,000.
-- **Fields -** Select the fields display in the panel.
-
-## Gauge
+### Gauge options
 
 Adjust how the gauge is displayed.
 
-### Orientation
+<!-- prettier-ignore-start -->
 
-Choose a stacking direction.
+| Option | Description |
+| ------ | ----------- |
+| Orientation | Choose a stacking direction:<ul><li>**Auto** - Gauges display in rows and columns.</li><li>**Horizontal** - Gauges display top to bottom.</li><li>**Vertical** - Gauges display left to right.</li></ul> |
+| Show threshold labels | Controls if threshold values are shown. |
+| [Show threshold markers](#show-threshold-markers) | Controls if a threshold band is shown outside the inner gauge value band. |
+| Gauge size | Choose a gauge size mode:<ul><li>**Auto** - Grafana determines the best gauge size.</li><li>**Manual** - Manually configure the gauge size.</li></ul>This option only applies when **Orientation** is set to **Horizontal** or **Vertical**. |
+| Min width | Set the minimum width of vertically-oriented gauges. If you set a minimum width, the x-axis scrollbar is automatically displayed when there's a large amount of data. This option only applies when **Gauge size** is set to **Manual**. |
+| Min height | Set the minimum height of horizontally-oriented gauges. If you set a minimum height, the y-axis scrollbar is automatically displayed when there's a large amount of data. This option only applies when **Gauge size** is set to **Manual**. |
+| Neutral | Set the starting value from which every gauge will be filled. |
 
-- **Auto -** Gauges display in rows and columns.
-- **Horizontal -** Gauges display top to bottom.
-- **Vertical -** Gauges display left to right.
+<!-- prettier-ignore-end -->
 
-### Show threshold labels
+#### Show threshold markers
 
-Controls if threshold values are shown.
+Controls if a threshold band is shown around the inner gauge value band.
 
-### Show threshold markers
+![Gauge viz with multiple rows and columns of numeric values showing all the values and thresholds defined for 0-6-11](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.2-gauge-example8.png)
 
-Controls if a threshold band is shown outside the inner gauge value band.
-
-### Gauge size
-
-Choose a gauge size mode.
-
-- **Auto -** Grafana determines the best gauge size.
-- **Manual -** Manually configure the gauge size.
-
-### Min width
-
-Set the minimum width of vertically-oriented gauges.
-
-If you set a minimum width, the x-axis scrollbar is automatically displayed when there's a large amount of data.
-
-{{% admonition type="note" %}}
-This option only applies when gauge size is set to manual.
-{{% /admonition %}}
-
-### Min height
-
-Set the minimum height of horizontally-oriented gauges.
-
-If you set a minimum height, the y-axis scrollbar is automatically displayed when there's a large amount of data.
-
-{{% admonition type="note" %}}
-This option only applies when gauge size is set to manual.
-{{% /admonition %}}
-
-### Neutral
-
-Set the starting value from which every gauge will be filled.
-
-## Text size
+### Text size
 
 Adjust the sizes of the gauge text.
 
-- **Title -** Enter a numeric value for the gauge title size.
-- **Value -** Enter a numeric value for the gauge value size.
+- **Title** - Enter a numeric value for the gauge title size.
+- **Value** - Enter a numeric value for the gauge value size.
 
-## Standard options
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Data links
+### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Thresholds
+### Thresholds
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/geomap/index.md

@@ -35,7 +35,7 @@ labels:
 title: Geomap
 weight: 100
 refs:
-  data-format-supported-by-the-node-graph-visualization:
+  data-format:
     - pattern: /docs/grafana/
       destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/node-graph/#data-api
     - pattern: /docs/grafana-cloud/
@@ -49,13 +49,28 @@ refs:
 
 # Geomap
 
-Geomaps allow you to view and customize the world map using geospatial data. You can configure various overlay styles and map view settings to easily focus on the important location-based characteristics of the data.
+Geomaps allow you to view and customize the world map using geospatial data. It's the ideal visualization if you have data that includes location information and you want to see it displayed in a map.
 
-> We would love your feedback on geomaps. Please check out the [open Github issues](https://github.com/grafana/grafana/issues?page=1&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fpanel%2Fgeomap) and [submit a new feature request](https://github.com/grafana/grafana/issues/new?assignees=&labels=type%2Ffeature-request,area%2Fpanel%2Fgeomap&title=Geomap:&projects=grafana-dataviz&template=1-feature_requests.md) as needed.
+You can configure and overlay [map layers](#layer-type), like heatmaps and networks, and blend included basemaps or your own custom maps. This helps you to easily focus on the important location-based characteristics of the data.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-example-8-1-0.png" max-width="1200px" caption="Geomap panel" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-example-8-1-0.png" max-width="1200px" alt="Geomap visualization" >}}
 
-Pan the map, while it's in focus, by using the arrow keys. Zoom in and out by using the `+` and `-` keys.
+When a geomap is in focus, in addition to typical mouse controls, you can pan around using the arrow keys or zoom in and out using the plus (`+`) and minus (`-`) keys or icons.
+
+Geomaps are also useful when you have location data that’s changing in real time and you want to visualize where an element is moving, using auto-refresh.
+
+You can use a geomap visualization if you need to:
+
+- Track your fleet of vehicles and associated metrics
+- Show the locations and statuses of data centers or other connected assets in a network
+- Display geographic trends in a heatmap
+- Visualize the relationship of your locations' HVAC consumption or solar production with the sun's location
+
+{{< admonition type="note" >}}
+We'd love your feedback on the geomap visualization. Please check out the [open Github issues](https://github.com/grafana/grafana/issues?page=1&q=is%3Aopen+is%3Aissue+label%3Aarea%2Fpanel%2Fgeomap) and [submit a new feature request](https://github.com/grafana/grafana/issues/new?assignees=&labels=type%2Ffeature-request,area%2Fpanel%2Fgeomap&title=Geomap:&projects=grafana-dataviz&template=1-feature_requests.md) as needed.
+{{< /admonition >}}
+
+## Configure a geomap visualization
 
 The following video provides beginner steps for creating geomap visualizations. You'll learn the data requirements and caveats, special customizations, preconfigured displays and much more:
 
@@ -63,42 +78,105 @@ The following video provides beginner steps for creating geomap visualizations.
 
 {{< docs/play title="Geomap Examples" url="https://play.grafana.org/d/panel-geomap/" >}}
 
-## Panel options
+## Supported data formats
+
+To create a geomap visualization, you need datasets containing fields with location information.
+
+The supported location formats are:
+
+- Latitude and longitude
+- Geohash
+- Lookup codes: country, US states, or airports
+
+To learn more, refer to [Location mode](#location-mode).
+
+Geomaps also support additional fields with various data types to define things like labels, numbers, heat sizes, and colors.
+
+### Example - Latitude and longitude
+
+If you plan to use latitude and longitude coordinates, the dataset must include at least two fields (or columns): one called `latitude` (you can also use`lat`), and one called `longitude` (also `lon` or `lng`). When you use this naming convention, the visualization automatically detects the fields and displays the elements. The order of the fields doesn't matter as long as there is one latitude and one longitude.
+
+| Name            | latitude  | longitude | value |
+| --------------- | --------- | --------- | ----- |
+| Disneyland      | 33.8121   | -117.9190 | 4     |
+| DisneyWorld     | 28.3772   | -81.5707  | 10    |
+| EuroDisney      | 48.867374 | 2.784018  | 3     |
+| Tokyo Disney    | 35.6329   | 139.8804  | 70    |
+| Shanghai Disney | 31.1414   | 121.6682  | 1     |
+
+If your latitude and longitude fields are named differently, you can specify them, as indicated in the [Location mode](#location-mode) section.
+
+### Example - Geohash
+
+If your location data is in geohash format, the visualization requires at least one field (or column) containing location data.
+
+If the field is named `geohash`, the visualization automatically detects the location and displays the elements. The order of the fields doesn't matter and the data set can have multiple other numeric, text, and time fields.
+
+| Name      | geohash      | trips |
+| --------- | ------------ | ----- |
+| Cancun    | d5f21        | 8     |
+| Honolulu  | 87z9ps       | 0     |
+| Palm Cove | rhzxudynb014 | 1     |
+| Mykonos   | swdj02ey9gyx | 3     |
+
+If your field containing geohash location data is not named as above, you can configure the visualization to use geohash and specify which field to use, as explained in the [Location mode](#location-mode) section.
+
+### Example - Lookup codes
+
+The geomap visualization can identify locations based on country, airport, or US state codes.
+
+For this configuration, the dataset must contain at least one field (or column) containing the location code.
+
+If the field is named `lookup`, the visualization automatically detects it and displays points based on country codes.
+
+| Year | lookup | gdp       |
+| ---- | ------ | --------- |
+| 2016 | MEX    | 104171935 |
+| 2016 | DEU    | 94393454  |
+| 2016 | FRA    | 83654250  |
+| 2016 | BRA    | 80921527  |
+| 2016 | CAN    | 79699762  |
+
+The other location types&mdash; airport codes or US state codes&mdash;aren't automatically detected.
+
+If you want to use other codes or give the field a custom name, you can follow the steps in the [Location mode](#location-mode) section.
+
+## Configuration options
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Map View
+### Map view options
 
 The map view controls the initial view of the map when the dashboard loads.
 
-### Initial View
+#### Initial View
 
 The initial view configures how the geomap renders when the panel is first loaded.
 
-- **View** sets the center for the map when the panel first loads.
-  - **Fit to data** fits the map view based on the data extents of Map layers and updates when data changes.
-    - **Data** option allows selection of extent based on data from "All layers", a single "Layer", or the "Last value" from a selected layer.
-    - **Layer** can be selected if fitting data from a single "Layer" or the "Last value" of a layer.
-    - **Padding** sets padding in relative percent beyond data extent (not available when looking at "Last value" only).
-    - **Max Zoom** sets the maximum zoom level when fitting data.
-  - **Coordinates** sets the map view based on:
-    - **Latitude**
-    - **Longitude**
-  - Default Views are also available including:
-    - **(0°, 0°)**
-    - **North America**
-    - **South America**
-    - **Europe**
-    - **Africa**
-    - **West Asia**
-    - **South Asia**
-    - **South-East Asia**
-    - **East Asia**
-    - **Australia**
-    - **Oceania**
-- **Zoom** sets the initial zoom level.
+- **View** - Sets the center for the map when the panel first loads. Refer to the table following this list for view selections.
+- **Zoom** - Sets the initial zoom level.
+- **Use current map settings** - Use the settings of the current map to set the center.
 
-### Share view
+<!-- prettier-ignore-start -->
+| View selection | Description |
+|---|---|
+| Fit to data | fits the map view based on the data extents of Map layers and updates when data changes.<ul><li>**Data** - option allows selection of extent based on data from "All layers", a single "Layer", or the "Last value" from a selected layer.</li><li>**Layer** - can be selected if fitting data from a single "Layer" or the "Last value" of a layer.</li><li>**Padding** - sets padding in relative percent beyond data extent (not available when looking at "Last value" only).</li><li>**Max zoom** - sets the maximum zoom level when fitting data.</li> |
+| (0°, 0°) |  |
+| Coordinates | sets the map view based on: **Latitude** and **Longitude**. |
+<!-- prettier-ignore-end -->
+
+Default Views are also available including:
+
+<!-- prettier-ignore-start -->
+|               |               |        |        |           |
+| ------------- | ------------- | ------ | ------ | --------- |
+| North America | South America | Europe | Africa | West Asia |
+| South Asia | South-East Asia | East Asia | Australia | Oceania |
+<!-- prettier-ignore-end -->
+
+#### Share view
 
 The **Share view** option allows you to link the movement and zoom actions of multiple map visualizations within the same dashboard. The map visualizations that have this option enabled act in tandem when one of them is moved or zoomed, leaving the other ones independent.
 
@@ -106,11 +184,28 @@ The **Share view** option allows you to link the movement and zoom actions of mu
 You might need to reload the dashboard for this feature to work.
 {{< /admonition >}}
 
-## Map layers
+### Map layers options
 
 Geomaps support showing multiple layers. Each layer determines how you visualize geospatial data on top of the base map.
 
-### Types
+There are three options that you need to set for all maps:
+
+- [Layer type](#layer-type)
+- [Data](#data)
+- [Location mode](#location-mode)
+
+Other options are dependent on your map layer type and are described within the layer type section.
+
+The layer controls allow you to create layers, change their name, reorder and delete layers.
+
+- **Add layer** creates an additional, configurable data layer for the geomap. When you add a layer, you are prompted to select a layer type. You can change the layer type at any point during panel configuration. See the **Layer Types** section above for details on each layer type.
+- **Edit layer name (pencil icon)** renames the layer.
+- **Trash Bin** deletes the layer.
+- **Reorder (six dots/grab handle)** allows you to change the layer order. Data on higher layers will appear above data on lower layers. The visualization will update the layer order as you drag and drop to help simplify choosing a layer order.
+
+You can add multiple layers of data to a single geomap in order to create rich, detailed visualizations.
+
+#### Layer type
 
 There are seven map layer types to choose from in a geomap.
 
@@ -121,6 +216,10 @@ There are seven map layer types to choose from in a geomap.
 - [Route (Beta)](#route-layer-beta) render data points as a route.
 - [Photos (Beta)](#photos-layer-beta) renders a photo at each data point.
 - [Network (Beta)](#network-layer-beta) visualizes a network graph from the data.
+- [Open Street Map](#open-street-map-layer) adds a map from a collaborative free geographic world database.
+- [CARTO basemap](#carto-basemap-layer) adds a layer from CARTO Raster basemaps.
+- [ArcGIS MapServer](#arcgis-mapserver-layer) adds a layer from an ESRI ArcGIS MapServer.
+- [XYZ Tile layer](#xyz-tile-layer) adds a map from a generic tile layer.
 
 {{% admonition type="note" %}}
 Beta is equivalent to the [public preview](/docs/release-life-cycle/) release stage.
@@ -131,9 +230,7 @@ There are also two experimental (or alpha) layer types.
 - **Icon at last point (alpha)** renders an icon at the last data point.
 - **Dynamic GeoJSON (alpha)** styles a GeoJSON file based on query results.
 
-{{% admonition type="note" %}}
-To enable experimental layers:
-Set `enable_alpha` to `true` in your configuration file:
+To enable experimental layers. Set `enable_alpha` to `true` in your configuration file:
 
 ```
 [panels]
@@ -146,29 +243,11 @@ To enable the experimental layers using Docker, run the following command:
 docker run -p 3000:3000 -e "GF_PANELS_ENABLE_ALPHA=true" grafana/grafana:<VERSION>
 ```
 
-{{% /admonition %}}
-
-{{% admonition type="note" %}}
-[Basemap layer types](#types-1) can also be added as layers. You can specify an opacity.
-{{% /admonition %}}
-
-### Layer Controls
-
-The layer controls allow you to create layers, change their name, reorder and delete layers.
-
-- **Add layer** creates an additional, configurable data layer for the geomap. When you add a layer, you are prompted to select a layer type. You can change the layer type at any point during panel configuration. See the **Layer Types** section above for details on each layer type.
-- The layer controls allow you to rename, delete, and reorder the layers of the visualization.
-  - **Edit layer name (pencil icon)** renames the layer.
-  - **Trash Bin** deletes the layer.
-  - **Reorder (six dots/grab handle)** allows you to change the layer order. Data on higher layers will appear above data on lower layers. The visualization will update the layer order as you drag and drop to help simplify choosing a layer order.
-
-You can add multiple layers of data to a single geomap in order to create rich, detailed visualizations.
-
-### Data
+#### Data
 
 Geomaps need a source of geographical data gathered from a data source query which can return multiple datasets. By default Grafana picks the first dataset, but this drop-down allows you to pick other datasets if the query returns more than one.
 
-### Location mode
+#### Location mode
 
 There are four options to map the data returned by the selected query:
 
@@ -181,23 +260,290 @@ There are four options to map the data returned by the selected query:
 - **Geohash** specifies that your query holds geohash data. You will be prompted to select a string data field for the geohash from your database query.
 - **Lookup** specifies that your query holds location name data that needs to be mapped to a value. You will be prompted to select the lookup field from your database query and a gazetteer. The gazetteer is the directory that is used to map your queried data to a geographical point.
 
-## Basemap layer
+#### Markers layer
+
+The markers layer allows you to display data points as different marker shapes such as circles, squares, triangles, stars, and more.
+
+![Markers Layer](/static/img/docs/geomap-panel/geomap-markers-8-1-0.png)
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Data | Configure the data settings for the layer. For more information, refer to [Data](#data). |
+| Location | Configure the data settings for the layer. For more information, refer to [Location mode](#location-mode). |
+| Size | Configures the size of the markers. The default is `Fixed size`, which makes all marker sizes the same regardless of the data; however, there is also an option to size the markers based on data corresponding to a selected field. `Min` and `Max` marker sizes have to be set such that the markers can scale within this range. |
+| Symbol | Allows you to choose the symbol, icon, or graphic to aid in providing additional visual context to your data. Choose from assets that are included with Grafana such as simple symbols or the Unicon library. You can also specify a URL containing an image asset. The image must be a scalable vector graphic (SVG). |
+| Symbol Vertical Align | Configures the vertical alignment of the symbol relative to the data point. Note that the symbol's rotation angle is applied first around the data point, then the vertical alignment is applied relative to the rotation of the symbol. |
+| Symbol Horizontal Align | Configures the horizontal alignment of the symbol relative to the data point. Note that the symbol's rotation angle is applied first around the data point, then the horizontal alignment is applied relative to the rotation of the symbol. |
+| Color | Configures the color of the markers. The default `Fixed color` sets all markers to a specific color. There is also an option to have conditional colors depending on the selected field data point values and the color scheme set in the `Standard options` section. |
+| Fill opacity | Configures the transparency of each marker. |
+| Rotation angle | Configures the rotation angle of each marker. The default is `Fixed value`, which makes all markers rotate to the same angle regardless of the data; however, there is also an option to set the rotation of the markers based on data corresponding to a selected field. |
+| Text label | Configures a text label for each marker. |
+| Show legend | Allows you to toggle the legend for the layer. |
+| Display tooltip | Allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+#### Heatmap layer
+
+The heatmap layer clusters various data points to visualize locations with different densities.
+To add a heatmap layer:
+
+Click on the drop-down menu under Data Layer and choose `Heatmap`.
+
+Similar to `Markers`, you are prompted with various options to determine which data points to visualize and how you want to visualize them.
+
+![Heatmap Layer](/static/img/docs/geomap-panel/geomap-heatmap-8-1-0.png)
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Data | Configure the data settings for the layer. For more information, refer to [Data](#data). |
+| Location | Configure the data settings for the layer. For more information, refer to [Location mode](#location-mode). |
+| Weight values | Configures the size of the markers. The default is `Fixed size`, which makes all marker sizes the same regardless of the data; however, there is also an option to size the markers based on data corresponding to a selected field. `Min` and `Max` marker sizes have to be set such that the markers can scale within this range. |
+| Radius | Configures the size of the heatmap clusters. |
+| Blur | Configures the amount of blur on each cluster. |
+| Opacity | Configures the opacity of each cluster. |
+| Display tooltip | Allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+#### GeoJSON layer
+
+The GeoJSON layer allows you to select and load a static GeoJSON file from the filesystem.
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| GeoJSON URL | Provides a choice of GeoJSON files that ship with Grafana. |
+| Default Style | Controls which styles to apply when no rules above match.<ul><li>**Color** - configures the color of the default style</li><li>**Opacity** - configures the default opacity</li></ul> |
+| Style Rules | Apply styles based on feature properties <ul><li>**Rule** - allows you to select a _feature_, _condition_, and _value_ from the GeoJSON file in order to define a rule. The trash bin icon can be used to delete the current rule.</li><li>**Color** - configures the color of the style for the current rule</li><li>**Opacity** - configures the transparency level for the current rule</li> |
+| Display tooltip | Allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+Styles can be set within the "properties" object of the GeoJSON with support for the following geometries:
+
+**Polygon, MultiPolygon**
+
+- **"fill"** - The color of the interior of the polygon(s)
+- **"fill-opacity"** - The opacity of the interior of the polygon(s)
+- **"stroke-width"** - The width of the line component of the polygon(s)
+
+**Point, MultiPoint**
+
+- **"marker-color"** - The color of the point(s)
+- **"marker-size"** - The size of the point(s)
+
+**LineString, MultiLineString**
+
+- **"stroke"** - The color of the line(s)
+- **"stroke-width"** - The width of the line(s)
+
+#### Night / Day layer
+
+The Night / Day layer displays night and day regions based on the current time range.
+
+{{< figure src="/static/img/docs/geomap-panel/geomap-day-night-9-1-0.png" max-width="1200px" alt="Geomap panel Night / Day" >}}
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Data | Configures the data set for the layer. For more information, refer to [Data](#data). |
+| Show | Toggles the time source from panel time range. |
+| Night region color | Picks the color for the night region. |
+| Display sun | Toggles the sun icon. |
+| Opacity | Set the opacity from `0` (transparent) to `1` (opaque). |
+| Display tooltip | Allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+[Extensions for OpenLayers - DayNight](https://viglino.github.io/ol-ext/examples/layer/map.daynight.html)
+
+#### Route layer (Beta)
+
+{{% admonition type="caution" %}}
+The Route layer is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
+{{% /admonition %}}
+
+The Route layer renders data points as a route.
+
+{{< figure src="/media/docs/grafana/geomap-route-layer-basic-9-4-0.png" max-width="1200px" alt="Geomap panel Route" >}}
+
+The layer can also render a route with arrows.
+
+{{< figure src="/media/docs/grafana/geomap-route-layer-arrow-size-9-4-0.png" max-width="1200px" alt="Geomap panel Route arrows with size" >}}
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Data | configure the data settings for the layer. For more information, refer to [Data](#data). |
+| Location | configure the data settings for the layer. For more information, refer to [Location mode](#location-mode). |
+| Size | sets the route thickness. Fixed value by default. When field data is selected you can set the Min and Max range in which field data can scale. |
+| Color | sets the route color. Set to `Fixed color` by default. You can also tie the color to field data. |
+| Fill opacity | configures the opacity of the route. |
+| Text label | configures a text label for each route. |
+| Arrow | sets the arrow styling to display along route, in order of data. Choose from: **None**, **Forward**, and **Reverse** |
+| Display tooltip | allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+[Extensions for OpenLayers - Flow Line Style](http://viglino.github.io/ol-ext/examples/style/map.style.gpxline.html)
+
+#### Photos layer (Beta)
+
+{{% admonition type="caution" %}}
+The Photos layer is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
+{{% /admonition %}}
+
+The Photos layer renders a photo at each data point.
+
+{{< figure src="/static/img/docs/geomap-panel/geomap-photos-9-3-0.png" max-width="1200px" alt="Geomap panel Photos" >}}
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Data | Configure the data settings for the layer. For more information, refer to [Data](#data). |
+| Location | Configure the data settings for the layer. For more information, refer to [Location mode](#location-mode). |
+| Image Source field | Allows you to select a string field containing image data in either of the following formats:<ul><li>**Image URLs**</li><li>**Base64 encoded** - Image binary ("data:image/png;base64,...")</li></ul> |
+| Kind | Sets the frame style around the images. Choose from: **Square**, **Circle**, **Anchored**, and **Folio**. |
+| Crop | Toggles whether the images are cropped to fit. |
+| Shadow | Toggles a box shadow behind the images. |
+| Border | Sets the border size around images. |
+| Border color | Sets the border color around images. |
+| Radius | Sets the overall size of images in pixels. |
+| Display tooltip | Allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+[Extensions for OpenLayers - Image Photo Style](http://viglino.github.io/ol-ext/examples/style/map.style.photo.html)
+
+#### Network layer (Beta)
+
+{{% admonition type="caution" %}}
+The Network layer is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
+{{% /admonition %}}
+
+The Network layer renders a network graph. This layer supports the same [data format supported by the node graph visualization](ref:data-format) with the addition of [geospatial data](#location-mode) included in the nodes data. The geospatial data is used to locate and render the nodes on the map.
+
+{{< figure src="/media/docs/grafana/screenshot-grafana-10-1-geomap-network-layer-v2.png" max-width="750px" alt="Geomap network layer" >}}
+
+You can convert node graph data to a network layer:
+{{< video-embed src="/media/docs/grafana/screen-recording-10-1-geomap-network-layer-from-node-graph.mp4" max-width="750px" alt="Node graph to Geomap network layer" >}}
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Data | Configure the data settings for the layer. For more information, refer to [Data](#data). |
+| Location | Configure the data settings for the layer. For more information, refer to [Location mode](#location-mode). |
+| Arrow | Sets the arrow direction to display for each edge, with forward meaning source to target. Choose from: **None**, **Forward**, **Reverse** and **Both**. |
+| Show legend | Allows you to toggle the legend for the layer. **Note:** The legend currently only supports node data. |
+| Display tooltip | Allows you to toggle tooltips for the layer. |
+<!-- prettier-ignore-end -->
+
+##### Node styles options
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Size | Configures the size of the nodes. The default is `Fixed size`, which makes all node sizes the same regardless of the data; however, there is also an option to size the nodes based on data corresponding to a selected field. `Min` and `Max` node sizes have to be set such that the nodes can scale within this range. |
+| Symbol | Allows you to choose the symbol, icon, or graphic to aid in providing additional visual context to your data. Choose from assets that are included with Grafana such as simple symbols or the Unicon library. You can also specify a URL containing an image asset. The image must be a scalable vector graphic (SVG). |
+| Color | Configures the color of the nodes. The default `Fixed color` sets all nodes to a specific color. There is also an option to have conditional colors depending on the selected field data point values and the color scheme set in the `Standard options` section. |
+| Fill opacity | Configures the transparency of each node. |
+| Rotation angle | Configures the rotation angle of each node. The default is `Fixed value`, which makes all nodes rotate to the same angle regardless of the data; however, there is also an option to set the rotation of the nodes based on data corresponding to a selected field. |
+| Text label | Configures a text label for each node. |
+<!-- prettier-ignore-end -->
+
+##### Edge styles options
+
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Size | Configures the line width of the edges. The default is `Fixed size`, which makes all edge line widths the same regardless of the data; however, there is also an option to size the edges based on data corresponding to a selected field. `Min` and `Max` eges sizes have to be set such that the edges can scale within this range. |
+| Color | Configures the color of the edges. The default `Fixed color` sets all edges to a specific color. There is also an option to have conditional colors depending on the selected field data point values and the color scheme set in the `Standard options` section. |
+| Fill opacity | Configures the transparency of each edge. |
+| Text label | Configures a text label for each edge. |
+<!-- prettier-ignore-end -->
+
+#### Open Street Map layer
+
+A map from a collaborative free geographic world database.
+
+{{< figure src="/static/img/docs/geomap-panel/geomap-osm-9-1-0.png" max-width="1200px" alt="Geomap panel Open Street Map" >}}
+
+- **Opacity** from 0 (transparent) to 1 (opaque)
+- **Display tooltip** - allows you to toggle tooltips for the layer.
+
+[About Open Street Map](https://www.openstreetmap.org/about)
+
+#### CARTO basemap layer
+
+A CARTO layer is from CARTO Raster basemaps.
+
+- **Theme**
+  - Auto
+  - Light
+    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-light-9-1-0.png" max-width="1200px" alt="Geomap panel CARTO light example" >}}
+  - Dark
+    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-dark-9-1-0.png" max-width="1200px" alt="Geomap panel CARTO dark example" >}}
+- **Show labels** shows the Country details on top of the map.
+- **Opacity** from 0 (transparent) to 1 (opaque)
+- **Display tooltip** - allows you to toggle tooltips for the layer.
+
+[About CARTO](https://carto.com/about-us/)
+
+#### ArcGIS MapServer layer
+
+An ArcGIS layer is a layer from an ESRI ArcGIS MapServer.
+
+- **Server Instance** to select the map type.
+  - World Street Map
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wsm-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Street Map" >}}
+  - World Imagery
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wi-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Imagery" >}}
+  - World Physical
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wp-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Physical" >}}
+  - Topographic
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-topographic-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS Topographic" >}}
+  - USA Topographic
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-usa-topographic-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS USA Topographic" >}}
+  - World Ocean
+    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-ocean-9-1-0.png" max-width="1200px" alt="Geomap panel ArcGIS World Ocean" >}}
+  - Custom MapServer (see [XYZ](#xyz-tile-layer) for formatting)
+    - URL template
+    - Attribution
+- **Opacity** from 0 (transparent) to 1 (opaque)
+- **Display tooltip** - allows you to toggle tooltips for the layer.
+
+##### More Information
+
+- [ArcGIS Services](https://services.arcgisonline.com/arcgis/rest/services)
+- [About ESRI](https://www.esri.com/en-us/about/about-esri/overview)
+
+#### XYZ Tile layer
+
+The XYZ Tile layer is a map from a generic tile layer.
+
+{{< figure src="/static/img/docs/geomap-panel/geomap-xyz-9-1-0.png" max-width="1200px" alt="Geomap panel xyz example" >}}
+
+- **URL template** - Set a valid tile server url, with {z}/{x}/{y} for example: https://tile.openstreetmap.org/{z}/{x}/{y}.png
+- **Attribution** sets the reference string for the layer if displayed in [map controls](#show-attribution)
+- **Opacity** from 0 (transparent) to 1 (opaque)
+
+##### More information
+
+- [Tiled Web Map Wikipedia](https://en.wikipedia.org/wiki/Tiled_web_map)
+- [List of Open Street Map Tile Servers](https://wiki.openstreetmap.org/wiki/Tile_servers)
+
+### Basemap layer options
 
 A basemap layer provides the visual foundation for a mapping application. It typically contains data with global coverage. Several base layer options
 are available each with specific configuration options to style the base map.
 
-### Types
+Basemap layer types can also be added as layers. You can specify an opacity.
 
 There are four basemap layer types to choose from in a geomap.
 
 - [Open Street Map](#open-street-map-layer) adds a map from a collaborative free geographic world database.
-- [CARTO](#carto-layer) adds a layer from CARTO Raster basemaps.
-- [ArcGIS](#arcgis-layer) adds a layer from an ESRI ArcGIS MapServer.
-- [XYZ](#xyz-tile-layer) adds a map from a generic tile layer.
+- [CARTO basemap](#carto-basemap-layer) adds a layer from CARTO Raster basemaps.
+- [ArcGIS MapServer](#arcgis-mapserver-layer) adds a layer from an ESRI ArcGIS MapServer.
+- [XYZ Tile layer](#xyz-tile-layer) adds a map from a generic tile layer.
 
-### Default
-
-The default base layer uses the [CARTO](#carto-layer) map. You can define custom default base layers in the `.ini` configuration file.
+The default basemap layer uses the CARTO map. You can define custom default base layers in the `.ini` configuration file.
 
 ![Basemap layer options](/static/img/docs/geomap-panel/geomap-baselayer-8-1-0.png)
 
@@ -221,6 +567,9 @@ geomap_default_baselayer = `{
 
 - **esri-xyz** loads the ESRI tile server. There are already multiple server instances implemented to show the various map styles: `world-imagery`, `world-physical`, `topo`, `usa-topo`, and `ocean`. The `custom` server option allows you to configure your own ArcGIS map server. Here are some examples:
 
+{{< tabs >}}
+{{< tab-content name="World imagery" >}}
+
 ```ini
 geomap_default_baselayer = `{
   "type": "esri-xyz",
@@ -230,6 +579,9 @@ geomap_default_baselayer = `{
 }`
 ```
 
+{{< /tab-content >}}
+{{< tab-content name="Custom" >}}
+
 ```ini
 geomap_default_baselayer = `{
   "type": "esri-xyz",
@@ -241,6 +593,9 @@ geomap_default_baselayer = `{
 }`
 ```
 
+{{< /tab-content >}}
+{{< /tabs >}}
+
 - **osm-standard** loads the OpenStreetMap tile server. There are no additional configurations needed and the `config` fields can be left blank. Here is an example:
 
 ```ini
@@ -264,337 +619,57 @@ default_baselayer_config = `{
 
 `enable_custom_baselayers` allows you to enable or disable custom open source base maps that are already implemented. The default is `true`.
 
-## Markers layer
-
-The markers layer allows you to display data points as different marker shapes such as circles, squares, triangles, stars, and more.
-
-![Markers Layer](/static/img/docs/geomap-panel/geomap-markers-8-1-0.png)
-
-![Markers Layer Options](/static/img/docs/geomap-panel/geomap-markers-options-8-1-0.png)
-
-- **Size** configures the size of the markers. The default is `Fixed size`, which makes all marker sizes the same regardless of the data; however, there is also an option to size the markers based on data corresponding to a selected field. `Min` and `Max` marker sizes have to be set such that the markers can scale within this range.
-- **Symbol** allows you to choose the symbol, icon, or graphic to aid in providing additional visual context to your data. Choose from assets that are included with Grafana such as simple symbols or the Unicon library. You can also specify a URL containing an image asset. The image must be a scalable vector graphic (SVG).
-- **Symbol Vertical Align** configures the vertical alignment of the symbol relative to the data point. Note that the symbol's rotation angle is applied first around the data point, then the vertical alignment is applied relative to the rotation of the symbol.
-- **Symbol Horizontal Align** configures the horizontal alignment of the symbol relative to the data point. Note that the symbol's rotation angle is applied first around the data point, then the horizontal alignment is applied relative to the rotation of the symbol.
-- **Color** configures the color of the markers. The default `Fixed color` sets all markers to a specific color. There is also an option to have conditional colors depending on the selected field data point values and the color scheme set in the `Standard options` section.
-- **Fill opacity** configures the transparency of each marker.
-- **Rotation angle** configures the rotation angle of each marker. The default is `Fixed value`, which makes all markers rotate to the same angle regardless of the data; however, there is also an option to set the rotation of the markers based on data corresponding to a selected field.
-- **Text label** configures a text label for each marker.
-- **Show legend** allows you to toggle the legend for the layer.
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-## Heatmap layer
-
-The heatmap layer clusters various data points to visualize locations with different densities.
-To add a heatmap layer:
-
-Click on the drop-down menu under Data Layer and choose `Heatmap`.
-
-Similar to `Markers`, you are prompted with various options to determine which data points to visualize and how you want to visualize them.
-
-![Heatmap Layer](/static/img/docs/geomap-panel/geomap-heatmap-8-1-0.png)
-
-![Heatmap Layer Options](/static/img/docs/geomap-panel/geomap-heatmap-options-8-1-0.png)
-
-- **Weight values** configure the intensity of the heatmap clusters. `Fixed value` keeps a constant weight value throughout all data points. This value should be in the range of 0~1. Similar to Markers, there is an alternate option in the drop-down to automatically scale the weight values depending on data values.
-- **Radius** configures the size of the heatmap clusters.
-- **Blur** configures the amount of blur on each cluster.
-- **Opacity** configures the opacity of each cluster.
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-## GeoJSON layer
-
-The GeoJSON layer allows you to select and load a static GeoJSON file from the filesystem.
-
-- **GeoJSON URL** provides a choice of GeoJSON files that ship with Grafana.
-- **Default Style** controls which styles to apply when no rules above match.
-  - **Color** configures the color of the default style
-  - **Opacity** configures the default opacity
-- **Style Rules** apply styles based on feature properties
-  - **Rule** allows you to select a _feature_, _condition_, and _value_ from the GeoJSON file in order to define a rule. The trash bin icon can be used to delete the current rule.
-  - **Color** configures the color of the style for the current rule
-  - **Opacity** configures the transparency level for the current rule
-- **Add style rule** creates additional style rules.
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-{{% admonition type="note" %}}
-Styles can be set within the "properties" object of the GeoJSON with support for the following geometries:
-
-- Polygon, MultiPolygon
-
-  - **"fill"** - The color of the interior of the polygon(s)
-  - **"fill-opacity"** - The opacity of the interior of the polygon(s)
-  - **"stroke-width"** - The width of the line component of the polygon(s)
-
-- Point, MultiPoint
-
-  - **"marker-color"** - The color of the point(s)
-  - **"marker-size"** - The size of the point(s)
-
-- LineString, MultiLineString
-  - **"stroke"** - The color of the line(s)
-  - **"stroke-width"** - The width of the line(s)
-
-{{% /admonition %}}
-
-## Night / Day layer
-
-The Night / Day layer displays night and day regions based on the current time range.
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-day-night-9-1-0.png" max-width="1200px" caption="Geomap panel Night / Day" >}}
-
-### Options
-
-- **Show** toggles the time source from panel time range.
-- **Night region color** picks the color for the night region.
-- **Display sun** toggles the sun icon.
-- **Opacity** set the opacity from `0` (transparent) to `1` (opaque).
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-day-night-options-9-1-0.png" max-width="1200px" caption="Geomap panel Night / Day options" >}}
-
-### More information
-
-- [**Extensions for OpenLayers - DayNight**](https://viglino.github.io/ol-ext/examples/layer/map.daynight.html)
-
-## Route layer (Beta)
-
-{{% admonition type="caution" %}}
-The Route layer is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
-{{% /admonition %}}
-
-The Route layer renders data points as a route.
-
-{{< figure src="/media/docs/grafana/geomap-route-layer-basic-9-4-0.png" max-width="1200px" caption="Geomap panel Route" >}}
-
-### Options
-
-- **Size** sets the route thickness. Fixed value by default. When field data is selected you can set the Min and Max range in which field data can scale.
-- **Color** sets the route color. Set to `Fixed color` by default. You can also tie the color to field data.
-- **Fill opacity** configures the opacity of the route.
-- **Text label** configures a text label for each route.
-- **Arrow** sets the arrow styling to display along route, in order of data.
-  - **None**
-  - **Forward**
-  - **Reverse**
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-{{< figure src="/media/docs/grafana/geomap-route-layer-arrow-size-9-4-0.png" max-width="1200px" caption="Geomap panel Route arrows with size" >}}
-
-### More information
-
-- [**Extensions for OpenLayers - Flow Line Style**](http://viglino.github.io/ol-ext/examples/style/map.style.gpxline.html)
-
-## Photos layer (Beta)
-
-{{% admonition type="caution" %}}
-The Photos layer is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
-{{% /admonition %}}
-
-The Photos layer renders a photo at each data point.
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-photos-9-3-0.png" max-width="1200px" caption="Geomap panel Photos" >}}
-
-### Options
-
-- **Image Source field** allows you to select a string field containing image data in either of the following formats:
-  - **Image URLs**
-  - **Base64 encoded** - Image binary ("data:image/png;base64,...")
-- **Kind** sets the frame style around the images. Choose from:
-  - **Square**
-  - **Circle**
-  - **Anchored**
-  - **Folio**
-- **Crop** toggles whether the images are cropped to fit.
-- **Shadow** toggles a box shadow behind the images.
-- **Border** sets the border size around images.
-- **Border color** sets the border color around images.
-- **Radius** sets the overall size of images in pixels.
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-photos-options-9-3-0.png" max-width="1200px" caption="Geomap panel Photos options" >}}
-
-### More information
-
-- [**Extensions for OpenLayers - Image Photo Style**](http://viglino.github.io/ol-ext/examples/style/map.style.photo.html)
-
-## Network layer (Beta)
-
-{{% admonition type="caution" %}}
-The Network layer is currently in [public preview](/docs/release-life-cycle/). Grafana Labs offers limited support, and breaking changes might occur prior to the feature being made generally available.
-{{% /admonition %}}
-
-The Network layer renders a network graph. This layer supports the same [data format supported by the node graph visualization](ref:data-format-supported-by-the-node-graph-visualization) with the addition of [geospatial data]({{< relref "#location">}}) included in the nodes data. The geospatial data is used to locate and render the nodes on the map.
-
-{{< figure src="/media/docs/grafana/screenshot-grafana-10-1-geomap-network-layer-v2.png" max-width="750px" caption="Geomap network layer" >}}
-{{< video-embed src="/media/docs/grafana/screen-recording-10-1-geomap-network-layer-from-node-graph.mp4" max-width="750px" caption="Node graph to Geomap network layer" >}}
-
-### Options
-
-- **Arrow** sets the arrow direction to display for each edge, with forward meaning source to target. Choose from:
-  - **None**
-  - **Forward**
-  - **Reverse**
-  - **Both**
-- **Show legend** allows you to toggle the legend for the layer. **Note:** The legend currently only supports node data.
-- **Display tooltip** allows you to toggle tooltips for the layer.
-
-#### Node styles
-
-- **Size** configures the size of the nodes. The default is `Fixed size`, which makes all node sizes the same regardless of the data; however, there is also an option to size the nodes based on data corresponding to a selected field. `Min` and `Max` node sizes have to be set such that the nodes can scale within this range.
-- **Symbol** allows you to choose the symbol, icon, or graphic to aid in providing additional visual context to your data. Choose from assets that are included with Grafana such as simple symbols or the Unicon library. You can also specify a URL containing an image asset. The image must be a scalable vector graphic (SVG).
-- **Color** configures the color of the nodes. The default `Fixed color` sets all nodes to a specific color. There is also an option to have conditional colors depending on the selected field data point values and the color scheme set in the `Standard options` section.
-- **Fill opacity** configures the transparency of each node.
-- **Rotation angle** configures the rotation angle of each node. The default is `Fixed value`, which makes all nodes rotate to the same angle regardless of the data; however, there is also an option to set the rotation of the nodes based on data corresponding to a selected field.
-- **Text label** configures a text label for each node.
-
-#### Edge styles
-
-- **Size** configures the line width of the edges. The default is `Fixed size`, which makes all edge line widths the same regardless of the data; however, there is also an option to size the edges based on data corresponding to a selected field. `Min` and `Max` eges sizes have to be set such that the edges can scale within this range.
-- **Color** configures the color of the edges. The default `Fixed color` sets all edges to a specific color. There is also an option to have conditional colors depending on the selected field data point values and the color scheme set in the `Standard options` section.
-- **Fill opacity** configures the transparency of each edge.
-- **Text label** configures a text label for each edge.
-
-## CARTO layer
-
-A CARTO layer is from CARTO Raster basemaps.
-
-### Options
-
-- **Theme**
-  - Auto
-  - Light
-    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-light-9-1-0.png" max-width="1200px" caption="Geomap panel CARTO light example" >}}
-  - Dark
-    {{< figure src="/static/img/docs/geomap-panel/geomap-carto-dark-9-1-0.png" max-width="1200px" caption="Geomap panel CARTO dark example" >}}
-- **Show labels** shows the Country details on top of the map.
-- **Opacity** from 0 (transparent) to 1 (opaque)
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-carto-options-9-1-0.png" max-width="1200px" caption="Geomap panel CARTO options" >}}
-
-### More Information
-
-- [**About CARTO**](https://carto.com/about-us/)
-
-## XYZ tile layer
-
-The XYZ tile layer is a map from a generic tile layer.
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-xyz-9-1-0.png" max-width="1200px" caption="Geomap panel xyz example" >}}
-
-### Options
-
-- **URL template**
-
-  > **Note:** Set a valid tile server url, with {z}/{x}/{y} for example: https://tile.openstreetmap.org/{z}/{x}/{y}.png
-
-- **Attribution** sets the reference string for the layer if displayed in [map controls](#show-attribution)
-- **Opacity** from 0 (transparent) to 1 (opaque)
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-xyz-options-9-1-0.png" max-width="1200px" caption="Geomap panel xyz options" >}}
-
-### More information
-
-- [**Tiled Web Map Wikipedia**](https://en.wikipedia.org/wiki/Tiled_web_map)
-- [**List of Open Street Map Tile Servers**](https://wiki.openstreetmap.org/wiki/Tile_servers)
-
-## Open Street Map layer
-
-A map from a collaborative free geographic world database.
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-osm-9-1-0.png" max-width="1200px" caption="Geomap panel Open Street Map" >}}
-
-### Options
-
-- **Opacity** from 0 (transparent) to 1 (opaque)
-
-{{< figure src="/static/img/docs/geomap-panel/geomap-osm-options-9-1-0.png" max-width="1200px" caption="Geomap panel Open Street Map options" >}}
-
-### More Information
-
-- [**About Open Street Map**](https://www.openstreetmap.org/about)
-
-## ArcGIS layer
-
-An ArcGIS layer is a layer from an ESRI ArcGIS MapServer.
-
-### Options
-
-- **Server Instance** to select the map type.
-  - World Street Map
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wsm-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS World Street Map" >}}
-  - World Imagery
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wi-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS World Imagery" >}}
-  - World Physical
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-wp-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS World Physical" >}}
-  - Topographic
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-topographic-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS Topographic" >}}
-  - USA Topographic
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-usa-topographic-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS USA Topographic" >}}
-  - World Ocean
-    {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-ocean-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS World Ocean" >}}
-  - Custom MapServer (see [XYZ](#xyz-tile-layer) for formatting)
-    - URL template
-    - Attribution
-- **Opacity** from 0 (transparent) to 1 (opaque)
-
-  {{< figure src="/static/img/docs/geomap-panel/geomap-arcgis-options-9-1-0.png" max-width="1200px" caption="Geomap panel ArcGIS options" >}}
-
-### More Information
-
-- [**ArcGIS Services**](https://services.arcgisonline.com/arcgis/rest/services)
-- [**About ESRI**](https://www.esri.com/en-us/about/about-esri/overview)
-
-## Map Controls
+### Map controls options
 
 The map controls section contains various options for map information and tool overlays.
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-9-1-0.png" max-width="1200px" caption="Geomap panel map controls" >}}
 
-### Zoom
-
-This section describes each of the zoom controls.
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| [Show zoom control](#show-zoom-control) | Displays zoom controls in the upper left corner. |
+| [Mouse wheel zoom](#mouse-wheel-zoom) | Enables the mouse wheel to be used for zooming in or out. |
+| [Show attribution](#show-attribution) | Displays attribution for basemap layers. |
+| [Show scale](#show-scale) | Displays scale information in the bottom left corner in meters (m) or kilometers (km). |
+| [Show measure tools](#show-measure-tools) | Displays measure tools in the upper right corner. This includes the [Length](#length) and [Area](#area) options. |
+| [Show debug](#show-debug) | Displays debug information in the upper right corner. |
+| [Tooltip](#tooltip) | Controls display of tooltips. |
+<!-- prettier-ignore-end -->
 
 #### Show zoom control
 
 Displays zoom controls in the upper left corner. This control can be useful when using systems that don't have a mouse.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-zoom-9-1-0.png" max-width="1200px" caption="Geomap panel zoom" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-zoom-9-1-0.png" max-width="1200px" alt="Geomap panel zoom" >}}
 
 #### Mouse wheel zoom
 
 Enables the mouse wheel to be used for zooming in or out.
 
-### Show attribution
+#### Show attribution
 
 Displays attribution for basemap layers.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-attribution-9-1-0.png" max-width="1200px" caption="Geomap panel attribution" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-attribution-9-1-0.png" max-width="1200px" alt="Geomap panel attribution" >}}
 
-### Show scale
+#### Show scale
 
-Displays scale information in the bottom left corner.
+Displays scale information in the bottom left corner in meters (m) or kilometers (km).
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-scale-9-1-0.png" max-width="1200px" caption="Geomap panel scale" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-scale-9-1-0.png" max-width="1200px" alt="Geomap panel scale" >}}
 
-{{% admonition type="note" %}}
-Currently only displays units in [m]/[km].
-{{% /admonition %}}
-
-### Show measure tools
+#### Show measure tools
 
 Displays measure tools in the upper right corner. Measurements appear only when this control is open.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-9-1-0.png" max-width="1200px" caption="Geomap panel measure" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-9-1-0.png" max-width="1200px" alt="Geomap panel measure" >}}
 
 - **Click** to start measuring
 - **Continue clicking** to continue measurement
 - **Double-click** to end measurement
 
-{{% admonition type="note" %}}
 When you change measurement type or units, the previous measurement is removed from the map. If the control is closed and then re-opened, the most recent measurement is displayed. A measurement can be modified by clicking and dragging on it.
-{{% /admonition %}}
 
-#### Length
+##### Length
 
 Get the spherical length of a geometry. This length is the sum of the great circle distances between coordinates. For multi-part geometries, the length is the sum of the length of each part. Geometries are assumed to be in 'EPSG:3857'.
 
@@ -603,9 +678,9 @@ Get the spherical length of a geometry. This length is the sum of the great circ
 - **Miles (mi)**
 - **Nautical miles (nmi)**
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-length-9-1-0.png" max-width="1200px" caption="Geomap panel measure length" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-length-9-1-0.png" max-width="1200px" alt="Geomap panel measure length" >}}
 
-#### Area
+##### Area
 
 Get the spherical area of a geometry. This area is calculated assuming that polygon edges are segments of great circles on a sphere. Geometries are assumed to be in 'EPSG:3857'.
 
@@ -616,38 +691,38 @@ Get the spherical area of a geometry. This area is calculated assuming that poly
 - **Acres (acre)**
 - **Hectare (ha)**
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-area-9-1-0.png" max-width="1200px" caption="Geomap panel measure area" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-area-9-1-0.png" max-width="1200px" alt="Geomap panel measure area" >}}
 
-### Show debug
+#### Show debug
 
 Displays debug information in the upper right corner. This can be useful for debugging or validating a data source.
 
 - **Zoom** displays current zoom level of the map.
 - **Center** displays the current **longitude**, **latitude** of the map center.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-debug-9-1-0.png" max-width="1200px" caption="Geomap panel debug" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-debug-9-1-0.png" max-width="1200px" alt="Geomap panel debug" >}}
 
-### Tooltip
+#### Tooltip
 
 - **None** displays tooltips only when a data point is clicked.
 - **Details** displays tooltips when a mouse pointer hovers over a data point.
 
-## Standard options
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Data links
+### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Thresholds
+### Thresholds
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/heatmap/index.md

@@ -16,16 +16,26 @@ labels:
 title: Heatmap
 weight: 100
 refs:
-  introduction-to-histograms-and-heatmaps:
+  intro-histograms-heatmaps:
     - pattern: /docs/grafana/
       destination: /docs/grafana/<GRAFANA_VERSION>/fundamentals/intro-histograms/
     - pattern: /docs/grafana-cloud/
       destination: /docs/grafana/<GRAFANA_VERSION>/fundamentals/intro-histograms/
+  histograms:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/visualizations/histogram/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/visualizations/histogram/
+  dashboards:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard/
 ---
 
 # Heatmap
 
-Heatmaps allow you to view [histograms](https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/histogram/) over time. While histograms display the data distribution that falls in a specific value range, heatmaps allow you to identify patterns in the histogram data distribution over time. For more information about heatmaps, refer to [Introduction to histograms and heatmaps](https://grafana.com/docs/grafana/latest/fundamentals/intro-histograms/).
+Heatmaps allow you to view [histograms](ref:histograms) over time. While histograms display the data distribution that falls in a specific value range, heatmaps allow you to identify patterns in the histogram data distribution over time. For more information about heatmaps, refer to [Introduction to histograms and heatmaps](ref:intro-histograms-heatmaps).
 
 For example, if you want to understand the temperature changes for the past few years, you can use a heatmap visualization to identify trends in your data:
 
@@ -42,7 +52,7 @@ You can use a heatmap visualization if you need to:
 
 ## Configure a heatmap visualization
 
-Once you’ve created a [dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a heatmap visualization:
+Once you’ve created a [dashboard](ref:dashboards), the following video shows you how to configure a heatmap visualization:
 
 {{< youtube id="SGWBzQ54koE" >}}
 
@@ -68,99 +78,111 @@ The data is converted as follows:
 
 {{< figure src="/static/img/docs/heatmap-panel/heatmap.png" max-width="1025px" alt="A heatmap visualization showing the random walk distribution over time" >}}
 
-## Panel options
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Heatmap options
+### Heatmap options
 
-### Calculate from data
+The following options control how data in the heatmap is calculated and grouped.
 
-This setting determines if the data is already a calculated heatmap (from the data source/transformer), or one that should be calculated in the panel.
+<!-- prettier-ignore-start -->
 
-### X Bucket
+| Options | Description |
+| ------- | ----------- |
+| Calculate from data | This setting determines if the data is already a calculated heatmap (from the data source/transformer), or one that should be calculated in the panel. |
+| X Bucket | This setting determines how the x-axis is split into buckets. You can specify a time interval in the **Size** input. For example, a time range of `1h` makes the cells 1-hour wide on the x-axis. You can also set an interval based on **Count**.  |
+| Y Bucket | This setting determines how the y-axis is split into buckets. Choose from **Size** or **Count**. |
+| Y Bucket scale | Select one of the following y-axis value scales:<ul><li>**Linear** - Linear scale.</li><li>**Logarithmic** - Choose a **Log base** of **2** or **10**.</li><li>**Symlog** - Symlog scale. Choose a **Log base** of **2** or **10** and enter a value for the **Linear threshold**.</li></ul> |
 
-This setting determines how the X-axis is split into buckets. You can specify a time interval in the **Size** input. For example, a time range of `1h` makes the cells 1-hour wide on the X-axis.
+<!-- prettier-ignore-end -->
 
-### Y Bucket
+### Y-Axis options
 
-This setting determines how the Y-axis is split into buckets.
+The following options define the display of the y-axis.
 
-### Y Bucket scale
+<!-- prettier-ignore-start -->
 
-Select one of the following Y-axis value scales:
+| Options | Description |
+| ------- | ----------- |
+| Placement | Set where the y-axis is displayed. Choose from: **Left**, **Right**, or **Hidden**. |
+| Unit | Unit configuration. |
+| Decimals | This setting determines decimal configuration. |
+| Min/Max value | These settings configure the axis range. |
+| Axis width | This setting configures the width for the axis. |
+| Axis label | This setting configures the axis value. |
+| Tick alignment | Sets the alignment of the tick marks on the visualization. Choose from: **Auto**, **Top (LE)**, **Middle**, and **Bottom (GE)**. This option is only displayed when your **Calculate from data** setting is **No**. |
+| Reverse| When selected, the axis appears in reverse order. |
 
-- **linear -** Linear scale.
-- **log (base 2) -** Logarithmic scale with base 2.
-- **log (base 10) -** Logarithmic scale with base 10.
-- **symlog -** Symlog scale.
+<!-- prettier-ignore-end -->
 
-## Y Axes
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+3" >}}
 
-Defines how the Y axis is displayed
-
-### Placement
-
-- **Left** On the left
-- **Right** On the right
-- **Hidden** Hidden
-
-### Unit
-
-Unit configuration
-
-### Decimals
-
-This setting determines decimal configuration.
-
-### Min/Max value
-
-This setting configures the axis range.
-
-### Axis width
-
-This setting configures the width for the axis.
-
-### Axis value
-
-This setting configures the axis value.
-
-### Reverse
-
-When selected, the axis appears in reverse order.
-
-{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
-
-## Colors
+### Colors options
 
 The color spectrum controls the mapping between value count (in each bucket) and the color assigned to each bucket. The leftmost color on the spectrum represents the minimum count and the color on the right most side represents the maximum count. Some color schemes are automatically inverted when using the light theme.
 
 You can also change the color mode to Opacity. In this case, the color will not change but the amount of opacity will change with the bucket count
 
-- **Mode**
-  - **Scheme -** Bucket value represented by cell color.
-    - **Scheme -** If the mode is **scheme**, then select a color scheme.
-  - **opacity -** Bucket value represented by cell opacity. Opaque cell means maximum value.
-    - **Color -** Cell base color.
-    - **Scale -** Scale for mapping bucket values to the opacity.
-      - **linear -** Linear scale. Bucket value maps linearly to the opacity.
-      - **sqrt -** Power scale. Cell opacity calculated as `value ^ k`, where `k` is a configured **Exponent** value. If exponent is less than `1`, you will get a logarithmic scale. If exponent is greater than `1`, you will get an exponential scale. In case of `1`, scale will be the same as linear.
-    - **Exponent -** value of the exponent, greater than `0`.
+#### Mode
 
-### Start/end color from value
+Use the following options to define the heatmap colors.
+
+- **Scheme** - Bucket value represented by cell color.
+  - **Scheme** - If the mode is **Scheme**, then select a color scheme.
+- **Opacity** - Bucket value represented by cell opacity. Opaque cell means maximum value.
+  - **Color** - Cell base color.
+  - **Scale** - Scale for mapping bucket values to the opacity.
+    - **Exponential** - Power scale. Cell opacity calculated as `value ^ k`, where `k` is a configured **Exponent** value. If exponent is less than `1`, you will get a logarithmic scale. If exponent is greater than `1`, you will get an exponential scale. In case of `1`, scale will be the same as linear.
+      - **Exponent** - Value of the exponent, greater than `0`.
+    - **Linear** - Linear scale. Bucket value maps linearly to the opacity.
+
+#### Steps
+
+Set a value between `1` and `128`.
+
+#### Reverse
+
+Toggle the switch to reverse the color scheme. This option only applies the **Scheme** color mode.
+
+#### Start/end color scale from value
 
 By default, Grafana calculates cell colors based on minimum and maximum bucket values. With Min and Max you can overwrite those values. Consider a bucket value as a Z-axis and Min and Max as Z-Min and Z-Max, respectively.
 
-- **Start -** Minimum value using for cell color calculation. If the bucket value is less than Min, then it is mapped to the "minimum" color. The series min value is the default value.
-- **End -** Maximum value using for cell color calculation. If the bucket value is greater than Max, then it is mapped to the "maximum" color. The series max value is the default value.
+- **Start** - Minimum value using for cell color calculation. If the bucket value is less than Min, then it is mapped to the "minimum" color. The series min value is the default value.
+- **End** - Maximum value using for cell color calculation. If the bucket value is greater than Max, then it is mapped to the "maximum" color. The series max value is the default value.
 
-## Cell display
+### Cell display options
 
-Use these settings to refine your visualization.
+Use these settings to control the display of heatmap cells.
 
-## Additional display options
+<!-- prettier-ignore-start -->
 
-### Tooltip
+| Option | Description |
+| ------ | ----------- |
+| Unit | Unit configuration. |
+| Decimals | This setting determines decimal configuration. |
+| Cell gap | Set how much space there is between cells. |
+| Hide cells with values <= | Enter a value. |
+| Hide cells with values >= | Enter a value. |
+
+<!-- prettier-ignore-end -->
+
+### Tooltip options
+
+Tooltip options control the information overlay that appears when you hover over data points in the visualization.
+
+| Option                                | Description                                                                                                                                                              |
+| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| [Tooltip mode](#tooltip-mode)         | When you hover your cursor over the visualization, Grafana can display tooltips. Choose how tooltips behave.                                                             |
+| Show histogram (Y axis)               | When you set the **Tooltip mode** to **Single**, this option is displayed. This option controls whether or not the tooltip includes a histogram representing the y-axis. |
+| [Show color scale](#show-color-scale) | This option controls whether or not the tooltip includes the color scale that's also represented in the legend.                                                          |
+| Max width                             | Set the maximum width of the tooltip box.                                                                                                                                |
+| Max height                            | Set the maximum height of the tooltip box. The default is 600 pixels.                                                                                                    |
 
 #### Tooltip mode
 
@@ -172,20 +194,24 @@ When you hover your cursor over the visualization, Grafana can display tooltips.
 
 Use an override to hide individual series from the tooltip.
 
-#### Show histogram (Y axis)
-
-When you set the **Tooltip mode** to **Single**, this option is displayed. This option controls whether or not the tooltip includes a histogram representing the y-axis.
-
 #### Show color scale
 
 When you set the **Tooltip mode** to **Single**, this option is displayed. This option controls whether or not the tooltip includes the color scale that's also represented in the legend. When the color scale is included in the tooltip, it shows the hovered value on the scale:
 
 ![Heatmap with a tooltip displayed showing the hovered value reflected in the color scale](/media/docs/grafana/panels-visualizations/screenshot-heatmap-tooltip-color-scale-v11.0.png)
 
-### Legend
+### Legend options
 
 Choose whether you want to display the heatmap legend on the visualization by toggling the **Show legend** switch.
 
+### Exemplars
+
+Set the color used to show exemplar data.
+
+### Standard options
+
+Toggle the **Field min/max** option on to have minimum and maximum values calculated per field.
+
 ### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
@@ -193,7 +219,3 @@ Choose whether you want to display the heatmap legend on the visualization by to
 ### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-### Exemplars
-
-Set the color used to show exemplar data.

docs/sources/panels-visualizations/visualizations/histogram/index.md

@@ -100,6 +100,10 @@ The data is converted as follows:
 
 Use the following options to refine your histogram visualization.
 
+### Bucket count
+
+Specifies the number of bins used to group your data in the histogram, affecting the granularity of the displayed distribution. Leave this empty for automatic bucket count of 30.
+
 ### Bucket size
 
 The size of the buckets. Leave this empty for automatic bucket sizing (~10% of the full range).
@@ -112,6 +116,14 @@ If the first bucket should not start at zero. A non-zero offset has the effect o
 
 This will merge all series and fields into a combined histogram.
 
+### Stacking
+
+Controls how multiple series are displayed in the histogram. Choose from the following:
+
+- **Off** - Series are not stacked, but instead shown side by side.
+- **Normal** - Series are stacked on top of each other, showing cumulative values.
+- **100%** - Series are stacked to fill 100% of the chart, showing the relative proportion of each series.
+
 ### Line width
 
 Controls line width of the bars.
@@ -126,17 +138,12 @@ Set the mode of the gradient fill. Fill gradient is based on the line color. To
 
 Gradient display is influenced by the **Fill opacity** setting.
 
-#### None
+Choose from the following:
 
-No gradient fill. This is the default setting.
-
-#### Opacity
-
-Transparency of the gradient is calculated based on the values on the Y-axis. The opacity of the fill is increasing with the values on the Y-axis.
-
-#### Hue
-
-Gradient color is generated based on the hue of the line color.
+- **None** - No gradient fill. This is the default setting.
+- **Opacity** - Transparency of the gradient is calculated based on the values on the Y-axis. The opacity of the fill is increasing with the values on the Y-axis.
+- **Hue** - Gradient color is generated based on the hue of the line color.
+- **Scheme** - The selected [color palette](https://grafana.com/docs/grafana/latest/panels-visualizations/configure-standard-options/#color-scheme) is applied to the histogram bars.
 
 ## Standard options
 

docs/sources/panels-visualizations/visualizations/logs/index.md

@@ -19,7 +19,7 @@ description: Configure options for Grafana's logs visualization
 title: Logs
 weight: 100
 refs:
-  supported-log-levels-and-mappings-of-log-level-abbreviation-and-expressions:
+  log-levels:
     - pattern: /docs/grafana/
       destination: /docs/grafana/<GRAFANA_VERSION>/explore/logs-integration/#log-level
     - pattern: /docs/grafana-cloud/
@@ -28,41 +28,71 @@ refs:
 
 # Logs
 
-The logs visualization shows log lines from data sources that support logs, such as Elastic, Influx, and Loki. Typically you would use this visualization next to a graph visualization to display the log output of a related process.
+_Logs_ are structured records of events or messages generated by a system or application&mdash;that is, a series of text records with status updates from your system or app. They generally include timestamps, messages, and context information like the severity of the logged event.
 
-{{< figure src="/static/img/docs/v64/logs-panel.png" max-width="1025px" alt="Logs panel" >}}
+The logs visualization displays these records from data sources that support logs, such as Elastic, Influx, and Loki. The logs visualization has colored indicators of log status, as well as collapsible log events that help you analyze the information generated.
+
+![Logs visualization](/media/docs/grafana/panels-visualizations/screenshot-logs-v11.3.png)
 
 {{< docs/play title="Logs Panel" url="https://play.grafana.org/d/6NmftOxZz/" >}}
 
-The logs visualization shows the result of queries that were entered in the Query tab. The results of multiple queries are merged and sorted by time. You can scroll inside the panel if the data source returns more lines than can be displayed at any one time.
+Typically, you use logs with a graph visualization to display the log output of a related process. If you have an incident in your application or systems, such as a website disruption or code failure, you can use the logs visualization to help you figure out what went wrong, when, and even why.
 
-To limit the number of lines rendered, you can use the **Max data points** setting in the **Query options**. If it is not set, then the data source will usually enforce a default limit.
+## Configure a log visualization
 
 The following video provides a walkthrough of creating a logs visualization. You'll also learn how to customize some settings and log visualization caveats:
 
 {{< youtube id="jSSi_x-fD_8" >}}
 
-## Panel options
+## Supported data formats
 
-{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+The logs visualization works best with log-type datasets such as queries from data sources like Loki, Elastic, and InfluxDB.
+
+You can also build log-formatted data from other data sources as long as the first field is a time type followed by string, number, and time fields. The leading time field is used to sort and timestamp the logs and if the data contains other time-type fields, they’re included as elements of the logged record.
+
+The second field is used as the log record title regardless of whether it’s a time, numeric, or string field. Usually the second field is a text field containing multiple string elements, but if the message level (or `lvl`) is present, the visualization uses the values in it to add colors to the record, as described in [Log levels integration](ref:log-levels).
+
+Subsequent fields are collapsed inside of each log record and you can open them by clicking the expand (`>`) icon.
+
+To limit the number of log lines rendered in the visualization, you can use the **Max data points** setting in the panel **Query options**. If that option isn't set, then the data source typically enforces its own default limit.
+
+### Example
+
+| Time                | TitleMessage         | Element1 | Element2 | Element3            |
+| ------------------- | -------------------- | -------- | -------- | ------------------- |
+| 2023-02-01 12:00:00 | title=Log1 lvl=info  | 1        | server2  | 2023-02-01 11:00:00 |
+| 2023-02-01 11:30:00 | title=Log1 lvl=error | 1        | server2  | 2023-02-01 11:00:00 |
+| 2023-02-01 11:00:00 | title=Log1 lvl=trace | 1        | server2  | 2023-02-01 11:00:00 |
+
+![Logs Example](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-logs-example.png 'Logs Example')
 
 ## Log level
 
-For logs where a **level** label is specified, we use the value of the label to determine the log level and update color accordingly. If the log doesn't have a level label specified, we try to find out if its content matches any of the supported expressions (see below for more information). The log level is always determined by the first match. In case Grafana is not able to determine a log level, it will be visualized with **unknown** log level. See [supported log levels and mappings of log level abbreviation and expressions](ref:supported-log-levels-and-mappings-of-log-level-abbreviation-and-expressions).
+For logs where a **level** label is specified, we use the value of the label to determine the log level and update color accordingly. If the log doesn't have a level label specified, we try to find out if its content matches any of the supported expressions (see below for more information). The log level is always determined by the first match. In case Grafana is not able to determine a log level, it will be visualized with **unknown** log level. See [supported log levels and mappings of log level abbreviation and expressions](ref:log-levels).
 
-## Log details
+## Configuration options
 
-Each log row has an extendable area with its labels and detected fields, for more robust interaction. Each field or label has a stats icon to display ad-hoc statistics in relation to all displayed logs.
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-### Display options
+### Panel options
+
+{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Logs options
 
 Use these settings to refine your visualization:
 
-- **Time -** Show or hide the time column. This is the timestamp associated with the log line as reported from the data source.
-- **Unique labels -** Show or hide the unique labels column, which shows only non-common labels.
-- **Common labels -** Show or hide the common labels.
-- **Wrap lines -** Toggle line wrapping.
-- **Prettify JSON -** Set this to `true` to pretty print all JSON logs. This setting does not affect logs in any format other than JSON.
-- **Enable log details -** Toggle option to see the log details view for each log row. The default setting is true.
-- **Deduplication -** Hides log messages that are duplicates of others shown according to your selected criteria. Choose from: **Exact** (ignoring ISO datetimes), **Numerical** (ignoring only those that differ by numbers such as IPs or latencies), or **Signatures** (removing successive lines with identical punctuation and white space).
-- **Order -** Display results in descending or ascending time order. The default is **Descending**, showing the newest logs first. Set to **Ascending** to show the oldest log lines first.
+<!-- prettier-ignore-start -->
+
+| Option | Description |
+| ------ | ----------- |
+| Time   | Show or hide the time column. This is the timestamp associated with the log line as reported from the data source. |
+| Unique labels | Show or hide the unique labels column, which shows only non-common labels. |
+| Common labels | Show or hide the common labels. |
+| Wrap lines | Turn line wrapping on or off. |
+| Prettify JSON | Toggle the switch on to pretty print all JSON logs. This setting does not affect logs in any format other than JSON. |
+| Enable log details | Toggle the switch on to see an extendable area with log details including labels and detected fields. Each field or label has a stats icon to display ad-hoc statistics in relation to all displayed logs. The default setting is on. |
+| Deduplication | Hide log messages that are duplicates of others shown, according to your selected criteria. Choose from: <ul><li>**Exact** - Ignoring ISO datetimes.</li><li>**Numerical** - Ignoring only those that differ by numbers such as IPs or latencies.</li><li>**Signatures** - Removing successive lines with identical punctuation and white space.</li></ul> |
+| Order | Set whether to show results **Newest first** or **Oldest first**. |
+
+<!-- prettier-ignore-end -->

docs/sources/panels-visualizations/visualizations/node-graph/index.md

@@ -21,9 +21,25 @@ weight: 100
 
 # Node graph
 
-Node graphs can visualize directed graphs or networks. They use a directed force layout to effectively position the nodes, so they can display complex infrastructure maps, hierarchies, or execution diagrams.
+Node graphs are useful when you need to visualize elements that are related to each other. This is done by displaying circles—or _nodes_—for each element you want to visualize, connected by lines—or _edges_. The visualization uses a directed force layout that positions the nodes into a network of connected circles.
 
-![Node graph visualization](/static/img/docs/node-graph/node-graph-8-0.png 'Node graph')
+Node graphs display useful information about each node, as well as the relationships between them, allowing you to visualize complex infrastructure maps, hierarchies, or execution diagrams.
+
+![Node graph visualization](/media/docs/grafana/panels-visualizations/screenshot-node-graph-v11.3.png 'Node graph')
+
+The appearance of nodes and edges can also be customized in several ways including color, borders, and line style.
+
+You can use a node graph visualization if you need to show:
+
+- Solution topologies
+- Networks
+- Infrastructure
+- Organizational charts
+- Critical path diagrams
+- Family trees
+- Mind maps
+
+## Configure a node graph visualization
 
 The following video provides beginner steps for creating node panel visualizations. You'll learn the data requirements and caveats, special customizations, and much more:
 
@@ -31,7 +47,39 @@ The following video provides beginner steps for creating node panel visualizatio
 
 {{< docs/play title="Node graph panel" url="https://play.grafana.org/d/bdodfbi3d57uoe/" >}}
 
-## Data requirements
+## Supported data formats
+
+To create node graphs, you need two datasets: one containing the records for the displayed elements (nodes) and one dataset containing the records for the connections between those elements (edges).
+
+### Nodes dataset
+
+The nodes dataset must contain one alphanumeric ID field that gives each element a unique identifier. The visualization also accepts other options fields for titles, subtitles, main and secondary stats, arc information for how much of the circle border to paint, details, colors, icons, node size, and indicators for element highlighting. For more information and naming conventions for these fields, refer to the [Nodes data frame structure](#nodes-data-frame-structure) section.
+
+#### Example
+
+| id    | title | subtitle | mainstat | secondarystat | color | icon | highlighted |
+| ----- | ----- | -------- | -------- | ------------- | ----- | ---- | ----------- |
+| node1 | PC    | Windows  | AMD      | 16gbRAM       | blue  |      | true        |
+| node2 | PC    | Linux    | Intel    | 32gbRAM       | green | eye  | false       |
+| node3 | Mac   | MacOS    | M3       | 16gbRAM       | gray  | apps | false       |
+| node4 | Alone | SoLonely | JustHere | NotConnected  | red   |      | false       |
+
+If the icon field contains a value, it’s displayed instead of the title and subtitle. For a list of of available icons, refer to [Icons Overview](https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview).
+
+### Edges dataset
+
+Similar to the nodes dataset, the edges dataset needs one unique ID field for each relationship, followed by two fields containing the source and the target nodes of the edge; that is, the nodes the edge connects. Other optional fields are main and secondary stats, context menu elements, line thickness, highlight indications, line colors, and configurations to turn the connection into a dashed line. For more information and naming conventions for these fields, refer to the [Edges data frame structure](#edges-data-frame-structure) section.
+
+#### Example
+
+| id    | source | target | mainstat | seconddarystat | thickness | highlighted | color  |
+| ----- | ------ | ------ | -------- | -------------- | --------- | ----------- | ------ |
+| edge1 | node1  | node2  | TheMain  | TheSub         | 3         | true        | cyan   |
+| edge2 | node3  | node2  | Main2    | Sub2           | 1         | false       | orange |
+
+If a node lacks edge connections, it’s displayed on its own outside of the network.
+
+### Data requirements
 
 A node graph requires a specific shape of the data to be able to display its nodes and edges. This means not every data source or query can be visualized with this graph. If you want to use this as a data source developer see the section about data API.
 
@@ -42,7 +90,7 @@ A node graph consists of _nodes_ and _edges_.
 
 Both nodes and edges can have associated metadata or statistics. The data source defines what information and values is shown, so different data sources can show different type of values or not show some values.
 
-### Nodes
+#### Nodes
 
 {{% admonition type="note" %}}
 Node graphs can show only 1,500 nodes. If this limit is crossed a warning will be visible in upper right corner, and some nodes will be hidden. You can expand hidden parts of the graph by clicking on the "Hidden nodes" markers in the graph.
@@ -52,45 +100,82 @@ Usually, nodes show two statistical values inside the node and two identifiers j
 
 For example, you can have the percentage of errors represented by a red portion of the circle. Additional details can be displayed in a context menu which is displayed when you click on the node. There also can be additional links in the context menu that can target either other parts of Grafana or any external link.
 
-![Node graph navigation](/static/img/docs/node-graph/node-graph-navigation-7-4.gif 'Node graph navigation')
+![Node context menu](/media/docs/grafana/panels-visualizations/screenshot-node-links-v11.3.png 'Node context menu')
 
-### Edges
+#### Edges
 
 Edges can also show statistics when you hover over the edge. Similar to nodes, you can open a context menu with additional details and links by clicking on the edge.
 
 The first data source supporting this visualization is X-Ray data source for its Service map feature. For more information, refer to the [X-Ray plugin documentation](https://grafana.com/grafana/plugins/grafana-x-ray-datasource).
 
-## Navigating the node graph
+## Node graph navigation
 
-You can pan and zoom in or out a node graph.
+You can use pan, zoom, and other functions to navigate a node graph.
 
 ### Pan
 
 You can pan the view by clicking outside any node or edge and dragging your mouse.
 
-### Zoom in or out
+### Zoom
 
-Use the buttons in the upper left corner or use the mouse wheel, touchpad scroll, together with either Ctrl or Cmd key to zoom in or out.
+Use the buttons in the lower right corner to zoom in or out. You can also use the mouse wheel or touchpad scroll, together with either Ctrl or Cmd key to do so.
 
-### Explore hidden nodes
+### Hidden nodes
 
 The number of nodes shown at a given time is limited to maintain a reasonable visualization performance. Nodes that are not currently visible are hidden behind clickable markers that show an approximate number of hidden nodes that are connected by a particular edge. You can click on the marker to expand the graph around that node.
 
-![Node graph exploration](/static/img/docs/node-graph/node-graph-exploration-8-0.png 'Node graph exploration')
+![Node graph exploration](/media/docs/grafana/panels-visualizations/node-graph-exploration-8.0-2.png 'Node graph exploration')
 
 ### Grid view
 
 You can switch to the grid view to have a better overview of the most interesting nodes in the graph. Grid view shows nodes in a grid without edges and can be sorted by stats shown inside the node or by stats represented by the a colored border of the nodes.
 
-![Node graph grid](/static/img/docs/node-graph/node-graph-grid-8-0.png 'Node graph grid')
+![Node graph grid](/media/docs/grafana/panels-visualizations/screenshot-node-graph-grid-v11.3.png 'Node graph grid')
 
 To sort the nodes, click on the stats inside the legend. The marker next to the stat name shows which stat is currently used for sorting and sorting direction.
 
-![Node graph legend](/static/img/docs/node-graph/node-graph-legend-8-0.png 'Node graph legend')
+![Node graph legend](/media/docs/grafana/panels-visualizations/screenshot-node-graph-legend-v11.3.png 'Node graph legend')
 
 Click on the node and select "Show in Graph layout" option to switch back to graph layout and focus on the selected node, to show it in context of the full graph.
 
-![Node graph grid to default](/static/img/docs/node-graph/node-graph-grid-to-default-8-0.png 'Node graph grid to default')
+![Node graph grid to default](/media/docs/grafana/panels-visualizations/screenshot-node-graph-view-v11.3.png 'Node graph grid to default')
+
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
+
+{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Nodes options
+
+The **Nodes** options section provides configurations for node behaviors.
+
+- **Main stat unit** - Choose which unit the main stat displays in the graph's nodes.
+- **Secondary stat unit** - Choose which unit the secondary stat displays in the graph's nodes.
+- **Arc sections** - Configure which fields define the size of the colored circle around the node and select a color for each. You can add multiple fields.
+
+{{< admonition type="note" >}}
+Defining arc sections overrides the automatic detection of `arc__*` and `color` fields described in the **Optional fields** section of [Nodes data frame structure](#nodes-data-frame-structure).
+{{< /admonition >}}
+
+### Edges options
+
+The **Edges** options section provides configurations for node edges behaviors.
+
+- **Main stat unit** - Choose which unit the main stat displays in the graph's edges.
+- **Secondary stat unit** - Choose which unit the secondary stat displays in the graph's edges.
+
+### Data links
+
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+In node graphs, some data fields may have pre-configured data links. To add a different data link in those cases, use a [field override](#field-overrides).
+
+### Field overrides
+
+{{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
 ## Data API
 
@@ -136,19 +221,15 @@ Required fields:
 
 Optional fields:
 
-| Field name    | Type          | Description                                                                                                                                                                                                                                                                                                                                                               |
-| ------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| title         | string        | Name of the node visible in just under the node.                                                                                                                                                                                                                                                                                                                          |
-| subtitle      | string        | Additional, name, type or other identifier shown under the title.                                                                                                                                                                                                                                                                                                         |
-| mainstat      | string/number | First stat shown inside the node itself. It can either be a string showing the value as is or a number. If it is a number, any unit associated with that field is also shown.                                                                                                                                                                                             |
-| secondarystat | string/number | Same as mainStat, but shown under it inside the node.                                                                                                                                                                                                                                                                                                                     |
-| arc\_\_\*     | number        | Any field prefixed with `arc__` will be used to create the color circle around the node. All values in these fields should add up to 1. You can specify color using `config.color.fixedColor`.                                                                                                                                                                            |
-| detail\_\_\*  | string/number | Any field prefixed with `detail__` will be shown in the header of context menu when clicked on the node. Use `config.displayName` for more human readable label.                                                                                                                                                                                                          |
-| color         | string/number | Can be used to specify a single color instead of using the `arc__` fields to specify color sections. It can be either a string which should then be an acceptable HTML color string or it can be a number in which case the behaviour depends on `field.config.color.mode` setting. This can be for example used to create gradient colors controlled by the field value. |
-| icon          | string        | Name of the icon to show inside the node instead of the default stats. Only Grafana built in icons are allowed (see the available icons [here](https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview)).                                                                                                                      |
-| nodeRadius    | number        | Radius value in pixels. Used to manage node size.                                                                                                                                                                                                                                                                                                                         |
-| highlighted   | boolean       | Sets whether the node should be highlighted. Useful for example to represent a specific path in the graph by highlighting several nodes and edges. Default: `false`                                                                                                                                                                                                       |
-
-## Panel options
-
-{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+| Field name    | Type          | Description                                                                                                                                                                                                                                                                                                                                                              |
+| ------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| title         | string        | Name of the node visible in just under the node.                                                                                                                                                                                                                                                                                                                         |
+| subtitle      | string        | Additional, name, type or other identifier shown under the title.                                                                                                                                                                                                                                                                                                        |
+| mainstat      | string/number | First stat shown inside the node itself. It can either be a string showing the value as is or a number. If it is a number, any unit associated with that field is also shown.                                                                                                                                                                                            |
+| secondarystat | string/number | Same as mainStat, but shown under it inside the node.                                                                                                                                                                                                                                                                                                                    |
+| arc\_\_\*     | number        | Any field prefixed with `arc__` will be used to create the color circle around the node. All values in these fields should add up to 1. You can specify color using `config.color.fixedColor`.                                                                                                                                                                           |
+| detail\_\_\*  | string/number | Any field prefixed with `detail__` will be shown in the header of context menu when clicked on the node. Use `config.displayName` for more human readable label.                                                                                                                                                                                                         |
+| color         | string/number | Can be used to specify a single color instead of using the `arc__` fields to specify color sections. It can be either a string which should then be an acceptable HTML color string or it can be a number in which case the behavior depends on `field.config.color.mode` setting. This can be for example used to create gradient colors controlled by the field value. |
+| icon          | string        | Name of the icon to show inside the node instead of the default stats. Only Grafana [built in icons](https://developers.grafana.com/ui/latest/index.html?path=/story/docs-overview-icon--icons-overview)) are allowed.                                                                                                                                                   |
+| nodeRadius    | number        | Radius value in pixels. Used to manage node size.                                                                                                                                                                                                                                                                                                                        |
+| highlighted   | boolean       | Sets whether the node should be highlighted. Useful for example to represent a specific path in the graph by highlighting several nodes and edges. Default: `false`                                                                                                                                                                                                      |

docs/sources/panels-visualizations/visualizations/pie-chart/index.md

@@ -19,122 +19,169 @@ refs:
       destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types/
     - pattern: /docs/grafana-cloud/
       destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types/
+  configure-legends:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-legend/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-legend/
 ---
 
 # Pie chart
 
-{{< figure src="/static/img/docs/pie-chart-panel/pie-chart-example.png" max-width="1200px" lightbox="true" caption="Pie charts" >}}
+A pie chart is a graph that displays data as segments of a circle proportional to the whole, making it look like a sliced pie. Each slice corresponds to a value or measurement.
 
-Pie charts display reduced series, or values in a series, from one or more queries, as they relate to each other, in the form of slices of a pie. The arc length, area and central angle of a slice are all proportional to the slices value, as it relates to the sum of all values. This type of chart is best used when you want a quick comparison of a small set of values in an aesthetically pleasing form.
+![Pie chart visualizations](/media/docs/grafana/panels-visualizations/screenshot-pie-chart-v11.4.png)
+
+The pie chart visualization is ideal when you have data that adds up to a total and you want to show the proportion of each value compared to other slices, as well as to the whole of the pie.
+
+You can use a pie chart if you need to compare:
+
+- Browser share distribution in the market
+- Incident causes per category
+- Network traffic sources
+- User demographics
+
+## Configure a pie chart visualization
+
+The following video guides you through the creation steps and common customizations of pie chart visualizations and is great for beginners:
+
+{{< youtube id="A_lDhM9w4_g" >}}
 
 {{< docs/play title="Grafana Bar Charts and Pie Charts" url="https://play.grafana.org/d/ktMs4D6Mk/" >}}
 
-## Panel options
+## Supported data formats
+
+The pie chart is different from other visualizations in that it will only display one pie, regardless of the number of datasets, fields, or records queried in it.
+
+To create a pie chart visualization, you need a dataset containing a set of numeric values either in rows, columns, or both.
+
+### Example - One row
+
+The easiest way to provide data for a pie chart visualization is in a dataset with a single record (or row) containing the fields (or columns) that you want in the pie, as in the following example. The default settings of the pie chart visualization automatically display each column as a slice of the pie.
+
+| Value1 | Value2 | Value3 | Optional |
+| ------ | ------ | ------ | -------- |
+| 5      | 3      | 2      | Sums10   |
+
+![Pie chart visualization with multiple values in a single row](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-pie-example1.png)
+
+### Example - Multiple rows
+
+If you need to use numeric data that's in multiple rows, the default **Show** parameter of the visualization [Value options](#value-options) is set to **Calculate** and use data from the last row.
+
+| Value | Label  |
+| ----- | ------ |
+| 5     | Value1 |
+| 3     | Value2 |
+| 2     | Value3 |
+
+![Pie chart visualization with multiple row values showing the last one](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-pie-example2.png)
+
+By default, the visualization is configured to [calculate](#value-options) a single value per column or series and to display only the last row of data.
+
+To allow values in multiple rows to be displayed, change the **Show** setting in the [Value options](#value-options) from **Calculate** to **All values**.
+
+![Pie chart visualization with multiple row values showing all values](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-pie-example3.png)
+
+### Example - Multiple rows and columns
+
+If your dataset contains multiple rows and columns with numeric data, by default only the last row's values are summed.
+
+| Value1 | Value2 | Value3 | Optional |
+| ------ | ------ | ------ | -------- |
+| 5      | 3      | 2      | Sums10   |
+| 10     | 6      | 4      | Sums20   |
+| 20     | 8      | 2      | Sums30   |
+
+![Pie chart visualization with multiple rows and columns showing the last one](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-pie-example4.png)
+
+If you want to display all the cells, change the **Show** setting in the [Value options](#value-options) from **Calculate** to **All values**. This also labels the elements by concatenating all the text fields (if you have any) with the column name.
+
+![Pie chart visualization with multiple rows and columns showing the all values](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-pie-example5.png)
+
+If you want to display only the values from a given field (or column), once the **Show** setting in the [Value options](#value-options) is set to **All values**, set the **Fields** option to the column you wish to sum in the display. The value labels are also concatenated as indicated before.
+
+![Pie chart visualization with multiple rows and columns showing values from one column](/media/docs/grafana/panels-visualizations/screenshot-grafana-12.1-pie-example6.png)
+
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value options
+### Value options
 
 Use the following options to refine the value in your visualization.
 
-### Show
+<!-- prettier-ignore-start -->
 
-Choose how much information to show.
+| Option | Description |
+| ------ | ----------- |
+| Show | Set how much information to show. Choose from:<ul><li>**Calculate** - Reduces each value to a single value per series.</li><li>**All values** - Displays every value from a single series.</li></ul> |
+| Calculation | If you chose **Calculate** as your **Show** option, select a calculation to reduce each series. For information about available calculations, refer to [Calculation types](ref:calculation-types). |
+| Limit | If you chose **All values** as your **Show** option, enter a value to limit the number of values displayed. |
+| Fields | Select which field or fields to display in the visualization. Each field name is available on the list, or you can select one of the following options:<ul><li>**Numeric fields** - All fields with numerical values.</li><li>**All fields** - All fields that are not removed by transformations.</li><li>**Time** - All fields with time values.</li></ul> |
 
-- **Calculate -** Reduces each value to a single value per series.
-- **All values -** Displays every value from a single series.
+<!-- prettier-ignore-end -->
 
-### Calculation
-
-Select a calculation to reduce each series when Calculate has been selected. For information about available calculations, refer to [Calculation types](ref:calculation-types).
-
-### Limit
-
-When displaying every value from a single series, this limits the number of values displayed.
-
-### Fields
-
-Select which field or fields to display in the visualization. Each field name is available on the list, or you can select one of the following options:
-
-- **Numeric fields -** All fields with numerical values.
-- **All fields -** All fields that are not removed by transformations.
-- **Time -** All fields with time values.
-
-## Pie chart options
+### Pie chart options
 
 Use these options to refine how your visualization looks.
 
-### Pie chart type
+#### Pie chart type
 
-Select the pie chart display style.
+Select the pie chart display style. Choose from **Pie** or **Donut**.
 
-### Pie
+![Pie chart types](/media/docs/grafana/panels-visualizations/screenshot-pie-chart-types.png)
 
-![Pie type chart](/static/img/docs/pie-chart-panel/pie-type-chart-7-5.png)
-
-### Donut
-
-![Donut type chart](/static/img/docs/pie-chart-panel/donut-type-chart-7-5.png)
-
-### Labels
+#### Labels
 
 Select labels to display on the pie chart. You can select more than one.
 
-- **Name -** The series or field name.
-- **Percent -** The percentage of the whole.
-- **Value -** The raw numerical value.
+- **Name** - The series or field name.
+- **Percent** - The percentage of the whole.
+- **Value** - The raw numerical value.
 
 Labels are displayed in white over the body of the chart. You might need to select darker chart colors to make them more visible. Long names or numbers might be clipped.
 
-The following example shows a pie chart with **Name** and **Percent** labels displayed.
+The following example shows a pie chart with **Name** and **Percent** labels displayed:
 
-![Pie chart labels](/static/img/docs/pie-chart-panel/pie-chart-labels-7-5.png)
+{{< figure src="/static/img/docs/pie-chart-panel/pie-chart-labels-7-5.png" alt="Pie chart labels" max-width="350px" >}}
 
-## Standard options
+### Tooltip options
+
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
+
+### Legend options
+
+Use these settings to define how the legend appears in your visualization. For more information about the legend, refer to [Configure a legend](ref:configure-legends).
+
+<!-- prettier-ignore-start -->
+
+| Option | Description |
+| ------ | ----------- |
+| Visibility | Toggle the switch to turn the legend on or off. |
+| Mode | Use these settings to define how the legend appears in your visualization. Choose from:<ul><li>**List** - Displays the legend as a list. This is a default display mode of the legend.</li><li>**Table** - Displays the legend as a table.</li></ul> |
+| Placement | Select where to display the legend. Choose **Bottom** or **Right**. |
+| Width | Control how wide the legend is when placed on the right side of the visualization. This option is only displayed if you set the legend placement to **Right**. |
+| Legend values | Select values to display in the legend. You can select more than one:<ul><li>**Percent** - The percentage of the whole.</li><li>**Value** - The raw numerical value.</li></ul> |
+
+<!-- prettier-ignore-end -->
+
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Tooltip options
+### Data links
 
-{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+{{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Legend options
-
-Use these settings to define how the legend appears in your visualization. For more information about the legend, refer to [Configure a legend]({{< relref "../../configure-legend" >}}).
-
-### Visibility
-
-Toggle the switch to turn the legend on or off.
-
-### Mode
-
-Use these settings to define how the legend appears in your visualization.
-
-- **List -** Displays the legend as a list. This is a default display mode of the legend.
-- **Table -** Displays the legend as a table.
-
-### Placement
-
-Choose where to display the legend.
-
-- **Bottom -** Below the graph.
-- **Right -** To the right of the graph.
-
-#### Width
-
-Control how wide the legend is when placed on the right side of the visualization. This option is only displayed if you set the legend placement to **Right**.
-
-### Values
-
-Select values to display in the legend. You can select more than one.
-
-- **Percent:** The percentage of the whole.
-- **Value:** The raw numerical value.
-
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/stat/index.md

@@ -23,6 +23,11 @@ refs:
       destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/calculation-types/
     - pattern: /docs/grafana-cloud/
       destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/calculation-types/
+  create-dashboard:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/dashboards/build-dashboards/create-dashboard/
 ---
 
 # Stat
@@ -35,7 +40,7 @@ A stat visualization displays your data in single values of interest&mdash;such
 
 For example, if you're monitoring the utilization of various services, you can use a stat visualization to show their latest usage:
 
-{{< figure src="/static/img/docs/v66/stat_panel_dark3.png" max-width="1025px" alt="A stat panel showing latest usage of various services" >}}
+![A stat panel showing latest usage of various services](/media/docs/grafana/panels-visualizations/screenshot-stat-visualization-v11.3.png)
 
 Use a stat visualization when you need to:
 
@@ -47,7 +52,7 @@ Use a stat visualization when you need to:
 
 ## Configure a stat visualization
 
-Once you've [created a dashboard](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/dashboards/build-dashboards/create-dashboard/), the following video shows you how to configure a stat visualization:
+Once you've [created a dashboard](ref:create-dashboard), the following video shows you how to configure a stat visualization:
 
 {{< youtube id="yNRnLyVntUw" start="1048" >}}
 
@@ -73,9 +78,9 @@ The following tables are examples of the type of data you need for a stat visual
 | 59                           |
 | 40                           |
 
-The data is visualized as follows, with the last value displayed, along with a sparkline and [percentage change](#show-percent-change):
+The data is visualized as follows, with the last value displayed, along with a sparkline and [percentage change](#value-options):
 
-{{< figure src="/static/img/docs/stat-panel/stat_panel_single.png" max-width="1025px" alt="A stat panel showing the latest number of high priority bugs" >}}
+![A stat panel showing the latest number of high priority bugs](/media/docs/grafana/panels-visualizations/screenshot-stat-single-value-v11.3.png)
 
 #### Time-series data
 
@@ -89,7 +94,7 @@ The data is visualized as follows, with the last value displayed, along with a s
 
 The data is visualized as follows, with the mean value displayed for each room, along with the room name, sparkline, and unit of measurement:
 
-{{< figure src="/static/img/docs/stat-panel/stat_panel_multiple.png" max-width="1025px" alt="A stat panel showing some statistics for each room in square meters" >}}
+![A stat panel showing some statistics for each room in square meters](/media/docs/grafana/panels-visualizations/screenshot-stat-multiple-values-v11.3.png)
 
 By default, a stat displays one of the following:
 
@@ -98,131 +103,87 @@ By default, a stat displays one of the following:
 
 You can use the [**Text mode**](#text-mode) to control how the text is displayed.
 
-## Automatic layout adjustment
+## Configuration options
 
-The panel automatically adjusts the layout depending on available width and height in the dashboard. It automatically hides the graph (sparkline) if the panel becomes too small.
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Panel options
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value options
+### Value options
 
 Use the following options to refine how your visualization displays its values:
 
-### Show
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Show | Display a single value per column or series, or show values for each row. Choose from: <ul><li>**Calculate** - Display a calculated value based on all rows.</li><li>**All values** - Show a separate stat for every row. If you select this option, then you can also limit the number of rows to display.</li> |
+| Calculation | This option is displayed when you select **Calculate** as your **Show** option. Select a reducer function that Grafana will use to reduce many fields to a single value. For a list of available calculations, refer to [Calculation types](ref:calculation-types). |
+| Limit | This option is displayed when you select **All values** as your **Show** option. Set the maximum number of rows to display. Default is 5,000. |
+| Fields | Select the fields displayed in the visualization. |
 
-Display a single value per column or series, or show values for each row.
+<!-- prettier-ignore-end -->
 
-#### Calculate
+### Stat styles
 
-Display a calculated value based on all rows.
+The stat visualization automatically adjusts the layout depending on available width and height in the dashboard, but you can also use the following options to further style the visualization.
 
-- **Calculation -** Select a reducer function that Grafana will use to reduce many fields to a single value. For a list of available calculations, refer to [Calculation types](ref:calculation-types).
-- **Fields -** Select the fields display in the visualization.
+<!-- prettier-ignore-start -->
+| Option | Description |
+| ------ | ----------- |
+| Orientation | Select a stacking direction. Choose from: <ul><li>**Auto** - Grafana selects the ideal orientation.</li><li>**Horizontal** - Bars stretch horizontally, left to right.</li><li>**Vertical** - Bars stretch vertically, top to bottom.</li></ul> |
+| [Text mode](#text-mode) | You can use the **Text mode** option to control what text the visualization renders. If the value is not important, only the name and color is, then change the **Text mode** to **Name**. The value will still be used to determine color and is displayed in a tooltip. |
+| [Wide layout](#wide-layout) | Set whether wide layout is enabled or not. Wide layout is enabled by default. This option is only applicable when **Text mode** is set to **Value and name**. |
+| Color mode | Select a color mode. Choose from: <ul><li>**None** - No color applied to the value.</li><li>**Value** - Applies color to the value and graph area.</li><li>**Background Gradient** - Applies color to the value, graph area, and background, with a slight background gradient.</li><li>**Background Solid** - Applies color to the value, graph area, and background, with a solid background color.</li></ul> |
+| Graph mode | Select a graph sparkline mode. Choose from: <ul><li>**None** - Hides the graph sparkline and only shows the value.</li><li>**Area** - Shows the graph sparkline below the value. This requires that your query returns a time column.</li></ul> The graph sparkline is automatically hidden if the panel becomes too small.|
+| Text alignment | Select an alignment mode. Choose from: <ul><li>**Auto** - If only a single value is shown (no repeat), then the value is centered. If multiple series or rows are shown, then the value is left-aligned.</li><li>**Center** - Stat value is centered.</li></ul> |
+| Show percent change | Set whether percent change is displayed or not. Disabled by default. This option is applicable when the **Show** setting, under **Value options**, is set to **Calculate**. |
+| Percent change color mode | This option is only displayed when **Show percent change** is enabled. Choose from: <ul><li>**Standard** - Green if the percent change is positive, red if the percent change is negative.</li><li>**Inverted** - Red if the percent change is positive, green if the percent change is negative.</li><li>**Same as Value** - Use the same color as the value.</li></ul> |
+<!-- prettier-ignore-end -->
 
-#### All values
-
-Show a separate stat for every row. If you select this option, then you can also limit the number of rows to display.
-
-- **Limit -** The maximum number of rows to display. Default is 5,000.
-- **Fields -** Select the fields display in the visualization.
-
-## Stat styles
-
-Style your visualization.
-
-### Orientation
-
-Choose a stacking direction.
-
-- **Auto -** Grafana selects what it thinks is the best orientation.
-- **Horizontal -** Bars stretch horizontally, left to right.
-- **Vertical -** Bars stretch vertically, top to bottom.
-
-### Text mode
+#### Text mode
 
 You can use the Text mode option to control what text the visualization renders. If the value is not important, only the name and color is, then change the **Text mode** to **Name**. The value will still be used to determine color and is displayed in a tooltip.
 
-- **Auto -** If the data contains multiple series or fields, show both name and value.
-- **Value -** Show only value, never name. Name is displayed in the hover tooltip instead.
-- **Value and name -** Always show value and name.
-- **Name -** Show name instead of value. Value is displayed in the hover tooltip.
-- **None -** Show nothing (empty). Name and value are displayed in the hover tooltip.
+- **Auto** - If the data contains multiple series or fields, show both name and value.
+- **Value** - Show only value, never name. Name is displayed in the hover tooltip instead.
+- **Value and name** - Always show value and name.
+- **Name** - Show name instead of value. Value is displayed in the hover tooltip.
+- **None** - Show nothing (empty). Name and value are displayed in the hover tooltip.
 
-### Wide layout
+#### Wide layout
 
 Set whether wide layout is enabled or not. Wide layout is enabled by default.
 
-- **On -** Wide layout is enabled.
-- **Off -** Wide layout is disabled.
+- **On** - Wide layout is enabled.
+- **Off** - Wide layout is disabled.
 
-{{< admonition type="note" >}}
 This option is only applicable when **Text mode** is set to **Value and name**. When wide layout is enabled, the value and name are displayed side-by-side with the value on the right, if the panel is wide enough. When wide layout is disabled, the value is always rendered underneath the name.
-{{< /admonition >}}
 
-### Color mode
-
-Select a color mode.
-
-- **None -** No color applied to the value.
-- **Value -** Applies color to the value and graph area.
-- **Background Gradient -** Applies color to the value, graph area, and background, with a slight background gradient.
-- **Background Solid -** Applies color to the value, graph area, and background, with a solid background color.
-
-### Graph mode
-
-Select a graph and sparkline mode.
-
-- **None -** Hides the graph and only shows the value.
-- **Area -** Shows the area graph below the value. This requires that your query returns a time column.
-
-### Text alignment
-
-Choose an alignment mode.
-
-- **Auto -** If only a single value is shown (no repeat), then the value is centered. If multiple series or rows are shown, then the value is left-aligned.
-- **Center -** Stat value is centered.
-
-### Show percent change
-
-Set whether percent change is displayed or not. Disabled by default.
-
-{{< admonition type="note" >}}
-This option is not applicable when the **Show** setting, under **Value options**, is set to **All values**.
-{{< /admonition >}}
-
-### Percent change color mode
-
-This option is only displayed when **Show percent change** is enabled. Choose from:
-
-- **Standard -** Green if the percent change is positive, red if the percent change is negative.
-- **Inverted -** Red if the percent change is positive, green if the percent change is negative.
-- **Same as Value -** Use the same color as the value.
-
-## Text size
+### Text size
 
 Adjust the sizes of the gauge text.
 
-- **Title -** Enter a numeric value for the gauge title size.
-- **Value -** Enter a numeric value for the gauge value size.
+- **Title** - Enter a numeric value for the gauge title size.
+- **Value** - Enter a numeric value for the gauge value size.
 
-## Standard options
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Data links
+### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Thresholds
+### Thresholds
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/state-timeline/index.md

@@ -34,7 +34,7 @@ A state timeline visualization displays data in a way that shows state changes o
 
 For example, if you're monitoring the CPU usage of a server, you can use a state timeline to visualize the different states, such as “LOW,” “NORMAL,” “HIGH,” or “CRITICAL,” over time. Each state is represented by a different color and the lengths represent the duration of time that the server remained in that state:
 
-{{< figure src="/static/img/docs/state-timeline-panel/state-timeline-panel.png" max-width="1025px" alt="A state timeline visualization showing CPU usage" >}}
+![A state timeline visualization showing CPU usage](/media/docs/grafana/panels-visualizations/screenshot-state-timeline-v11.4.png)
 
 The state timeline visualization is useful when you need to monitor and analyze changes in states or statuses of various entities over time. You can use one when you need to:
 
@@ -58,11 +58,9 @@ The state timeline visualization works best if you have data capturing the vario
 
 Each state ends when the next state begins or when there is a `null` value.
 
-### Examples
+### Example 1
 
-The following tables are examples of the type of data you need for a state timeline visualization and how it should be formatted.
-
-#### Single time column with null values
+The following example has a single time column and includes null values:
 
 | Timestamps          | Server A | Server B |
 | ------------------- | -------- | -------- |
@@ -76,11 +74,13 @@ The following tables are examples of the type of data you need for a state timel
 | 2024-02-29 10:00:00 | Down     | Down     |
 | 2024-02-29 10:30:00 | Warning  | Down     |
 
-The data is converted as follows, with the [null and empty values visualized as gaps](https://grafana.com/docs/grafana/latest/panels-visualizations/visualizations/state-timeline/#connect-null-values) in the state timeline:
+The data is converted as follows, with the [null and empty values visualized as gaps](#connect-null-values) in the state timeline:
 
 {{< figure src="/static/img/docs/state-timeline-panel/state-timeline-with-null-values.png" max-width="1025px" alt="A state timeline visualization with null values showing the status of two servers" >}}
 
-#### Two time columns without null values
+### Example 2
+
+The following example has two time columns and doesn't include any null values:
 
 | Start time          | End time            | Server A | Server B |
 | ------------------- | ------------------- | -------- | -------- |
@@ -97,74 +97,68 @@ The data is converted as follows:
 
 If your query results aren't in a table format like the preceding examples, especially for time-series data, you can apply specific [transformations](https://stackoverflow.com/questions/68887416/grafana-state-timeline-panel-with-values-states-supplied-by-label) to achieve this.
 
-## Panel options
+### Time series data
+
+You can also create a state timeline visualization using time series data. To do this, add [thresholds](#thresholds), which turn the time series into discrete colored state regions.
+
+![State timeline with time series](/media/docs/grafana/panels-visualizations/screenshot-state-timeline-time-series-v11.4.png)
+
+## Configuration options
+
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## State timeline options
+### State timeline options
 
 Use these options to refine the visualization.
 
-### Merge equal consecutive values
+<!-- prettier-ignore-start -->
 
-Controls whether Grafana merges identical values if they are next to each other.
+| Option | Description                                                                                     |
+| ------ | ----------------------------------------------------------------------------------------------- |
+| Merge equal consecutive values  | Controls whether Grafana merges identical values if they are next to each other. |
+| Show values  | Controls whether values are rendered inside the state regions. Choose from **Auto**, **Always**, and **Never**. **Auto** renders values if there is sufficient space. |
+| Align values | Controls value alignment inside state regions. Choose from **Left**, **Center**, and **Right**. |
+| Row height | Controls how much space between rows there are. 1 = no space = 0.5 = 50% space. |
+| [Page size](#page-size-enable-pagination) | The **Page size** option lets you paginate the state timeline visualization to limit how many series are visible at once.  |
+| Line width | Controls line width of state regions. |
+| Fill opacity | Controls value alignment inside state regions. |
+| [Connect null values](#connect-null-values) | Choose how null values, which are gaps in the data, appear on the graph. |
+| [Disconnect null values](#disconnect-values) | Choose whether to set a threshold above which values in the data should be disconnected. |
 
-### Show values
+<!-- prettier-ignore-end -->
 
-Controls whether values are rendered inside the state regions. Auto will render values if there is sufficient space.
+{{< docs/shared lookup="visualizations/connect-null-values.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
 
-### Align values
+{{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
 
-Controls value alignment inside state regions.
+### Legend options
 
-### Row height
+{{< docs/shared lookup="visualizations/legend-options-2.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
 
-Controls how much space between rows there are. 1 = no space = 0.5 = 50% space.
+### Tooltip options
 
-### Line width
+{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
 
-Controls line width of state regions.
-
-### Fill opacity
-
-Controls the opacity of state regions.
-
-{{< docs/shared lookup="visualizations/connect-null-values.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-{{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Time series data with thresholds
-
-The visualization can be used with time series data as well. In this case, the thresholds are used to turn the time series into discrete colored state regions.
-
-{{< figure src="/static/img/docs/v8/state_timeline_time_series.png" max-width="1025px" caption="state timeline with time series" >}}
-
-## Standard options
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Legend options
-
-{{< docs/shared lookup="visualizations/legend-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Tooltip options
-
-{{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Data links
+### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-{{< figure src="/static/img/docs/v8/value_mappings_side_editor.png" max-width="300px" caption="Value mappings side editor" >}}
-
-## Thresholds
+### Thresholds
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/status-history/index.md

@@ -107,6 +107,10 @@ Use these options to refine the visualization.
 
 Controls whether values are rendered inside the value boxes. Auto will render values if there is sufficient space.
 
+### Row height
+
+Controls the height of boxes. 1 = maximum space and 0 = minimum space.
+
 ### Column width
 
 Controls the width of boxes. 1 = maximum space and 0 = minimum space.
@@ -119,10 +123,6 @@ Controls line width of state regions.
 
 Controls the opacity of state regions.
 
-## Standard options
-
-{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
 ## Legend options
 
 {{< docs/shared lookup="visualizations/legend-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
@@ -131,6 +131,10 @@ Controls the opacity of state regions.
 
 {{< docs/shared lookup="visualizations/tooltip-options-1.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
+## Standard options
+
+{{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 ## Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/table/index.md

@@ -54,261 +54,326 @@ refs:
       destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/configure-overrides/
     - pattern: /docs/grafana-cloud/
       destination: /docs/grafana-cloud/visualizations/panels-visualizations/configure-overrides/
+  data-transformation:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/transform-data/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/transform-data/
+  build-query:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/query-transform-data/
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/query-transform-data/
 ---
 
 # Table
 
-Tables are a highly flexible visualization designed to display data in columns and rows. They support various data types, including tables, time series, annotations, and raw JSON data. The table visualization can even take multiple data sets and provide the option to switch between them. With this versatility, it's the preferred visualization for viewing multiple data types, aiding in your data analysis needs.
+Tables are a highly flexible visualization designed to display data in columns and rows.
+The table visualization can take multiple datasets and provide the option to switch between them.
+With this versatility, it's the preferred visualization for viewing multiple data types, aiding in your data analysis needs.
 
-{{< figure src="/static/img/docs/tables/table_visualization.png" max-width="1200px" lightbox="true" caption="Table visualization" >}}
+![Basic table visualization](/media/docs/grafana/panels-visualizations/screenshot-basic-table-v11.3.png)
 
-The following video provides a visual walkthrough of the options you can set in a table visualization. If you want to see a configuration in action, check out the video:
+You can use a table visualization to show datasets such as:
 
-{{< youtube id="PCY7O8EJeJY" >}}
+- Common database queries like logs, traces, metrics
+- Financial reports
+- Customer lists
+- Product catalogs
 
-{{< docs/play title="Table Visualizations in Grafana" url="https://play.grafana.org/d/OhR1ID6Mk/" >}}
+Any information you might want to put in a spreadsheet can often be best visualized in a table.
+
+Tables also provide different styles to visualize data inside the table cells, such as colored text and cell backgrounds, gauges, sparklines, data links, JSON code, and images.
 
 {{< admonition type="note" >}}
 Annotations and alerts are not currently supported for tables.
 {{< /admonition >}}
 
-## Sort column
+## Configure a table visualization
 
-Click a column title to change the sort order from default to descending to ascending. Each time you click, the sort order changes to the next option in the cycle. You can sort multiple columns by holding the `shift` key and clicking the column name.
+The following video provides a visual walkthrough of the options you can set in a table visualization.
+If you want to see a configuration in action, check out the video:
 
-![Sort descending](/static/img/docs/tables/sort-descending.png 'Sort descending')
+{{< youtube id="PCY7O8EJeJY" >}}
 
-## Data set selector
+{{< docs/play title="Table Visualizations in Grafana" url="https://play.grafana.org/d/OhR1ID6Mk/" >}}
 
-If the data queried contains multiple data sets, a table displays a drop-down list at the bottom, so you can select the data set you want to visualize.
+## Supported data formats
 
-![Table visualization with multiple data sets](/media/docs/grafana/panels-visualizations/TablePanelMultiSet.png)
-
-## Panel options
-
-{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
-
-## Table options
-
-{{% admonition type="note" %}}
-If you are using a table created before Grafana 7.0, then you need to migrate to the new table version in order to see these options. To migrate, on the Panel tab, click **Table** visualization. Grafana updates the table version and you can then access all table options.
-{{% /admonition %}}
-
-### Show header
-
-Show or hide column names imported from your data source.
-
-### Column width
-
-By default, Grafana automatically calculates the column width based on the table size and the minimum column width. This field option can override the setting and define the width for all columns in pixels.
-
-For example, if you enter `100` in the field, then when you click outside the field, all the columns will be set to 100 pixels wide.
-
-### Minimum column width
-
-By default, the minimum width of the table column is 150 pixels. This field option can override that default and will define the new minimum column width for the table in pixels.
-
-For example, if you enter `75` in the field, then when you click outside the field, all the columns will scale to no smaller than 75 pixels wide.
-
-For small-screen devices, such as smartphones or tablets, reduce the default `150` pixel value to`50` to allow table-based panels to render correctly in dashboards.
-
-### Column alignment
-
-Choose how Grafana should align cell contents:
-
-- Auto (default)
-- Left
-- Center
-- Right
-
-### Column filter
-
-You can temporarily change how column data is displayed. For example, you can order values from highest to lowest or hide specific values. For more information, refer to [Filter table columns](#filter-table-columns).
-
-### Pagination
-
-Use this option to enable or disable pagination. It is a front-end option that does not affect queries. When enabled, the page size automatically adjusts to the height of the table.
-
-## Cell options
-
-### Cell type
-
-By default, Grafana automatically chooses display settings. You can override the settings by choosing one of the following options to set the default for all fields. Additional configuration is available for some cell types.
-
-{{% admonition type="note" %}}
-If you set these in the Field tab, then the type will apply to all fields, including the time field. Many options will work best if you set them in the Override tab so that they can be restricted to one or more fields.
-{{% /admonition %}}
-
-#### Auto
-
-The **Auto** cell type automatically displays values, with sensible defaults applied.
-
-#### Color text
-
-If thresholds are set, then the field text is displayed in the appropriate threshold color.
-
-{{< figure src="/static/img/docs/tables/color-text.png" max-width="500px" caption="Color text" class="docs-image--no-shadow" >}}
-
-#### Color background (gradient or solid)
-
-If thresholds are set, then the field background is displayed in the appropriate threshold color.
-
-{{< figure src="/static/img/docs/tables/color-background.png" max-width="500px" caption="Color background" class="docs-image--no-shadow" >}}
-
-Toggle the **Apply to entire row** switch, to apply the background color that's configured for the cell to the whole row.
-
-{{< figure src="/static/img/docs/tables/colored-rows.png" max-width="500px" alt="Colored row background" class="docs-image--no-shadow" >}}
-
-#### Gauge
-
-Cells can be displayed as a graphical gauge, with several different presentation types.
+The table visualization supports any data that has a column-row structure.
 
 {{< admonition type="note" >}}
-The maximum and minimum values of the gauges are configured automatically from the smallest and largest values in your whole data set. If you don't want the max/min values to be pulled from the whole data set, you can configure them for each column with field overrides.
+If you’re using a cell type such as sparkline or JSON, the data requirements may differ in a way that’s specific to that type. For more info refer to [Cell type](#cell-type).
 {{< /admonition >}}
 
-##### Basic
+### Example
 
-The basic mode will show a simple gauge with the threshold levels defining the color of gauge.
+This example shows a basic dataset in which there's data for every table cell:
 
-{{< figure src="/static/img/docs/tables/basic-gauge.png" max-width="500px" caption="Gradient gauge" class="docs-image--no-shadow" >}}
+```csv
+Column1, Column2, Column3
+value1 , value2 , value3
+value4 , value5 , value6
+value7 , value8 , value9
+```
 
-##### Gradient
+If a cell is missing or the table column-row structure is not complete, as in the following example, the table visualization won’t display any of the data:
 
-The threshold levels define a gradient.
+```csv
+Column1, Column2, Column3
+value1 , value2 , value3
+gap1   , gap2
+value4 , value5 , value6
+```
 
-{{< figure src="/static/img/docs/tables/gradient-gauge.png" max-width="500px" caption="Gradient gauge" class="docs-image--no-shadow" >}}
+If you need to hide columns, you can do so using [data transformations](ref:data-transformation), [field overrides](#field-overrides), or by [building a query](ref:build-query) that returns only the needed columns.
 
-##### LCD
+## Column filtering
 
-The gauge is split up in small cells that are lit or unlit.
+You can temporarily change how column data is displayed using column filtering.
+For example, you can show or hide specific values.
 
-{{< figure src="/static/img/docs/tables/lcd-gauge.png" max-width="500px" caption="LCD gauge" class="docs-image--no-shadow" >}}
+### Turn on column filtering
 
-##### Label Options
-
-Additionally, labels displayed alongside of the gauges can be set to be colored by value, match the theme text color, or be hidden.
-
-**Value Color**
-
-{{< figure src="/static/img/docs/tables/value-color-mode.png" max-width="500px" caption="Color Label by Value" class="docs-image--no-shadow" >}}
-
-**Text Color**
-
-{{< figure src="/static/img/docs/tables/text-color-mode.png" max-width="500px" caption="Color Label by theme color" class="docs-image--no-shadow" >}}
-
-**Hidden**
-
-{{< figure src="/static/img/docs/tables/hidden-mode.png" max-width="500px" caption="Hide Label" class="docs-image--no-shadow" >}}
-
-#### Data links
-
-If you've configured data links, when the cell type is **Auto** mode, the cell text becomes clickable. If you change the cell type to **Data links**, the cell text reflects the titles of the configured data links. To control the application of data link text more granularly use a **Cell option > Cell type > Data links** field override.
-
-#### JSON view
-
-Shows value formatted as code. If a value is an object the JSON view allowing browsing the JSON object will appear on hover.
-
-{{< figure src="/static/img/docs/tables/json-view.png" max-width="500px" caption="JSON view" class="docs-image--no-shadow" >}}
-
-#### Image
-
-> Only available in Grafana 7.3+
-
-If you have a field value that is an image URL or a base64 encoded image you can configure the table to display it as an image.
-
-{{< figure src="/static/img/docs/v73/table_hover.gif" max-width="900px" caption="Table hover" >}}
-
-#### Sparkline
-
-Shows values rendered as a sparkline. You can show sparklines using the [Time series to table transformation](ref:time-series-to-table-transformation) on data with multiple time series to process it into a format the table can show.
-
-{{< figure src="/static/img/docs/tables/sparkline2.png" max-width="500px" caption="Sparkline" class="docs-image--no-shadow" >}}
-
-You can be customize sparklines with many of the same options as the [Time series panel](ref:time-series-panel) including line width, fill opacity, and more. You can also change the color of the sparkline by updating the [color scheme](ref:color-scheme) in the _Standard options_ section of the panel configuration.
-
-### Wrap text
-
-{{< admonition type="note" >}}
-Text wrapping is in [public preview](https://grafana.com/docs/release-life-cycle/#public-preview), however, it’s available to use by default. We’d love hear from you about how this new feature is working. To provide feedback, you can open an issue in the [Grafana GitHub repository](https://github.com/grafana/grafana).
-{{< /admonition >}}
-
-Toggle the **Wrap text** switch to wrap text in the cell with the longest content in your table. To wrap the text in a specific column only, use the Wrap Text option in a [field override](ref:field-override).
-
-### Cell value inspect
-
-Enables value inspection from table cell. The raw value is presented in a modal window.
-
-{{% admonition type="note" %}}
-Cell value inspection is only available when cell display mode is set to Auto, Color text, Color background or JSON View.
-{{% /admonition %}}
-
-## Turn on column filtering
+To turn on column filtering, follow these steps:
 
 1. In Grafana, navigate to the dashboard with the table with the columns that you want to filter.
-1. On the table panel you want to filter, open the panel editor.
-1. Click the **Field** tab.
-1. In Table options, turn on the **Column filter** option.
+1. Hover over any part of the panel to which you want to add the link to display the actions menu on the top right corner.
+1. Click the menu and select **Edit**.
+1. In the panel editor pane, expand the **Table** options section.
+1. Toggle on the [**Column filter** switch](#table-options).
 
-A filter icon appears next to each column title.
+A filter icon (funnel) appears next to each column title.
 
-{{< figure src="/static/img/docs/tables/column-filter-with-icon.png" max-width="500px" caption="Column filtering turned on" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/tables/column-filter-with-icon.png" max-width="350px" alt="Column filtering turned on" class="docs-image--no-shadow" >}}
 
 ### Filter column values
 
-To filter column values, click the filter (funnel) icon next to a column title. Grafana displays the filter options for that column.
+To filter column values, follow these steps:
 
-{{< figure src="/static/img/docs/tables/filter-column-values.png" max-width="500px" caption="Filter column values" class="docs-image--no-shadow" >}}
+1. Click the filter icon (funnel) next to a column title.
 
-Click the check box next to the values that you want to display. Enter text in the search field at the top to show those values in the display so that you can select them rather than scroll to find them.
+   Grafana displays the filter options for that column.
 
-Choose from several operators to display column values:
+   {{< figure src="/static/img/docs/tables/filter-column-values.png" max-width="300px" alt="Filter column values" class="docs-image--no-shadow" >}}
 
-- **Contains** - Matches a regex pattern (operator by default).
-- **Expression** - Evaluates a boolean expression. The character `$` represents the column value in the expression (for example, "$ >= 10 && $ <= 12").
-- The typical comparison operators: `=`, `!=`, `<`, `<=`, `>`, `>=`.
+1. Click the checkbox next to the values that you want to display or click **Select all**.
+1. Enter text in the search field at the top to show those values in the display so that you can select them rather than scroll to find them.
+1. Choose from several operators to display column values:
 
-Click the check box above the **Ok** and **Cancel** buttons to add or remove all displayed values to/from the filter.
+   - **Contains** - Matches a regex pattern (operator by default).
+   - **Expression** - Evaluates a boolean expression. The character `$` represents the column value in the expression (for example, "$ >= 10 && $ <= 12").
+   - The typical comparison operators: `=`, `!=`, `<`, `<=`, `>`, `>=`.
+
+1. Click the checkbox above the **Ok** and **Cancel** buttons to add or remove all displayed values to and from the filter.
 
 ### Clear column filters
 
-Columns with filters applied have a blue funnel displayed next to the title.
+Columns with filters applied have a blue filter displayed next to the title.
 
-{{< figure src="/static/img/docs/tables/filtered-column.png" max-width="500px" caption="Filtered column" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/tables/filtered-column.png" max-width="100px" alt="Filtered column" class="docs-image--no-shadow" >}}
 
-To remove the filter, click the blue funnel icon and then click **Clear filter**.
+To remove the filter, click the blue filter icon and then click **Clear filter**.
 
-## Table footer
+## Sort columns
 
-You can use the table footer to show [calculations](ref:calculations) on fields.
+Click a column title to change the sort order from default to descending to ascending.
+Each time you click, the sort order changes to the next option in the cycle.
+You can sort multiple columns by holding the `Shift` key and clicking the column name.
 
-After you enable the table footer:
+{{< figure src="/static/img/docs/tables/sort-descending.png" max-width="350px" alt="Sort descending" class="docs-image--no-shadow" >}}
 
-1. Select the **Calculation**
-2. Select the **Fields** that you want to calculate
+## Dataset selector
 
-The system applies the calculation to all numeric fields if you do not select a field.
+If the data queried contains multiple datasets, a table displays a drop-down list at the bottom, so you can select the dataset you want to visualize.
+This option is only available when you're editing the panel.
 
-### Count rows
+{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-table-multi-dataset-v11.3.png" max-width="650px" alt="Table visualization with multiple datasets" >}}
 
-If you want to show the number of rows in the dataset instead of the number of values in the selected fields, select the **Count** calculation and enable **Count rows**.
+## Configuration options
 
-## Standard options
+### Panel options
+
+{{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
+### Table options
+
+| Option               | Description                                                                                                                                                                                                                                                                 |
+| -------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Show table header    | Show or hide column names imported from your data source.                                                                                                                                                                                                                   |
+| Cell height          | Set the height of the cell. Choose from **Small**, **Medium**, or **Large**.                                                                                                                                                                                                |
+| Enable pagination    | Toggle the switch to control how many table rows are visible at once. When switched on, the page size automatically adjusts to the height of the table. This option doesn't affect queries.                                                                                 |
+| Minimum column width | Define the lower limit of the column width, in pixels. By default, the minimum width of the table column is 150 pixels. For small-screen devices, such as mobile phones or tablets, reduce the value to `50` to allow table-based panels to render correctly in dashboards. |
+| Column width         | Define a column width, in pixels, rather than allowing the width to be set automatically. By default, Grafana calculates the column width based on the table size and the minimum column width.                                                                             |
+| Column alignment     | Set how Grafana should align cell contents. Choose from: **Auto** (default), **Left**, **Center**, or **Right**.                                                                                                                                                            |
+| Column filter        | Temporarily change how column data is displayed. For example, show or hide specific values. For more information, refer to [Column filtering](#column-filtering).                                                                                                           |
+
+### Table footer options
+
+Toggle the **Show table footer** switch on and off to control the display of the footer.
+When the toggle is switched on, you can use the table footer to show [calculations](ref:calculations) on fields.
+
+After you activate the table footer, make selections for the following options:
+
+- **Calculation** - The calculation that you want to apply.
+- **Count rows** - This option is displayed if you select the **Count** calculation. If you want to show the number of rows in the dataset instead of the number of values in the selected fields, toggle on the **Count rows** switch.
+- **Fields** - The fields to which you want to apply the calculation. Grafana applies the calculation to all numeric fields if you don't select a field.
+
+### Cell options
+
+Cell options allow you to control how data is displayed in a table.
+The options are:
+
+- [Cell type](#cell-type) - Control the default cell display settings.
+- [Wrap text](#wrap-text) - Wrap text in the cell that contains the longest content in your table.
+- [Cell value inspect](#cell-value-inspect) - Enables value inspection from table cells.
+
+#### Cell type
+
+By default, Grafana automatically chooses display settings.
+You can override these settings by choosing one of the following cell types to control the default display for all fields.
+Additional configuration is available for some cell types.
+
+If you want to apply a cell type to only some fields instead of all fields, you can do so using the **Cell options > Cell type** field override.
+
+| Cell type                                 | Description                                                                                                                                                                                                                                                                                                                                   |
+| ----------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Auto                                      | Automatically displays values with sensible defaults applied.                                                                                                                                                                                                                                                                                 |
+| [Sparkline](#sparkline)                   | Shows values rendered as a sparkline.                                                                                                                                                                                                                                                                                                         |
+| [Colored text](#colored-text)             | If thresholds are set, then the field text is displayed in the appropriate threshold color.                                                                                                                                                                                                                                                   |
+| [Colored background](#colored-background) | If thresholds are set, then the field background is displayed in the appropriate threshold color.                                                                                                                                                                                                                                             |
+| [Gauge](#gauge)                           | Cells can be displayed as a graphical gauge, with several different presentation types. You can set the [Gauge display mode](#gauge-display-mode) and the [Value display](#value-display) options.                                                                                                                                            |
+| Data links                                | If you've configured data links, when the cell type is **Auto**, the cell text becomes clickable. If you change the cell type to **Data links**, the cell text reflects the titles of the configured data links. To control the application of data link text more granularly, use a **Cell option > Cell type > Data links** field override. |
+| [JSON View](#json-view)                   | Shows values formatted as code.                                                                                                                                                                                                                                                                                                               |
+| [Image](#image)                           | If the field value is an image URL or a base64 encoded image, the table displays the image.                                                                                                                                                                                                                                                   |
+
+##### Sparkline
+
+This cell type shows values rendered as a sparkline.
+To show sparklines on data with multiple time series, use the [Time series to table transformation](ref:time-series-to-table-transformation) to process it into a format the table can show.
+
+![Table using sparkline cell type](/media/docs/grafana/panels-visualizations/screenshot-table-as-sparkline-v11.3.png)
+
+You can customize sparklines with many of the same options as the [time series visualization](ref:time-series-panel) including line style and width, fill opacity, gradient mode, and more.
+You can also change the color of the sparkline by updating the [color scheme](ref:color-scheme) in the **Standard options** section of the panel configuration.
+
+##### Colored text
+
+If thresholds are set, with this cell type, the field text is displayed in the appropriate threshold color.
+
+![Table with colored text cell type](/media/docs/grafana/panels-visualizations/screenshot-table-colored-text-v11.3-2.png)
+
+{{< admonition type="note" >}}
+This is an experimental feature.
+{{< /admonition >}}
+
+##### Colored background
+
+If thresholds are set, with this cell type, the field background is displayed in the appropriate threshold color.
+
+![Table with colored background cell type](/media/docs/grafana/panels-visualizations/screenshot-table-colored-bkgrnd-v11.3-2.png)
+
+- **Background display mode** - Choose between **Basic** and **Gradient**.
+- **Apply to entire row** - Toggle the switch on to apply the background color that's configured for the cell to the whole row.
+
+![Table with background cell color applied to row](/media/docs/grafana/panels-visualizations/screenshot-table-colored-row-v11.3.png)
+
+##### Gauge
+
+With this cell type, cells can be displayed as a graphical gauge, with several different presentation types controlled by the [gauge display mode](#gauge-display-mode) and the [value display](#value-display).
+
+{{< admonition type="note" >}}
+The maximum and minimum values of the gauges are configured automatically from the smallest and largest values in your whole dataset.
+If you don't want the max/min values to be pulled from the whole dataset, you can configure them for each column using [field overrides](#field-overrides).
+{{< /admonition >}}
+
+###### Gauge display mode
+
+You can set three gauge display modes.
+
+<!-- prettier-ignore-start -->
+
+| Option | Description |
+| ------ | ----------- |
+| Basic | Shows a simple gauge with the threshold levels defining the color of gauge. {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-gauge-mode-basic-v11.3.png" alt="Table cell with basic gauge mode" >}} |
+| Gradient | The threshold levels define a gradient. {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-gauge-mode-gradient-v11.3.png" alt="Table cell with gradient gauge mode" >}} |
+| Retro LCD | The gauge is split up in small cells that are lit or unlit. {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-gauge-mode-retro-v11.3.png" alt="Table cell with retro LCD gauge mode" >}} |
+
+<!-- prettier-ignore-end -->
+
+###### Value display
+
+Labels displayed alongside of the gauges can be set to be colored by value, match the theme text color, or be hidden.
+
+<!-- prettier-ignore-start -->
+
+| Option | Description |
+| ------ | ----------- |
+| Value color | Labels are colored by value. {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-labels-value-color-v11.3.png" alt="Table with labels in value color" >}} |
+| Text color | Labels match the theme text color. {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-labels-text-color-v11.3.png" alt="Table with labels in theme color" >}} |
+| Hidden | Labels are hidden. {{< figure src="/media/docs/grafana/panels-visualizations/screenshot-labels-hidden-v11.3.png" alt="Table with labels hidden" >}} |
+
+<!-- prettier-ignore-end -->
+
+##### JSON View
+
+This cell type shows values formatted as code.
+If a value is an object the JSON view allowing browsing the JSON object will appear on hover.
+
+{{< figure src="/static/img/docs/tables/json-view.png" max-width="350px" alt="JSON view" class="docs-image--no-shadow" >}}
+
+##### Image
+
+If you have a field value that is an image URL or a base64 encoded image, this cell type displays it as an image.
+
+![Table with image cell type](/media/docs/grafana/panels-visualizations/screenshot-table-cell-image-v11.3.png)
+
+Set the following options:
+
+- **Alt text** - Set the alternative text of an image. The text will be available for screen readers and in cases when images can't be loaded.
+- **Title text** - Set the text that's displayed when the image is hovered over with a cursor.
+
+#### Wrap text
+
+{{< admonition type="note" >}}
+Text wrapping is in [public preview](https://grafana.com/docs/release-life-cycle/#public-preview), however, it’s available to use by default.
+We’d love hear from you about how this new feature is working. To provide feedback, you can open an issue in the [Grafana GitHub repository](https://github.com/grafana/grafana).
+{{< /admonition >}}
+
+Toggle the **Wrap text** switch to wrap text in the cell that contains the longest content in your table.
+
+To wrap the text _in a specific column only_, use a **Fields with name** [field override](ref:field-override), select the **Cell options > Cell type** override property, and toggle on the **Wrap text** switch.
+
+This option is available for the following cell types: **Auto**, **Colored text**, and **Colored background**.
+
+#### Cell value inspect
+
+Enables value inspection from table cells. When the **Cell inspect value** switch is toggled on, clicking the inspect icon in a cell opens the **Inspect value** drawer.
+
+The **Inspect value** drawer has two tabs, **Plain text** and **Code editor**.
+Grafana attempts to automatically detect the type of data in the cell and opens the drawer with the associated tab showing.
+However, you can switch back and forth between tabs.
+
+This option is available for the following cell types: **Auto**, **Colored text**, **Colored background**, and **JSON View**.
+
+If you want to apply this setting to only some fields instead of all fields, you can do so using the **Cell options > Cell value inspect** field override.
+
+### Standard options
 
 {{< docs/shared lookup="visualizations/standard-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Data links
+### Data links
 
 {{< docs/shared lookup="visualizations/datalink-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Value mappings
+### Value mappings
 
 {{< docs/shared lookup="visualizations/value-mappings-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Thresholds
+### Thresholds
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-## Field overrides
+### Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

docs/sources/panels-visualizations/visualizations/time-series/index.md

@@ -59,21 +59,39 @@ refs:
       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/
+  panel-editor-alerts:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/panel-editor-overview/#data-section
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/panel-editor-overview/#data-section
+  data-transformation:
+    - pattern: /docs/grafana/
+      destination: /docs/grafana/<GRAFANA_VERSION>/panels-visualizations/panel-editor-overview/#data-section
+    - pattern: /docs/grafana-cloud/
+      destination: /docs/grafana-cloud/visualizations/panels-visualizations/panel-editor-overview/#data-section
 ---
 
 # Time series
 
-Time series visualizations are the default and primary way to visualize data points over intervals of time as a graph. They can render series as lines, points, or bars. They're versatile enough to display almost any time-series data.
+Time series visualizations are the default way to show the variations of a set of data values over time. Each data point is matched to a timestamp and this _time series_ is displayed as a graph. The visualization can render series as lines, points, or bars and it's versatile enough to display almost any type of [time-series data](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/fundamentals/timeseries/).
 
 {{< figure src="/static/img/docs/time-series-panel/time_series_small_example.png" max-width="1200px" alt="Time series" >}}
 
 {{< admonition type="note" >}}
-You can migrate from the old Graph visualization to the new time series visualization. To migrate, open the panel and click the **Migrate** button in the side pane.
+You can migrate from the legacy Graph visualization to the time series visualization. To migrate, open the panel and click the **Migrate** button in the side pane.
 {{< /admonition >}}
 
+A time series visualization displays an x-y graph with time progression on the x-axis and the magnitude of the values on the y-axis. This visualization is ideal for displaying large numbers of timed data points that would be hard to track in a table or list.
+
+You can use the time series visualization if you need track:
+
+- Temperature variations throughout the day
+- The daily progress of your retirement account
+- The distance you jog each day over the course of a year
+
 ## Configure a time series visualization
 
-The following video guides you through the creation steps and common customizations of time series visualizations and is great for beginners:
+The following video guides you through the creation steps and common customizations of time series visualizations, and is great for beginners:
 
 {{< youtube id="RKtW87cPxsw" >}}
 
@@ -81,40 +99,102 @@ The following video guides you through the creation steps and common customizati
 
 ## Supported data formats
 
-Time series visualizations require time series data; that is a sequence of measurements, ordered in time, where every row in the table represents one individual measurement at a specific time. Learn more about [time series data](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/fundamentals/timeseries/).
+Time series visualizations require time-series data—a sequence of measurements, ordered in time, and formatted as a table—where every row in the table represents one individual measurement at a specific time. Learn more about [time-series data](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/fundamentals/timeseries/).
+
+The dataset must contain at least one numeric field, and in the case of multiple numeric fields, each one is plotted as a new line, point, or bar labeled with the field name in the tooltip.
+
+### Example 1
+
+In the following example, there are three numeric fields represented by three lines in the chart:
+
+| Time                | value1 | value2 | value3 |
+| ------------------- | ------ | ------ | ------ |
+| 2022-11-01 10:00:00 | 1      | 2      | 3      |
+| 2022-11-01 11:00:00 | 4      | 5      | 6      |
+| 2022-11-01 12:00:00 | 7      | 8      | 9      |
+| 2022-11-01 13:00:00 | 4      | 5      | 6      |
+
+![Time series line chart with multiple numeric fields](/media/docs/grafana/panels-visualizations/screenshot-grafana-11.1-timeseries-example1v2.png 'Time series line chart with multiple numeric fields')
+
+If the time field isn't automatically detected, you might need to convert the data to a time format using a [data transformation](ref:data-transformation).
+
+### Example 2
+
+The time series visualization also supports multiple datasets. If all datasets are in the correct format, the visualization plots the numeric fields of all datasets and labels them using the column name of the field.
+
+#### Query1
+
+| Time                | value1 | value2 | value3 |
+| ------------------- | ------ | ------ | ------ |
+| 2022-11-01 10:00:00 | 1      | 2      | 3      |
+| 2022-11-01 11:00:00 | 4      | 5      | 6      |
+| 2022-11-01 12:00:00 | 7      | 8      | 9      |
+
+#### Query2
+
+| timestamp           | number1 | number2 | number3 |
+| ------------------- | ------- | ------- | ------- |
+| 2022-11-01 10:30:00 | 11      | 12      | 13      |
+| 2022-11-01 11:30:00 | 14      | 15      | 16      |
+| 2022-11-01 12:30:00 | 17      | 18      | 19      |
+| 2022-11-01 13:30:00 | 14      | 15      | 16      |
+
+![Time series line chart with two datasets](/media/docs/grafana/panels-visualizations/screenshot-grafana-11.1-timeseries-example2v2.png 'Time series line chart with two datasets')
+
+### Example 3
+
+If you want to more easily compare events between different, but overlapping, time frames, you can do this by using a time offset while querying the compared dataset:
+
+#### Query1
+
+| Time                | value1 | value2 | value3 |
+| ------------------- | ------ | ------ | ------ |
+| 2022-11-01 10:00:00 | 1      | 2      | 3      |
+| 2022-11-01 11:00:00 | 4      | 5      | 6      |
+| 2022-11-01 12:00:00 | 7      | 8      | 9      |
+
+#### Query2
+
+| timestamp(-30min)   | number1 | number2 | number3 |
+| ------------------- | ------- | ------- | ------- |
+| 2022-11-01 10:30:00 | 11      | 12      | 13      |
+| 2022-11-01 11:30:00 | 14      | 15      | 16      |
+| 2022-11-01 12:30:00 | 17      | 18      | 19      |
+| 2022-11-01 13:30:00 | 14      | 15      | 16      |
+
+![Time Series Example with second Data Set offset](/media/docs/grafana/panels-visualizations/screenshot-grafana-11.1-timeseries-example3v2.png 'Time Series Example with second Data Set offset')
+
+When you add the offset, the resulting visualization makes the datasets appear to be occurring at the same time so that you can compare them more easily.
 
 ## Alert rules
 
-You can [link alert rules](ref:link-alert) to time series visualizations to observe when alerts fire and are resolved in the form of annotations. In addition, you can create alert rules from the **Alert** tab within the panel editor.
+You can [link alert rules](ref:link-alert) to time series visualizations in the form of annotations to observe when alerts fire and are resolved. In addition, you can create alert rules from the **Alert** tab within the [panel editor](ref:panel-editor-alerts).
 
-## Transform override property
+## Special overrides
 
-Use the **Transform** override property to transform series values without affecting the values shown in the tooltip, context menu, or legend.
+The following overrides help you further refine a time series visualization.
 
-<!-- add more information about how to access this property -->
+### Transform override property
 
-- **Negative Y transform:** Flip the results to negative values on the Y axis.
-- **Constant:** Show the first value as a constant line.
+Use the **Graph styles > Transform** [override property](#field-overrides) to transform series values without affecting the values shown in the tooltip, context menu, or legend. Choose from the following transform options:
 
-{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
+- **Constant** - Show the first value as a constant line.
+- **Negative Y transform** - Flip the results to negative values on the y-axis.
 
-<!-- update shared filed above to add actual steps for adding this override -->
+### Fill below to override property
 
-## Add the Fill below to override
-
-The **Fill below to** option fills the area between two series. This option is only available as a series/field override.
-
-1. Edit the panel and click **Overrides**.
-1. Select the fields to fill below.
-1. In **Add override property**, select **Fill below to**.
-1. Select the series for which you want the fill to stop.
+The **Graph styles > Fill below to** [override property](#field-overrides) fills the area between two series. When you configure the property, select the series for which you want the fill to stop.
 
 The following example shows three series: Min, Max, and Value. The Min and Max series have **Line width** set to 0. Max has a **Fill below to** override set to Min, which fills the area between Max and Min with the Max line color.
 
 {{< figure src="/static/img/docs/time-series-panel/fill-below-to-7-4.png" max-width="600px" alt="Fill below to example" >}}
 
+{{< docs/shared lookup="visualizations/multiple-y-axes.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+2" >}}
+
 ## Configuration options
 
+{{< docs/shared lookup="visualizations/config-options-intro.md" source="grafana" version="<GRAFANA_VERSION>" >}}
+
 ### Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
@@ -129,30 +209,30 @@ The following example shows three series: Min, Max, and Value. The Min and Max s
 
 ### Axis options
 
-Options under the axis category change how the x- and y-axes are rendered. Some options do not take effect until you click outside of the field option box you are editing. You can also or press `Enter`.
+Options under the **Axis** section control how the x- and y-axes are rendered. Some options don't take effect until you click outside of the field option box you're editing. You can also press `Enter`.
 
-| Option                             | Description                                                                                                                                                                                                                                                                                                                                                                       |
-| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Time zone                          | Set the desired time zone(s) to display along the x-axis.                                                                                                                                                                                                                                                                                                                         |
-| [Placement](#placement)            | Select the placement of the y-axis.                                                                                                                                                                                                                                                                                                                                               |
-| Label                              | Set a y-axis text label. If you have more than one y-axis, then you can assign different labels using an override.                                                                                                                                                                                                                                                                |
-| Width                              | Set a fixed width of the axis. By default, Grafana dynamically calculates the width of an axis. By setting the width of the axis, data with different axes types can share the same display proportions. This setting makes it easier for you to compare more than one graph’s worth of data because the axes are not shifted or stretched within visual proximity to each other. |
-| Show grid lines                    | Set the axis grid line visibility.<br>                                                                                                                                                                                                                                                                                                                                            |
-| Color                              | Set the color of the axis.                                                                                                                                                                                                                                                                                                                                                        |
-| Show border                        | Set the axis border visibility.                                                                                                                                                                                                                                                                                                                                                   |
-| Scale                              | Set the y-axis values scale.<br>                                                                                                                                                                                                                                                                                                                                                  |
-| Centered zero                      | Set the y-axis to be centered on zero.                                                                                                                                                                                                                                                                                                                                            |
-| [Soft min](#soft-min-and-soft-max) | Set a soft min to better control the y-axis limits. zero.                                                                                                                                                                                                                                                                                                                         |
-| [Soft max](#soft-min-and-soft-max) | Set a soft max to better control the y-axis limits. zero.                                                                                                                                                                                                                                                                                                                         |
+| Option                             | Description                                                                                                                                                                                                                                                                                                                                                                      |
+| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Time zone                          | Set the desired time zones to display along the x-axis.                                                                                                                                                                                                                                                                                                                          |
+| [Placement](#placement)            | Select the placement of the y-axis.                                                                                                                                                                                                                                                                                                                                              |
+| Label                              | Set a y-axis text label. If you have more than one y-axis, then you can assign different labels using an override.                                                                                                                                                                                                                                                               |
+| Width                              | Set a fixed width of the axis. By default, Grafana dynamically calculates the width of an axis. By setting the width of the axis, data with different axes types can share the same display proportions. This setting makes it easier for you to compare more than one graph’s worth of data because the axes aren't shifted or stretched within visual proximity to each other. |
+| Show grid lines                    | Set the axis grid line visibility.<br>                                                                                                                                                                                                                                                                                                                                           |
+| Color                              | Set the color of the axis.                                                                                                                                                                                                                                                                                                                                                       |
+| Show border                        | Set the axis border visibility.                                                                                                                                                                                                                                                                                                                                                  |
+| Scale                              | Set the y-axis values scale.<br>                                                                                                                                                                                                                                                                                                                                                 |
+| Centered zero                      | Set the y-axis so it's centered on zero.                                                                                                                                                                                                                                                                                                                                         |
+| [Soft min](#soft-min-and-soft-max) | Set a soft min to better control the y-axis limits. zero.                                                                                                                                                                                                                                                                                                                        |
+| [Soft max](#soft-min-and-soft-max) | Set a soft max to better control the y-axis limits. zero.                                                                                                                                                                                                                                                                                                                        |
 
 #### Placement
 
-Select the placement of the y-axis.
+Select the placement of the y-axis. Choose from the following:
 
-- **Auto:** Automatically assigns the y-axis to the series. When there are two or more series with different units, Grafana assigns the left axis to the first unit and the right axis to the units that follow.
-- **Left:** Display all y-axes on the left side.
-- **Right:** Display all y-axes on the right side.
-- **Hidden:** Hide all axes. To selectively hide axes, [Add a field override](ref:add-a-field-override) that targets specific fields.
+- **Auto** - Automatically assigns the y-axis to the series. When there are two or more series with different units, Grafana assigns the left axis to the first unit and the right axis to the units that follow.
+- **Left** - Display all y-axes on the left side.
+- **Right** - Display all y-axes on the right side.
+- **Hidden** - Hide all axes. To selectively hide axes, [Add a field override](ref:add-a-field-override) that targets specific fields.
 
 #### Soft min and soft max
 
@@ -166,71 +246,69 @@ To define hard limits of the y-axis, set standard min/max options. For more info
 
 ### Graph styles options
 
+The options under the **Graph styles** section let you control the general appearance of the graph, excluding [color](#standard-options).
+
 | Option                                      | Description                                                                                                                                                                                                                           |
 | ------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Style](#style)                             | Use this option to define how to display your time series data.                                                                                                                                                                       |
-| [Line interpolation](#line-interpolation)   | This option controls how the graph interpolates the series line.                                                                                                                                                                      |
-| [Line width](#line-width)                   | Line width is a slider that controls the thickness for series lines or the outline for bars.                                                                                                                                          |
-| [Fill opacity](#fill-opacity)               | Use opacity to specify the series area fill color.                                                                                                                                                                                    |
-| [Gradient mode](#gradient-mode)             | Gradient mode specifies the gradient fill, which is based on the series color.                                                                                                                                                        |
-| [Line style](#line-style)                   | Set the style of the line.                                                                                                                                                                                                            |
+| [Style](#style)                             | Choose whether to display your time-series data as lines, bars, or points.                                                                                                                                                            |
+| [Line interpolation](#line-interpolation)   | Choose how the graph interpolates the series line.                                                                                                                                                                                    |
+| Line width                                  | Set the thickness of the series lines or the outline for bars using the **Line width** slider.                                                                                                                                        |
+| [Fill opacity](#fill-opacity)               | Set the series area fill color using the **Fill opacity** slider.                                                                                                                                                                     |
+| [Gradient mode](#gradient-mode)             | Choose a gradient mode to control the gradient fill, which is based on the series color.                                                                                                                                              |
+| [Line style](#line-style)                   | Choose a solid, dashed, or dotted line style.                                                                                                                                                                                         |
 | [Connect null values](#connect-null-values) | Choose how null values, which are gaps in the data, appear on the graph.                                                                                                                                                              |
 | [Disconnect values](#disconnect-values)     | Choose whether to set a threshold above which values in the data should be disconnected.                                                                                                                                              |
-| [Show points](#show-points)                 | You can configure your visualization to add points to lines or bars.                                                                                                                                                                  |
+| [Show points](#show-points)                 | Set whether to show data points to lines or bars.                                                                                                                                                                                     |
 | Point size                                  | Set the size of the points, from 1 to 40 pixels in diameter.                                                                                                                                                                          |
-| [Stack series](#stack-series)               | Stacking allows Grafana to display series on top of each other.                                                                                                                                                                       |
+| [Stack series](#stack-series)               | Set whether Grafana displays series on top of each other.                                                                                                                                                                             |
 | [Bar alignment](#bar-alignment)             | Set the position of the bar relative to a data point.                                                                                                                                                                                 |
 | Bar width factor                            | Set the width of the bar relative to minimum space between data points. A factor of 0.5 means that the bars take up half of the available space between data points. A factor of 1.0 means that the bars take up all available space. |
 
 #### Style
 
-Use this option to define how to display your time series data. You can use overrides to combine multiple styles in the same graph.
-
-- Lines
-- Bars
-- Points
+Choose whether to display your time-series data as lines, bars, or points. You can use overrides to combine multiple styles in the same graph. Choose from the following:
 
 ![Style modes](/static/img/docs/time-series-panel/style-modes-v9.png)
 
 #### Line interpolation
 
-This option controls how the graph interpolates the series line.
+Choose how the graph interpolates the series line:
 
-- **Linear:** Points are joined by straight lines.
-- **Smooth:** Points are joined by curved lines that smooths transitions between points.
-- **Step before:** The line is displayed as steps between points. Points are rendered at the end of the step.
-- **Step after:** The line is displayed as steps between points. Points are rendered at the beginning of the step.
+- **Linear** - Points are joined by straight lines.
+- **Smooth** - Points are joined by curved lines that smooths transitions between points.
+- **Step before** - The line is displayed as steps between points. Points are rendered at the end of the step.
+- **Step after** - The line is displayed as steps between points. Points are rendered at the beginning of the step.
 
 #### Line width
 
-Line width is a slider that controls the thickness for series lines or the outline for bars.
+Set the thickness of the series lines or the outline for bars using the **Line width** slider.
 
 #### Fill opacity
 
-Use opacity to specify the series area fill color.
+Set the series area fill color using the **Fill opacity** slider.
 
 ![Fill opacity examples](/static/img/docs/time-series-panel/fill-opacity.png)
 
 #### Gradient mode
 
-Gradient mode specifies the gradient fill, which is based on the series color. To change the color, use the standard color scheme field option. For more information, refer to [Color scheme](ref:color-scheme).
+Choose a gradient mode to control the gradient fill, which is based on the series color. To change the color, use the standard color scheme field option. For more information, refer to [Color scheme](ref:color-scheme).
 
-- **None:** No gradient fill. This is the default setting.
-- **Opacity:** An opacity gradient where the opacity of the fill increases as y-axis values increase.
-- **Hue:** A subtle gradient that is based on the hue of the series color.
-- **Scheme:** A color gradient defined by your [Color scheme](ref:color-scheme). This setting is used for the fill area and line. For more information about scheme, refer to [Scheme gradient mode](#scheme-gradient-mode).
+- **None** - No gradient fill. This is the default setting.
+- **Opacity** - An opacity gradient where the opacity of the fill increases as y-axis values increase.
+- **Hue** - A subtle gradient that's based on the hue of the series color.
+- **Scheme** - A color gradient defined by your [Color scheme](ref:color-scheme). This setting is used for the fill area and line. For more information about scheme, refer to [Scheme gradient mode](#scheme-gradient-mode).
 
-Gradient appearance is influenced by the **Fill opacity** setting. The following image show, the **Fill opacity** is set to 50.
+Gradient appearance is influenced by the **Fill opacity** setting. The following image shows the **Fill opacity** set to 50.
 
 ![Gradient mode examples](/static/img/docs/time-series-panel/gradient-modes-v9.png)
 
 ##### Scheme gradient mode
 
-The **Gradient mode** option located under the **Graph styles** has a mode named **Scheme**. When you enable **Scheme**, the line or bar receives a gradient color defined from the selected **Color scheme**.
+The **Gradient mode** option located under the **Graph styles** section has a mode called **Scheme**. When you enable **Scheme**, the line or bar receives a gradient color defined from the selected **Color scheme**.
 
 ###### From thresholds
 
-If the **Color scheme** is set to **From thresholds (by value)** and **Gradient mode** is set to **Scheme**, then the line or bar color changes as they cross the defined thresholds.
+If the **Color scheme** is set to **From thresholds (by value)** and **Gradient mode** is set to **Scheme**, then the line or bar color changes as it crosses the defined thresholds.
 
 {{< figure src="/static/img/docs/time-series-panel/gradient_mode_scheme_thresholds_line.png" max-width="1200px" alt="Colors scheme: From thresholds" >}}
 
@@ -242,11 +320,11 @@ The following image shows a line chart with the **Green-Yellow-Red (by value)**
 
 #### Line style
 
-Set the style of the line. To change the color, use the standard [color scheme](ref:color-scheme) field option.
+Choose a solid, dashed, or dotted line style:
 
-- **Solid:** Display a solid line. This is the default setting.
-- **Dash:** Display a dashed line. When you choose this option, a list appears for you to select the length and gap (length, gap) for the line dashes. Dash spacing set to 10, 10 (default).
-- **Dots:** Display dotted lines. When you choose this option, a list appears for you to select the gap (length = 0, gap) for the dot spacing. Dot spacing set to 0, 10 (default)
+- **Solid** - Display a solid line. This is the default setting.
+- **Dash** - Display a dashed line. When you choose this option, a list appears for you to select the length and gap (length, gap) for the line dashes. Dash spacing is 10, 10 by default.
+- **Dots** - Display dotted lines. When you choose this option, a list appears for you to select the gap (length = 0, gap) for the dot spacing. Dot spacing is 0, 10 by default.
 
 ![Line styles examples](/static/img/docs/time-series-panel/line-styles-examples-v9.png)
 
@@ -254,21 +332,23 @@ Set the style of the line. To change the color, use the standard [color scheme](
 
 {{< docs/shared lookup="visualizations/disconnect-values.md" source="grafana" version="<GRAFANA_VERSION>" leveloffset="+1" >}}
 
+To change the color, use the standard [color scheme](ref:color-scheme) field option.
+
 #### Show points
 
-You can configure your visualization to add points to lines or bars.
+Set whether to show data points as lines or bars. Choose from the following:
 
-- **Auto:** Grafana determines to show or not to show points based on the density of the data. If the density is low, then points appear.
-- **Always:** Show the points regardless of how dense the data set is.
-- **Never:** Do not show points.
+- **Auto** - Grafana determines a point's visibility based on the density of the data. If the density is low, then points appear.
+- **Always** - Show the points regardless of how dense the data set is.
+- **Never** - Don't show points.
 
 #### Stack series
 
-_Stacking_ allows Grafana to display series on top of each other. Be cautious when using stacking in the visualization as it can easily create misleading graphs. To read more about why stacking might not be the best approach, refer to [The issue with stacking](https://www.data-to-viz.com/caveat/stacking.html).
+Set whether Grafana stacks or displays series on top of each other. Be cautious when using stacking because it can create misleading graphs. To read more about why stacking might not be the best approach, refer to [The issue with stacking](https://www.data-to-viz.com/caveat/stacking.html). Choose from the following:
 
-- **Off:** Turns off series stacking. When **Off**, all series share the same space in the visualization.
-- **Normal:** Stacks series on top of each other.
-- **100%:** Stack by percentage where all series add up to 100%.
+- **Off** - Turns off series stacking. When **Off**, all series share the same space in the visualization.
+- **Normal** - Stacks series on top of each other.
+- **100%** - Stack by percentage where all series add up to 100%.
 
 ##### Stack series in groups
 
@@ -283,7 +363,7 @@ The stacking group option is only available as an override. For more information
 
 #### Bar alignment
 
-Set the position of the bar relative to a data point. In the examples below, **Show points** is set to **Always** which makes it easier to see the difference this setting makes. The points do not change; the bars change in relationship to the points.
+Set the position of the bar relative to a data point. In the examples below, **Show points** is set to **Always** which makes it easier to see the difference this setting makes. The points don't change, but the bars change in relationship to the points. Choose from the following:
 
 - **Before** ![Bar alignment before icon](/static/img/docs/time-series-panel/bar-alignment-before.png)
   The bar is drawn before the point. The point is placed on the trailing corner of the bar.

docs/sources/setup-grafana/configure-grafana/_index.md

@@ -39,7 +39,7 @@ On Windows, the `sample.ini` file is located in the same directory as `defaults.
 
 ### macOS
 
-By default, the configuration file is located at `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override the settings defined in `conf/defaults.ini`.
+By default, the configuration file is located at `/opt/homebrew/etc/grafana/grafana.ini` or `/usr/local/etc/grafana/grafana.ini`. For a Grafana instance installed using Homebrew, edit the `grafana.ini` file directly. Otherwise, add a configuration file named `custom.ini` to the `conf` folder to override the settings defined in `conf/defaults.ini`.
 
 ## Remove comments in the .ini files
 
@@ -1325,7 +1325,7 @@ Either "OpportunisticStartTLS", "MandatoryStartTLS", "NoStartTLS". Default is `e
 
 ### enable_tracing
 
-Enable trace propagation in e-mail headers, using the `traceparent`, `tracestate` and (optionally) `baggage` fields. Default is `false`. To enable, you must first configure tracing in one of the `tracing.oentelemetry.*` sections.
+Enable trace propagation in e-mail headers, using the `traceparent`, `tracestate` and (optionally) `baggage` fields. Default is `false`. To enable, you must first configure tracing in one of the `tracing.opentelemetry.*` sections.
 
 <hr>
 
@@ -1552,7 +1552,7 @@ Sets a global limit on number of correlations that can be created. Default is -1
 
 ## [unified_alerting]
 
-For more information about the Grafana alerts, refer to [About Grafana Alerting]({{< relref "../../alerting" >}}).
+For more information about the Grafana alerts, refer to [Grafana Alerting]({{< relref "../../alerting" >}}).
 
 ### enabled
 
@@ -1580,6 +1580,10 @@ The interval string is a possibly signed sequence of decimal numbers, followed b
 
 The Redis server address that should be connected to.
 
+{{< admonition type="note" >}}
+For more information on Redis, refer to [Enable alerting high availability using Redis](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/alerting/set-up/configure-high-availability/#enable-alerting-high-availability-using-redis).
+{{< /admonition >}}
+
 ### ha_redis_username
 
 The username that should be used to authenticate with the Redis server.

docs/sources/setup-grafana/configure-security/configure-authentication/saml/index.md

@@ -183,13 +183,13 @@ Grafana supports user authentication through Okta, which is useful when you want
    - In the **Single sign on URL** field, use the `/saml/acs` endpoint URL of your Grafana instance, for example, `https://grafana.example.com/saml/acs`.
    - In the **Audience URI (SP Entity ID)** field, use the `/saml/metadata` endpoint URL, for example, `https://grafana.example.com/saml/metadata`.
    - Leave the default values for **Name ID format** and **Application username**.
-   - In the **ATTRIBUTE STATEMENTS (OPTIONAL)** section, enter the SAML attributes to be shared with Grafana, for example:
+   - In the **ATTRIBUTE STATEMENTS (OPTIONAL)** section, enter the SAML attributes to be shared with Grafana. The attribute names in Okta need to match exactly what is defined within Grafana, for example:
 
-     | Attribute name (in Grafana) | Value (in Okta profile)                |
-     | --------------------------- | -------------------------------------- |
-     | Login                       | `user.login`                           |
-     | Email                       | `user.email`                           |
-     | DisplayName                 | `user.firstName + " " + user.lastName` |
+     | Attribute name (in Grafana) | Name and value (in Okta profile)                   |
+     | --------------------------- | -------------------------------------------------- |
+     | Login                       | Login `user.login`                                 |
+     | Email                       | Email `user.email`                                 |
+     | DisplayName                 | DisplayName `user.firstName + " " + user.lastName` |
 
    - In the **GROUP ATTRIBUTE STATEMENTS (OPTIONAL)** section, enter a group attribute name (for example, `Group`) and set filter to `Matches regex .*` to return all user groups.
 

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)
@@ -97,6 +97,14 @@ On a minimal CentOS 8 installation, the following dependencies are required for
 libXcomposite libXdamage libXtst cups libXScrnSaver pango atk adwaita-cursor-theme adwaita-icon-theme at at-spi2-atk at-spi2-core cairo-gobject colord-libs dconf desktop-file-utils ed emacs-filesystem gdk-pixbuf2 glib-networking gnutls gsettings-desktop-schemas gtk-update-icon-cache gtk3 hicolor-icon-theme jasper-libs json-glib libappindicator-gtk3 libdbusmenu libdbusmenu-gtk3 libepoxy liberation-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts libgusb libindicator-gtk3 libmodman libproxy libsoup libwayland-cursor libwayland-egl libxkbcommon m4 mailx nettle patch psmisc redhat-lsb-core redhat-lsb-submod-security rest spax time trousers xdg-utils xkeyboard-config alsa-lib libX11-xcb
 ```
 
+**RHEL:**
+
+On a minimal RHEL 8 installation, the following dependencies are required for the image rendering to function:
+
+```bash
+linux-vdso.so.1 libdl.so.2 libpthread.so.0 libgobject-2.0.so.0 libglib-2.0.so.0 libnss3.so libnssutil3.so libsmime3.so libnspr4.so libatk-1.0.so.0 libatk-bridge-2.0.so.0 libcups.so.2 libgio-2.0.so.0 libdrm.so.2 libdbus-1.so.3 libexpat.so.1 libxcb.so.1 libxkbcommon.so.0 libm.so.6 libX11.so.6 libXcomposite.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXrandr.so.2 libgbm.so.1 libpango-1.0.so.0 libcairo.so.2 libasound.so.2 libatspi.so.0 libgcc_s.so.1 libc.so.6 /lib64/ld-linux-x86-64.so.2 libgnutls.so.30 libpcre.so.1 libffi.so.6 libplc4.so libplds4.so librt.so.1 libgmodule-2.0.so.0 libgssapi_krb5.so.2 libkrb5.so.3 libk5crypto.so.3 libcom_err.so.2 libavahi-common.so.3 libavahi-client.so.3 libcrypt.so.1 libz.so.1 libselinux.so.1 libresolv.so.2 libmount.so.1 libsystemd.so.0 libXau.so.6 libXrender.so.1 libthai.so.0 libfribidi.so.0 libpixman-1.so.0 libfontconfig.so.1 libpng16.so.16 libxcb-render.so.0 libidn2.so.0 libunistring.so.2 libtasn1.so.6 libnettle.so.6 libhogweed.so.4 libgmp.so.10 libkrb5support.so.0 libkeyutils.so.1 libpcre2-8.so.0 libuuid.so.1 liblz4.so.1 libgcrypt.so.20 libbz2.so.1
+```
+
 ## Certificate signed by internal certificate authorities
 
 In many cases, Grafana runs on internal servers and uses certificates that have not been signed by a CA ([Certificate Authority](https://en.wikipedia.org/wiki/Certificate_authority)) known to Chrome, and therefore cannot be validated. Chrome internally uses NSS ([Network Security Services](https://en.wikipedia.org/wiki/Network_Security_Services)) for cryptographic operations such as the validation of certificates.

docs/sources/setup-grafana/installation/_index.md

@@ -61,7 +61,7 @@ Grafana requires a database to store its configuration data, such as users, data
 Grafana supports the following databases:
 
 - [SQLite 3](https://www.sqlite.org/index.html)
-- [MySQL 5.7+](https://www.mysql.com/support/supportedplatforms/database.html)
+- [MySQL 8.0+](https://www.mysql.com/support/supportedplatforms/database.html)
 - [PostgreSQL 12+](https://www.postgresql.org/support/versioning/)
 
 By default Grafana uses an embedded SQLite database, which is stored in the Grafana installation location.

docs/sources/setup-grafana/installation/debian/index.md

@@ -111,7 +111,7 @@ Complete any of the following steps to uninstall Grafana.
 
 To uninstall Grafana, run the following commands in a terminal window:
 
-1. If you configured Grafana to run with systemd, stop the systemd servivce for Grafana server:
+1. If you configured Grafana to run with systemd, stop the systemd service for Grafana server:
 
    ```shell
    sudo systemctl stop grafana-server

docs/sources/setup-grafana/installation/docker/index.md

@@ -221,7 +221,6 @@ To run the latest stable version of Grafana using Docker Compose, complete the f
    For example:
 
    ```bash
-   version: "3.8"
    services:
      grafana:
        image: grafana/grafana-enterprise
@@ -279,7 +278,6 @@ To use Docker volumes for persistent storage, complete the following steps:
 1. Add the following code into the `docker-compose.yaml` file.
 
    ```yaml
-   version: '3.8'
    services:
      grafana:
        image: grafana/grafana-enterprise
@@ -324,7 +322,6 @@ To use bind mounts, complete the following steps:
 1. Now, add the following code into the `docker-compose.yaml` file.
 
    ```yaml
-   version: '3.8'
    services:
      grafana:
        image: grafana/grafana-enterprise
@@ -351,7 +348,6 @@ To use bind mounts, complete the following steps:
 The following example runs the latest stable version of Grafana, listening on port 3000, with the container named `grafana`, persistent storage in the `grafana-storage` docker volume, the server root URL set, and the official [clock panel](/grafana/plugins/grafana-clock-panel/) plugin installed.
 
 ```bash
-version: "3.8"
 services:
   grafana:
     image: grafana/grafana-enterprise

docs/sources/setup-grafana/installation/helm/index.md

@@ -278,6 +278,67 @@ To install plugins in the Grafana Helm Charts, complete the following steps:
 
 1. Search for the above plugins and they should be marked as installed.
 
+### Configure a Private CA (Certificate Authority)
+
+In many enterprise networks, TLS certificates are issued by a private certificate authority and are not trusted by default (using the provided OS trust chain).
+
+If your Grafana instance needs to interact with services exposing certificates issued by these private CAs, then you need to ensure Grafana trusts the root certificate.
+
+You might need to configure this if you:
+
+- have plugins that require connectivity to other self hosted systems. For example, if you've installed the Grafana Enterprise Metrics, Logs, or Traces (GEM, GEL, GET) plugins, and your GEM (or GEL/GET) cluster is using a private certificate.
+- want to connect to data sources which are listening on HTTPS with a private certificate.
+- are using a backend database for persistence, or caching service that uses private certificates for encryption in transit.
+
+In some cases you can specify a self-signed certificate within Grafana (such as in some data sources), or choose to skip TLS certificate validation (this is not recommended unless absolutely necessary).
+
+A simple solution which should work across your entire instance (plugins, data sources, and backend connections) is to add your self-signed CA certificate to your Kubernetes deployment.
+
+1. Create a ConfigMap containing the certificate, and deploy it to your Kubernetes cluster
+
+   ```yaml
+   # grafana-ca-configmap.yaml
+   ---
+   apiVersion: v1
+   kind: ConfigMap
+   metadata:
+     name: grafana-ca-cert
+   data:
+     ca.pem: |
+       -----BEGIN CERTIFICATE-----
+       (rest of the CA cert)
+       -----END CERTIFICATE-----
+   ```
+
+   ```bash
+   kubectl apply --filename grafana-ca-configmap.yaml --namespace monitoring
+   ```
+
+1. Open the Helm `values.yaml` file in your favorite editor.
+
+1. Find the line that says `extraConfigmapMounts:` and under that section, specify the additional ConfigMap that you want to mount.
+
+   ```yaml
+   .......
+   ............
+   ......
+   extraConfigmapMounts:
+      - name: ca-certs-configmap
+        mountPath: /etc/ssl/certs/ca.pem
+        subPath: ca.pem
+        configMap: grafana-ca-cert
+        readOnly: true
+   .......
+   ............
+   ......
+   ```
+
+1. Save the changes and use the `helm upgrade` command to update your Grafana deployment and mount the new ConfigMap:
+
+   ```bash
+   helm upgrade my-grafana grafana/grafana --values values.yaml --namespace monitoring
+   ```
+
 ## Troubleshooting
 
 This section includes troubleshooting tips you might find helpful when deploying Grafana on Kubernetes via Helm.