apply security patch: v11.1.x/0001-Alerting-Fix-permission-on-external-rule-write-endpo.patch

commit 8be7b33e066ebaa575efb63bf62eec8d1defd602
Author: Alex Weaver <weaver.alex.d@gmail.com>
Date:   Thu Aug 22 11:54:30 2024 -0500

    Alerting: Fix permission on external rule write endpoint

.drone.star

@@ -17,10 +17,18 @@ 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",
@@ -36,7 +44,12 @@ 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                                                        @irenerl24
-/docs/sources/getting-started/                                                    @irenerl24
-/docs/sources/introduction/                                                       @irenerl24
+/docs/sources/fundamentals                                                        @chri2547
+/docs/sources/getting-started/                                                    @chri2547
+/docs/sources/introduction/                                                       @chri2547
 /docs/sources/panels-visualizations/                                              @imatwawana
 /docs/sources/release-notes/                                                      @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/                                                      @irenerl24
+/docs/sources/setup-grafana/                                                      @chri2547
 /docs/sources/upgrade-guide/                                                      @imatwawana
 /docs/sources/whatsnew/                                                           @imatwawana
 

.github/workflows/doc-validator.yml

@@ -1,18 +1,13 @@
 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.2.0"
+      image: "grafana/doc-validator:v5.0.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v4"
@@ -20,7 +15,15 @@ jobs:
         # Only run doc-validator on specific directories.
         run: >
           doc-validator
-          '--include=${{ inputs.include }}'
+          '--include=^docs/sources/(?:alerting|fundamentals|getting-started|introduction|setup-grafana|upgrade-guide|whatsnew/whats-new-in-v(?:9|10))/.+\.md$'
           '--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/publish-technical-documentation-next.yml

@@ -1,21 +1,38 @@
-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'
-    permissions:
-      contents: read
-      id-token: write
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
-      - uses: grafana/writers-toolkit/publish-technical-documentation@publish-technical-documentation/v1
+      - 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"
         with:
-          website_directory: content/docs/grafana/next
+          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"

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

@@ -1,4 +1,4 @@
-name: publish-technical-documentation-release
+name: "publish-technical-documentation-release"
 
 on:
   push:
@@ -12,18 +12,63 @@ on:
 jobs:
   sync:
     if: github.repository == 'grafana/grafana'
-    permissions:
-      contents: read
-      id-token: write
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-latest"
     steps:
-      - uses: actions/checkout@v4
+      - name: "Checkout Grafana repo"
+        uses: "actions/checkout@v4"
         with:
           fetch-depth: 0
-      - uses: grafana/writers-toolkit/publish-technical-documentation-release@publish-technical-documentation-release/v1
+
+      - name: "Checkout Actions library"
+        uses: "actions/checkout@v4"
         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$"
-          release_branch_with_patch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
-          website_directory: content/docs/grafana
-          version_suffix: ""
+
+      - 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 }}"

CHANGELOG.md

@@ -1,72 +1,3 @@
-<!-- 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)

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.7-alpine
+ARG GO_IMAGE=golang:1.22.4-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.7
+GO_VERSION = 1.22.4
 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

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

conf/defaults.ini

@@ -1175,9 +1175,6 @@ 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
@@ -1692,9 +1689,6 @@ 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,9 +1101,6 @@
 # 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
@@ -1549,9 +1546,6 @@ 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/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md

@@ -43,35 +43,33 @@ refs:
 
 # Configure data source-managed alert rules
 
-Create data source-managed alert rules for Grafana Mimir or Grafana Loki data sources, which have been configured to support rule creation.
-
-To configure your Grafana Mimir or Loki data source for alert rule creation, enable either the Loki Ruler API or the Mimir Ruler API.
-
-For more information, refer to [Loki Ruler API](/docs/loki/<GRAFANA_VERSION>/api/#ruler) or [Mimir Ruler API](/docs/mimir/<GRAFANA_VERSION>/references/http-api/#ruler).
+Create alert rules for an external Grafana Mimir or Loki instance that has ruler API enabled; these are called data source-managed alert rules.
 
 **Note**:
 
-Alert rules for a Grafana Mimir or Loki instance can be edited or deleted by users with Editor or Admin roles.
+Alert rules for an external Grafana Mimir or Loki instance can be edited or deleted by users with Editor or Admin roles.
 
 If you delete an alerting resource created in the UI, you can no longer retrieve it.
 To make a backup of your configuration and to be able to restore deleted alerting resources, create your alerting resources using file provisioning, Terraform, or the Alerting API.
 
 ## Before you begin
 
-- Verify that you have write permission to the Mimir or Loki data source. Otherwise, you cannot create or update Grafana Mimir or Loki-managed alert rules.
+- 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.
 
-- Enable the Mimir or Loki Ruler API.
+- For Grafana Mimir and Loki data sources, enable the Ruler API by configuring their respective services.
 
   - **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 Mimir 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 Prometheus 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-oncall.md

@@ -2,7 +2,6 @@
 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:
@@ -10,6 +9,8 @@ keywords:
   - alerting
   - oncall
   - integration
+aliases:
+  - ../configure-oncall/ # /docs/grafana/<GRAFANA_VERSION>/alerting/alerting-rules/manage-contact-points/configure-oncall/
 labels:
   products:
     - cloud

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 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.
+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.
 
 **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 should look like and the corresponding payload data.
+   d. Click **Refresh preview** to see what your template content will 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,86 +162,6 @@ 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/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 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.
+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.
 
 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,11 +87,9 @@ Find the public data sources supporting Alerting in the [Grafana Plugins directo
 
 ## Data source-managed alert rules
 
-Data source-managed alert rules can be used for Grafana Mimir or Grafana Loki data sources which have been configured to support rule creation.
+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.
 
-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).
+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).
 
 {{< figure src="/media/docs/alerting/mimir-managed-alerting-architecture-v2.png" max-width="750px" caption="Mimir-managed alerting architecture" >}}
 

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

@@ -60,7 +60,6 @@ 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).
@@ -76,7 +75,6 @@ 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.
 
 For a demo, see this [example using Docker Compose](https://github.com/grafana/alerting-ha-docker-examples/tree/main/redis).
 

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

@@ -335,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. The maximum file size is 16 MB. 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. 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. The maximum file size is 16 MB. 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. 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/datasources/aws-cloudwatch/_index.md

@@ -238,10 +238,6 @@ 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/loki/query-editor/index.md

@@ -171,8 +171,6 @@ 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/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 Overview" url="https://play.grafana.org/d/edyh1ib7db6rkb/mysql-overview" >}}
+{{< docs/play title="MySQL: Cities of the World Sample Data Set" url="https://play.grafana.org/d/8JOvPQr7k/" >}}
 
 ## 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/explore/simplified-exploration/metrics/index.md

@@ -16,14 +16,18 @@ 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 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.
+- 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 -->
 
 {{< 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" >}}
 

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

@@ -39,12 +39,6 @@ You can use a bar gauge visualization when you need to show:
 - 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

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

@@ -43,12 +43,6 @@ With all of these dynamic elements, there's almost no limit to what a canvas can
 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.
@@ -91,23 +85,7 @@ The text element lets you easily add text to the canvas. The element also suppor
 
 ### Icon
 
-The icon element lets you add a supported icon to the canvas. Icons can have their color set based on thresholds or value mappings.
-
-#### Add a custom icon
-
-You can add a custom icon by referencing an SVG file. To add a custom icon, follow these steps:
-
-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="300px" 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).
+The icon element lets you add a supported icon to the canvas. Icons can have their color set based on thresholds / value mappings.
 
 ### Server
 
@@ -127,25 +105,6 @@ A button click will only trigger an API call when [inline editing](#inline-editi
 
 {{< docs/play title="Canvas Visualization: Buttons" url="https://play.grafana.org/d/c9ea65f5-ed5a-45cf-8fb7-f82af7c3afdf/" >}}
 
-## 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="300px" 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.

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

@@ -25,94 +25,16 @@ refs:
 
 # Gauge
 
-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.
+Gauges are single-value visualizations that can repeat a gauge for every series, column or row.
 
 {{< figure src="/static/img/docs/v66/gauge_panel_cover.png" max-width="1025px" alt="A gauge visualization">}}
 
-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 setpoint and alarm thresholds
-- CPU consumption (0-100%)
-- RAM availability
-
-## Configure a time series visualization
+{{< docs/play title="Grafana Gauge Visualization" url="https://play.grafana.org/d/KIhkVD6Gk/" >}}
 
 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" >}}
 
-{{< 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 'Gauge with single numeric value')
-
-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 'Gauge with single numeric value and hardcoded max-min')
-
-### 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 'Gauge with multiple numeric values in a single row')
-
-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 'Gauge viz with multiple rows and columns of numeric values showing the last row')
-
-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 'Gauge viz with multiple rows and columns of numeric values showing all the values')
-
-### 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 'Gauge with numeric values defining max and minimum')
-
-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 'Gauge with numeric values defining max and minimum but hidden')
-
-Even when minimum and maximum values aren’t displayed, the visualization still pulls the range from them.
-
 ## Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
@@ -213,10 +135,6 @@ Adjust the sizes of the gauge text.
 
 {{< docs/shared lookup="visualizations/thresholds-options-2.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-Last, gauge colors and thresholds (the outer bar markers) of the gauge can be configured as described above.
-
-![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 'Gauge viz with multiple rows and columns of numeric values showing all the values and thresholds defined for 0-6-11')
-
 ## Field overrides
 
 {{< docs/shared lookup="visualizations/overrides-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}

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

@@ -51,7 +51,7 @@ refs:
 
 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.
 
-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.
+You can configure and overlay [map layers](#types), 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" alt="Geomap visualization" >}}
 
@@ -141,42 +141,42 @@ The other location types&mdash; airport codes or US state codes&mdash;aren't aut
 
 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
+## Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-### Map view options
+## Map View
 
 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. 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.
+- **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.
 
-<!-- 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
+### 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.
 
@@ -184,28 +184,11 @@ 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 options
+## Map layers
 
 Geomaps support showing multiple layers. Each layer determines how you visualize geospatial data on top of the base map.
 
-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
+### Types
 
 There are seven map layer types to choose from in a geomap.
 
@@ -216,10 +199,6 @@ 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.
@@ -230,7 +209,9 @@ 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.
 
-To enable experimental layers. Set `enable_alpha` to `true` in your configuration file:
+{{% admonition type="note" %}}
+To enable experimental layers:
+Set `enable_alpha` to `true` in your configuration file:
 
 ```
 [panels]
@@ -243,11 +224,29 @@ 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>
 ```
 
-#### Data
+{{% /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
 
 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:
 
@@ -260,290 +259,23 @@ 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.
 
-#### 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
+## Basemap layer
 
 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.
 
-Basemap layer types can also be added as layers. You can specify an opacity.
+### Types
 
 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 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.
+- [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.
 
-The default basemap layer uses the CARTO map. You can define custom default base layers in the `.ini` configuration file.
+### Default
+
+The default base layer uses the [CARTO](#carto-layer) 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)
 
@@ -567,9 +299,6 @@ 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",
@@ -579,9 +308,6 @@ geomap_default_baselayer = `{
 }`
 ```
 
-{{< /tab-content >}}
-{{< tab-content name="Custom" >}}
-
 ```ini
 geomap_default_baselayer = `{
   "type": "esri-xyz",
@@ -593,9 +319,6 @@ 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
@@ -619,57 +342,343 @@ 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`.
 
-### Map controls options
+## 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)
+
+{{< figure src="/media/docs/grafana/panels-visualizations/geomap-markers-options-11-1-0.png" max-width="350px" alt="Markers layer options" >}}
+
+- **Data** and **Location mode** configure the data settings for the layer. For more information, refer to [Data](#data) and [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.
+
+## 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)
+
+{{< figure src="/media/docs/grafana/panels-visualizations/geomap-heatmap-options-11-1-0.png" max-width="350px" alt="Heatmap layer options" >}}
+
+- **Data** and **Location mode** configure the data settings for the layer. For more information, refer to [Data](#data) and [Location mode](#location-mode).
+- **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
+
+- **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.
+
+{{< 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
+
+- **Data** and **Location mode** configure the data settings for the layer. For more information, refer to [Data](#data) and [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.
+  - **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
+
+- **Data** and **Location mode** configure the data settings for the layer. For more information, refer to [Data](#data) and [Location mode](#location-mode).
+- **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) 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" 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
+
+- **Data** and **Location mode** configure the data settings for the layer. For more information, refer to [Data](#data) and [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**
+  - **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
 
 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" >}}
 
-<!-- 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 -->
+### Zoom
+
+This section describes each of the zoom controls.
 
 #### 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" alt="Geomap panel zoom" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-zoom-9-1-0.png" max-width="1200px" caption="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" alt="Geomap panel attribution" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-attribution-9-1-0.png" max-width="1200px" caption="Geomap panel attribution" >}}
 
-#### Show scale
+### Show scale
 
-Displays scale information in the bottom left corner in meters (m) or kilometers (km).
+Displays scale information in the bottom left corner.
 
-{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-scale-9-1-0.png" max-width="1200px" alt="Geomap panel scale" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-scale-9-1-0.png" max-width="1200px" caption="Geomap panel scale" >}}
 
-#### Show measure tools
+{{% admonition type="note" %}}
+Currently only displays units in [m]/[km].
+{{% /admonition %}}
+
+### 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" alt="Geomap panel measure" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-9-1-0.png" max-width="1200px" caption="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'.
 
@@ -678,9 +687,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" alt="Geomap panel measure length" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-length-9-1-0.png" max-width="1200px" caption="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'.
 
@@ -691,38 +700,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" alt="Geomap panel measure area" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-measure-area-9-1-0.png" max-width="1200px" caption="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" alt="Geomap panel debug" >}}
+{{< figure src="/static/img/docs/geomap-panel/geomap-map-controls-debug-9-1-0.png" max-width="1200px" caption="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/table/index.md

@@ -68,11 +68,9 @@ refs:
 
 # Table
 
-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.
+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.
 
-![Basic table visualization](/media/docs/grafana/panels-visualizations/screenshot-basic-table-v11.3.png)
+{{< figure src="/static/img/docs/tables/table_visualization.png" max-width="1200px" lightbox="true" alt="Table visualization" >}}
 
 You can use a table visualization to show datasets such as:
 
@@ -83,43 +81,36 @@ You can use a table visualization to show datasets such as:
 
 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 >}}
+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.
 
 ## Configure a table visualization
 
-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:
+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:
 
 {{< youtube id="PCY7O8EJeJY" >}}
 
 {{< docs/play title="Table Visualizations in Grafana" url="https://play.grafana.org/d/OhR1ID6Mk/" >}}
 
+{{< admonition type="note" >}}
+Annotations and alerts are not currently supported for tables.
+{{< /admonition >}}
+
 ## Supported data formats
 
 The table visualization supports any data that has a column-row structure.
 
-{{< admonition type="note" >}}
-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 >}}
-
 ### Example
 
-This example shows a basic dataset in which there's data for every table cell:
-
-```csv
+```
 Column1, Column2, Column3
 value1 , value2 , value3
 value4 , value5 , value6
 value7 , value8 , value9
 ```
 
-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:
+If a cell is missing or the table cell-row structure is not complete, the table visualization won’t display any of the data:
 
-```csv
+```
 Column1, Column2, Column3
 value1 , value2 , value3
 gap1   , gap2
@@ -128,251 +119,251 @@ value4 , value5 , value6
 
 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.
 
-## Column filtering
+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).
 
-You can temporarily change how column data is displayed using column filtering.
-For example, you can show or hide specific values.
+## Debugging in tables
 
-### Turn on column filtering
+The table visualization helps with debugging when you need to know exactly what results your query is returning and why other visualizations might not be working. This functionality is also accessible in most visualizations by toggling on the **Table view** switch at the top of the panel:
 
-To turn on column filtering, follow these steps:
+![The Table view switch](/media/docs/grafana/panels-visualizations/screenshot-table-view-on-11.2.png)
 
-1. In Grafana, navigate to the dashboard with the table with the columns that you want to filter.
-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).
+## Sort column
 
-A filter icon (funnel) appears next to each column title.
+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.
 
-{{< figure src="/static/img/docs/tables/column-filter-with-icon.png" max-width="350px" alt="Column filtering turned on" class="docs-image--no-shadow" >}}
+![Sort descending](/static/img/docs/tables/sort-descending.png 'Sort descending')
 
-### Filter column values
+## Data set selector
 
-To filter column values, follow these steps:
+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.
 
-1. Click the filter icon (funnel) next to a column title.
+![Table visualization with multiple data sets](/media/docs/grafana/panels-visualizations/TablePanelMultiSet.png)
 
-   Grafana displays the filter options for that column.
-
-   {{< figure src="/static/img/docs/tables/filter-column-values.png" max-width="300px" alt="Filter column values" class="docs-image--no-shadow" >}}
-
-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:
-
-   - **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 filter displayed next to the title.
-
-{{< 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 filter icon and then click **Clear filter**.
-
-## Sort columns
-
-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.
-
-{{< figure src="/static/img/docs/tables/sort-descending.png" max-width="350px" alt="Sort descending" class="docs-image--no-shadow" >}}
-
-## Dataset selector
-
-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.
-
-{{< figure src="/media/docs/grafana/panels-visualizations/screenshot-table-multi-dataset-v11.3.png" max-width="650px" alt="Table visualization with multiple datasets" >}}
-
-## Configuration options
-
-### Panel options
+## Panel options
 
 {{< docs/shared lookup="visualizations/panel-options.md" source="grafana" version="<GRAFANA_VERSION>" >}}
 
-### Table options
+## 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).                                                                                                           |
+{{% 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 %}}
 
-### Table footer options
+### Show header
 
-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.
+Show or hide column names imported from your data source.
 
-After you activate the table footer, make selections for the following options:
+### Column width
 
-- **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.
+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.
 
-### Cell options
+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.
 
-Cell options allow you to control how data is displayed in a table.
-The options are:
+### Minimum column width
 
-- [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.
+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.
 
-#### Cell type
+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.
 
-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.
+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.
 
-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.
+### Column alignment
 
-| 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.                                                                                                                                                                                                                                                   |
+Choose how Grafana should align cell contents:
 
-##### Sparkline
+- Auto (default)
+- Left
+- Center
+- Right
 
-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.
+### Column filter
 
-![Table using sparkline cell type](/media/docs/grafana/panels-visualizations/screenshot-table-as-sparkline-v11.3.png)
+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).
 
-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.
+### Pagination
 
-##### Colored text
+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.
 
-If thresholds are set, with this cell type, the field text is displayed in the appropriate threshold color.
+## Cell options
 
-![Table with colored text cell type](/media/docs/grafana/panels-visualizations/screenshot-table-colored-text-v11.3-2.png)
+### 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.
 
 {{< admonition type="note" >}}
-This is an experimental feature.
+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.
 {{< /admonition >}}
 
-##### Colored background
+##### Basic
 
-If thresholds are set, with this cell type, the field background is displayed in the appropriate threshold color.
+The basic mode will show a simple gauge with the threshold levels defining the color of gauge.
 
-![Table with colored background cell type](/media/docs/grafana/panels-visualizations/screenshot-table-colored-bkgrnd-v11.3-2.png)
+{{< figure src="/static/img/docs/tables/basic-gauge.png" max-width="500px" caption="Gradient gauge" class="docs-image--no-shadow" >}}
 
-- **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.
+##### Gradient
 
-![Table with background cell color applied to row](/media/docs/grafana/panels-visualizations/screenshot-table-colored-row-v11.3.png)
+The threshold levels define a gradient.
 
-##### Gauge
+{{< figure src="/static/img/docs/tables/gradient-gauge.png" max-width="500px" caption="Gradient gauge" class="docs-image--no-shadow" >}}
 
-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).
+##### LCD
+
+The gauge is split up in small cells that are lit or unlit.
+
+{{< figure src="/static/img/docs/tables/lcd-gauge.png" max-width="500px" caption="LCD gauge" class="docs-image--no-shadow" >}}
+
+##### 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" >}}
-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).
+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 >}}
 
-###### Gauge display mode
+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).
 
-You can set three gauge display modes.
+### Cell value inspect
 
-<!-- prettier-ignore-start -->
+Enables value inspection from table cell. The raw value is presented in a modal window.
 
-| 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" >}} |
+{{% 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 %}}
 
-<!-- prettier-ignore-end -->
+## Turn on column filtering
 
-###### Value display
+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.
 
-Labels displayed alongside of the gauges can be set to be colored by value, match the theme text color, or be hidden.
+A filter icon appears next to each column title.
 
-<!-- prettier-ignore-start -->
+{{< figure src="/static/img/docs/tables/column-filter-with-icon.png" max-width="500px" caption="Column filtering turned on" class="docs-image--no-shadow" >}}
 
-| 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" >}} |
+### Filter column values
 
-<!-- prettier-ignore-end -->
+To filter column values, click the filter (funnel) icon next to a column title. Grafana displays the filter options for that column.
 
-##### JSON View
+{{< figure src="/static/img/docs/tables/filter-column-values.png" max-width="500px" caption="Filter column values" class="docs-image--no-shadow" >}}
 
-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.
+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.
 
-{{< figure src="/static/img/docs/tables/json-view.png" max-width="350px" alt="JSON view" class="docs-image--no-shadow" >}}
+Choose from several operators to display column values:
 
-##### Image
+- **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: `=`, `!=`, `<`, `<=`, `>`, `>=`.
 
-If you have a field value that is an image URL or a base64 encoded image, this cell type displays it as an image.
+Click the check box above the **Ok** and **Cancel** buttons to add or remove all displayed values to/from the filter.
 
-![Table with image cell type](/media/docs/grafana/panels-visualizations/screenshot-table-cell-image-v11.3.png)
+### Clear column filters
 
-Set the following options:
+Columns with filters applied have a blue funnel displayed next to the title.
 
-- **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.
+{{< figure src="/static/img/docs/tables/filtered-column.png" max-width="500px" caption="Filtered column" class="docs-image--no-shadow" >}}
 
-#### Wrap text
+To remove the filter, click the blue funnel icon and then click **Clear filter**.
 
-{{< 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 >}}
+## Table footer
 
-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 the Wrap Text option in a [field override](ref:field-override).
+You can use the table footer to show [calculations](ref:calculations) on fields.
 
-This option is available for the following cell types: **Auto**, **Colored text**, and **Colored background**.
+After you enable the table footer:
 
-#### Cell value inspect
+1. Select the **Calculation**
+2. Select the **Fields** that you want to calculate
 
-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 system applies the calculation to all numeric fields if you do not select a field.
 
-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.
+### Count rows
 
-This option is available for the following cell types: **Auto**, **Colored text**, **Colored background**, and **JSON View**.
+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**.
 
-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
+## 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/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 `/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`.
+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`.
 
 ## Remove comments in the .ini files
 

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. The attribute names in Okta need to match exactly what is defined within Grafana, for example:
+   - In the **ATTRIBUTE STATEMENTS (OPTIONAL)** section, enter the SAML attributes to be shared with Grafana, for example:
 
-     | Attribute name (in Grafana) | Name and value (in Okta profile)                   |
-     | --------------------------- | -------------------------------------------------- |
-     | Login                       | Login `user.login`                                 |
-     | Email                       | Email `user.email`                                 |
-     | DisplayName                 | DisplayName `user.firstName + " " + user.lastName` |
+     | Attribute name (in Grafana) | Value (in Okta profile)                |
+     | --------------------------- | -------------------------------------- |
+     | Login                       | `user.login`                           |
+     | Email                       | `user.email`                           |
+     | 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

@@ -97,14 +97,6 @@ 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 8.0+](https://www.mysql.com/support/supportedplatforms/database.html)
+- [MySQL 5.7+](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/helm/index.md

@@ -278,67 +278,6 @@ 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.

docs/sources/shared/alerts/alerting_provisioning.md

@@ -1621,9 +1621,9 @@ Status: Accepted
 
 | Name     | Type   | Go type  | Required | Default | Description | Example |
 | -------- | ------ | -------- | :------: | ------- | ----------- | ------- |
-| template | string | `string` |          |         |             |         |
-
-{{% /responsive-table %}}
+| template | string | `string` |          |         |             |         |
+
+{{% /responsive-table %}}
 
 ### <span id="notification-templates"></span> NotificationTemplates
 

docs/sources/shared/visualizations/thresholds-options-2.md

@@ -8,11 +8,11 @@ comments: |
 
 A threshold is a value or limit you set for a metric that’s reflected visually when it’s met or exceeded. Thresholds are one way you can conditionally style and color your visualizations based on query results.
 
-For each threshold, set the following options:
+Set the following options:
 
-| Option          | Description                                  |
-| --------------- | -------------------------------------------- |
-| Value           | Set the value for each threshold.            |
-| Thresholds mode | Choose from **Absolute** and **Percentage**. |
+- **Value** - Set the value for each threshold.
+- **Thresholds mode** - Choose from:
+  - **Absolute**
+  - **Percentage**
 
 To learn more, refer to [Configure thresholds](../../configure-thresholds/).

docs/sources/upgrade-guide/when-to-upgrade/index.md

@@ -1,115 +0,0 @@
----
-description: Strategies for upgrading your self-managed Grafana instance
-keywords:
-  - grafana
-  - configuration
-  - documentation
-  - upgrade
-title: Strategies for upgrading your self-managed Grafana instance
-menuTitle: Upgrade strategies
-weight: 1000
----
-
-# Strategies for upgrading your self-managed Grafana instance
-
-At Grafana Labs, we believe in shipping features early and often, and in recent years we’ve increased our commitment to that philosophy.
-
-We no longer wait for the yearly major release to give you access to the next big improvement. Instead, we regularly make new features, bug fixes, and security patches available to our self-managing users ([Grafana OSS](https://grafana.com/oss/grafana/) and [Grafana Enterprise](https://grafana.com/products/enterprise/)) throughout the year.
-
-Having a dependable release process provides users like you with the best Grafana experience possible, and it provides the flexibility to upgrade in a manner that works best for you and your organization.
-
-## What to expect from each release type
-
-We split Grafana OSS and Grafana Enterprise releases into three main categories:
-
-- **Minor release (every other month)**: These releases can include new features, deprecation notices, notices about upcoming breaking changes, previously announced breaking changes, bug fixes, and security vulnerability patches.
-- **Major release (once a year, in April/May)**: These are like a minor release, but accompanied by [GrafanaCON](https://grafana.com/events/grafanacon/) and a comprehensive upgrade guide for users who like to upgrade only once a year.
-- **Patching release (every month)**: These include bug fixes for currently supported versions, as well as any security vulnerability patches.
-
-You can choose your cadence: For frequent self-managed updates, you should follow the minor release (for example, upgrade 10.1 to 10.2), which also gives you access to the latest features. If you need a longer period to review our new releases, you should follow the major releases. Both strategies get patching releases with security fixes (high severity security fixes also result in ad-hoc patch releases). We’ll get into additional guidance on upgrade cadences later in this guide.
-
-## How to find the specifics for a release
-
-We love sharing all our great features with you so you can leverage Grafana to its fullest. We also understand that great release documentation allows you to upgrade with confidence.
-Whether it’s knowing that a bug has been fixed, seeing that a security vulnerability is patched, or understanding how to mitigate the impact of breaking changes, proper documentation allows you to make informed decisions about when to upgrade your local Grafana instances.
-
-We provide release documentation in multiple places to address different needs:
-
-- [**What’s new**](https://grafana.com/docs/grafana/latest/whatsnew/?pg=blog&plcmt=body-txt) outlines new features debuting in each major and minor release.
-- [**Breaking changes**](https://grafana.com/docs/grafana/latest/breaking-changes/?pg=blog&plcmt=body-txt) notify you of updates included in major releases that could impact you and provide mitigation recommendations when needed.
-- [**Upgrade guides**](https://grafana.com/docs/grafana/latest/upgrade-guide/?pg=blog&plcmt=body-txt) instruct you on how to upgrade to a newer minor or major version.
-- And finally, a [**changelog**](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) is generated for every release (major, minor, patching, security) and outlines all changes included in that release.
-
-## When to expect releases
-
-Currently, Grafana is on a monthly release cycle. Here’s a look at scheduled releases for 2024:
-
-| **Anticipated release date** | **Grafana versions** | **Release type**   |
-| ---------------------------- | -------------------- | ------------------ |
-| May 14, 2024                 | 11                   | Major and patching |
-| June 25, 2024                | 11.1                 | Minor and patching |
-| July 23, 2024                | 11.1.x               | Patching           |
-| Aug. 27, 2024                | 11.2                 | Minor and patching |
-| Sept. 24, 2024               | 11.2.x               | Patching           |
-| Oct. 22, 2024                | 11.3                 | Minor and patching |
-| November/December 2024       | To be determined     | To be determined   |
-
-### A few important notes
-
-- The schedule above outlines how we plan release dates. However, unforeseen events and circumstances may cause dates to change.
-- High severity security and feature degradation incidents will result in ad-hoc releases that are not scheduled ahead of time.
-- Patching releases are for the current (last released) minor version of Grafana. Additional older versions of Grafana may be included if there is a critical bug or security vulnerability that needs to be patched.
-- A Grafana release freeze occurs for a week in November and again during the end of December. This does not apply to changes that may be required during the course of an operational or security incident.
-
-## What to know about version support
-
-Self-managed Grafana users have control over when they upgrade to a new version of Grafana. To help you make an informed decision about whether it's time to upgrade, it’s important that you understand the level of support provided for your current version.
-
-For self-managed Grafana (both Enterprise and OSS), the support for versions is as follows:
-
-- Support for each minor release extends to nine months after the release date.
-- Support for the last minor release of a major version is extended an additional six months, for a total of 15 months of support after the release date.
-
-Here is an overview of projected version support through 2024:
-
-| **Version**               | **Release date**        | **Support end of life (EOL)** |
-| ------------------------- | ----------------------- | ----------------------------- |
-| 10.3                      | January 2024            | October 2024                  |
-| 10.4 (Last minor of 10.0) | March 2024              | June 2025 (extended support)  |
-| 11.0                      | May 2024                | February 2025                 |
-| 11.1                      | June 2024               | March 2025                    |
-| 11.2                      | August 2024 (tentative) | May 2025 (tentative)          |
-
-{{< admonition type="note" >}}
-Grafana 9.5.x was the last supported minor for the 9.0 major release and is no longer supported as of July 2024.
-{{< /admonition >}}
-
-## How are these versions supported?
-
-The level of support changes as new versions of Grafana are released. Here are a few details to keep in mind:
-
-- The current (most recently released) version of Grafana gets the highest level of support. Releases for this version include all the new features along with all bug fixes.
-- All supported versions receive security patches for vulnerabilities impacting that version.
-- All supported versions receive patches for bugs that cause critical feature degradation incidents.
-
-Keeping all this in mind, users that want to receive the most recent features and all bug fixes should be on the current (most recently released) version of Grafana.
-
-### What is a critical feature degradation?
-
-A critical feature degradation usually meets one of the following criteria:
-
-- Major functionality is universally unavailable (for example, cannot create dashboards, unable to authenticate).
-- Major (critical) impact to a significant amount of customers.
-- Major escalated incident for one or many customers.
-
-## Self-managing upgrade strategies
-
-Based on your needs, you can choose your ideal upgrade strategy. Here’s what that might look like in practice:
-
-| **Strategy/cadence**                      | **Advantages/disadvantages**                                                                                                                                                                                                                                                                                           | **Example upgrade procedure**                                                                                                                                                                                                                                               |
-| ----------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Minor / bi-monthly (11.1 to 11.2)**     | Our recommended strategy. It combines up-to-date, secure releases with access to latest features as soon as they're released. <ul><li>Small changelog to review</li><li>Highest compatibility with actively maintained plugins</li><li>Easy migration to [Grafana Cloud](https://grafana.com/products/cloud)</li></ul> | <ul><li>**June 2024**: You review the 11.1 changelog and deploy the release to testing</li><li>**July 2024**: You deploy 11.1 to production</li><li>**August 2024**: 11.2 is released</li></ul>                                                                             |
-| **Major / yearly (10.0 to 11.0)**         | Yearly upgrade path that still gives access to up-to-date features presented at GrafanaCON.<ul><li>Big changelog to review</li><li>High compatibility with plugins</li><li>Relatively easy migration to [Grafana Cloud](https://grafana.com/products/cloud)</li></ul>                                                  | <ul><li>**April 2024**: 11.0 is released, you start a big changelog review</li><li>**May 2024**: You deploy 11.0 to testing</li><li>**June 2024**: You deploy 11.0 to production</li><li>**April 2025**: 12.0 is released</li></ul>                                         |
-| **Previous major / yearly (9.5 to 10.4)** | Release with extended support timeline<ul><li>Limited compatibility with actively developed plugins</li><li>Big changelog to review</li><li>Migrations to Grafana Cloud might require professional support</li></ul>                                                                                                   | <ul><li>**April 2024**: 11.0 is released, marking the previous minor (10.4.x) with extended support, you start a big changelog review (9.5.x to 10.4.x)</li><li>**May 2024**: You deploy 10.4.x to testing</li><li>**June 2024**: You deploy 10.4.x to production</li></ul> |
-
-For each strategy, you should stay informed about patch releases that fix security vulnerabilities (released monthly, plus ad-hoc releases). Follow the “minor” strategy for the most flexibility, as you can also occasionally lengthen the cadence to a full quarter and still rely on your currently deployed minor release being supported with security fixes.

go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana
 
-go 1.22.7
+go 1.22.4
 
 // Override docker/docker to avoid:
 // go: github.com/drone-runners/drone-runner-docker@v1.8.2 requires
@@ -103,7 +103,7 @@ require (
 	// Check go.work file for details
 	github.com/grafana/grafana/pkg/promlib v0.0.6 // @grafana/observability-metrics
 	github.com/grafana/otel-profiling-go v0.5.1 // @grafana/grafana-backend-group
-	github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // @grafana/observability-traces-and-profiling
+	github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // @grafana/observability-traces-and-profiling
 	github.com/grafana/pyroscope/api v0.3.0 // @grafana/observability-traces-and-profiling
 	github.com/grafana/tempo v1.5.1-0.20230524121406-1dc1bfe7085b // @grafana/observability-traces-and-profiling
 	github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // @grafana/plugins-platform-backend
@@ -144,6 +144,7 @@ require (
 	github.com/redis/go-redis/v9 v9.1.0 // @grafana/alerting-backend
 	github.com/robfig/cron/v3 v3.0.1 // @grafana/grafana-backend-group
 	github.com/russellhaering/goxmldsig v1.4.0 // @grafana/grafana-backend-group
+	github.com/scottlepp/go-duck v0.0.21 // @grafana/grafana-app-platform-squad
 	github.com/spf13/cobra v1.8.0 // @grafana/grafana-app-platform-squad
 	github.com/spf13/pflag v1.0.5 // @grafana-app-platform-squad
 	github.com/spyzhov/ajson v0.9.0 // @grafana/grafana-app-platform-squad
@@ -221,6 +222,7 @@ require (
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
 	github.com/DATA-DOG/go-sqlmock v1.5.2 // @grafana/grafana-search-and-storage
 	github.com/FZambia/eagle v0.1.0 // indirect
+	github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
@@ -228,6 +230,8 @@ require (
 	github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
 	github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
 	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 // indirect
+	github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
+	github.com/apache/thrift v0.18.1 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
 	github.com/armon/go-metrics v0.4.1 // indirect
@@ -330,7 +334,8 @@ require (
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/jszwedko/go-datemath v0.1.1-0.20230526204004-640a500621d6 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/asmfmt v1.3.2 // indirect
+	github.com/klauspost/compress v1.17.8 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
@@ -341,6 +346,8 @@ require (
 	github.com/mattn/go-ieproxy v0.0.3 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/miekg/dns v1.1.59 // indirect
+	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
+	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect

go.sum

@@ -1369,6 +1369,7 @@ github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJc
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.0.0/go.mod h1:+6sju8gk8FRmSajX3Oz4G5Gm7P+mbqE9FVaXXFYTkCM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.2.0/go.mod h1:NBanQUfSWiWn3QEpWDTCU0IjBECKOYvl2R8xdRtMtiM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.4.0/go.mod h1:1fXstnBMas5kzG+S3q8UoJcmyU6nUeunJcMDHcRYHhs=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 h1:FDif4R1+UUR+00q6wquyX90K7A8dN+R5E8GEadoP7sU=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2/go.mod h1:aiYBYui4BJ/BJCAIKs92XiPyQfTaBWqvHujDwKb6CBU=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 h1:tfLQ34V6F7tVSwoTf/4lH5sE0o6eCJuNDTmH09nDpbc=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg=
@@ -1378,6 +1379,7 @@ github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLC
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.0/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 h1:LqbJ/WzJUwBf8UiaSzgX7aMclParm9/5Vgp+TY51uBQ=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 h1:jBQA3cKT4L2rWMpgE7Yt3Hwh2aUj8KXjIGLxjHeYNNo=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
@@ -1457,6 +1459,7 @@ github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0/go.mod h1:spvB9eLJH9dutlbP
 github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
+github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/KimMachineGun/automemlimit v0.6.0/go.mod h1:T7xYht7B8r6AG/AqFcUdc7fzd2bIdBKmepfP2S1svPY=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
@@ -1525,6 +1528,8 @@ github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kd
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 h1:goHVqTbFX3AIo0tzGr14pgfAW2ZfPChKO21Z9MGf/gk=
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/apache/arrow/go/arrow v0.0.0-20210223225224-5bea62493d91/go.mod h1:c9sxoIT3YgLxH4UhLOCKaBlEojuMhVYpk4Ntv3opUTQ=
+github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ=
+github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
 github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0=
 github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4xei5aX110hRiI=
 github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg=
@@ -1536,10 +1541,14 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
 github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q=
+github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
+github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/apparentlymart/go-textseg/v13 v13.0.0 h1:Y+KvPE1NYz0xl601PVImeQfFyEy6iT90AvPUL1NNfNw=
 github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
+github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
+github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
@@ -1817,6 +1826,7 @@ github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5
 github.com/dlmiddlecote/sqlstats v1.0.2 h1:gSU11YN23D/iY50A2zVYwgXgy072khatTsIW6UPjUtI=
 github.com/dlmiddlecote/sqlstats v1.0.2/go.mod h1:0CWaIh/Th+z2aI6Q9Jpfg/o21zmGxWhbByHgQSCUQvY=
 github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
+github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=
@@ -2138,6 +2148,7 @@ github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl76
 github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
 github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
 github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
+github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
 github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI=
@@ -2314,8 +2325,6 @@ github.com/grafana/prometheus-alertmanager v0.25.1-0.20240422145632-c33c6b5b6e6b
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20240422145632-c33c6b5b6e6b/go.mod h1:01sXtHoRwI8W324IPAzuxDFOmALqYLCOhvSC2fUHWXc=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.6 h1:nEdZ8louGAplSvIJi1HVp7kWvFvdiiYg3COLlTwJiFo=
 github.com/grafana/pyroscope-go/godeltaprof v0.1.6/go.mod h1:Tk376Nbldo4Cha9RgiU7ik8WKFkNpfds98aUzS8omLE=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.8 h1:iwOtYXeeVSAeYefJNaxDytgjKtUuKQbJqgAIjlnicKg=
-github.com/grafana/pyroscope-go/godeltaprof v0.1.8/go.mod h1:2+l7K7twW49Ct4wFluZD3tZ6e0SjanjcUUBPVD/UuGU=
 github.com/grafana/pyroscope/api v0.3.0 h1:WcVKNZ8JlriJnD28wTkZray0wGo8dGkizSJXnbG7Gd8=
 github.com/grafana/pyroscope/api v0.3.0/go.mod h1:JggA80ToAAUACYGfwL49XoFk5aN5ecHp4pNIZhlk9Uc=
 github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd/go.mod h1:M5qHK+eWfAv8VR/265dIuEpL3fNfeC21tXXp9itM24A=
@@ -2592,8 +2601,10 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kisielk/sqlstruct v0.0.0-20201105191214-5f3e10d3ab46/go.mod h1:yyMNCyc/Ib3bDTKd379tNMpB/7/H5TjM2Y9QJ5THLbE=
+github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
 github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
 github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
+github.com/klauspost/compress v1.13.1/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.4/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
@@ -2602,8 +2613,6 @@ github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQs
 github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
 github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
-github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
-github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.3/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -2720,7 +2729,9 @@ github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJys
 github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
 github.com/miekg/dns v1.1.59 h1:C9EXc/UToRwKLhK5wKU/I4QVsBUc8kE6MkHBkeypWZs=
 github.com/miekg/dns v1.1.59/go.mod h1:nZpewl5p6IvctfgrckopVx2OlSEHPRO/U4SYkRklrEk=
+github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 h1:AMFGa4R4MiIpspGNG7Z948v4n35fFGB3RR3G/ry4FWs=
 github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8/go.mod h1:mC1jAcsrzbxHt8iiaC+zU4b1ylILSosueou12R++wfY=
+github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8DFdX7uMikMLXX4oubIzJF4kv/wI=
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
 github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY=
@@ -2916,6 +2927,7 @@ github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk
 github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
 github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.15/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
@@ -3056,6 +3068,8 @@ github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26 h1:F+GIVtGqCFxPxO46ujf8cEOP574MBoRm3gNbPXECbxs=
 github.com/scaleway/scaleway-sdk-go v1.0.0-beta.26/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg=
+github.com/scottlepp/go-duck v0.0.21 h1:bFg5/8ULOo62vmvIjEOy1EOf7Q86cpzq82BDN5RakVE=
+github.com/scottlepp/go-duck v0.0.21/go.mod h1:m6V1VGZ4hdgvCj6+BmNMFo0taqiWhMx3CeL3uKHmP2E=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
@@ -4171,6 +4185,7 @@ google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxH
 google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210630183607-d20f26d13c79/go.mod h1:yiaVoXHpRzHGyxV3o4DktVWY4mSUErTKaeEOq6C3t3U=
 google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
 google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
 google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=

go.work

@@ -1,4 +1,4 @@
-go 1.22.7
+go 1.22.4
 
 use (
 	.

go.work.sum

@@ -290,7 +290,6 @@ github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oM
 github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4=
 github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
 github.com/GoogleCloudPlatform/cloudsql-proxy v1.29.0 h1:YNu23BtH0PKF+fg3ykSorCp6jSTjcEtfnYLzbmcjVRA=
-github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
 github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk=
 github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM=
 github.com/KimMachineGun/automemlimit v0.6.0 h1:p/BXkH+K40Hax+PuWWPQ478hPjsp9h1CPDhLlA3Z37E=
@@ -334,8 +333,6 @@ github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+Dx
 github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
 github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
-github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 h1:q4dksr6ICHXqG5hm0ZW5IHyeEJXoIJSOZeBLmWPNeIQ=
-github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40/go.mod h1:Q7yQnSMnLvcXlZ8RV+jwz/6y1rQTqbX6C82SndT52Zs=
 github.com/apache/arrow/go/v10 v10.0.1 h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI=
 github.com/apache/arrow/go/v11 v11.0.0 h1:hqauxvFQxww+0mEU/2XHG6LT7eZternCZq+A5Yly2uM=
 github.com/apache/arrow/go/v12 v12.0.0 h1:xtZE63VWl7qLdB0JObIXvvhGjoVNrQ9ciIHG2OK5cmc=
@@ -343,8 +340,6 @@ github.com/apache/arrow/go/v12 v12.0.1 h1:JsR2+hzYYjgSUkBSaahpqCetqZMr76djX80fF/
 github.com/apache/arrow/go/v13 v13.0.0 h1:kELrvDQuKZo8csdWYqBQfyi431x6Zs/YJTEgUuSVcWk=
 github.com/apache/arrow/go/v13 v13.0.0/go.mod h1:W69eByFNO0ZR30q1/7Sr9d83zcVZmF2MiP3fFYAWJOc=
 github.com/apache/arrow/go/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw=
-github.com/apache/thrift v0.18.1 h1:lNhK/1nqjbwbiOPDBPFJVKxgDEGSepKuTh6OLiXW8kg=
-github.com/apache/thrift v0.18.1/go.mod h1:rdQn/dCcDKEWjjylUeueum4vQEjG2v8v2PqriUnbr+I=
 github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3 h1:ZSTrOEhiM5J5RFxEaFvMZVEAM1KvT1YzbEOwB2EAGjA=
 github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
@@ -719,6 +714,7 @@ github.com/matryer/moq v0.3.1/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFK
 github.com/matryer/moq v0.3.3 h1:pScMH9VyrdT4S93yiLpVyU8rCDqGQr24uOyBxmktG5Q=
 github.com/matryer/moq v0.3.3/go.mod h1:RJ75ZZZD71hejp39j4crZLsEDszGk6iH4v4YsWFKH4s=
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/maxatome/go-testdeep v1.12.0 h1:Ql7Go8Tg0C1D/uMMX59LAoYK7LffeJQ6X2T04nTH68g=
 github.com/mediocregopher/radix/v3 v3.8.1/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=

lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "npmClient": "yarn",
-  "version": "11.1.9"
+  "version": "11.1.6"
 }

package.json

@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "grafana",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "repository": "github:grafana/grafana",
   "scripts": {
     "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",

packages/grafana-data/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/data",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana Data Library",
   "keywords": [
     "typescript"
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@braintree/sanitize-url": "7.0.1",
-    "@grafana/schema": "11.1.9",
+    "@grafana/schema": "11.1.6",
     "@types/d3-interpolate": "^3.0.0",
     "@types/string-hash": "1.1.3",
     "d3-interpolate": "3.0.1",

packages/grafana-e2e-selectors/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/e2e-selectors",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana End-to-End Test Selectors Library",
   "keywords": [
     "cli",

packages/grafana-eslint-rules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@grafana/eslint-plugin",
   "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "main": "./index.cjs",
   "author": "Grafana Labs",
   "license": "Apache-2.0",

packages/grafana-flamegraph/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/flamegraph",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana flamegraph visualization component",
   "keywords": [
     "grafana",
@@ -44,8 +44,8 @@
   ],
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@grafana/data": "11.1.9",
-    "@grafana/ui": "11.1.9",
+    "@grafana/data": "11.1.6",
+    "@grafana/ui": "11.1.6",
     "@leeoniya/ufuzzy": "1.0.14",
     "d3": "^7.8.5",
     "lodash": "4.17.21",

packages/grafana-icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/saga-icons",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "private": true,
   "description": "Icons for Grafana",
   "author": "Grafana Labs",

packages/grafana-o11y-ds-frontend/package.json

@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "name": "@grafana/o11y-ds-frontend",
   "private": true,
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Library to manage traces in Grafana.",
   "sideEffects": false,
   "repository": {
@@ -18,12 +18,12 @@
   },
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@grafana/data": "11.1.9",
-    "@grafana/e2e-selectors": "11.1.9",
+    "@grafana/data": "11.1.6",
+    "@grafana/e2e-selectors": "11.1.6",
     "@grafana/experimental": "1.7.11",
-    "@grafana/runtime": "11.1.9",
-    "@grafana/schema": "11.1.9",
-    "@grafana/ui": "11.1.9",
+    "@grafana/runtime": "11.1.6",
+    "@grafana/schema": "11.1.6",
+    "@grafana/ui": "11.1.6",
     "react-select": "5.8.0",
     "react-use": "17.5.0",
     "rxjs": "7.8.1",

packages/grafana-plugin-configs/package.json

@@ -2,7 +2,7 @@
   "name": "@grafana/plugin-configs",
   "description": "Shared dependencies and files for core plugins",
   "private": true,
-  "version": "11.1.9",
+  "version": "11.1.6",
   "dependencies": {
     "tslib": "2.6.3"
   },

packages/grafana-prometheus/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "AGPL-3.0-only",
   "name": "@grafana/prometheus",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana Prometheus Library",
   "keywords": [
     "typescript"
@@ -38,12 +38,12 @@
   "dependencies": {
     "@emotion/css": "11.11.2",
     "@floating-ui/react": "0.26.16",
-    "@grafana/data": "11.1.9",
+    "@grafana/data": "11.1.6",
     "@grafana/experimental": "1.7.11",
     "@grafana/faro-web-sdk": "1.7.3",
-    "@grafana/runtime": "11.1.9",
-    "@grafana/schema": "11.1.9",
-    "@grafana/ui": "11.1.9",
+    "@grafana/runtime": "11.1.6",
+    "@grafana/schema": "11.1.6",
+    "@grafana/ui": "11.1.6",
     "@leeoniya/ufuzzy": "1.0.14",
     "@lezer/common": "1.2.1",
     "@lezer/highlight": "1.2.0",
@@ -76,7 +76,7 @@
   },
   "devDependencies": {
     "@emotion/eslint-plugin": "11.11.0",
-    "@grafana/e2e-selectors": "11.1.9",
+    "@grafana/e2e-selectors": "11.1.6",
     "@grafana/tsconfig": "^1.3.0-rc1",
     "@rollup/plugin-image": "3.0.3",
     "@rollup/plugin-node-resolve": "15.2.3",

packages/grafana-prometheus/src/datasource.test.ts

@@ -552,7 +552,7 @@ describe('PrometheusDatasource', () => {
       config.featureToggles.promQLScope = undefined;
     });
 
-    it('should call replace function 3 times', () => {
+    it('should call replace function 2 times', () => {
       const query: PromQuery = {
         expr: 'test{job="testjob"}',
         format: 'time_series',
@@ -563,7 +563,7 @@ describe('PrometheusDatasource', () => {
       replaceMock.mockReturnValue(interval);
 
       const queries = ds.interpolateVariablesInQueries([query], { Interval: { text: interval, value: interval } });
-      expect(templateSrvStub.replace).toBeCalledTimes(3);
+      expect(templateSrvStub.replace).toBeCalledTimes(2);
       expect(queries[0].interval).toBe(interval);
     });
 
@@ -753,55 +753,6 @@ describe('PrometheusDatasource', () => {
       const result = ds.applyTemplateVariables(query, {}, filters);
       expect(result).toMatchObject({ expr: 'test{job="99", k1="v1", k2!="v2"} > 99' });
     });
-
-    it('should replace variables in ad-hoc filters', () => {
-      const searchPattern = /\$A/g;
-      replaceMock.mockImplementation((a: string) => a?.replace(searchPattern, '99') ?? a);
-
-      const query = {
-        expr: 'test',
-        refId: 'A',
-      };
-      const filters = [
-        {
-          key: 'job',
-          operator: '=~',
-          value: '$A',
-        },
-      ];
-
-      const result = ds.applyTemplateVariables(query, {}, filters);
-      expect(result).toMatchObject({ expr: 'test{job=~"99"}' });
-    });
-
-    it('should replace variables in adhoc filters on backend when promQLScope is enabled', () => {
-      config.featureToggles.promQLScope = true;
-      const searchPattern = /\$A/g;
-      replaceMock.mockImplementation((a: string) => a?.replace(searchPattern, '99') ?? a);
-
-      const query = {
-        expr: 'test',
-        refId: 'A',
-      };
-      const filters = [
-        {
-          key: 'job',
-          operator: '=~',
-          value: '$A',
-        },
-      ];
-      const result = ds.applyTemplateVariables(query, {}, filters);
-      expect(result).toMatchObject({
-        expr: 'test',
-        adhocFilters: [
-          {
-            key: 'job',
-            operator: 'regex-match',
-            value: '99',
-          },
-        ],
-      });
-    });
   });
 
   describe('metricFindQuery', () => {

packages/grafana-prometheus/src/datasource.ts

@@ -89,6 +89,7 @@ export class PrometheusDatasource
   basicAuth: any;
   withCredentials: boolean;
   interval: string;
+  queryTimeout: string | undefined;
   httpMethod: string;
   languageProvider: PrometheusLanguageProvider;
   exemplarTraceIdDestinations: ExemplarTraceIdDestination[] | undefined;
@@ -117,6 +118,7 @@ export class PrometheusDatasource
     this.basicAuth = instanceSettings.basicAuth;
     this.withCredentials = Boolean(instanceSettings.withCredentials);
     this.interval = instanceSettings.jsonData.timeInterval || '15s';
+    this.queryTimeout = instanceSettings.jsonData.queryTimeout;
     this.httpMethod = instanceSettings.jsonData.httpMethod || 'GET';
     this.exemplarTraceIdDestinations = instanceSettings.jsonData.exemplarTraceIdDestinations;
     this.hasIncrementalQuery = instanceSettings.jsonData.incrementalQuerying ?? false;
@@ -657,19 +659,14 @@ export class PrometheusDatasource
     if (queries && queries.length) {
       expandedQueries = queries.map((query) => {
         const interpolatedQuery = this.templateSrv.replace(query.expr, scopedVars, this.interpolateQueryExpr);
-        const replacedInterpolatedQuery = config.featureToggles.promQLScope
-          ? interpolatedQuery
-          : this.templateSrv.replace(
-              this.enhanceExprWithAdHocFilters(filters, interpolatedQuery),
-              scopedVars,
-              this.interpolateQueryExpr
-            );
 
         const expandedQuery = {
           ...query,
           ...(config.featureToggles.promQLScope ? { adhocFilters: this.generateScopeFilters(filters) } : {}),
           datasource: this.getRef(),
-          expr: replacedInterpolatedQuery,
+          expr: config.featureToggles.promQLScope
+            ? interpolatedQuery
+            : this.enhanceExprWithAdHocFilters(filters, interpolatedQuery),
           interval: this.templateSrv.replace(query.interval, scopedVars),
         };
 
@@ -827,11 +824,7 @@ export class PrometheusDatasource
       return [];
     }
 
-    return filters.map((f) => ({
-      ...f,
-      value: this.templateSrv.replace(f.value, {}, this.interpolateQueryExpr),
-      operator: scopeFilterOperatorMap[f.operator],
-    }));
+    return filters.map((f) => ({ ...f, operator: scopeFilterOperatorMap[f.operator] }));
   }
 
   enhanceExprWithAdHocFilters(filters: AdHocVariableFilter[] | undefined, expr: string) {
@@ -872,21 +865,12 @@ export class PrometheusDatasource
     };
 
     // interpolate expression
-
-    // We need a first replace to evaluate variables before applying adhoc filters
-    // This is required for an expression like `metric > $VAR` where $VAR is a float to which we must not add adhoc filters
     const expr = this.templateSrv.replace(target.expr, variables, this.interpolateQueryExpr);
 
-    // Apply ad-hoc filters
-    // When ad-hoc filters are applied, we replace again the variables in case the ad-hoc filters also reference a variable
-    const exprWithAdhoc = config.featureToggles.promQLScope
-      ? expr
-      : this.templateSrv.replace(this.enhanceExprWithAdHocFilters(filters, expr), variables, this.interpolateQueryExpr);
-
     return {
       ...target,
       ...(config.featureToggles.promQLScope ? { adhocFilters: this.generateScopeFilters(filters) } : {}),
-      expr: exprWithAdhoc,
+      expr: config.featureToggles.promQLScope ? expr : this.enhanceExprWithAdHocFilters(filters, expr),
       interval: this.templateSrv.replace(target.interval, variables),
       legendFormat: this.templateSrv.replace(target.legendFormat, variables),
     };

packages/grafana-runtime/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/runtime",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana Runtime Library",
   "keywords": [
     "grafana",
@@ -37,11 +37,11 @@
     "postpack": "mv package.json.bak package.json"
   },
   "dependencies": {
-    "@grafana/data": "11.1.9",
-    "@grafana/e2e-selectors": "11.1.9",
+    "@grafana/data": "11.1.6",
+    "@grafana/e2e-selectors": "11.1.6",
     "@grafana/faro-web-sdk": "^1.3.6",
-    "@grafana/schema": "11.1.9",
-    "@grafana/ui": "11.1.9",
+    "@grafana/schema": "11.1.6",
+    "@grafana/ui": "11.1.6",
     "history": "4.10.1",
     "lodash": "4.17.21",
     "rxjs": "7.8.1",

packages/grafana-schema/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/schema",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana Schema Library",
   "keywords": [
     "typescript"

packages/grafana-schema/src/raw/composable/annotationslist/panelcfg/x/AnnotationsListPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   limit: number;

packages/grafana-schema/src/raw/composable/barchart/panelcfg/x/BarChartPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip, common.OptionsWithTextFormatting {
   /**

packages/grafana-schema/src/raw/composable/bargauge/panelcfg/x/BarGaugePanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends common.SingleStatBaseOptions {
   displayMode: common.BarGaugeDisplayMode;

packages/grafana-schema/src/raw/composable/candlestick/panelcfg/x/CandlestickPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export enum VizDisplayMode {
   Candles = 'candles',

packages/grafana-schema/src/raw/composable/canvas/panelcfg/x/CanvasPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export enum HorizontalConstraint {
   Center = 'center',

packages/grafana-schema/src/raw/composable/cloudwatch/dataquery/x/CloudWatchDataQuery_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface MetricStat {
   /**

packages/grafana-schema/src/raw/composable/dashboardlist/panelcfg/x/DashboardListPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   /**

packages/grafana-schema/src/raw/composable/datagrid/panelcfg/x/DatagridPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   selectedSeries: number;

packages/grafana-schema/src/raw/composable/debug/panelcfg/x/DebugPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export type UpdateConfig = {
   render: boolean,

packages/grafana-schema/src/raw/composable/elasticsearch/dataquery/x/ElasticsearchDataQuery_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export type BucketAggregation = (DateHistogram | Histogram | Terms | Filters | GeoHashGrid | Nested);
 

packages/grafana-schema/src/raw/composable/gauge/panelcfg/x/GaugePanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends common.SingleStatBaseOptions {
   minVizHeight: number;

packages/grafana-schema/src/raw/composable/geomap/panelcfg/x/GeomapPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   basemap: ui.MapLayerOptions;

packages/grafana-schema/src/raw/composable/heatmap/panelcfg/x/HeatmapPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 /**
  * Controls the color mode of the heatmap

packages/grafana-schema/src/raw/composable/histogram/panelcfg/x/HistogramPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends common.OptionsWithLegend, common.OptionsWithTooltip {
   /**

packages/grafana-schema/src/raw/composable/logs/panelcfg/x/LogsPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   dedupStrategy: common.LogsDedupStrategy;

packages/grafana-schema/src/raw/composable/loki/dataquery/x/LokiDataQuery_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export enum QueryEditorMode {
   Builder = 'builder',

packages/grafana-schema/src/raw/composable/news/panelcfg/x/NewsPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   /**

packages/grafana-schema/src/raw/composable/nodegraph/panelcfg/x/NodeGraphPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface ArcOption {
   /**

packages/grafana-schema/src/raw/composable/piechart/panelcfg/x/PieChartPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 /**
  * Select the pie chart display style.

packages/grafana-schema/src/raw/composable/stat/panelcfg/x/StatPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends common.SingleStatBaseOptions {
   colorMode: common.BigValueColorMode;

packages/grafana-schema/src/raw/composable/statetimeline/panelcfg/x/StateTimelinePanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**

packages/grafana-schema/src/raw/composable/statushistory/panelcfg/x/StatusHistoryPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends ui.OptionsWithLegend, ui.OptionsWithTooltip, ui.OptionsWithTimezones {
   /**

packages/grafana-schema/src/raw/composable/table/panelcfg/x/TablePanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as ui from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options {
   /**

packages/grafana-schema/src/raw/composable/text/panelcfg/x/TextPanelCfg_types.gen.ts

@@ -8,7 +8,7 @@
 //
 // Run 'make gen-cue' from repository root to regenerate.
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export enum TextMode {
   Code = 'code',

packages/grafana-schema/src/raw/composable/timeseries/panelcfg/x/TimeSeriesPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 export interface Options extends common.OptionsWithTimezones {
   legend: common.VizLegendOptions;

packages/grafana-schema/src/raw/composable/trend/panelcfg/x/TrendPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 /**
  * Identical to timeseries... except it does not have timezone settings

packages/grafana-schema/src/raw/composable/xychart/panelcfg/x/XYChartPanelCfg_types.gen.ts

@@ -10,7 +10,7 @@
 
 import * as common from '@grafana/schema';
 
-export const pluginVersion = "11.1.9";
+export const pluginVersion = "11.1.6";
 
 /**
  * Auto is "table" in the UI

packages/grafana-sql/package.json

@@ -3,7 +3,7 @@
   "license": "AGPL-3.0-only",
   "private": true,
   "name": "@grafana/sql",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "repository": {
     "type": "git",
     "url": "http://github.com/grafana/grafana.git",
@@ -15,11 +15,11 @@
   },
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@grafana/data": "11.1.9",
-    "@grafana/e2e-selectors": "11.1.9",
+    "@grafana/data": "11.1.6",
+    "@grafana/e2e-selectors": "11.1.6",
     "@grafana/experimental": "1.7.11",
-    "@grafana/runtime": "11.1.9",
-    "@grafana/ui": "11.1.9",
+    "@grafana/runtime": "11.1.6",
+    "@grafana/ui": "11.1.6",
     "@react-awesome-query-builder/ui": "6.5.2",
     "immutable": "4.3.6",
     "lodash": "4.17.21",

packages/grafana-ui/package.json

@@ -2,7 +2,7 @@
   "author": "Grafana Labs",
   "license": "Apache-2.0",
   "name": "@grafana/ui",
-  "version": "11.1.9",
+  "version": "11.1.6",
   "description": "Grafana Components Library",
   "keywords": [
     "grafana",
@@ -50,10 +50,10 @@
     "@emotion/css": "11.11.2",
     "@emotion/react": "11.11.4",
     "@floating-ui/react": "0.26.16",
-    "@grafana/data": "11.1.9",
-    "@grafana/e2e-selectors": "11.1.9",
+    "@grafana/data": "11.1.6",
+    "@grafana/e2e-selectors": "11.1.6",
     "@grafana/faro-web-sdk": "^1.3.6",
-    "@grafana/schema": "11.1.9",
+    "@grafana/schema": "11.1.6",
     "@leeoniya/ufuzzy": "1.0.14",
     "@monaco-editor/react": "4.6.0",
     "@popperjs/core": "2.11.8",

pkg/api/annotations.go

@@ -21,8 +21,6 @@ import (
 	"github.com/grafana/grafana/pkg/web"
 )
 
-const defaultAnnotationsLimit = 100
-
 // swagger:route GET /annotations annotations getAnnotations
 //
 // Find Annotations.
@@ -49,9 +47,6 @@ func (hs *HTTPServer) GetAnnotations(c *contextmodel.ReqContext) response.Respon
 		MatchAny:     c.QueryBool("matchAny"),
 		SignedInUser: c.SignedInUser,
 	}
-	if query.Limit == 0 {
-		query.Limit = defaultAnnotationsLimit
-	}
 
 	// When dashboard UID present in the request, we ignore dashboard ID
 	if query.DashboardUID != "" {

pkg/api/org_invite.go

@@ -200,20 +200,6 @@ func (hs *HTTPServer) inviteExistingUserToOrg(c *contextmodel.ReqContext, user *
 // 404: notFoundError
 // 500: internalServerError
 func (hs *HTTPServer) RevokeInvite(c *contextmodel.ReqContext) response.Response {
-	query := tempuser.GetTempUserByCodeQuery{Code: web.Params(c.Req)[":code"]}
-	queryResult, err := hs.tempUserService.GetTempUserByCode(c.Req.Context(), &query)
-	if err != nil {
-		if errors.Is(err, tempuser.ErrTempUserNotFound) {
-			return response.Error(http.StatusNotFound, "Invite not found", nil)
-		}
-		return response.Error(http.StatusInternalServerError, "Failed to get invite", err)
-	}
-
-	canRevoke := c.SignedInUser.GetOrgID() == queryResult.OrgID || c.SignedInUser.GetIsGrafanaAdmin()
-	if !canRevoke {
-		return response.Error(http.StatusForbidden, "Permission denied: not permitted to revoke invite", nil)
-	}
-
 	if ok, rsp := hs.updateTempUserStatus(c.Req.Context(), web.Params(c.Req)[":code"], tempuser.TmpUserRevoked); !ok {
 		return rsp
 	}

pkg/api/plugin_checks.go

@@ -28,13 +28,7 @@ func checkAppEnabled(pluginStore pluginstore.Store, pluginSettings pluginsetting
 		})
 		if err != nil {
 			if errors.Is(err, pluginsettings.ErrPluginSettingNotFound) {
-				// If the plugin is auto enabled, we don't want to return an error because auto enabling allows us
-				// to enable plugins that are not explicitly configured.
-				if p.AutoEnabled {
-					return
-				}
-
-				c.JsonApiErr(http.StatusNotFound, "Plugin setting not found", nil)
+				c.JsonApiErr(http.StatusNotFound, "Plugin not found", nil)
 				return
 			}
 			c.JsonApiErr(http.StatusInternalServerError, "Failed to get plugin settings", err)

pkg/api/plugin_checks_test.go

@@ -41,11 +41,6 @@ func TestHTTPServer_CheckEnabled(t *testing.T) {
 			pluginID:     "grafana-test-app_disabled",
 			expectedCode: 404,
 		},
-		{
-			name:         "should not set an error code if the plugin is auto enabled, without a saved plugin setting",
-			pluginID:     "grafana-test-app_autoEnabled",
-			expectedCode: 0,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -55,7 +50,6 @@ func TestHTTPServer_CheckEnabled(t *testing.T) {
 					{JSONData: plugins.JSONData{ID: "mysql"}},
 					{JSONData: plugins.JSONData{Type: plugins.TypeApp, ID: "grafana-test-app"}},
 					{JSONData: plugins.JSONData{Type: plugins.TypeApp, ID: "grafana-test-app_disabled"}},
-					{JSONData: plugins.JSONData{Type: plugins.TypeApp, ID: "grafana-test-app_autoEnabled", AutoEnabled: true}},
 				},
 			}
 			hs.PluginSettings = &pluginsettings.FakePluginSettings{Plugins: map[string]*pluginsettings.DTO{

pkg/apimachinery/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/apimachinery
 
-go 1.22.7
+go 1.21.10
 
 require (
 	k8s.io/apimachinery v0.29.3

pkg/apiserver/go.mod

@@ -1,6 +1,6 @@
 module github.com/grafana/grafana/pkg/apiserver
 
-go 1.22.7
+go 1.21.10
 
 require (
 	github.com/bwmarrin/snowflake v0.3.0

pkg/build/cmd.go

@@ -11,8 +11,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/urfave/cli/v2"
 )
 
 const (
@@ -32,12 +30,6 @@ func logError(message string, err error) int {
 	return 1
 }
 
-func RunCmdCLI(c *cli.Context) error {
-	os.Exit(RunCmd())
-
-	return nil
-}
-
 // RunCmd runs the build command and returns the exit code
 func RunCmd() int {
 	opts := BuildOptsFromFlags()

pkg/build/cmd/argcount_wrapper.go

@@ -2,6 +2,20 @@ package main
 
 import "github.com/urfave/cli/v2"
 
+// ArgCountWrapper will cause the action to fail if there were not exactly `num` args provided.
+func ArgCountWrapper(num int, action cli.ActionFunc) cli.ActionFunc {
+	return func(ctx *cli.Context) error {
+		if ctx.NArg() != num {
+			if err := cli.ShowSubcommandHelp(ctx); err != nil {
+				return cli.Exit(err.Error(), 1)
+			}
+			return cli.Exit("", 1)
+		}
+
+		return action(ctx)
+	}
+}
+
 // ArgCountWrapper will cause the action to fail if there were more than `num` args provided.
 func MaxArgCountWrapper(max int, action cli.ActionFunc) cli.ActionFunc {
 	return func(ctx *cli.Context) error {

pkg/build/cmd/buildbackend.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/compilers"
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/errutil"
+	"github.com/grafana/grafana/pkg/build/grafana"
+	"github.com/grafana/grafana/pkg/build/syncutil"
+)
+
+func BuildBackend(ctx *cli.Context) error {
+	metadata, err := config.GenerateMetadata(ctx)
+	if err != nil {
+		return err
+	}
+	version := metadata.GrafanaVersion
+
+	var (
+		edition = config.Edition(ctx.String("edition"))
+		cfg     = config.Config{
+			NumWorkers: ctx.Int("jobs"),
+		}
+	)
+
+	buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
+	if err != nil {
+		return fmt.Errorf("could not get version / package info for mode '%s': %w", metadata.ReleaseMode.Mode, err)
+	}
+
+	const grafanaDir = "."
+
+	log.Printf("Building Grafana back-end, version %q, %s edition, variants [%v]",
+		version, edition, buildConfig.Variants)
+
+	p := syncutil.NewWorkerPool(cfg.NumWorkers)
+	defer p.Close()
+
+	if err := compilers.Install(); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+
+	g, _ := errutil.GroupWithContext(ctx.Context)
+	for _, variant := range buildConfig.Variants {
+		variant := variant
+
+		opts := grafana.BuildVariantOpts{
+			Variant:    variant,
+			Edition:    edition,
+			Version:    version,
+			GrafanaDir: grafanaDir,
+		}
+
+		p.Schedule(g.Wrap(func() error {
+			return grafana.BuildVariant(ctx.Context, opts)
+		}))
+	}
+	if err := g.Wait(); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+
+	log.Println("Successfully built back-end binaries!")
+	return nil
+}

pkg/build/cmd/builddocker.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"log"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/docker"
+	"github.com/grafana/grafana/pkg/build/gcloud"
+)
+
+func BuildDocker(c *cli.Context) error {
+	if err := docker.Init(); err != nil {
+		return err
+	}
+
+	metadata, err := config.GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	useUbuntu := c.Bool("ubuntu")
+	buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
+	if err != nil {
+		return err
+	}
+
+	shouldSave := buildConfig.Docker.ShouldSave
+	if shouldSave {
+		if err := gcloud.ActivateServiceAccount(); err != nil {
+			return err
+		}
+	}
+
+	edition := config.Edition(c.String("edition"))
+
+	version := metadata.GrafanaVersion
+
+	log.Printf("Building Docker images, version %s, %s edition, Ubuntu based: %v...", version, edition,
+		useUbuntu)
+
+	for _, arch := range buildConfig.Docker.Architectures {
+		if _, err := docker.BuildImage(version, arch, ".", useUbuntu, shouldSave, edition, metadata.ReleaseMode.Mode); err != nil {
+			return cli.Exit(err.Error(), 1)
+		}
+	}
+
+	log.Println("Successfully built Docker images!")
+	return nil
+}

pkg/build/cmd/buildfrontend.go

@@ -0,0 +1,39 @@
+package main
+
+import (
+	"log"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/errutil"
+	"github.com/grafana/grafana/pkg/build/frontend"
+	"github.com/grafana/grafana/pkg/build/syncutil"
+)
+
+func BuildFrontend(c *cli.Context) error {
+	metadata, err := config.GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	cfg, mode, err := frontend.GetConfig(c, metadata)
+	if err != nil {
+		return err
+	}
+
+	p := syncutil.NewWorkerPool(cfg.NumWorkers)
+	defer p.Close()
+
+	g, _ := errutil.GroupWithContext(c.Context)
+	if err := frontend.Build(mode, frontend.GrafanaDir, p, g); err != nil {
+		return err
+	}
+	if err := g.Wait(); err != nil {
+		return err
+	}
+
+	log.Println("Successfully built Grafana front-end!")
+
+	return nil
+}

pkg/build/cmd/buildfrontendpackages.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"log"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/errutil"
+	"github.com/grafana/grafana/pkg/build/frontend"
+	"github.com/grafana/grafana/pkg/build/syncutil"
+	"github.com/urfave/cli/v2"
+)
+
+func BuildFrontendPackages(c *cli.Context) error {
+	metadata, err := config.GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	cfg, mode, err := frontend.GetConfig(c, metadata)
+	if err != nil {
+		return err
+	}
+
+	p := syncutil.NewWorkerPool(cfg.NumWorkers)
+	defer p.Close()
+
+	g, _ := errutil.GroupWithContext(c.Context)
+	if err := frontend.BuildFrontendPackages(cfg.PackageVersion, mode, frontend.GrafanaDir, p, g); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+	if err := g.Wait(); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+
+	log.Println("Successfully built Grafana front-end packages!")
+
+	return nil
+}

pkg/build/cmd/buildinternalplugins.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	"context"
+	"log"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/config"
+	"github.com/grafana/grafana/pkg/build/errutil"
+	"github.com/grafana/grafana/pkg/build/plugins"
+	"github.com/grafana/grafana/pkg/build/syncutil"
+)
+
+func BuildInternalPlugins(c *cli.Context) error {
+	cfg := config.Config{
+		NumWorkers: c.Int("jobs"),
+	}
+
+	const grafanaDir = "."
+	metadata, err := config.GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+	buildConfig, err := config.GetBuildConfig(metadata.ReleaseMode.Mode)
+	if err != nil {
+		return err
+	}
+
+	log.Println("Building internal Grafana plug-ins...")
+
+	ctx := context.Background()
+
+	p := syncutil.NewWorkerPool(cfg.NumWorkers)
+	defer p.Close()
+
+	var g *errutil.Group
+	g, ctx = errutil.GroupWithContext(ctx)
+	if err := plugins.Build(ctx, grafanaDir, p, g, buildConfig); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+	if err := g.Wait(); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+
+	if err := plugins.Download(ctx, grafanaDir, p); err != nil {
+		return cli.Exit(err.Error(), 1)
+	}
+
+	log.Println("Successfully built Grafana plug-ins!")
+
+	return nil
+}

pkg/build/cmd/enterprisecheck.go

@@ -0,0 +1,133 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"os"
+	"strconv"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/env"
+	"github.com/grafana/grafana/pkg/build/git"
+)
+
+// checkOpts are options used to create a new GitHub check for the enterprise downstream test.
+type checkOpts struct {
+	SHA    string
+	URL    string
+	Branch string
+	PR     int
+}
+
+func getCheckOpts(args []string) (*checkOpts, error) {
+	branch, ok := env.Lookup("DRONE_SOURCE_BRANCH", args)
+	if !ok {
+		return nil, cli.Exit("Unable to retrieve build source branch", 1)
+	}
+
+	var (
+		rgx     = git.PRCheckRegexp()
+		matches = rgx.FindStringSubmatch(branch)
+	)
+
+	sha, ok := env.Lookup("SOURCE_COMMIT", args)
+	if !ok {
+		if matches == nil || len(matches) <= 1 {
+			return nil, cli.Exit("Unable to retrieve source commit", 1)
+		}
+		sha = matches[2]
+	}
+
+	url, ok := env.Lookup("DRONE_BUILD_LINK", args)
+	if !ok {
+		return nil, cli.Exit(`missing environment variable "DRONE_BUILD_LINK"`, 1)
+	}
+
+	prStr, ok := env.Lookup("OSS_PULL_REQUEST", args)
+	if !ok {
+		if matches == nil || len(matches) <= 1 {
+			return nil, cli.Exit("Unable to retrieve PR number", 1)
+		}
+
+		prStr = matches[1]
+	}
+
+	pr, err := strconv.Atoi(prStr)
+	if err != nil {
+		return nil, err
+	}
+
+	return &checkOpts{
+		Branch: branch,
+		PR:     pr,
+		SHA:    sha,
+		URL:    url,
+	}, nil
+}
+
+// EnterpriseCheckBegin creates the GitHub check and signals the beginning of the downstream build / test process
+func EnterpriseCheckBegin(c *cli.Context) error {
+	var (
+		ctx    = c.Context
+		client = git.NewGitHubClient(ctx, c.String("github-token"))
+	)
+
+	opts, err := getCheckOpts(os.Environ())
+	if err != nil {
+		return err
+	}
+
+	if _, err = git.CreateEnterpriseStatus(ctx, client.Repositories, opts.SHA, opts.URL, "pending"); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func EnterpriseCheckSuccess(c *cli.Context) error {
+	return completeEnterpriseCheck(c, true)
+}
+
+func EnterpriseCheckFail(c *cli.Context) error {
+	return completeEnterpriseCheck(c, false)
+}
+
+func completeEnterpriseCheck(c *cli.Context, success bool) error {
+	var (
+		ctx    = c.Context
+		client = git.NewGitHubClient(ctx, c.String("github-token"))
+	)
+
+	// Update the pull request labels
+	opts, err := getCheckOpts(os.Environ())
+	if err != nil {
+		return err
+	}
+
+	status := "failure"
+	if success {
+		status = "success"
+	}
+
+	// Update the GitHub check...
+	if _, err := git.CreateEnterpriseStatus(ctx, client.Repositories, opts.SHA, opts.URL, status); err != nil {
+		return err
+	}
+
+	// Delete branch if needed
+	log.Printf("Checking branch '%s' against '%s'", git.PRCheckRegexp().String(), opts.Branch)
+	if git.PRCheckRegexp().MatchString(opts.Branch) {
+		log.Println("Deleting branch", opts.Branch)
+		if err := git.DeleteEnterpriseBranch(ctx, client.Git, opts.Branch); err != nil {
+			return fmt.Errorf("error deleting enterprise branch: %w", err)
+		}
+	}
+
+	label := "enterprise-failed"
+	if success {
+		label = "enterprise-ok"
+	}
+
+	return git.AddLabelToPR(ctx, client.Issues, opts.PR, label)
+}

pkg/build/cmd/enterprisecheck_test.go

@@ -0,0 +1,69 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetCheckOpts(t *testing.T) {
+	t.Run("it should return the checkOpts if the correct environment variables are set", func(t *testing.T) {
+		args := []string{
+			"SOURCE_COMMIT=1234",
+			"DRONE_SOURCE_BRANCH=test",
+			"DRONE_BUILD_LINK=http://example.com",
+			"OSS_PULL_REQUEST=1",
+		}
+
+		opts, err := getCheckOpts(args)
+		require.NoError(t, err)
+		require.Equal(t, opts.SHA, "1234")
+		require.Equal(t, opts.URL, "http://example.com")
+	})
+	t.Run("it should return an error if SOURCE_COMMIT is not set", func(t *testing.T) {
+		args := []string{
+			"DRONE_BUILD_LINK=http://example.com",
+			"DRONE_SOURCE_BRANCH=test",
+			"DRONE_BUILD_LINK=http://example.com",
+			"OSS_PULL_REQUEST=1",
+		}
+
+		opts, err := getCheckOpts(args)
+		require.Nil(t, opts)
+		require.Error(t, err)
+	})
+	t.Run("it should return an error if DRONE_BUILD_LINK is not set", func(t *testing.T) {
+		args := []string{
+			"SOURCE_COMMIT=1234",
+			"DRONE_SOURCE_BRANCH=test",
+			"OSS_PULL_REQUEST=1",
+		}
+
+		opts, err := getCheckOpts(args)
+		require.Nil(t, opts)
+		require.Error(t, err)
+	})
+	t.Run("it should return an error if OSS_PULL_REQUEST is not set", func(t *testing.T) {
+		args := []string{
+			"SOURCE_COMMIT=1234",
+			"DRONE_SOURCE_BRANCH=test",
+			"DRONE_BUILD_LINK=http://example.com",
+		}
+
+		opts, err := getCheckOpts(args)
+		require.Nil(t, opts)
+		require.Error(t, err)
+	})
+	t.Run("it should return an error if OSS_PULL_REQUEST is not an integer", func(t *testing.T) {
+		args := []string{
+			"SOURCE_COMMIT=1234",
+			"DRONE_SOURCE_BRANCH=test",
+			"DRONE_BUILD_LINK=http://example.com",
+			"OSS_PULL_REQUEST=http://example.com",
+		}
+
+		opts, err := getCheckOpts(args)
+		require.Nil(t, opts)
+		require.Error(t, err)
+	})
+}

pkg/build/cmd/exportversion.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/urfave/cli/v2"
+
+	"github.com/grafana/grafana/pkg/build/config"
+)
+
+func ExportVersion(c *cli.Context) error {
+	metadata, err := config.GenerateMetadata(c)
+	if err != nil {
+		return err
+	}
+
+	const distDir = "dist"
+	if err := os.RemoveAll(distDir); err != nil {
+		return err
+	}
+	if err := os.Mkdir(distDir, 0750); err != nil {
+		return err
+	}
+
+	// nolint:gosec
+	if err := os.WriteFile(filepath.Join(distDir, "grafana.version"), []byte(metadata.GrafanaVersion), 0664); err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/build/cmd/fetchimages.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 	"os/exec"
-	"path/filepath"
+	"strings"
 
 	"github.com/urfave/cli/v2"
 
@@ -18,25 +18,6 @@ const (
 	ubuntu = "ubuntu"
 )
 
-// GetImageFiles returns the list of image (.img, but should be .tar because they are tar archives) files that are
-// created in the 'tag' process and stored in the prerelease bucket, waiting to be released.
-func GetImageFiles(grafana string, version string, architectures []config.Architecture) []string {
-	bases := []string{alpine, ubuntu}
-	images := []string{}
-	for _, base := range bases {
-		for _, arch := range architectures {
-			image := fmt.Sprintf("%s-%s-%s.img", grafana, version, arch)
-			if base == "ubuntu" {
-				image = fmt.Sprintf("%s-%s-ubuntu-%s.img", grafana, version, arch)
-			}
-
-			images = append(images, image)
-		}
-	}
-
-	return images
-}
-
 func FetchImages(c *cli.Context) error {
 	if c.NArg() > 0 {
 		if err := cli.ShowSubcommandHelp(c); err != nil {
@@ -63,65 +44,74 @@ func FetchImages(c *cli.Context) error {
 		Tag:          metadata.GrafanaVersion,
 	}
 
-	grafana := "grafana"
-	if cfg.Edition == "enterprise" {
-		grafana = "grafana-enterprise"
-	}
-	if cfg.Edition == "enterprise2" {
-		grafana = "grafana-enterprise2"
-	}
-	if cfg.Edition == "grafana" || cfg.Edition == "oss" {
-		grafana = "grafana-oss"
-	}
+	edition := fmt.Sprintf("-%s", cfg.Edition)
 
-	baseURL := fmt.Sprintf("gs://%s/%s/", cfg.Bucket, cfg.Tag)
-	images := GetImageFiles(grafana, cfg.Tag, cfg.Archs)
-
-	log.Printf("Fetching images [%v]", images)
-
-	if err := gcloud.ActivateServiceAccount(); err != nil {
+	err = gcloud.ActivateServiceAccount()
+	if err != nil {
 		return err
 	}
-	if err := DownloadImages(baseURL, images, "."); err != nil {
+
+	var basesStr []string
+	for _, base := range cfg.Distribution {
+		switch base {
+		case alpine:
+			basesStr = append(basesStr, "")
+		case ubuntu:
+			basesStr = append(basesStr, "-ubuntu")
+		default:
+			return fmt.Errorf("unrecognized base %q", base)
+		}
+	}
+
+	err = downloadFromGCS(cfg, basesStr, edition)
+	if err != nil {
 		return err
 	}
-	if err := LoadImages(images, "."); err != nil {
+
+	err = loadImages(cfg, basesStr, edition)
+	if err != nil {
 		return err
 	}
 	return nil
 }
 
-// LoadImages uses the `docker load -i` command to load the image tar file into the docker daemon so that it can be
-// tagged and pushed.
-func LoadImages(images []string, source string) error {
-	p := filepath.Clean(source)
-	for _, image := range images {
-		image := filepath.Join(p, image)
-		log.Println("Loading image", image)
-		//nolint:gosec
-		cmd := exec.Command("docker", "load", "-i", image)
-		cmd.Dir = "."
-		out, err := cmd.CombinedOutput()
-		if err != nil {
-			log.Printf("out: %s\n", out)
-			return fmt.Errorf("error loading image: %q", err)
+func loadImages(cfg docker.Config, basesStr []string, edition string) error {
+	log.Println("Loading fetched image files to local docker registry...")
+	log.Printf("Number of images to be loaded: %d\n", len(basesStr)*len(cfg.Archs))
+	for _, base := range basesStr {
+		for _, arch := range cfg.Archs {
+			imageFilename := fmt.Sprintf("grafana%s-%s%s-%s.img", edition, cfg.Tag, base, arch)
+			log.Printf("image file name: %s\n", imageFilename)
+			//nolint:gosec
+			cmd := exec.Command("docker", "load", "-i", imageFilename)
+			cmd.Dir = "."
+			out, err := cmd.CombinedOutput()
+			if err != nil {
+				log.Printf("out: %s\n", out)
+				return fmt.Errorf("error loading image: %q", err)
+			}
+			log.Printf("Successfully loaded %s!\n %s\n", fmt.Sprintf("grafana%s-%s%s-%s", edition, cfg.Tag, base, arch), out)
 		}
-		log.Println("Loaded image", image)
 	}
 	log.Println("Images successfully loaded!")
 	return nil
 }
 
-func DownloadImages(baseURL string, images []string, destination string) error {
-	for _, image := range images {
-		p := baseURL + image
-		log.Println("Downloading image", p)
-		//nolint:gosec
-		cmd := exec.Command("gsutil", "-m", "cp", "-r", p, destination)
-		out, err := cmd.CombinedOutput()
-		if err != nil {
-			return fmt.Errorf("failed to download: %w\n%s", err, out)
+func downloadFromGCS(cfg docker.Config, basesStr []string, edition string) error {
+	log.Printf("Downloading Docker images from GCS bucket: %s\n", cfg.Bucket)
+
+	for _, base := range basesStr {
+		for _, arch := range cfg.Archs {
+			src := fmt.Sprintf("gs://%s/%s/grafana%s-%s%s-%s.img", cfg.Bucket, cfg.Tag, edition, cfg.Tag, base, arch)
+			args := strings.Split(fmt.Sprintf("-m cp -r %s .", src), " ")
+			//nolint:gosec
+			cmd := exec.Command("gsutil", args...)
+			out, err := cmd.CombinedOutput()
+			if err != nil {
+				return fmt.Errorf("failed to download: %w\n%s", err, out)
+			}
 		}
 	}
+	log.Printf("Successfully fetched image files from %s bucket!\n", cfg.Bucket)
 	return nil
 }