[v10.2.x] CI: post changelog to forum in release-comms (#90753 )

CI: post changelog to forum in release-comms (#90742) * post changelog to forum in post-release workflow (cherry picked from commit 9a3672c2bb) Co-authored-by: Kevin Minehart <5140827+kminehart@users.noreply.github.com>
[v10.2.x] CI: For every release PR created, also push a changelog PR to main (#90700 )
2024-07-22 18:19:18 +03:00 · 2024-07-20 01:09:36 +03:00 · 2024-07-19 21:43:28 +02:00 · 2024-07-18 12:41:36 -05:00 · 2024-07-15 11:02:49 -06:00 · 2024-07-10 15:49:53 -05:00
3345 changed files with 189213 additions and 107136 deletions
--- a/.betterer.results
+++ b/.betterer.results
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -2,7 +2,12 @@
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
-GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
+ifeq ($(OS),Windows_NT)
+	PATHSEP := $(if $(COMSPEC),;,:)
+	GOBIN  ?= $(firstword $(subst $(PATHSEP), ,$(subst \,/,${GOPATH})))/bin
+else
+	GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
+endif
 GO     ?= $(shell which go)

 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
--- a/.drone.star
+++ b/.drone.star
@@ -19,7 +19,6 @@ load(
 )
 load(
    "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_build_container_image_pipeline",
    "publish_ci_windows_test_image_pipeline",
 )
 load(
@@ -51,7 +50,6 @@ def main(_ctx):
        }, "oss", "testing")] +
        integration_test_pipelines() +
        publish_ci_windows_test_image_pipeline() +
-        publish_ci_build_container_image_pipeline() +
        cronjobs() +
        secrets()
    )
--- a/.drone.yml
+++ b/.drone.yml
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -12,9 +12,9 @@
 # This should make it easy to add new rules without breaking existing ones.

 # Documentation
-/.changelog-archive @grafana/grafana-delivery
+/.changelog-archive @grafana/grafana-release-guild
 /.codespellignore @grafana/docs-tooling
-/CHANGELOG.md @grafana/grafana-delivery
+/CHANGELOG.md @grafana/grafana-release-guild
 /CODE_OF_CONDUCT.md @grafana/grafana-community-support
 /CONTRIBUTING.md @grafana/grafana-community-support
 /GOVERNANCE.md @RichiH
@@ -38,7 +38,7 @@
 # Documentation sources might have different owners.
 /docs/                                                                       @grafana/docs-tooling
 /docs/sources/                                                               @Eve832
-/docs/sources/administration/                                                @Eve832 @GrafanaWriter
+/docs/sources/administration/                                                @jdbaldry
 /docs/sources/alerting/                                                      @brendamuir
 /docs/sources/dashboards/                                                    @imatwawana
 /docs/sources/datasources/                                                   @lwandz13
@@ -48,6 +48,7 @@
 /docs/sources/introduction/                                                  @chri2547
 /docs/sources/old-alerting/                                                  @brendamuir
 /docs/sources/panels-visualizations/                                         @imatwawana
+/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md  @imatwawana @baldm0mma
 /docs/sources/release-notes/                                                 @Eve832 @GrafanaWriter
 /docs/sources/setup-grafana/                                                 @chri2547
 /docs/sources/upgrade-guide/                                                 @imatwawana
@@ -57,6 +58,8 @@
 # Backend code
 /go.mod @grafana/backend-platform
 /go.sum @grafana/backend-platform
+/go.work @grafana/grafana-app-platform-squad
+/go.work.sum @grafana/grafana-app-platform-squad
 /.bingo/ @grafana/backend-platform
 /pkg/README.md @grafana/backend-platform
 /pkg/ruleguard.rules.go @grafana/backend-platform
@@ -64,13 +67,15 @@
 /.golangci.toml @grafana/backend-platform
 /build.go @grafana/backend-platform
 /scripts/modowners/ @grafana/backend-platform
+/hack/ @grafana/grafana-app-platform-squad

 /pkg/api/ @grafana/backend-platform
 /pkg/apis/ @grafana/grafana-app-platform-squad
 /pkg/bus/ @grafana/backend-platform
 /pkg/cmd/ @grafana/backend-platform
-/pkg/components/apikeygen/ @grafana/grafana-authnz-team
-/pkg/components/satokengen/ @grafana/grafana-authnz-team
+/pkg/cmd/grafana/apiserver @grafana/grafana-app-platform-squad
+/pkg/components/apikeygen/ @grafana/identity-access-team
+/pkg/components/satokengen/ @grafana/identity-access-team
 /pkg/components/dashdiffs/ @grafana/backend-platform
 /pkg/components/imguploader/ @grafana/backend-platform
 /pkg/components/loki/ @grafana/backend-platform
@@ -97,13 +102,12 @@
 /pkg/models/ @grafana/backend-platform
 /pkg/server/ @grafana/backend-platform
 /pkg/services/annotations/ @grafana/backend-platform
-/pkg/services/apikey/ @grafana/grafana-authnz-team
+/pkg/services/apikey/ @grafana/identity-access-team
 /pkg/services/cleanup/ @grafana/backend-platform
 /pkg/services/contexthandler/ @grafana/backend-platform
 /pkg/services/correlations/ @grafana/explore-squad
 /pkg/services/dashboardimport/ @grafana/backend-platform
 /pkg/services/dashboards/ @grafana/backend-platform
-/pkg/services/dashboardsnapshots/ @grafana/sharing-squad
 /pkg/services/dashboardversion/ @grafana/backend-platform
 /pkg/services/encryption/ @grafana/backend-platform
 /pkg/services/folder/ @grafana/backend-platform
@@ -115,10 +119,8 @@
 /pkg/services/notifications/ @grafana/backend-platform
 /pkg/services/org/ @grafana/backend-platform
 /pkg/services/playlist/ @grafana/grafana-app-platform-squad
-/pkg/services/plugindashboards/ @grafana/backend-platform
 /pkg/services/preference/ @grafana/backend-platform
 /pkg/services/provisioning/ @grafana/backend-platform
-/pkg/services/publicdashboards/ @grafana/sharing-squad
 /pkg/services/query/ @grafana/backend-platform
 /pkg/services/queryhistory/ @grafana/backend-platform
 /pkg/services/quota/ @grafana/backend-platform
@@ -129,16 +131,18 @@
 /pkg/services/secrets/ @grafana/backend-platform
 /pkg/services/shorturls/ @grafana/backend-platform
 /pkg/services/sqlstore/ @grafana/backend-platform
+/pkg/services/ssosettings/ @grafana/identity-access-team
 /pkg/services/star/ @grafana/backend-platform
 /pkg/services/stats/ @grafana/backend-platform
 /pkg/services/tag/ @grafana/backend-platform
-/pkg/services/team/ @grafana/grafana-authnz-team
+/pkg/services/team/ @grafana/identity-access-team
 /pkg/services/temp_user/ @grafana/backend-platform
 /pkg/services/updatechecker/ @grafana/backend-platform
-/pkg/services/user/ @grafana/grafana-authnz-team
+/pkg/services/user/ @grafana/identity-access-team
 /pkg/services/validations/ @grafana/backend-platform
 /pkg/setting/ @grafana/backend-platform
 /pkg/tests/ @grafana/backend-platform
+/pkg/tests/apis/ @grafana/grafana-app-platform-squad
 /pkg/tests/api/correlations/ @grafana/explore-squad
 /pkg/tsdb/grafanads/ @grafana/backend-platform
 /pkg/tsdb/intervalv2/ @grafana/backend-platform
@@ -149,7 +153,6 @@
 /pkg/util/ @grafana/backend-platform
 /pkg/web/ @grafana/backend-platform

-/pkg/services/grpcserver/ @grafana/backend-platform
 /pkg/infra/kvstore/ @grafana/backend-platform
 /pkg/infra/fs/ @grafana/backend-platform
 /pkg/infra/x/ @grafana/backend-platform
@@ -157,7 +160,7 @@

 # devenv
 # Backend code, developers environment
-/devenv/docker/blocks/auth/ @grafana/grafana-authnz-team
+/devenv/docker/blocks/auth/ @grafana/identity-access-team

 # Logs code, developers environment
 /devenv/docker/blocks/loki* @grafana/observability-logs
@@ -230,15 +233,15 @@


 # Continuous Integration
-.drone.yml @grafana/grafana-delivery
-.drone.star @grafana/grafana-delivery
-/scripts/drone/ @grafana/grafana-delivery
-/pkg/build/ @grafana/grafana-delivery
-/.dockerignore @grafana/grafana-delivery
-/Dockerfile @grafana/grafana-delivery
-/Makefile @grafana/grafana-delivery
-/scripts/build/ @grafana/grafana-delivery
-/scripts/list-release-artifacts.sh @grafana/grafana-delivery
+.drone.yml @grafana/grafana-release-guild
+.drone.star @grafana/grafana-release-guild
+/scripts/drone/ @grafana/grafana-release-guild
+/pkg/build/ @grafana/grafana-release-guild
+/.dockerignore @grafana/grafana-release-guild
+/Dockerfile @grafana/grafana-release-guild
+/Makefile @grafana/grafana-release-guild
+/scripts/build/ @grafana/grafana-release-guild
+/scripts/list-release-artifacts.sh @grafana/grafana-release-guild

 # OSS Plugin Partnerships backend code
 /pkg/tsdb/cloudwatch/ @grafana/aws-datasources
@@ -255,10 +258,12 @@
 /pkg/tsdb/grafana-pyroscope-datasource/ @grafana/observability-traces-and-profiling
 /pkg/tsdb/parca/ @grafana/observability-traces-and-profiling

-# BI backend code
+# OSS Big Tent backend code
 /pkg/tsdb/mysql/ @grafana/oss-big-tent
-/pkg/tsdb/postgres/ @grafana/oss-big-tent
-/pkg/tsdb/mssql/ @grafana/grafana-bi-squad
+/pkg/tsdb/grafana-postgresql-datasource/ @grafana/oss-big-tent
+
+# Partner Datasources backend code
+/pkg/tsdb/mssql/ @grafana/partner-datasources

 # Database migrations
 /pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
@@ -272,6 +277,7 @@
 /pkg/util/converter/ @grafana/grafana-app-platform-squad
 /pkg/modules/ @grafana/grafana-app-platform-squad
 /pkg/kindsysreport/ @grafana/grafana-app-platform-squad
+/pkg/services/grpcserver/ @grafana/grafana-app-platform-squad

 # Alerting
 /pkg/services/ngalert/ @grafana/alerting-backend-product
@@ -293,7 +299,9 @@
 /pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
 /pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
 /pkg/tsdb/grafana-testdata-datasource/ @grafana/plugins-platform-backend
+/pkg/tsdb/Magefile.go @grafana/plugins-platform-backend
 /pkg/services/pluginsintegration/pluginsettings/ @grafana/plugins-platform-backend
+/pkg/services/plugindashboards/ @grafana/plugins-platform-backend

 # Backend code docs
 /contribute/backend/ @grafana/backend-platform
@@ -311,11 +319,9 @@
 /packages/grafana-ui/src/components/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/DateTimePickers/ @grafana/grafana-frontend-platform
 /packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/Table/SparklineCell.tsx @grafana/grafana-bi-squad @grafana/app-o11y-visualizations
 /packages/grafana-ui/src/components/Gauge/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/BarGauge/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/GraphNG/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/Graph/ @grafana/dataviz-squad
-/packages/grafana-ui/src/components/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/uPlot/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/DataLinks/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/ValuePicker/ @grafana/dataviz-squad
@@ -323,12 +329,17 @@
 /packages/grafana-ui/src/components/VizLegend/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizRepeater/ @grafana/dataviz-squad
 /packages/grafana-ui/src/components/VizTooltip/ @grafana/dataviz-squad
+/packages/grafana-ui/src/components/Sparkline/ @grafana/grafana-frontend-platform @grafana/app-o11y-visualizations
+/packages/grafana-ui/src/graveyard/Graph/ @grafana/dataviz-squad
+/packages/grafana-ui/src/graveyard/GraphNG/ @grafana/dataviz-squad
+/packages/grafana-ui/src/graveyard/TimeSeries/ @grafana/dataviz-squad
 /packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
 /packages/grafana-data/src/transformations/ @grafana/grafana-bi-squad
 /packages/grafana-data/src/**/*logs* @grafana/observability-logs
 /packages/grafana-schema/src/**/*tempo* @grafana/observability-traces-and-profiling
 /packages/grafana-flamegraph/ @grafana/observability-traces-and-profiling
 /plugins-bundled/ @grafana/plugins-platform-frontend
+/packages/grafana-plugin-configs/ @grafana/plugins-platform-frontend


 # root files, mostly frontend
@@ -366,11 +377,13 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/core/components/TimePicker/ @grafana/grafana-frontend-platform
 /public/app/core/components/Layers/ @grafana/dataviz-squad
 /public/app/core/components/TraceToLogs @grafana/observability-traces-and-profiling
+/public/app/core/components/GraphNG/ @grafana/dataviz-squad
+/public/app/core/components/TimeSeries/ @grafana/dataviz-squad
 /public/app/features/all.ts @grafana/grafana-frontend-platform
-/public/app/features/admin/ @grafana/grafana-authnz-team
-/public/app/features/auth-config/ @grafana/grafana-authnz-team
+/public/app/features/admin/ @grafana/identity-access-team
+/public/app/features/auth-config/ @grafana/identity-access-team
 /public/app/features/annotations/ @grafana/grafana-frontend-platform
-/public/app/features/api-keys/ @grafana/grafana-authnz-team
+/public/app/features/api-keys/ @grafana/identity-access-team
 /public/app/features/canvas/ @grafana/dataviz-squad
 /public/app/features/geo/ @grafana/dataviz-squad
 /public/app/features/visualization/data-hover/ @grafana/dataviz-squad
@@ -405,12 +418,14 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/features/scenes/ @grafana/dashboards-squad
 /public/app/features/browse-dashboards/ @grafana/grafana-frontend-platform
 /public/app/features/search/ @grafana/grafana-frontend-platform
-/public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
+/public/app/features/serviceaccounts/ @grafana/identity-access-team
 /public/app/features/storage/ @grafana/grafana-app-platform-squad
-/public/app/features/teams/ @grafana/grafana-authnz-team
+/public/app/features/teams/ @grafana/identity-access-team
 /public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/transformers/ @grafana/dataviz-squad
-/public/app/features/users/ @grafana/grafana-authnz-team
+/public/app/features/trails/ @torkelo
+/public/app/features/transformers/ @grafana/grafana-bi-squad
+/public/app/features/transformers/timeSeriesTable/ @grafana/grafana-bi-squad @grafana/app-o11y-visualizations
+/public/app/features/users/ @grafana/identity-access-team
 /public/app/features/variables/ @grafana/dashboards-squad
 /public/app/plugins/panel/alertGroups/ @grafana/alerting-frontend
 /public/app/plugins/panel/alertlist/ @grafana/alerting-frontend
@@ -426,13 +441,14 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/app/plugins/panel/heatmap/ @grafana/dataviz-squad
 /public/app/plugins/panel/histogram/ @grafana/dataviz-squad
 /public/app/plugins/panel/logs/ @grafana/observability-logs
-/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
+/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling @grafana/app-o11y-visualizations
 /public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
 /public/app/plugins/panel/piechart/ @grafana/dataviz-squad
 /public/app/plugins/panel/state-timeline/ @grafana/dataviz-squad
 /public/app/plugins/panel/status-history/ @grafana/dataviz-squad
 /public/app/plugins/panel/table/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/table/cells/SparklineCellOptionsEditor.tsx @grafana/grafana-bi-squad @grafana/app-o11y-visualizations
 /public/app/plugins/panel/table-old/ @grafana/grafana-bi-squad
 /public/app/plugins/panel/timeseries/ @grafana/dataviz-squad
 /public/app/plugins/panel/trend/ @grafana/dataviz-squad
@@ -461,6 +477,7 @@ cypress.config.js @grafana/grafana-frontend-platform
 /public/test/ @grafana/grafana-frontend-platform
 /public/test/helpers/alertingRuleEditor.tsx @grafana/alerting-frontend
 /public/views/ @grafana/grafana-frontend-platform
+/public/views/swagger.html @grafana/backend-platform

 /public/app/features/explore/Logs/ @grafana/observability-logs

@@ -484,31 +501,32 @@ cypress.config.js @grafana/grafana-frontend-platform



-/scripts/benchmark-access-control.sh @grafana/grafana-authnz-team
+/scripts/benchmark-access-control.sh @grafana/identity-access-team
 /scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
-/scripts/ci-* @grafana/grafana-delivery
-/scripts/circle-* @grafana/grafana-delivery
-/scripts/publish-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
-/scripts/validate-npm-packages.sh @grafana/grafana-delivery @grafana/plugins-platform-frontend
+/scripts/ci-* @grafana/grafana-release-guild
+/scripts/circle-* @grafana/grafana-release-guild
+/scripts/publish-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
+/scripts/validate-npm-packages.sh @grafana/grafana-release-guild @grafana/plugins-platform-frontend
 /scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
 /scripts/cli/ @grafana/grafana-frontend-platform
 /scripts/clean-git-or-error.sh @grafana/grafana-as-code
 /scripts/grafana-server/ @grafana/grafana-frontend-platform
-/scripts/helpers/ @grafana/grafana-delivery
+/scripts/helpers/ @grafana/grafana-release-guild
 /scripts/import_many_dashboards.sh @torkelo
 /scripts/mixin-check.sh @bergquist
 /scripts/openapi3/ @grafana/grafana-operator-experience-squad
 /scripts/prepare-packagejson.js @grafana/frontend-ops
 /scripts/protobuf-check.sh @grafana/plugins-platform-backend
 /scripts/stripnulls.sh @grafana/grafana-as-code
-/scripts/tag_release.sh @grafana/grafana-delivery
-/scripts/trigger_docker_build.sh @grafana/grafana-delivery
-/scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
-/scripts/trigger_windows_build.sh @grafana/grafana-delivery
+/scripts/tag_release.sh @grafana/grafana-release-guild
+/scripts/trigger_docker_build.sh @grafana/grafana-release-guild
+/scripts/trigger_grafana_packer.sh @grafana/grafana-release-guild
+/scripts/trigger_windows_build.sh @grafana/grafana-release-guild
 /scripts/cleanup-husky.sh @grafana/frontend-ops
-/scripts/verify-repo-update/ @grafana/grafana-delivery
+/scripts/verify-repo-update/ @grafana/grafana-release-guild
 scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/grafana-frontend-platform

+/scripts/docs/generate-transformations.ts @grafana/grafana-bi-squad
 /scripts/webpack/ @grafana/frontend-ops
 /scripts/generate-a11y-report.sh @grafana/grafana-frontend-platform
 .pa11yci.conf.js @grafana/grafana-frontend-platform
@@ -537,7 +555,7 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 /public/app/plugins/datasource/mssql/ @grafana/grafana-bi-squad
 /public/app/plugins/datasource/mysql/ @grafana/oss-big-tent
 /public/app/plugins/datasource/opentsdb/ @grafana/observability-metrics
-/public/app/plugins/datasource/postgres/ @grafana/oss-big-tent
+/public/app/plugins/datasource/grafana-postgresql-datasource/ @grafana/oss-big-tent
 /public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
 /public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-datasources
 /public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling
@@ -546,6 +564,14 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 /public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling
 /public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad

+# Grafana Sharing Squad
+/public/app/features/dashboard/components/ShareModal/ @grafana/sharing-squad
+/public/app/features/manage-dashboards/components/PublicDashboardListTable/ @grafana/sharing-squad
+/public/app/features/dashboard/containers/PublicDashboardPage.tsx @grafana/sharing-squad
+/public/app/features/manage-dashboards/components/SnapshotListTable.tsx @grafana/sharing-squad
+/pkg/services/dashboardsnapshots/ @grafana/sharing-squad
+/pkg/services/publicdashboards/ @grafana/sharing-squad
+
 # SSE - Server Side Expressions
 /pkg/expr/ @grafana/observability-metrics

@@ -553,25 +579,25 @@ scripts/generate-icon-bundle.js @grafana/plugins-platform-frontend @grafana/graf
 /grafana-mixin/ @grafana/hosted-grafana-team

 # Grafana authentication and authorization
-/pkg/login/ @grafana/grafana-authnz-team
-/pkg/services/accesscontrol/ @grafana/grafana-authnz-team
-/pkg/services/anonymous/ @grafana/grafana-authnz-team
-/pkg/services/auth/ @grafana/grafana-authnz-team
-/pkg/services/authn/ @grafana/grafana-authnz-team
-/pkg/services/signingkeys/ @grafana/grafana-authnz-team
-/pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
-/pkg/services/datasources/guardian/ @grafana/grafana-authnz-team
-/pkg/services/guardian/ @grafana/grafana-authnz-team
-/pkg/services/ldap/ @grafana/grafana-authnz-team
-/pkg/services/login/ @grafana/grafana-authnz-team
-/pkg/services/loginattempt/ @grafana/grafana-authnz-team
-/pkg/services/extsvcauth/ @grafana/grafana-authnz-team
-/pkg/services/oauthtoken/ @grafana/grafana-authnz-team
-/pkg/services/serviceaccounts/ @grafana/grafana-authnz-team
+/pkg/login/ @grafana/identity-access-team
+/pkg/services/accesscontrol/ @grafana/identity-access-team
+/pkg/services/anonymous/ @grafana/identity-access-team
+/pkg/services/auth/ @grafana/identity-access-team
+/pkg/services/authn/ @grafana/identity-access-team
+/pkg/services/signingkeys/ @grafana/identity-access-team
+/pkg/services/dashboards/accesscontrol.go @grafana/identity-access-team
+/pkg/services/datasources/guardian/ @grafana/identity-access-team
+/pkg/services/guardian/ @grafana/identity-access-team
+/pkg/services/ldap/ @grafana/identity-access-team
+/pkg/services/login/ @grafana/identity-access-team
+/pkg/services/loginattempt/ @grafana/identity-access-team
+/pkg/services/extsvcauth/ @grafana/identity-access-team
+/pkg/services/oauthtoken/ @grafana/identity-access-team
+/pkg/services/serviceaccounts/ @grafana/identity-access-team

 # Support bundles
-/public/app/features/support-bundles/ @grafana/grafana-authnz-team
-/pkg/services/supportbundles/ @grafana/grafana-authnz-team
+/public/app/features/support-bundles/ @grafana/identity-access-team
+/pkg/services/supportbundles/ @grafana/identity-access-team

 # Grafana Operator Experience Team
 /pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-operator-experience-squad
@@ -588,6 +614,7 @@ embed.go @grafana/grafana-as-code
 /pkg/kinds/ @grafana/grafana-as-code
 /pkg/cuectx/ @grafana/grafana-as-code
 /pkg/registry/ @grafana/grafana-as-code
+/pkg/registry/apis/ @grafana/grafana-app-platform-squad
 /pkg/codegen/ @grafana/grafana-as-code
 /pkg/kinds/*/*_gen.go @grafana/grafana-as-code
 /pkg/registry/corekind/ @grafana/grafana-as-code
@@ -608,38 +635,39 @@ embed.go @grafana/grafana-as-code
 /.github/renovate.json5 @grafana/frontend-ops
 /.github/teams.yml @armandgrillet
 /.github/workflows/alerting-swagger-gen.yml @grafana/alerting-backend-product
-/.github/workflows/auto-milestone.yml @grafana/grafana-delivery
-/.github/workflows/backport.yml @grafana/grafana-delivery
-/.github/workflows/bump-version.yml @grafana/grafana-delivery
-/.github/workflows/close-milestone.yml @grafana/grafana-delivery
+/.github/workflows/auto-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/backport.yml @grafana/grafana-release-guild
+/.github/workflows/bump-version.yml @grafana/grafana-release-guild
+/.github/workflows/close-milestone.yml @grafana/grafana-release-guild
+/.github/workflows/release-pr.yml @grafana/grafana-release-guild
+/.github/workflows/release-comms.yml @grafana/grafana-release-guild
 /.github/workflows/codeowners-validator.yml @tolzhabayev
 /.github/workflows/codeql-analysis.yml @DanCech
 /.github/workflows/commands.yml @torkelo
-/.github/workflows/community-release.yml @grafana/grafana-delivery
+/.github/workflows/community-release.yml @grafana/grafana-release-guild
 /.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
 /.github/workflows/doc-validator.yml @grafana/docs-tooling
 /.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
-/.github/workflows/github-release.yml @grafana/grafana-delivery
+/.github/workflows/github-release.yml @grafana/grafana-release-guild
 /.github/workflows/issue-labeled.yml @armandgrillet
 /.github/workflows/issue-opened.yml @grafana/grafana-community-support
 /.github/workflows/metrics-collector.yml @torkelo
 /.github/workflows/milestone.yml @marefr
-/.github/workflows/ox-code-coverage.yml @grafana/explore-squad
 /.github/workflows/pr-checks.yml @marefr
 /.github/workflows/pr-codeql-analysis-go.yml @DanCech
 /.github/workflows/pr-codeql-analysis-javascript.yml @DanCech
 /.github/workflows/pr-codeql-analysis-python.yml @DanCech
 /.github/workflows/pr-commands.yml @marefr
-/.github/workflows/pr-patch-check.yml @grafana/grafana-delivery
-/.github/workflows/sync-mirror.yml @grafana/grafana-delivery
+/.github/workflows/pr-patch-check.yml @grafana/grafana-release-guild
+/.github/workflows/sync-mirror.yml @grafana/grafana-release-guild
 /.github/workflows/publish-technical-documentation-next.yml @grafana/docs-tooling
 /.github/workflows/publish-technical-documentation-release.yml @grafana/docs-tooling
-/.github/workflows/remove-milestone.yml @grafana/grafana-delivery
+/.github/workflows/remove-milestone.yml @grafana/grafana-release-guild
 /.github/workflows/sbom-report.yml @grafana/security-team
 /.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
 /.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/grafana-delivery
-/.github/workflows/update-changelog.yml @grafana/grafana-delivery
+/.github/workflows/stale.yml @grafana/grafana-release-guild
+/.github/workflows/update-changelog.yml @grafana/grafana-release-guild
 /.github/workflows/update-make-docs.yml @grafana/docs-tooling
 /.github/workflows/snyk.yml @grafana/security-team
 /.github/workflows/scripts/kinds/verify-kinds.go @grafana/grafana-as-code
@@ -649,8 +677,9 @@ embed.go @grafana/grafana-as-code
 /.github/workflows/dashboards-issue-add-label.yml @grafana/dashboards-squad
 /.github/workflows/ephemeral-instances-pr-comment.yml @grafana/grafana-operator-experience-squad
 /.github/workflows/ephemeral-instances-pr-opened-closed.yml @grafana/grafana-operator-experience-squad
-/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-delivery
-
+/.github/workflows/create-security-patch-from-security-mirror.yml @grafana/grafana-release-guild
+/.github/workflows/core-plugins-build-and-release.yml @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/.github/workflows/i18n-crowdin-fix-files.yml @grafana/grafana-frontend-platform

 # Generated files not requiring owner approval
 /packages/grafana-data/src/types/featureToggles.gen.ts @grafanabot
@@ -662,9 +691,9 @@ embed.go @grafana/grafana-as-code
 # Conf
 /conf/defaults.ini @torkelo
 /conf/sample.ini @torkelo
-/conf/ldap.toml @grafana/grafana-authnz-team
-/conf/ldap_multiple.toml @grafana/grafana-authnz-team
-/conf/provisioning/access-control/ @grafana/grafana-authnz-team
+/conf/ldap.toml @grafana/identity-access-team
+/conf/ldap_multiple.toml @grafana/identity-access-team
+/conf/provisioning/access-control/ @grafana/identity-access-team
 /conf/provisioning/alerting/ @grafana/alerting-backend-product
 /conf/provisioning/dashboards/ @grafana/dashboards-squad
 /conf/provisioning/datasources/ @grafana/plugins-platform-backend
--- a/.github/ISSUE_TEMPLATE/1-feature_requests.md
+++ b/.github/ISSUE_TEMPLATE/1-feature_requests.md
@@ -1,7 +1,6 @@
 ---
 name: Feature Requests
 about: Suggest an enhancement or new feature for the Grafana project
-labels: 'type/feature-request'
 ---

 <!-- Please only use this template for submitting feature requests -->
@@ -18,4 +17,4 @@ labels: 'type/feature-request'

 **Who is this feature for?**

-[Add information on what kind of user the feature is for.]
+[Add information on what kind of user the feature is for.]
--- a/.github/bot.md
+++ b/.github/bot.md
@@ -9,8 +9,8 @@ Comment commands:

 Label commands:

-* Add label `bot/question` the the bot will close with standard question message and add label `type/question`
-* Add label `bot/duplicate` the the bot will close with standard duplicate message and add label `type/duplicate`
+* Add label `bot/question` the bot will close with standard question message and add label `type/question`
+* Add label `bot/duplicate` the bot will close with standard duplicate message and add label `type/duplicate`
 * Add label `bot/needs more info` for bot to request more info (or use comment command mentioned above)
 * Add label `bot/close feature request` for bot to close a feature request with standard message and adds label `not implemented`
 * Add label `bot/no new info` for bot to close an issue where we asked for more info but has not received any updates in at least 14 days.
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -442,5 +442,13 @@
    "addToProject": {
      "url": "https://github.com/orgs/grafana/projects/72"
    }
+  },
+   {
+    "type": "label",
+    "name": "grafana program",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/471"
+    }
  }
 ]
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -6,25 +6,6 @@
    "success": "Milestone set",
    "failure": "Milestone not set"
  },
-  {
-    "type": "check-label",
-    "title": "Backport Check",
-    "labels": {
-      "exists": "Backport enabled",
-      "notExists": "Backport decision needed",
-      "matches": [
-        "backport v*"
-      ]
-    },
-    "skip": {
-      "message": "Backport skipped",
-      "matches": [
-        "backport",
-        "no-backport"
-      ]
-    },
-    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported"
-  },
  {
    "type": "check-changelog",
    "title": "Changelog Check",
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -149,7 +149,7 @@
  },
  {
    "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/postgres/**/*", "pkg/tsdb/postgres/**/*"],
+    "matches": [ "public/app/plugins/datasource/grafana-postgresql-datasource/**/*", "pkg/tsdb/grafana-postgresql-datasource/**/*"],
    "action": "updateLabel",
    "addLabel": "datasource/Postgres"
  },
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -4,28 +4,19 @@
  ],
  "enabledManagers": ["npm"],
  "ignoreDeps": [
-    "commander", // we are planning to remove this, so no need to update it
-    "execa", // we should bump this once we move to esm modules
-    "history", // we should bump this together with react-router-dom
-    "@mdx-js/react", // storybook peer-depends on its 1.x version, we should upgrade this when we upgrade storybook
+    "history", // we should bump this together with react-router-dom (see https://github.com/grafana/grafana/issues/76744)
+    "react-router-dom", // we should bump this together with history (see https://github.com/grafana/grafana/issues/76744)
    "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
    "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
-    "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first
-    "react-router-dom", // we should bump this together with history
-    "ts-loader", // we should remove ts-loader and use babel-loader instead
-    "ora", // we should bump this once we move to esm modules
-    "@locker/near-membrane-dom", // critical library. we need to bump this only intentionally
-    "@locker/near-membrane-shared", // critical library. we need to bump this only intentionally
-    "@locker/near-membrane-shared-dom", // critical library. we need to bump this only intentionally
  ],
  "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
-  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**"],
-  "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
+  "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**", "packages/grafana-e2e/**"],
+  "labels": ["area/frontend", "dependencies", "no-changelog"],
  "postUpdateOptions": ["yarnDedupeHighest"],
  "packageRules": [
    {
      "matchUpdateTypes": ["patch"],
-      "excludePackagePatterns": ["^@?storybook"],
+      "excludePackagePatterns": ["^@?storybook", "^@locker"],
      "extends": ["schedule:monthly"],
      "groupName": "Monthly patch updates"
    },
@@ -78,6 +69,13 @@
      ],
      "reviewers": ["leeoniya"],
    },
+    {
+      "groupName": "locker",
+      "matchPackagePrefixes": [
+        "@locker/"
+      ],
+      "reviewers": ["team:grafana/plugins-platform-frontend"],
+    },
  ],
  "pin": {
    "enabled": false
--- a/.github/workflows/actions/changelog/action.yml
+++ b/.github/workflows/actions/changelog/action.yml
@@ -0,0 +1,22 @@
+name: Changelog generator
+description: Generates and publishes a changelog for the given release version
+inputs:
+  target:
+    description: Target tag, branch or commit hash for the changelog
+    required: true
+  previous:
+    description: Previous tag, branch or commit hash to start changelog from
+    required: false
+  github_token:
+    description: GitHub token with read/write access to all necessary repositories
+    required: true
+  output_file:
+    description: A file to store resulting changelog markdown
+    required: false
+outputs:
+  changelog:
+    description: Changelog contents between the two given versions in Markdown format
+runs:
+  using: 'node20'
+  main: 'index.js'
+  
--- a/.github/workflows/actions/changelog/index.js
+++ b/.github/workflows/actions/changelog/index.js
@@ -0,0 +1,319 @@
+import { appendFileSync, writeFileSync } from 'fs';
+import { exec as execCallback } from 'node:child_process';
+import { promisify } from 'node:util';
+
+//
+// Github Action core utils: logging (notice + debug log levels), must escape
+// newlines and percent signs
+//
+const escapeData = (s) => s.replace(/%/g, '%25').replace(/\r/g, '%0D').replace(/\n/g, '%0A');
+const LOG = (msg) => console.log(`::notice::${escapeData(msg)}`);
+
+//
+// Semver utils: parse, compare, sort etc (using official regexp)
+// https://regex101.com/r/Ly7O1x/3/
+//
+const semverRegExp =
+  /^v?(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
+
+const semverParse = (tag) => {
+  const m = tag.match(semverRegExp);
+  if (!m) {
+    return;
+  }
+  const [_, major, minor, patch, prerelease] = m;
+  return [+major, +minor, +patch, prerelease, tag];
+};
+
+// semverCompare takes two parsed semver tags and comparest them more or less
+// according to the semver specs
+const semverCompare = (a, b) => {
+  for (let i = 0; i < 3; i++) {
+    if (a[i] !== b[i]) {
+      return a[i] < b[i] ? 1 : -1;
+    }
+  }
+  if (a[3] !== b[3]) {
+    return a[3] < b[3] ? 1 : -1;
+  }
+  return 0;
+};
+
+// Using `git tag -l` output find the tag (version) that goes semantically
+// right before the given version. This might not work correctly with some
+// pre-release versions, which is why it's possible to pass previous version
+// into this action explicitly to avoid this step.
+const getPreviousVersion = async (version) => {
+  const exec = promisify(execCallback);
+  const { stdout } = await exec('git tag -l');
+  const prev = stdout
+    .split('\n')
+    .map(semverParse)
+    .filter((tag) => tag)
+    .sort(semverCompare)
+    .find((tag) => semverCompare(tag, semverParse(version)) > 0);
+  if (!prev) {
+    throw `Could not find previous git tag for ${version}`;
+  }
+  return prev[4];
+};
+
+// A helper for Github GraphQL API endpoint
+const graphql = async (ghtoken, query, variables) => {
+  const { env } = process;
+  const results = await fetch('https://api.github.com/graphql', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${ghtoken}`,
+    },
+    body: JSON.stringify({ query, variables }),
+  });
+  const { data } = await results.json();
+  return data;
+};
+
+// Using Github GraphQL API find the timestamp for the given tag/commit hash.
+// This is required for PR listing, because Github API only takes date/time as
+// a "since" parameter while listing. Currently there is no way to provide two
+// "commitish" items and get a list of PRs in between them.
+const getCommitishDate = async (name, owner, target) => {
+  const result = await graphql(
+    ghtoken,
+    `
+      query getCommitDate($owner: String!, $name: String!, $target: String!) {
+        repository(owner: $owner, name: $name) {
+          object(expression: $target) {
+            ... on Commit {
+              committedDate
+            }
+          }
+        }
+      }
+    `,
+    { name, owner, target }
+  );
+  return result.repository.object.committedDate;
+};
+
+// Using Github GraphQL API get a list of PRs between the two "commitish" items.
+// This resoves the "since" item's timestamp first and iterates over all PRs
+// till "target" using naïve pagination.
+const getHistory = async (name, owner, target, sinceDate) => {
+  LOG(`Fetching ${owner}/${name} PRs since ${sinceDate} till ${target}`);
+  const query = `
+  query findCommitsWithAssociatedPullRequests(
+    $name: String!
+    $owner: String!
+    $target: String!
+    $sinceDate: GitTimestamp
+    $cursor: String
+  ) {
+    repository(name: $name, owner: $owner) {
+      object(expression: $target) {
+        ... on Commit {
+          history(first: 50, since: $sinceDate, after: $cursor) {
+            totalCount
+            pageInfo {
+              hasNextPage
+              endCursor
+            }
+            nodes {
+              id
+              associatedPullRequests(first: 1) {
+                nodes {
+                  title
+                  number
+                  labels(first: 10) {
+                    nodes {
+                      name
+                    }
+                  }
+                  commits(first: 1) {
+                    nodes {
+                      commit {
+                        author {
+                          user {
+                            login
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }`;
+
+  let cursor;
+  let nodes = [];
+  for (;;) {
+    const result = await graphql(ghtoken, query, {
+      name,
+      owner,
+      target,
+      sinceDate,
+      cursor,
+    });
+    LOG(`GraphQL: ${JSON.stringify(result)}`);
+    nodes = [...nodes, ...result.repository.object.history.nodes];
+    const { hasNextPage, endCursor } = result.repository.object.history.pageInfo;
+    if (!hasNextPage) {
+      break;
+    }
+    cursor = endCursor;
+  }
+  return nodes;
+};
+
+// The main function for this action: given two "commitish" items it gets a
+// list of PRs between them and filters/groups the PRs by category (bugfix,
+// feature, deprecation, breaking change and plugin fixes/enhancements).
+//
+// PR grouping relies on Github labels only, not on the PR contents.
+const getChangeLogItems = async (name, owner, sinceDate, to) => {
+  // check if a node contains a certain label
+  const hasLabel = ({ labels }, label) => labels.nodes.some(({ name }) => name === label);
+  // get all the PRs between the two "commitish" items
+  const history = await getHistory(name, owner, to, sinceDate);
+
+  const items = history.flatMap((node) => {
+    // discard PRs without a "changelog" label
+    const changes = node.associatedPullRequests.nodes.filter((PR) => hasLabel(PR, 'add to changelog'));
+    if (changes.length === 0) {
+      return [];
+    }
+    const item = changes[0];
+    const { number, url, labels } = item;
+    const title = item.title.replace(/^\[[^\]]+\]:?\s*/, '');
+    // for changelog PRs try to find a suitable category.
+    // Note that we can not detect "deprecation notices" like that
+    // as there is no suitable label yet.
+    const isBug = /fix/i.test(title) || hasLabel({ labels }, 'type/bug');
+    const isBreaking = hasLabel({ labels }, 'breaking change');
+    const isPlugin =
+      hasLabel({ labels }, 'area/grafana/ui') ||
+      hasLabel({ labels }, 'area/grafana/toolkit') ||
+      hasLabel({ labels }, 'area/grafana/runtime');
+    const author = item.commits.nodes[0].commit.author.user.login;
+    return {
+      repo: name,
+      number,
+      title,
+      author,
+      isBug,
+      isPlugin,
+      isBreaking,
+    };
+  });
+  return items;
+};
+
+// ======================================================
+//                 GENERATE CHANGELOG
+// ======================================================
+
+LOG(`Changelog action started`);
+
+const ghtoken = process.env.GITHUB_TOKEN || process.env.INPUT_GITHUB_TOKEN;
+if (!ghtoken) {
+  throw 'GITHUB_TOKEN is not set and "github_token" input is empty';
+}
+
+const target = process.argv[2] || process.env.INPUT_TARGET;
+LOG(`Target tag/branch/commit: ${target}`);
+
+const previous = process.argv[3] || process.env.INPUT_PREVIOUS || (await getPreviousVersion(target));
+
+LOG(`Previous tag/commit: ${previous}`);
+
+const sinceDate = await getCommitishDate('grafana', 'grafana', previous);
+LOG(`Previous tag/commit timestamp: ${sinceDate}`);
+
+// Get all changelog items from Grafana OSS
+const oss = await getChangeLogItems('grafana', 'grafana', sinceDate, target);
+// Get all changelog items from Grafana Enterprise
+const entr = await getChangeLogItems('grafana-enterprise', 'grafana', sinceDate, target);
+
+LOG(`Found OSS PRs: ${oss.length}`);
+LOG(`Found Enterprise PRs: ${entr.length}`);
+
+// Sort PRs and categorise them into sections
+const changelog = [...oss, ...entr]
+  .sort((a, b) => (a.title < b.title ? -1 : 1))
+  .reduce(
+    (changelog, item) => {
+      if (item.isPlugin) {
+        changelog.plugins.push(item);
+      } else if (item.isBug) {
+        changelog.bugfixes.push(item);
+      } else if (item.isBreaking) {
+        changelog.breaking.push(item);
+      } else {
+        changelog.features.push(item);
+      }
+      return changelog;
+    },
+    {
+      breaking: [],
+      plugins: [],
+      bugfixes: [],
+      features: [],
+    }
+  );
+
+// Convert PR numbers to Github links
+const pullRequestLink = (n) => `[#${n}](https://github.com/grafana/grafana/pull/${n})`;
+// Convert Github user IDs to Github links
+const userLink = (u) => `[@${u}](https://github.com/${u})`;
+
+// Now that we have a changelog - we can render some markdown as an output
+const markdown = (changelog) => {
+  // This convers a list of changelog items into a markdown section with a list of titles/links
+  const section = (title, items) =>
+    items.length === 0
+      ? ''
+      : `### ${title}
+
+${items
+  .map(
+    (item) =>
+      `- ${item.title.replace(/^([^:]*:)/gm, '**$1**')} ${
+        item.repo === 'grafana-enterprise'
+          ? '(Enterprise)'
+          : `${pullRequestLink(item.number)}, ${userLink(item.author)}`
+      }`
+  )
+  .join('\n')}
+  `;
+
+  // Render all present sections for the given changelog
+  return `${section('Features and enhancements', changelog.features)}
+${section('Bug fixes', changelog.bugfixes)}
+${section('Breaking changes', changelog.breaking)}
+${section('Plugin development fixes & changes', changelog.plugins)}
+`;
+};
+
+const md = markdown(changelog);
+
+// Print changelog, mostly for debugging
+LOG(`Resulting markdown: ${md}`);
+
+// Save changelog as an output for this action
+if (process.env.GITHUB_OUTPUT) {
+  LOG(`Output to ${process.env.GITHUB_OUTPUT}`);
+  appendFileSync(process.env.GITHUB_OUTPUT, `changelog<<EOF\n${escapeData(md)}\nEOF`);
+} else {
+  LOG('GITHUB_OUTPUT is not set');
+}
+
+// Save changelog as an output file (if requested)
+if (process.env.INPUT_OUTPUT_FILE) {
+  LOG(`Output to ${process.env.INPUT_OUTPUT_FILE}`);
+  writeFileSync(process.env.INPUT_OUTPUT_FILE, md);
+}
--- a/.github/workflows/alerting-swagger-gen.yml
+++ b/.github/workflows/alerting-swagger-gen.yml
@@ -16,7 +16,7 @@ jobs:
      - name: Set go version
        uses: actions/setup-go@v4
        with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'
      - name: Build swagger
        run: |
          make -C pkg/services/ngalert/api/tooling post.json api.json
@@ -31,7 +31,7 @@ jobs:
            Please review and merge.
          branch: update-alerting-swagger-spec
          delete-branch: true
-          labels: 'area/alerting,type/docs,no-backport,no-changelog'
+          labels: 'area/alerting,type/docs,no-changelog'
          team-reviewers: 'grafana/alerting-backend-product'
          draft: false

--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -3,7 +3,7 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
        required: true
 env:
  YARN_ENABLE_IMMUTABLE_INSTALLS: false
@@ -17,29 +17,29 @@ jobs:
        id: regex-match
        with:
          text: ${{ github.event.inputs.version }}
-          regex: '^(\d+.\d+).\d+(?:-(?:(preview\d?)|(pre)))?$'
+          regex: '^(\d+.\d+).\d+(?:-beta\d+)?$'
      - uses: actions-ecosystem/action-regex-match@v2.0.2
        if: ${{ inputs.version_call != '' }}
        id: regex-match-version-call
        with:
          text: ${{ inputs.version_call }}
-          regex: '^(\d+.\d+).\d+(?:-(?:(preview\d?)|(pre)))?$'
+          regex: '^(\d+.\d+).\d+(?:-beta\d+)?$'
      - name: Validate input version
        if: ${{ steps.regex-match.outputs.match == '' && github.event.inputs.version != '' }}
        run: |
          echo "The input version format is not correct, please respect:\
-          major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. \
-          example: 7.4.3, 7.4.3-preview or 7.4.3-preview1"
+          major.minor.patch or major.minor.patch-beta.number format. \
+          example: 7.4.3 or 7.4.3-beta1"
          exit 1
      - name: Validate input version call
        if: ${{ inputs.version_call != '' && steps.regex-match-version-call.outputs.match == '' }}
        run: |
          echo "The input version format is not correct, please respect:\
-          major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. \
-          example: 7.4.3, 7.4.3-preview or 7.4.3-preview1"
+          major.minor.patch or major.minor.patch-beta<number> format. \
+          example: 7.4.3 or 7.4.3-beta1"
          exit 1

-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      - name: Set intermedia variables
        id: intermedia
@@ -49,8 +49,16 @@ jobs:
          echo "branch_name=v${{steps.regex-match.outputs.group1}}" >> $GITHUB_OUTPUT
          echo "branch_exist=$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)" >> $GITHUB_OUTPUT

+      - name: Check input version is aligned with branch(main)
+        if: ${{ github.event.inputs.version != '' && steps.intermedia.outputs.branch_exist == '0' && !contains(steps.intermedia.outputs.short_ref, 'main') }}
+        run: |
+          echo "When you want to deliver a new new minor version, you might want to create a new branch first \
+          with naming convention v[major].[minor].x, and just run the workflow on that branch. \
+          Run the workflow on main only when needed"
+          exit 1
+
      - name: Checkout Actions
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
        with:
          repository: "grafana/grafana-github-actions"
          path: ./actions
@@ -58,10 +66,10 @@ jobs:
      # Go is required for also updating the schema versions as part of the precommit hook:
      - uses: actions/setup-go@v4
        with:
-          go-version: '1.20'
-      - uses: actions/setup-node@v3.8.1
+          go-version: '1.21'
+      - uses: actions/setup-node@v4
        with:
-          node-version: '16'
+          node-version: '18'
      - name: Install Actions
        run: npm install --production --prefix ./actions
      - name: "Generate token"
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -0,0 +1,120 @@
+name: Generate changelog
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        description: 'Target release version (semver, git tag, branch or commit)'
+      target:
+        required: true
+        type: string
+        description: 'The base branch that these changes are being merged into'
+      dry_run:
+        required: false
+        default: false
+        type: bool
+      latest:
+        required: false
+        default: false
+        type: bool
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        description: 'Target release version (semver, git tag, branch or commit)'
+      target:
+        required: true
+        type: string
+        description: 'The base branch that these changes are being merged into'
+      dry_run:
+        required: false
+        default: false
+        type: bool
+      latest:
+        required: false
+        default: false
+        type: bool
+
+permissions:
+  pull-requests: write
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: "Generate token"
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+      - name: "Checkout Grafana repo"
+        uses: "actions/checkout@v4"
+        with:
+          sparse-checkout: |
+            .github/workflows
+            CHANGELOG.md
+          fetch-depth: 0
+          fetch-tags: true
+      - name: "Configure git user"
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local --add --bool push.autoSetupRemote true
+      - name: "Create branch"
+        run: git checkout -b "release/${{ github.run_id }}/${{ inputs.version }}"
+      - name: "Generate changelog"
+        id: changelog
+        uses: ./.github/workflows/actions/changelog
+        with:
+          github_token: ${{ steps.generate_token.outputs.token }}
+          target: v${{ inputs.version }}
+          output_file: changelog_items.md
+      - name: "Patch CHANGELOG.md"
+        run: |
+          # Prepare CHANGELOG.md content with version delimiters
+          (
+            echo
+            echo "# ${{ inputs.version}} ($(date '+%F'))"
+            echo
+            cat changelog_items.md
+          ) > CHANGELOG.part
+
+          # Check if a version exists in the changelog
+          if grep -q "<!-- ${{ inputs.version}} START" CHANGELOG.md ; then
+            # Replace the content between START and END delimiters
+            echo "Version ${{ inputs.version }} is found in the CHANGELOG.md, patching contents..."
+            sed -i -e '/${{ inputs.version }} START/,/${{ inputs.version }} END/{//!d;}' \
+                   -e '/${{ inputs.version }} START/r CHANGELOG.part' CHANGELOG.md
+          else
+            # Prepend changelog part to the main changelog file
+            echo "Version ${{ inputs.version }} not found in the CHANGELOG.md"
+            (
+              echo "<!-- ${{ inputs.version }} START -->"
+              cat CHANGELOG.part
+              echo "<!-- ${{ inputs.version }} END -->"
+              cat CHANGELOG.md
+            ) > CHANGELOG.tmp
+            mv CHANGELOG.tmp CHANGELOG.md
+          fi
+
+          git diff CHANGELOG.md
+          git add CHANGELOG.md
+      - name: "Commit changelog changes"
+        run: git commit --allow-empty -m "Update changelog" CHANGELOG.md
+      - name: "git push"
+        if: ${{ inputs.dry_run }} != true
+        run: git push
+      - name: "Create changelog PR"
+        if: "${{ inputs.backport == '' }}"
+        run: >
+          gh pr create \
+            $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
+            --dry-run=${{ inputs.dry_run }} \
+            -B "${{ inputs.target }}" \
+            --title "Release: ${{ inputs.version }}" \
+            --body "Changelog changes for release ${{ inputs.version }}"
+        env:
+          GH_TOKEN: ${{ steps.generate_token.outputs.token }}
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -47,7 +47,7 @@ jobs:
      name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.20.10'
+        go-version: '1.21.10'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/community-release.yml
+++ b/.github/workflows/community-release.yml
@@ -1,25 +1,46 @@
 name: Create community release post
 on:
+  workflow_call:
+    inputs:
+      version:
+        type: string
+        required: true
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
+      dry_run:
+        type: boolean
+        required: false
+        default: false
+        description: When enabled, this workflow will print a preview instead of creating an actual post.
+    secrets:
+      GRAFANA_MISC_STATS_API_KEY:
+        required: true
+      GRAFANABOT_FORUM_KEY:
+        required: true
  workflow_dispatch:
    inputs:
      version:
+        type: string
        required: true
        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch, major.minor.patch-preview or major.minor.patch-preview<number> format. example: 7.4.3, 7.4.3-preview or 7.4.3-preview1'
+      dry_run:
+        type: boolean
+        required: false
+        default: false
+        description: When enabled, this workflow will print a preview instead of creating an actual post.
+
+permissions:
+  contents: read
+
 jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Run community-release (manually invoked)
        uses: grafana/grafana-github-actions-go/community-release@main
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
          version: ${{ inputs.version }}
          metrics_api_key: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
          community_api_key: ${{ secrets.GRAFANABOT_FORUM_KEY }}
          community_api_username: grafanabot
+          dry_run: ${{ inputs.dry_run }}
--- a/.github/workflows/core-plugins-build-and-release.yml
+++ b/.github/workflows/core-plugins-build-and-release.yml
@@ -0,0 +1,231 @@
+on:
+  workflow_dispatch:
+    inputs:
+      plugin_id:
+        description: "ID of the plugin you want to publish"
+        required: true
+        type: choice
+        options:
+          - grafana-testdata-datasource
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}-${{ inputs.plugin_id }}
+  cancel-in-progress: true
+
+env:
+  GRABPL_VERSION: 3.0.44
+  GCP_BUCKET: integration-artifacts # Dev: plugins-community-staging
+  GCOM_API: https://grafana.com # Dev: https://grafana-dev.com
+
+# These permissions are needed to assume roles from Github's OIDC.
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  build-and-publish:
+    name: Build and publish ${{ inputs.plugin_id }}
+    runs-on: ubuntu-latest
+    outputs:
+      type: ${{ steps.get_dir.outputs.dir }}
+      has_backend: ${{ steps.check_backend.outputs.has_backend }}
+      version: ${{ steps.build_frontend.outputs.version }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: Verify inputs
+        run: |
+          if [ -z ${{ inputs.plugin_id }} ]; then echo "Missing plugin ID"; exit 1; fi
+      - id: get-secrets
+        uses: grafana/shared-workflows/actions/get-vault-secrets@main
+        with:
+          # Secrets placed in the ci/repo/grafana/<repo>/<path> path in Vault
+          repo_secrets: |
+            PLUGINS_GOOGLE_CREDENTIALS=core-plugins-build-and-release:PLUGINS_GOOGLE_CREDENTIALS
+            PLUGINS_GRAFANA_API_KEY=core-plugins-build-and-release:PLUGINS_GRAFANA_API_KEY
+            PLUGINS_GCOM_TOKEN=core-plugins-build-and-release:PLUGINS_GCOM_TOKEN
+      - name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ env.PLUGINS_GOOGLE_CREDENTIALS }}'
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v1'
+      - name: Setup nodejs environment
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+          cache: yarn
+      - name: Find plugin directory
+        shell: bash
+        id: get_dir
+        run: |
+          dir=$(find public/app/plugins -name ${{ inputs.plugin_id }} -print -quit)
+          echo "dir=${dir}" >> $GITHUB_OUTPUT
+      - name: Install frontend dependencies
+        shell: bash
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          yarn install --immutable
+      - name: Download grabpl executable
+        shell: sh
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          [ ! -d ./bin ] && mkdir -pv ./bin || true
+          curl -fL -o ./bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${{ env.GRABPL_VERSION }}/grabpl
+          chmod 0755 ./bin/grabpl
+      - name: Check backend
+        id: check_backend
+        shell: bash
+        run: |
+          if [ -d ./pkg/tsdb/${{ inputs.plugin_id }} ]; then
+            echo "has_backend=true" >> $GITHUB_OUTPUT
+          else
+            echo "has_backend=false" >> $GITHUB_OUTPUT
+          fi
+      - name: Setup golang environment
+        uses: actions/setup-go@v4
+        if: steps.check_backend.outputs.has_backend == 'true'
+        with:
+          go-version-file: go.mod
+      - name: Install Mage
+        shell: bash
+        if: steps.check_backend.outputs.has_backend == 'true'
+        run: |
+          go install github.com/magefile/mage
+      - name: Check tools
+        shell: bash
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          echo "======================================="
+          echo "  Frontend tools"
+          echo "======================================="
+          echo "-------- node version -----"
+          node --version
+          echo "-------- npm version -----"
+          npm --version
+          echo "-------- yarn version -----"
+          yarn --version
+          echo "======================================="
+          echo "  Misc tools"
+          echo "======================================="
+          echo "-------- docker version -----"
+          docker --version
+          echo "-------- jq version -----"
+          jq --version
+          echo "-------- grabpl version -----"
+          ./bin/grabpl --version
+          echo "======================================="
+      - name: Check backend tools
+        shell: bash
+        if: steps.check_backend.outputs.has_backend == 'true'
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          echo "======================================="
+          echo "  Backend tools"
+          echo "======================================="
+          echo "-------- go version -----"
+          go version
+          echo "-------- mage version -----"
+          mage --version
+          echo "======================================="
+      - name: build:frontend
+        shell: bash
+        id: build_frontend
+        run: |
+          command="plugin:build:commit"
+          if [ "$GITHUB_REF" != "refs/heads/main" ]; then
+            # Release branch, do not add commit hash to version
+            command="plugin:build"
+          fi
+          yarn $command --scope="@grafana-plugins/${{ inputs.plugin_id }}"
+          version=$(cat ${{ steps.get_dir.outputs.dir }}/dist/plugin.json | jq -r .info.version)
+          echo "version=${version}" >> $GITHUB_OUTPUT
+      - name: build:backend
+        if: steps.check_backend.outputs.has_backend == 'true'
+        shell: bash
+        env:
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          make build-plugin-go PLUGIN_ID=${{ inputs.plugin_id }}
+      - name: package
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        run: |
+          mkdir -p ci/jobs/package
+          bin/grabpl plugin package
+        env:
+          GRAFANA_API_KEY: ${{ env.PLUGINS_GRAFANA_API_KEY }}
+          PLUGIN_SIGNATURE_TYPE: grafana
+      - name: Check existing release
+        env:
+          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          api_res=$(curl -X 'GET' -H "Authorization: Bearer $GCOM_TOKEN" \
+            '${{ env.GCOM_API}}/api/plugins/${{ inputs.plugin_id }}?version=$VERSION' \
+            -H 'accept: application/json')
+          api_res_code=$(echo $api_res | jq -r .code)
+          if [ "$api_res_code" = "NotFound" ]; then
+            echo "No existing release found"
+          else
+            echo "Expecting a missing release, got:"
+            echo $api_res
+            exit 1
+          fi
+      - name: store build artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-artifacts
+          path: ${{ steps.get_dir.outputs.dir }}/ci/packages/*.zip
+      - name: Publish release to Google Cloud Storage
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        env:
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          echo "Publish release to Google Cloud Storage:"
+          touch ci/packages/windows ci/packages/darwin ci/packages/linux ci/packages/any
+          gsutil -m cp -r ci/packages/*windows* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/windows
+          gsutil -m cp -r ci/packages/*linux* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux 
+          gsutil -m cp -r ci/packages/*darwin* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin
+          gsutil -m cp -r ci/packages/*any* gs://${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/any
+      - name: Publish new plugin version on grafana.com
+        working-directory: ${{ steps.get_dir.outputs.dir }}
+        env:
+          GCOM_TOKEN: ${{ env.PLUGINS_GCOM_TOKEN }}
+          VERSION: ${{ steps.build_frontend.outputs.version }}  
+        run: |
+          echo "Publish new plugin version on grafana.com:"
+          echo "Plugin version: ${VERSION}"
+          result=`curl -H "Authorization: Bearer $GCOM_TOKEN" -H "Content-Type: application/json" ${{ env.GCOM_API}}/api/plugins -d "{
+            \"url\": \"https://github.com/grafana/grafana/tree/main/${{ steps.get_dir.outputs.dir }}\",
+            \"download\": {
+              \"linux-amd64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_amd64.zip\",
+                \"md5\": \"$(cat ci/packages/info-linux_amd64.json | jq -r .plugin.md5)\"
+              },
+              \"linux-arm64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_arm64.zip\",
+                \"md5\": \"$(cat ci/packages/info-linux_arm64.json | jq -r .plugin.md5)\"
+              },
+              \"linux-arm\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/linux/${{ inputs.plugin_id }}-${VERSION}.linux_arm.zip\",
+                \"md5\": \"$(cat ci/packages/info-linux_arm.json | jq -r .plugin.md5)\"
+              },
+              \"windows-amd64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/windows/${{ inputs.plugin_id }}-${VERSION}.windows_amd64.zip\",
+                \"md5\": \"$(cat ci/packages/info-windows_amd64.json | jq -r .plugin.md5)\"
+              },
+              \"darwin-amd64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin/${{ inputs.plugin_id }}-${VERSION}.darwin_amd64.zip\",
+                \"md5\": \"$(cat ci/packages/info-darwin_amd64.json | jq -r .plugin.md5)\"
+              },
+              \"darwin-arm64\": {
+                \"url\": \"https://storage.googleapis.com/${{ env.GCP_BUCKET }}/${{ inputs.plugin_id }}/release/${VERSION}/darwin/${{ inputs.plugin_id }}-${VERSION}.darwin_arm64.zip\",
+                \"md5\": \"$(cat ci/packages/info-darwin_arm64.json | jq -r .plugin.md5)\"
+              }
+            }
+          }"`
+          if [[ "$(echo $result | jq -r .version)" == "null" ]]; then
+            echo "Failed to publish plugin version. Got:"
+            echo $result
+            exit 1
+          fi
--- a/.github/workflows/create-security-patch-from-security-mirror.yml
+++ b/.github/workflows/create-security-patch-from-security-mirror.yml
@@ -1,5 +1,5 @@
-# Owned by grafana-delivery-squad
-# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror. 
+# Owned by grafana-release-guild
+# Intended to be dropped into the base repo (Ex: grafana/grafana) for use in the security mirror.
 name: Create security patch
 run-name: create-security-patch
 on:
@@ -17,7 +17,7 @@ jobs:
  trigger_downstream_create_security_patch:
    concurrency: create-patch-${{ github.ref_name }}
    uses: grafana/security-patch-actions/.github/workflows/create-patch.yml@main
-    if: github.repository == 'grafana/grafana-security-mirror' 
+    if: github.repository == 'grafana/grafana-security-mirror'
    with:
      repo: "${{ github.repository }}"
      src_ref: "${{ github.head_ref }}" # this is the source branch name, Ex: "feature/newthing"
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -1,9 +1,9 @@
-# Only runs if anything under the packages/ directory changes. 
+# Only runs if anything under the packages/ directory changes.
 # (Otherwise detect-breaking-changes-build-skip.yml takes over)

 name: Levitate / Detect breaking changes

-on: 
+on:
  pull_request:
    paths:
      - 'packages/**'
@@ -22,9 +22,9 @@ jobs:
    - uses: actions/checkout@v4
      with:
        path: './pr'
-    - uses: actions/setup-node@v3.8.1
+    - uses: actions/setup-node@v4
      with:
-        node-version: 16.16.0
+        node-version: 20.9.0

    - name: Get yarn cache directory path
      id: yarn-cache-dir-path
@@ -70,9 +70,9 @@ jobs:
        path: './base'
        ref: ${{ github.event.pull_request.base.ref }}

-    - uses: actions/setup-node@v3.8.1
+    - uses: actions/setup-node@v4
      with:
-        node-version: 16.16.0
+        node-version: 20.9.0

    - name: Get yarn cache directory path
      id: yarn-cache-dir-path
--- a/.github/workflows/doc-validator.yml
+++ b/.github/workflows/doc-validator.yml
@@ -7,7 +7,7 @@ jobs:
  doc-validator:
    runs-on: "ubuntu-latest"
    container:
-      image: "grafana/doc-validator:v3.2.1"
+      image: "grafana/doc-validator:v4.0.0"
    steps:
      - name: "Checkout code"
        uses: "actions/checkout@v4"
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -1,27 +1,48 @@
 name: Create or update GitHub release
 on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        description: Needs to match, exactly, the name of a milestone (NO v prefix)
+        type: string
+      latest:
+        required: false
+        default: false
+        description: Mark this release as latest (`1`) or not (`0`, default)
+        type: string
+      dry_run:
+        required: false
+        default: false
+        type: boolean
  workflow_dispatch:
    inputs:
      version:
        required: true
        description: Needs to match, exactly, the name of a milestone (NO v prefix)
+        type: string
      latest:
        required: false
        description: Mark this release as latest (`1`) or not (`0`, default)
+        type: string
+      dry_run:
+        required: false
+        default: false
+        type: boolean
+
+permissions:
+  # contents: write allows the action(s) to create github releases
+  contents: write
+
 jobs:
  main:
    runs-on: ubuntu-latest
    steps:
-      - name: "Generate token"
-        id: generate_token
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
-        with:
-          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
-          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
      - name: Create GitHub release (manually invoked)
        uses: grafana/grafana-github-actions-go/github-release@main
        with:
-          token: ${{ steps.generate_token.outputs.token }}
+          token: ${{ secrets.GITHUB_TOKEN }}
          version: ${{ inputs.version }}
          metrics_api_key: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
          latest: ${{ inputs.latest }}
+          dry_run: ${{ inputs.dry_run }}
--- a/.github/workflows/i18n-crowdin-fix-files.yml
+++ b/.github/workflows/i18n-crowdin-fix-files.yml
@@ -0,0 +1,67 @@
+# When Crowdin creates a pull request from the crowdin-service-branch branch,
+# run `yarn i18n:extract` and commit the changed grafana.json files back into the PR
+# to reformat crowdin's changes to prevent conflicts with our CI checks.
+
+name: Fix Crowdin I18n files
+
+on:
+  pull_request:
+    paths:
+      - 'public/locales/*/grafana.json'
+    branches:
+      - main # Only run on pull requests *target* main (will be merged into main)
+
+jobs:
+  fix-files:
+    # Only run on pull requests *from* the crowdin-service-branch branch
+    if: github.head_ref == 'crowdin-service-branch'
+
+    name: Fix files
+    runs-on: ubuntu-latest
+
+
+    permissions:
+      contents: write # needed to commit changes back into the PR
+      pull-requests: write # needed to update PR description
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.9.0
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Extract I18n files
+        run: yarn i18n:extract
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
+        with:
+          commit_message: "Github Action: Auto-fix i18n files"
+          file_pattern: public/locales/*/grafana.json
+
+      - name: Update PR description
+        uses: devindford/Append_PR_Comment@32dd2619cd96ac8da9907c416c992fe265233ca8 # v1.1.3
+        if: ${{ ! contains(github.event.pull_request.body, 'Steps for merging') }}
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          body-update-action: prefix
+          body-template: |
+            :robot: Automatic sync of translations from Crowdin.
+
+            Steps for merging:
+              1. Wait for the "Github Action: Auto-fix i18n files" commit that may be required for CI to pass.
+              2. A quick sanity check of the changes and approve. Things to look out for:
+                - No changes to the English strings. The source of truth is already in the main branch, NOT Crowdin.
+                - Translations maybe be removed if the English phrase was removed, but there should not be many of these
+                - Anything else that looks 'funky'. Ask if you're not sure.
+              3. Approve & (Auto-)merge. :tada:
+
+            If there's a conflict, close the pull request and **delete the branch**. Crowdin will recreate the pull request eventually.
+            Remember, the longer this pull request is open, the more likely it is that it'll get conflicts.
--- a/.github/workflows/ox-code-coverage.yml
+++ b/.github/workflows/ox-code-coverage.yml
@@ -1,21 +0,0 @@
-name: Observability Experience test code coverage
-on:
-  pull_request:
-    paths:
-      - 'pkg/services/queryhistory/**'
-      - 'pkg/tsdb/loki/**'
-      - 'pkg/tsdb/elasticsearch/**'
-      - 'public/app/features/explore/**'
-      - 'public/app/features/correlations/**'
-      - 'public/app/plugins/datasource/loki/**'
-      - 'public/app/plugins/datasource/elasticsearch/**'
-    branches-ignore:
-      - dependabot/**
-      - backport-*
-
-jobs:
-  workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.20
-    with:
-      frontend-path-regexp: public\/app\/features\/(explore|correlations)|public\/app\/plugins\/datasource\/(loki|elasticsearch)
-      backend-path-regexp: pkg\/services\/(queryhistory)|pkg\/tsdb\/(loki|elasticsearch)
--- a/.github/workflows/pr-codeql-analysis-go.yml
+++ b/.github/workflows/pr-codeql-analysis-go.yml
@@ -26,7 +26,7 @@ jobs:
    - name: Set go version
      uses: actions/setup-go@v4
      with:
-        go-version: '1.20.10'
+        go-version: '1.21.10'

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/pr-patch-check.yml
+++ b/.github/workflows/pr-patch-check.yml
@@ -1,4 +1,4 @@
-# Owned by grafana-delivery-squad
+# Owned by grafana-release-guild
 # Intended to be dropped into the base repo Ex: grafana/grafana
 name: Check for patch conflicts
 run-name: check-patch-conflicts-${{ github.base_ref }}-${{ github.head_ref }}
--- a/.github/workflows/publish-kinds-next.yml
+++ b/.github/workflows/publish-kinds-next.yml
@@ -36,7 +36,7 @@ jobs:
      - name: "Setup Go"
        uses: "actions/setup-go@v4"
        with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'

      - name: "Verify kinds"
        run: go run .github/workflows/scripts/kinds/verify-kinds.go
--- a/.github/workflows/publish-kinds-release.yml
+++ b/.github/workflows/publish-kinds-release.yml
@@ -39,7 +39,7 @@ jobs:
      - name: "Setup Go"
        uses: "actions/setup-go@v4"
        with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'

      - name: "Verify kinds"
        run: go run .github/workflows/scripts/kinds/verify-kinds.go
--- a/.github/workflows/release-comms.yml
+++ b/.github/workflows/release-comms.yml
@@ -0,0 +1,77 @@
+# This workflow runs whenever the release PR is merged. It includes post-release communication processes like
+# posting to slack, the website, community forums, etc.
+# Only things that happen after a release is completed and all of the necessary code changes (like the changelog) are made.
+name: Post-release
+on:
+  workflow_dispatch:
+    inputs:
+      dry_run:
+        required: false
+        default: true
+      version:
+        required: true
+      latest:
+        type: bool
+        default: false
+  pull_request:
+    types:
+    - closed
+    branches:
+    - 'main'
+    - 'v*.*.*'
+
+jobs:
+  setup:
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/')) }}
+    name: Setup and establish latest
+    outputs:
+      version: ${{ steps.output.outputs.version }}
+      dry_run: ${{ steps.output.outputs.dry_run }}
+      latest: ${{ steps.output.outputs.latest }}
+    runs-on: ubuntu-latest
+    steps:
+    - if: ${{ github.event_name == 'workflow_dispatch' }}
+      run: |
+        echo setting up GITHUB_ENV for ${{ github.event_name }}
+        echo "VERSION=${{ inputs.version }}" >> $GITHUB_ENV
+        echo "DRY_RUN=${{ inputs.dry_run }}" >> $GITHUB_ENV
+        echo "LATEST=${{ inputs.latest }}" >> $GITHUB_ENV
+    - if: ${{ github.event.pull_request.merged == true && startsWith(github.head_ref, 'release/') }}
+      run: |
+        echo "VERSION=$(echo ${{ github.head_ref }} | sed -e 's/release\///g')" >> $GITHUB_ENV
+        echo "DRY_RUN=true" >> $GITHUB_ENV
+        echo "LATEST=${{ contains(github.event.pull_request.labels.*.name, 'release/latest') }}" >> $GITHUB_ENV
+    - id: output
+      run: |
+        echo "dry_run: $DRY_RUN"
+        echo "latest: $LATEST"
+        echo "version: $VERSION"
+
+        echo "dry_run=$DRY_RUN" >> "$GITHUB_OUTPUT"
+        echo "latest=$LATEST" >> "$GITHUB_OUTPUT"
+        echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+  post_changelog_on_forum:
+    needs: setup
+    uses: ./.github/workflows/community-release.yml
+    secrets:
+      GRAFANA_MISC_STATS_API_KEY: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+      GRAFANABOT_FORUM_KEY: ${{ secrets.GRAFANABOT_FORUM_KEY }}
+    with:
+      version: ${{ needs.setup.outputs.version }}
+      dry_run: ${{ needs.setup.outputs.dry_run == 'true' }}
+  create_github_release:
+    # a github release requires a git tag
+    # The github-release action retrieves the changelog using the /repos/grafana/grafana/contents/CHANGELOG.md API
+    # endpoint.
+    needs: setup
+    uses: ./.github/workflows/github-release.yml
+    with:
+      version: ${{ needs.setup.outputs.version }}
+      dry_run: ${{ needs.setup.outputs.dry_run == 'true' }}
+  post_on_slack:
+    needs: setup
+    runs-on: ubuntu-latest
+    steps:
+    - run: |
+        echo announce on slack that ${{ needs.setup.outputs.version }} has been released
+        echo dry run: ${{ needs.setup.outputs.dry_run }}
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -0,0 +1,153 @@
+# This workflow creates a new PR in Grafana which is triggered after a release is completed.
+# It should include all code changes that are needed after a release is done. This includes the changelog update and
+# version bumps, but could include more in the future.
+# Please refrain from including any processes that do not result in code changes in this workflow. Instead, they should
+# either be triggered in the release promotion process or in the release comms process (that is triggered by merging
+# this PR).
+name: Complete a Grafana release
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        type: string
+        description: The version of Grafana that is being released
+      target:
+        required: true
+        type: string
+        description: The base branch that these changes are being merged into
+      backport:
+        required: false
+        type: string
+        description: Branch to backport these changes to
+      dry_run:
+        required: false
+        default: false
+        type: bool
+      latest:
+        required: false
+        default: false
+        type: bool
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  push-changelog-to-main:
+    name: Create PR to main to update the changelog
+    uses: ./.github/workflows/changelog.yml
+    with:
+      version: ${{ inputs.version }}
+      latest: ${{ inputs.latest }}
+      dry_run: ${{ inputs.dry_run }}
+      target: main
+  create-prs:
+    name: Create Release PR
+    runs-on: ubuntu-latest
+    if: github.repository == 'grafana/grafana'
+    steps:
+      - name: Generate bot token
+        id: generate_token
+        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        with:
+          app_id: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_ID }}
+          private_key: ${{ secrets.GRAFANA_DELIVERY_BOT_APP_PEM }}
+
+      - name: Checkout Grafana
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+
+      - name: Configure git user
+        run: |
+          git config --local user.name "github-actions[bot]"
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local --add --bool push.autoSetupRemote true
+
+      - name: Create branch
+        run: git checkout -b "release/${{ github.run_id }}/${{ inputs.version }}"
+
+      - name: Generate changelog
+        id: changelog
+        uses: ./.github/workflows/actions/changelog
+        with:
+          github_token: ${{ steps.generate_token.outputs.token }}
+          target: v${{ inputs.version }}
+          output_file: changelog_items.md
+
+      - name: Patch CHANGELOG.md
+        run: |
+          # Prepare CHANGELOG.md content with version delimiters
+          (
+            echo
+            echo "# ${{ inputs.version}} ($(date '+%F'))"
+            echo
+            cat changelog_items.md
+          ) > CHANGELOG.part
+
+          # Check if a version exists in the changelog
+          if grep -q "<!-- ${{ inputs.version}} START" CHANGELOG.md ; then
+            # Replace the content between START and END delimiters
+            echo "Version ${{ inputs.version }} is found in the CHANGELOG.md, patching contents..."
+            sed -i -e '/${{ inputs.version }} START/,/${{ inputs.version }} END/{//!d;}' \
+                   -e '/${{ inputs.version }} START/r CHANGELOG.part' CHANGELOG.md
+          else
+            # Prepend changelog part to the main changelog file
+            echo "Version ${{ inputs.version }} not found in the CHANGELOG.md"
+            (
+              echo "<!-- ${{ inputs.version }} START -->"
+              cat CHANGELOG.part
+              echo "<!-- ${{ inputs.version }} END -->"
+              cat CHANGELOG.md
+            ) > CHANGELOG.tmp
+            mv CHANGELOG.tmp CHANGELOG.md
+          fi
+
+          rm -f CHANGELOG.part changelog_items.md
+
+          git diff CHANGELOG.md
+
+      - name: Commit CHANGELOG.md changes
+        run: git commit --allow-empty -m "Update changelog placeholder" CHANGELOG.md
+
+      - name: Update package.json versions
+        uses: ./pkg/build/actions/bump-version
+        with:
+          version: ${{ inputs.version }}
+
+      - name: Add package.json changes
+        run: |
+          git add .
+          git commit -m "Update version to ${{ inputs.version }}"
+
+      - name: Git push
+        if: ${{ inputs.dry_run }} != true
+        run: git push
+
+      - name: Create PR without backports
+        if: "${{ inputs.backport == '' }}"
+        run: >
+          gh pr create \
+            $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
+            --dry-run=${{ inputs.dry_run }} \
+            -B "${{ inputs.target }}" \
+            --title "Release: ${{ inputs.version }}" \
+            --body "These code changes must be merged after a release is complete"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create PR with backports
+        if: "${{ inputs.backport != '' }}"
+        run: >
+          gh pr create \
+            $( [ "x${{ inputs.latest }}" == "xtrue" ] && printf %s '-l "release/latest"') \
+            -l "backport ${{ inputs.backport }}" \
+            -l "product-approved" \
+            --dry-run=${{ inputs.dry_run }} \
+            -B "${{ inputs.target }}" \
+            --title "Release: ${{ inputs.version }}" \
+            --body "These code changes must be merged after a release is complete"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/sync-mirror.yml
+++ b/.github/workflows/sync-mirror.yml
@@ -1,4 +1,4 @@
-# Owned by grafana-delivery-squad
+# Owned by grafana-release-guild
 # Intended to be dropped into the base repo, Ex: grafana/grafana
 name: Sync to mirror
 run-name: sync-to-mirror-${{ github.ref_name }}
--- a/.github/workflows/update-make-docs.yml
+++ b/.github/workflows/update-make-docs.yml
@@ -2,26 +2,18 @@ name: Update `make docs` procedure
 on:
  schedule:
    - cron: '0 7 * * 1-5'
+  workflow_dispatch:
 jobs:
  main:
    if: github.repository == 'grafana/grafana'
    runs-on: ubuntu-latest
    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Update procedure
-        run: |
-          curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
-          curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs
-          if git diff --exit-code; then exit 0; fi
-          BRANCH="$(date +%Y-%m-%d)/update-make-docs"
-          git checkout -b "${BRANCH}"
-          git add .
-          git config --local user.email "bot@grafana.com"
-          git config --local user.name "grafanabot"
-          git commit -m "Update \`make docs\` procedure"
-          git push -v origin "refs/heads/${BRANCH}"
-          gh pr create --fill --label no-changelog --label --no-backport --label type/docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - uses: grafana/writers-toolkit/update-make-docs@update-make-docs/v1
+        with:
+          pr_options: >
+            --label 'backport v10.0.x'
+            --label 'backport v10.1.x'
+            --label 'backport v10.2.x'
+            --label no-changelog
+            --label type/docs
--- a/.github/workflows/verify-kinds.yml
+++ b/.github/workflows/verify-kinds.yml
@@ -18,7 +18,7 @@ jobs:
      - name: "Setup Go"
        uses: "actions/setup-go@v4"
        with:
-          go-version: '1.20.10'
+          go-version: '1.21.10'

      - name: "Verify kinds"
        run: go run .github/workflows/scripts/kinds/verify-kinds.go
--- a/.gitignore
+++ b/.gitignore
@@ -7,8 +7,6 @@ awsconfig
 /.awcache
 /dist
 /public/build
-/public/views/index.html
-/public/views/error.html
 /emails/dist
 /reports
 /e2e/tmp
@@ -78,6 +76,13 @@ public/css/*.min.css
 /data/*
 /bin/*

+# any certificates generated by grafana apiserver
+apiserver.local.config/
+default.etcd/
+
+# kubeconfig path used by example apiserver
+example-apiserver/
+
 # devenv
 /devenv/docker-compose.yaml
 /devenv/docker-compose.override.yaml
@@ -202,4 +207,8 @@ deployment_tools_config.json
 .pr-body.txt

 # Core plugin builds
-public/app/plugins/**/dist/
+public/app/plugins/**/dist/
+
+# Ignore transpiled JavaScript resulting from the generate-transformations.ts script.
+/public/app/features/transformers/docs/*.js
+/scripts/docs/generate-transformations.js
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v18.12.0
+v20.9.0
--- a/.pa11yci-pr.conf.js
+++ b/.pa11yci-pr.conf.js
@@ -33,7 +33,8 @@ var dashboardSettings = [
    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=permissions',
    wait: 500,
    rootElement: '.main-view',
-    threshold: 9,
+    // TODO: improve the accessibility of the permission tab https://github.com/grafana/grafana/issues/77203
+    threshold: 11,
  },
  {
    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=dashboard_json',
@@ -50,6 +51,7 @@ var config = {
    useIncognitoBrowserContext: false,
    standard: 'WCAG2AA',
    chromeLaunchConfig: {
+      executablePath: '/usr/bin/google-chrome',
      args: ['--no-sandbox'],
    },
    // see https://github.com/grafana/grafana/pull/41693#issuecomment-979921463 for context
@@ -71,8 +73,8 @@ var config = {
        "wait for element input[name='user'] to be added",
        "set field input[name='user'] to admin",
        "set field input[name='password'] to admin",
-        "click element button[aria-label='Login button']",
-        "wait for element [aria-label='Skip change password button'] to be visible",
+        "click element button[data-testid='data-testid Login button']",
+        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
      ],
      threshold: 15,
      rootElement: '.main-view',
--- a/.pa11yci.conf.js
+++ b/.pa11yci.conf.js
@@ -61,8 +61,8 @@ var config = {
        "wait for element input[name='user'] to be added",
        "set field input[name='user'] to admin",
        "set field input[name='password'] to admin",
-        "click element button[aria-label='Login button']",
-        "wait for element [aria-label='Skip change password button'] to be visible",
+        "click element button[data-testid='data-testid Login button']",
+        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
      ],
      wait: 500,
      rootElement: '.main-view',
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,6 +11,16 @@
      "cwd": "${workspaceFolder}",
      "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
    },
+    {
+      "name": "Run API Server (k8s)",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/pkg/cmd/grafana/",
+      "env": {},
+      "cwd": "${workspaceFolder}",
+      "args": ["apiserver", "example.grafana.app"]
+    },
    {
      "name": "Attach to Chrome",
      "port": 9222,
--- a/.yarn/cache/tether-drop-https-3382d2649f-178c3afb88.zip
+++ b/.yarn/cache/tether-drop-https-3382d2649f-178c3afb88.zip
--- a/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip
+++ b/.yarn/cache/tether-drop-https-3382d2649f-a10a7337d5.zip
--- a/.yarn/patches/history-npm-4.10.1-ee217563ae.patch
+++ b/.yarn/patches/history-npm-4.10.1-ee217563ae.patch
@@ -0,0 +1,63 @@
+diff --git a/cjs/history.js b/cjs/history.js
+index fcd8ebab613c6d87b9ac824feb30ab1080cf0ef2..4df20d5cb2f9ba5fc8777899aada53f49399560b 100644
+--- a/cjs/history.js
+++ b/cjs/history.js
+@@ -103,16 +103,6 @@ function createLocation(path, state, key, currentLocation) {
+     if (state !== undefined && location.state === undefined) location.state = state;
+   }
+ 
+-  try {
+-    location.pathname = decodeURI(location.pathname);
+-  } catch (e) {
+-    if (e instanceof URIError) {
+-      throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
+-    } else {
+-      throw e;
+-    }
+-  }
+-
+   if (key) location.key = key;
+ 
+   if (currentLocation) {
+diff --git a/esm/history.js b/esm/history.js
+index df67820fe3eed558c44fca07a82b0cd409d46720..e0e0d4f69a407e8de782b3fdf8297d42708e110a 100644
+--- a/esm/history.js
+++ b/esm/history.js
+@@ -80,16 +80,6 @@ function createLocation(path, state, key, currentLocation) {
+     if (state !== undefined && location.state === undefined) location.state = state;
+   }
+ 
+-  try {
+-    location.pathname = decodeURI(location.pathname);
+-  } catch (e) {
+-    if (e instanceof URIError) {
+-      throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
+-    } else {
+-      throw e;
+-    }
+-  }
+-
+   if (key) location.key = key;
+ 
+   if (currentLocation) {
+diff --git a/umd/history.js b/umd/history.js
+index 80e4ff66c44a2a71d4f842cc05a252e48dd18e9a..f8f4901be95e48c66f5626fbf051747a2ffbe41d 100644
+--- a/umd/history.js
+++ b/umd/history.js
+@@ -207,16 +207,6 @@
+       if (state !== undefined && location.state === undefined) location.state = state;
+     }
+ 
+-    try {
+-      location.pathname = decodeURI(location.pathname);
+-    } catch (e) {
+-      if (e instanceof URIError) {
+-        throw new URIError('Pathname "' + location.pathname + '" could not be decoded. ' + 'This is likely caused by an invalid percent-encoding.');
+-      } else {
+-        throw e;
+-      }
+-    }
+-
+     if (key) location.key = key;
+ 
+     if (currentLocation) {
--- a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
--- a/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
+++ b/.yarn/plugins/@yarnpkg/plugin-typescript.cjs
--- a/.yarn/releases/yarn-3.6.1.cjs
+++ b/.yarn/releases/yarn-3.6.1.cjs
--- a/.yarn/releases/yarn-4.0.0.cjs
+++ b/.yarn/releases/yarn-4.0.0.cjs
--- a/.yarn/sdks/eslint/package.json
+++ b/.yarn/sdks/eslint/package.json
@@ -1,6 +1,14 @@
 {
  "name": "eslint",
-  "version": "8.51.0-sdk",
+  "version": "8.52.0-sdk",
  "main": "./lib/api.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "eslint": "./bin/eslint.js"
+  },
+  "exports": {
+    "./package.json": "./package.json",
+    ".": "./lib/api.js",
+    "./use-at-your-own-risk": "./lib/unsupported-api.js"
+  }
 }
--- a/.yarn/sdks/prettier/index.js
+++ b/.yarn/sdks/prettier/index.js
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require prettier
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real prettier your application uses
-module.exports = absRequire(`prettier`);
--- a/.yarn/sdks/prettier/package.json
+++ b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,7 @@
 {
  "name": "prettier",
  "version": "3.0.0-sdk",
-  "main": "./index.js",
-  "type": "commonjs"
+  "main": "./index.cjs",
+  "type": "commonjs",
+  "bin": "./bin/prettier.cjs"
 }
--- a/.yarn/sdks/typescript/lib/typescript.js
+++ b/.yarn/sdks/typescript/lib/typescript.js
@@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

 if (existsSync(absPnpApiPath)) {
  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/typescript.js
+    // Setup the environment to be able to require typescript
    require(absPnpApiPath).setup();
  }
 }

-// Defer to the real typescript/lib/typescript.js your application uses
-module.exports = absRequire(`typescript/lib/typescript.js`);
+// Defer to the real typescript your application uses
+module.exports = absRequire(`typescript`);
--- a/.yarn/sdks/typescript/package.json
+++ b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,10 @@
 {
  "name": "typescript",
-  "version": "4.8.4-sdk",
+  "version": "5.2.2-sdk",
  "main": "./lib/typescript.js",
-  "type": "commonjs"
+  "type": "commonjs",
+  "bin": {
+    "tsc": "./bin/tsc",
+    "tsserver": "./bin/tsserver"
+  }
 }
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,11 +1,15 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 enableTelemetry: false

 nodeLinker: pnp

 packageExtensions:
-  '@storybook/core-common@7.4.5':
+  "@storybook/core-common@7.4.5":
    dependencies:
-      '@storybook/react-webpack5': '7.4.5'
+      '@storybook/react-webpack5': 7.4.5
  doctrine@3.0.0:
    dependencies:
      assert: 2.0.0
@@ -22,20 +26,16 @@ packageExtensions:
      react-simple-compat: 1.2.2
  react-icons@2.2.7:
    peerDependencies:
-      prop-types: '*'
+      prop-types: "*"
  react-resizable@3.0.4:
    peerDependencies:
      react-dom: 17.0.1

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

-yarnPath: .yarn/releases/yarn-3.6.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.0.cjs
 # Uncomment the following lines if you want to use Verdaccio local npm registry. Read more at packages/README.md
 # npmScopes:
 #   grafana:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/131
+++ b/131
@@ -1,9 +1,9 @@
 # syntax=docker/dockerfile:1

-ARG BASE_IMAGE=alpine:3.18.3
-ARG JS_IMAGE=node:18-alpine3.18
+ARG BASE_IMAGE=alpine:3.19.1
+ARG JS_IMAGE=node:20-alpine
 ARG JS_PLATFORM=linux/amd64
-ARG GO_IMAGE=golang:1.20.10-alpine3.18
+ARG GO_IMAGE=golang:1.21.10-alpine

 ARG GO_SRC=go-builder
 ARG JS_SRC=js-builder
@@ -40,19 +40,22 @@ ARG BINGO="true"

 # Install build dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache gcc g++ make git; \
-    fi
+  apk add --no-cache gcc g++ make git; \
+  fi

 WORKDIR /tmp/grafana

 COPY go.* ./
 COPY .bingo .bingo

+# Include vendored dependencies
+COPY pkg/util/xorm/go.* pkg/util/xorm/
+
 RUN go mod download
 RUN if [[ "$BINGO" = "true" ]]; then \
-      go install github.com/bwplotka/bingo@latest && \
-      bingo get -v; \
-    fi
+  go install github.com/bwplotka/bingo@latest && \
+  bingo get -v; \
+  fi

 COPY embed.go Makefile build.go package.json ./
 COPY cue.mod cue.mod
@@ -96,74 +99,74 @@ ARG GF_UID="472"
 ARG GF_GID="0"

 ENV PATH="/usr/share/grafana/bin:$PATH" \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
+  GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
+  GF_PATHS_DATA="/var/lib/grafana" \
+  GF_PATHS_HOME="/usr/share/grafana" \
+  GF_PATHS_LOGS="/var/log/grafana" \
+  GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
+  GF_PATHS_PROVISIONING="/etc/grafana/provisioning"

 WORKDIR $GF_PATHS_HOME

 # Install dependencies
 RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache ca-certificates bash curl tzdata musl-utils && \
-      apk info -vv | sort; \
-    elif grep -i -q ubuntu /etc/issue; then \
-      DEBIAN_FRONTEND=noninteractive && \
-      apt-get update && \
-      apt-get install -y ca-certificates curl tzdata musl && \
-      apt-get autoremove -y && \
-      rm -rf /var/lib/apt/lists/*; \
-    else \
-      echo 'ERROR: Unsupported base image' && /bin/false; \
-    fi
+  apk add --no-cache ca-certificates bash curl tzdata musl-utils && \
+  apk info -vv | sort; \
+  elif grep -i -q ubuntu /etc/issue; then \
+  DEBIAN_FRONTEND=noninteractive && \
+  apt-get update && \
+  apt-get install -y ca-certificates curl tzdata musl && \
+  apt-get autoremove -y && \
+  rm -rf /var/lib/apt/lists/*; \
+  else \
+  echo 'ERROR: Unsupported base image' && /bin/false; \
+  fi

 # glibc support for alpine x86_64 only
 RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
-      wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
-        -O /tmp/glibc-2.35-r0.apk && \
-      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
-        -O /tmp/glibc-bin-2.35-r0.apk && \
-      apk add --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
-      rm -f /lib64/ld-linux-x86-64.so.2 && \
-      ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
-      rm -f /tmp/glibc-2.35-r0.apk && \
-      rm -f /tmp/glibc-bin-2.35-r0.apk && \
-      rm -f /lib/ld-linux-x86-64.so.2 && \
-      rm -f /etc/ld.so.cache; \
-    fi
+  wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+  wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
+  -O /tmp/glibc-2.35-r0.apk && \
+  wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
+  -O /tmp/glibc-bin-2.35-r0.apk && \
+  apk add --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
+  rm -f /lib64/ld-linux-x86-64.so.2 && \
+  ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
+  rm -f /tmp/glibc-2.35-r0.apk && \
+  rm -f /tmp/glibc-bin-2.35-r0.apk && \
+  rm -f /lib/ld-linux-x86-64.so.2 && \
+  rm -f /etc/ld.so.cache; \
+  fi

 COPY --from=go-src /tmp/grafana/conf ./conf

 RUN if [ ! $(getent group "$GF_GID") ]; then \
-      if grep -i -q alpine /etc/issue; then \
-        addgroup -S -g $GF_GID grafana; \
-      else \
-        addgroup --system --gid $GF_GID grafana; \
-      fi; \
-    fi && \
-    GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
-    mkdir -p "$GF_PATHS_HOME/.aws" && \
-    if grep -i -q alpine /etc/issue; then \
-      adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana; \
-    else \
-      adduser --system --uid $GF_UID --ingroup "$GF_GID_NAME" grafana; \
-    fi && \
-    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_PROVISIONING/plugins" \
-             "$GF_PATHS_PROVISIONING/access-control" \
-             "$GF_PATHS_PROVISIONING/alerting" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
-    cp conf/ldap.toml /etc/grafana/ldap.toml && \
-    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
+  if grep -i -q alpine /etc/issue; then \
+  addgroup -S -g $GF_GID grafana; \
+  else \
+  addgroup --system --gid $GF_GID grafana; \
+  fi; \
+  fi && \
+  GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
+  mkdir -p "$GF_PATHS_HOME/.aws" && \
+  if grep -i -q alpine /etc/issue; then \
+  adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana; \
+  else \
+  adduser --system --uid $GF_UID --ingroup "$GF_GID_NAME" grafana; \
+  fi && \
+  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
+  "$GF_PATHS_PROVISIONING/dashboards" \
+  "$GF_PATHS_PROVISIONING/notifiers" \
+  "$GF_PATHS_PROVISIONING/plugins" \
+  "$GF_PATHS_PROVISIONING/access-control" \
+  "$GF_PATHS_PROVISIONING/alerting" \
+  "$GF_PATHS_LOGS" \
+  "$GF_PATHS_PLUGINS" \
+  "$GF_PATHS_DATA" && \
+  cp conf/sample.ini "$GF_PATHS_CONFIG" && \
+  cp conf/ldap.toml /etc/grafana/ldap.toml && \
+  chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+  chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"

 COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
 COPY --from=js-src /tmp/grafana/public ./public
--- a/25
+++ b/25
@@ -141,6 +141,22 @@ build-js: ## Build frontend assets.
 	yarn run build
 	yarn run plugins:build-bundled

+build-plugins-go: ## Build decoupled plugins
+	@echo "build plugins"
+	@cd pkg/tsdb; \
+	mage -v
+
+PLUGIN_ID ?=
+
+build-plugin-go: ## Build decoupled plugins
+	@echo "build plugin $(PLUGIN_ID)"
+	@cd pkg/tsdb; \
+	if [ -z "$(PLUGIN_ID)" ]; then \
+		echo "PLUGIN_ID is not set"; \
+		exit 1; \
+	fi; \
+	mage -v buildplugin $(PLUGIN_ID)
+
 build: build-go build-js ## Build backend and frontend.

 run: $(BRA) ## Build and run web server on filesystem changes.
@@ -164,6 +180,13 @@ test-go-integration: ## Run integration tests for backend with flags.
 	@echo "test backend integration tests"
 	$(GO) test -count=1 -run "^TestIntegration" -covermode=atomic -timeout=5m $(GO_INTEGRATION_TESTS)

+.PHONY: test-go-integration-alertmanager
+test-go-integration-alertmanager: ## Run integration tests for the remote alertmanager (config taken from the mimir_backend block).
+	@echo "test remote alertmanager integration tests"
+	$(GO) clean -testcache
+	AM_URL=http://localhost:8080 AM_TENANT_ID=test \
+	$(GO) test -count=1 -run "^TestIntegrationRemoteAlertmanager" -covermode=atomic -timeout=5m ./pkg/services/ngalert/...
+
 .PHONY: test-go-integration-postgres
 test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
 	@echo "test backend integration postgres tests"
@@ -238,7 +261,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	--build-arg COMMIT_SHA=$$(git rev-parse HEAD) \
 	--build-arg BUILD_BRANCH=$$(git rev-parse --abbrev-ref HEAD) \
 	--build-arg BASE_IMAGE=ubuntu:22.04 \
-	--build-arg GO_IMAGE=golang:1.20.10 \
+	--build-arg GO_IMAGE=golang:1.21.10 \
 	--tag grafana/grafana$(TAG_SUFFIX):dev-ubuntu \
 	$(DOCKER_BUILD_ARGS)

--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-![Grafana](docs/logo-horizontal.png)
+![Grafana Logo (Light)](docs/logo-horizontal.png#gh-light-mode-only)
+![Grafana Logo (Dark)](docs/logo-horizontal-dark.png#gh-dark-mode-only)

 The open-source platform for monitoring and observability

--- a/babel.config.json
+++ b/babel.config.json
@@ -6,9 +6,7 @@
      "@babel/preset-env",
      {
        "bugfixes": true,
-        "browserslistEnv": "dev",
-        "useBuiltIns": "entry",
-        "corejs": "3.10"
+        "browserslistEnv": "dev"
      }
    ],
    [
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -10,6 +10,7 @@ app_mode = production
 instance_name = ${HOSTNAME}

 # force migration will run migrations that might cause dataloss
+# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead.
 force_migration = false

 #################################### Paths ###############################
@@ -133,6 +134,9 @@ log_queries =
 # For "mysql", use either "true", "false", or "skip-verify".
 ssl_mode = disable

+# For "postregs", use either "1" to enable or "0" to disable SNI
+ssl_sni =
+
 # Database drivers may support different transaction isolation levels.
 # Currently, only "mysql" driver supports isolation levels.
 # If the value is empty - driver's default isolation level is applied.
@@ -245,7 +249,7 @@ reporting_distributor = grafana-labs
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 check_for_updates = true

 # Set to false to disable all checks to https://grafana.com
@@ -279,6 +283,9 @@ rudderstack_sdk_url =
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 rudderstack_config_url =

+# Rudderstack Integrations URL, optional. Only valid if you pass the SDK version 1.1 or higher
+rudderstack_integrations_url =
+
 # Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
 intercom_secret =

@@ -379,7 +386,7 @@ angular_support_enabled = true
 csrf_always_check = false

 # Comma-separated list of plugins ids that won't be loaded inside the frontend sandbox
-disable_frontend_sandbox_for_plugins =
+disable_frontend_sandbox_for_plugins = grafana-incident-app

 [security.encryption]
 # Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
@@ -562,6 +569,17 @@ azure_auth_enabled = false
 # Use email lookup in addition to the unique ID provided by the IdP
 oauth_allow_insecure_email_lookup = false

+# Set to true to include id of identity as a response header
+id_response_header_enabled = false
+
+# Prefix used for the id response header, X-Grafana-Identity-Id
+id_response_header_prefix = X-Grafana
+
+# List of identity namespaces to add id response headers for, separated by space.
+# Available namespaces are user, api-key and service-account.
+# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
+id_response_header_namespaces = user api-key service-account
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -576,6 +594,9 @@ org_role = Viewer
 # mask the Grafana version number for unauthenticated users
 hide_version = false

+# number of devices in total
+device_limit = 
+
 #################################### GitHub Auth #########################
 [auth.github]
 name = GitHub
@@ -589,6 +610,7 @@ scopes = user:email,read:org
 auth_url = https://github.com/login/oauth/authorize
 token_url = https://github.com/login/oauth/access_token
 api_url = https://api.github.com/user
+signout_redirect_url =
 allowed_domains =
 team_ids =
 allowed_organizations =
@@ -616,6 +638,7 @@ scopes = openid email profile
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
+signout_redirect_url =
 allowed_domains =
 allowed_groups =
 role_attribute_path =
@@ -642,6 +665,7 @@ scopes = openid email profile
 auth_url = https://accounts.google.com/o/oauth2/v2/auth
 token_url = https://oauth2.googleapis.com/token
 api_url = https://openidconnect.googleapis.com/v1/userinfo
+signout_redirect_url =
 allowed_domains =
 hosted_domain =
 allowed_groups =
@@ -692,6 +716,7 @@ client_secret =
 scopes = openid email profile
 auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+signout_redirect_url =
 allowed_domains =
 allowed_groups =
 allowed_organizations =
@@ -719,6 +744,7 @@ scopes = openid profile email groups
 auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 token_url = https://<tenant-id>.okta.com/oauth2/v1/token
 api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+signout_redirect_url =
 allowed_domains =
 allowed_groups =
 role_attribute_path =
@@ -755,6 +781,7 @@ team_ids_attribute_path =
 auth_url =
 token_url =
 api_url =
+signout_redirect_url =
 teams_url =
 allowed_domains =
 allowed_groups =
@@ -805,6 +832,7 @@ auto_sign_up = false
 url_login = false
 allow_assign_grafana_admin = false
 skip_org_role_sync = false
+signout_redirect_url =

 #################################### Auth LDAP ###########################
 [auth.ldap]
@@ -1125,8 +1153,8 @@ execute_alerts = true
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
-max_attempts = 3
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
+max_attempts = 1

 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1217,6 +1245,13 @@ loki_basic_auth_password =
 # ex.
 # mylabelkey = mylabelvalue

+[unified_alerting.upgrade]
+# If set to true when upgrading from legacy alerting to Unified Alerting, grafana will first delete all existing
+# Unified Alerting resources, thus re-upgrading all organizations from scratch. If false or unset, organizations that
+# have previously upgraded will not lose their existing Unified Alerting data when switching between legacy and
+# Unified Alerting. Should be kept false when not needed as it may cause unintended data-loss if left enabled.
+clean_upgrade = false
+
 # NOTE: this configuration options are not used yet.
 [remote.alertmanager]

@@ -1502,6 +1537,8 @@ public_key_retrieval_disabled = false
 public_key_retrieval_on_startup = false
 # Enter a comma-separated list of plugin identifiers to avoid loading (including core plugins). These plugins will be hidden in the catalog.
 disable_plugins =
+# Auth token for plugin installations and removal in managed instances
+install_token =

 #################################### Grafana Live ##########################################
 [live]
@@ -1557,6 +1594,10 @@ rendering_verbose_logging =
 # Default is false. This can be useful to enable (true) when troubleshooting.
 rendering_dumpio =

+# Instruct headless browser instance whether to register metrics for the duration of every rendering step. Default is false.
+# This can be useful to enable (true) when optimizing the rendering mode settings to improve the plugin performance or when troubleshooting.
+rendering_timing_metrics =
+
 # Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
 # here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
 rendering_args =
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -10,6 +10,7 @@
 ;instance_name = ${HOSTNAME}

 # force migration will run migrations that might cause dataloss
+# Deprecated, use clean_upgrade option in [unified_alerting.upgrade] instead.
 ;force_migration = false

 #################################### Paths ####################################
@@ -123,6 +124,9 @@
 # For "mysql", use either "true", "false", or "skip-verify".
 ;ssl_mode = disable

+# For "postregs", use either "1" to enable or "0" to disable SNI
+;ssl_sni =
+
 # Database drivers may support different transaction isolation levels.
 # Currently, only "mysql" driver supports isolation levels.
 # If the value is empty - driver's default isolation level is applied.
@@ -252,7 +256,7 @@
 # for new versions of grafana. The check is used
 # in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
+# only a GET request to https://grafana.com/api/grafana/versions/stable to get the latest version.
 ;check_for_updates = true

 # Set to false to disable all checks to https://grafana.com
@@ -286,6 +290,9 @@
 # Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
 ;rudderstack_config_url =

+# Rudderstack Integrations URL, optional. Only valid if you pass the SDK version 1.1 or higher
+;rudderstack_integrations_url =
+
 # Intercom secret, optional, used to hash user_id before passing to Intercom via Rudderstack
 ;intercom_secret =

@@ -551,6 +558,17 @@
 # Use email lookup in addition to the unique ID provided by the IdP
 ;oauth_allow_insecure_email_lookup = false

+# Set to true to include id of identity as a response header
+;id_response_header_enabled = false
+
+# Prefix used for the id response header, X-Grafana-Identity-Id
+;id_response_header_prefix = X-Grafana
+
+# List of identity namespaces to add id response headers for, separated by space.
+# Available namespaces are user, api-key and service-account.
+# The header value will encode the namespace ("user:<id>", "api-key:<id>", "service-account:<id>")
+;id_response_header_namespaces = user api-key service-account
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -578,6 +596,7 @@
 ;auth_url = https://github.com/login/oauth/authorize
 ;token_url = https://github.com/login/oauth/access_token
 ;api_url = https://api.github.com/user
+;signout_redirect_url =
 ;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
@@ -599,6 +618,7 @@
 ;auth_url = https://gitlab.com/oauth/authorize
 ;token_url = https://gitlab.com/oauth/token
 ;api_url = https://gitlab.com/api/v4
+;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_path =
@@ -624,6 +644,7 @@
 ;auth_url = https://accounts.google.com/o/oauth2/v2/auth
 ;token_url = https://oauth2.googleapis.com/token
 ;api_url = https://openidconnect.googleapis.com/v1/userinfo
+;signout_redirect_url =
 ;allowed_domains =
 ;hosted_domain =
 ;allowed_groups =
@@ -658,6 +679,7 @@
 ;scopes = openid email profile
 ;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 ;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
+;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;allowed_organizations =
@@ -679,6 +701,7 @@
 ;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
 ;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
 ;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
+;signout_redirect_url =
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_path =
@@ -705,6 +728,7 @@
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
+;signout_redirect_url =
 ;teams_url =
 ;allowed_domains =
 ;team_ids =
@@ -1073,8 +1097,8 @@
 # The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;evaluation_timeout = 30s

-# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
-;max_attempts = 3
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is 1.
+;max_attempts = 1

 # Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
@@ -1135,6 +1159,13 @@
 # Any number of label key-value-pairs can be provided.
 ; mylabelkey = mylabelvalue

+[unified_alerting.upgrade]
+# If set to true when upgrading from legacy alerting to Unified Alerting, grafana will first delete all existing
+# Unified Alerting resources, thus re-upgrading all organizations from scratch. If false or unset, organizations that
+# have previously upgraded will not lose their existing Unified Alerting data when switching between legacy and
+# Unified Alerting. Should be kept false when not needed as it may cause unintended data-loss if left enabled.
+;clean_upgrade = false
+
 #################################### Alerting ############################
 [alerting]
 # Disable legacy alerting engine & UI features
--- a/contribute/backend/style-guide.md
+++ b/contribute/backend/style-guide.md
@@ -66,25 +66,23 @@ Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resourc

 ### Mock

-Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to generate mocks. This is
+Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to write mocks. This is
 useful when you expect different behaviours of the same function.

 #### Tips

- Use `Once()` or `Times(n)` to make this mock only works `n` times.
- Use `mockedClass.AssertExpectations(t)` to guarantee that the mock is called the times asked.
-  - If any mock set is not called or its expects more calls, the test fails.
+- Use `Once()` or `Times(n)` to make a method call work `n` times.
+- Use `mockedClass.AssertExpectations(t)` to guarantee that methods are called the times asked.
+  - If any method is not called the expected amount of times, the test fails.
 - You can pass `mock.Anything` as argument if you don't care about the argument passed.
- Use `mockedClass.AssertNotCalled(t, "FunctionName")` to assert that this test is not called.
+- Use `mockedClass.AssertNotCalled(t, "MethodName")` to assert that a method was not called.

 #### Example

-This is an example to easily create a mock of an interface.
-
 Given this interface:

 ```go
-func MyInterface interface {
+type MyInterface interface {
    Get(ctx context.Context, id string) (Object, error)
 }
 ```
@@ -92,39 +90,38 @@ func MyInterface interface {
 Mock implementation should be like this:

 ```go
-import
+import "github.com/stretchr/testify/mock"

-func MockImplementation struct {
+type MockImplementation struct {
    mock.Mock
 }

-func (m *MockImplementation) Get(ctx context.Context, id string) error {
+func (m *MockImplementation) Get(ctx context.Context, id string) (Object, error) {
    args := m.Called(ctx, id) // Pass all arguments in order here
    return args.Get(0).(Object), args.Error(1)
 }
 ```

-And use it as the following way:
+And use it in the following way:

 ```go
-
 objectToReturn := Object{Message: "abc"}
 errToReturn := errors.New("my error")

 myMock := &MockImplementation{}
 defer myMock.AssertExpectations(t)

-myMock.On("Get", mock.Anything, "id1").Return(objectToReturn, errToReturn).Once()
-myMock.On("Get", mock.Anything, "id2").Return(Object{}, nil).Once()
+myMock.On("Get", mock.Anything, "id1").Return(Object{}, errToReturn).Once()
+myMock.On("Get", mock.Anything, "id2").Return(objectToReturn, nil).Once()

 anyService := NewService(myMock)
-resp, err := anyService.Call("id1")

-assert.Equal(t, resp.Message, objectToReturn.Message)
+resp, err := anyService.Call("id1")
 assert.Error(t, err, errToReturn)

 resp, err = anyService.Call("id2")
 assert.Nil(t, err)
+assert.Equal(t, resp.Message, objectToReturn.Message)
 ```

 #### Mockery
--- a/contribute/backend/upgrading-go-version.md
+++ b/contribute/backend/upgrading-go-version.md
@@ -0,0 +1,22 @@
+# Upgrading Go Version
+
+Notes on upgrading Go version.
+
+Example PR: https://github.com/grafana/grafana/pull/79329
+
+## The main areas that need to change during the upgrade are:
+
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/scripts/drone/variables.star#L6
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Makefile#L264
+- https://github.com/grafana/grafana/blob/d8ecea4ed93efb2e4d64a5ee24bc08f3805f413d/Dockerfile#L6
+
+Make sure to run `make drone` so that changes to `.star` files are reflected and `drone.yml` is generated.
+
+### Additional files to change
+
+- Take a look in `.github/workflows` folder for what `go` version is being used there in various workflows.
+- Make sure to create a PR with the corresponding changes in `grafana/grafana-enterprise` repository.
+
+## Updating the go.mod file
+
+Please avoid updating the `go.mod` to the newest version unless really necessary. This ensures backwards compatibility and introduces less breaking changes. Always upgrade Go version in the runtime files above first, let them run for a couple of weeks and only then consider updating the `go.mod` file if necessary.
--- a/contribute/deprecation-policy.md
+++ b/contribute/deprecation-policy.md
@@ -0,0 +1,31 @@
+# Deprecation policy
+
+We do our best to limit breaking changes and the deprecation of features to major releases. We always do our best **not** to introduce breaking changes in order to make upgrading Grafana as easy and reliable as possible. However, at times we have to introduce a breaking change by changing behavior or by removing a feature.
+
+To minimize the negative effects of removing a feature we require a deprecation plan that includes:
+
+- Determine usage levels of the feature.
+- Find alternative solutions and possible migration paths.
+- Announce deprecation of the feature.
+- Migrate users if possible
+- Give users time to adjust to the deprecation.
+- Disable the feature by default.
+- Remove the feature from the code base.
+
+Depending on the size and importance of the feature this can be a design doc or an issue. We want this to be written communication for all parties so we know it's intentional and that did a reasonable attempt to avoid breaking changes unless needed. The size of the feature also means different notice times between Depreciation and disabling as well as disabling and removal. The actual duration will depend on releases of Grafana and the table below should be used as a guide.
+
+Grafana employees can find more details in our internal docs.
+
+## Grace period between announcement and disabling feature by default
+
+| Size   | Duration   | Example                                                          |
+| ------ | ---------- | ---------------------------------------------------------------- |
+| Large  | 1-2 years  | Classic alerting, scripted dashboards, AngularJS                 |
+| Medium | 6 months   | Supported Database for Grafana's backend                         |
+| Small  | 1-3 months | Refresh OAuth access_token automatically using the refresh_token |
+
+## Announced deprecations.
+
+| Name                                                                     | Announcement Date | Disabling date | Removal Date | Description                                                                                                             | Status  |
+| ------------------------------------------------------------------------ | ----------------- | -------------- | ------------ | ----------------------------------------------------------------------------------------------------------------------- | ------- |
+| [Support for Mysql 5.7](https://github.com/grafana/grafana/issues/68446) | 2023-05-15        | October 2023   |              | MySQL 5.7 is being deprecated in October 2023 and Grafana's policy is to test against the officially supported version. | Planned |
--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -18,7 +18,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
-brew install node@18
+brew install node@20
 npm install -g yarn
 ```

@@ -61,7 +61,7 @@ To remove precommit hooks, run
 make lefthook-uninstall
 ```

-> [!NOTE]  
+> [!NOTE]
 > Contributors working on the frontend are highly encouraged to install the precommit hooks, even if your IDE formats on save, so the `.betterer.results` file is kept up to sync.

 ## Build Grafana
--- a/contribute/drone-pipeline.md
+++ b/contribute/drone-pipeline.md
@@ -14,4 +14,4 @@ The Drone pipelines are built with [Starlark](https://github.com/bazelbuild/star
 - Open a PR where you can do test runs for your changes. If you need to experiment with secrets, create a PR in the [grafana-ci-sandbox repo](https://github.com/grafana/grafana-ci-sandbox), before opening a PR in the main repo.
 - Run `make drone` after making changes to the Starlark files. This builds the `.drone.yml` file.

-For further questions, reach out to the grafana-delivery squad.
+For further questions, reach out to the grafana-release-guild squad.
--- a/contribute/internationalization.md
+++ b/contribute/internationalization.md
@@ -189,6 +189,23 @@ Once extracted with `yarn i18n:extract` you will need to manually edit the [Engl
 }
 ```

+## Feedback
+
+**Please note:** This is only for proofreaders with permissions to Grafana OSS project on Crowdin.
+
+To provide feedback on translations, sign into Crowdin and follow these steps:
+
+1. Open the Grafana OSS project in Crowdin.
+2. In the left-hand menu, click on the 'Dashboard' menu item.
+3. A list of available languages appears under the 'Translations' section. Click on the one you want to comment on.
+4. There is a table with the file structure in it:
+   <br>
+   `grafana/main > public > locales > 'language denomination' > grafana.json`
+   <br>
+   Click on the `grafana.json` file.
+5. In the left-hand section, click on the 'Search in file' input and search for the string that you want to comment on. You can search in English, as it is the default language, or in the language the string is translated to.
+6. Once you have found the string, on the right hand side there is a 'Comments' section where you can send the feedback about the translation. Tag @Translated to be sure the team of linguists gets notified.
+
 ## Documentation

 [Grafana's documentation](https://grafana.com/docs/grafana/latest/) is not yet open for translation and should be authored in American English only.
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -115,25 +115,12 @@ In case the pull request introduces a breaking change you should document this.
 <Breaking change description>
 ```

-### Should the pull request be backported?
+### Backporting

 Backporting is the process of copying the pull request into the version branch of one or multiple previous releases.
-This should only be done for _critical bug fixes_ and involves the intervention of a Grafana Labs employee.
-To make this decision explicit, there is a **Backport Check** that is re-evaluated automatically by adding/removing labels on the pull request.
+This is a rare exception, should only be done for _critical bug fixes_, and involves the intervention of a Grafana Labs employee.

-#### No backport
-
-If you don't want to backport you need to add a label named **no-backport** to the pull request.
-
-This should be the default!
-
-#### Backport
-
-If your pull request fixes a critical bug and needs to go into one or several existing release branches it should be backported.
-
-For a pull request to be backported, please add it to "Critical Bug Release" form so that the delivery team is aware that a release for a previous version needs to be made.
-Once approved, the backporting process will continue from there.
-In the meantime, set the `no-backport` label.
+If your pull request fixes a critical bug and needs to be backported, add it to the "Critical Bug Release" form so the team can approve the backport and know that a release needs to be made. Specify the correct `backport vx.x` labels for the releases the fix needs to be backported to. Once approved, the backporting process will continue from there.

 #### Required labels

--- a/contribute/style-guides/frontend.md
+++ b/contribute/style-guides/frontend.md
@@ -180,7 +180,7 @@ const getStyles = (theme: GrafanaTheme2) => ({
 });
 ```

-Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the the getStyles function and instead compose classes using emotion cx function.
+Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the getStyles function and instead compose classes using emotion cx function.

 #### Use `ALL_CAPS` for constants.

--- a/crowdin.yml
+++ b/crowdin.yml
@@ -1,8 +1,8 @@
 files:
  - source: /public/locales/en-US/grafana.json
    translation: /public/locales/%locale%/%original_file_name%
+    type: i18next_json
 pull_request_title: 'I18n: Crowdin sync'
 pull_request_labels:
  - area/internationalization
  - no-changelog
-  - no-backport
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -3,7 +3,6 @@ const fs = require('fs');
 const path = require('path');

 const benchmarkPlugin = require('./e2e/cypress/plugins/benchmark/index');
-const compareScreenshots = require('./e2e/cypress/plugins/compareScreenshots');
 const readProvisions = require('./e2e/cypress/plugins/readProvisions');
 const typescriptPreprocessor = require('./e2e/cypress/plugins/typescriptPreprocessor');

@@ -29,7 +28,6 @@ module.exports = defineConfig({
      }

      on('task', {
-        compareScreenshots,
        readProvisions: (filePaths) => readProvisions({ CWD: process.cwd(), filePaths }),
      });

--- a/devenv/README.md
+++ b/devenv/README.md
@@ -13,10 +13,16 @@ Grafana uses [Docker](https://docker.com) to make the task of setting up databas

 ## Developer dashboards and data sources

+To setup developer dashboards and data sources
 ```bash
 ./setup.sh
 ```

+To remove the setup developer dashboards and data sources
+```bash
+./setup.sh undev
+```
+
 After restarting the Grafana server, there should be a number of data sources named `gdev-<type>` provisioned as well as
 a dashboard folder named `gdev dashboards`. This folder contains dashboard and panel features tests dashboards. 

--- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
@@ -452,6 +452,10 @@
            {
              "text": "CFP franc (XPF)",
              "value": "currencyXPF"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -1611,6 +1615,10 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -2710,6 +2718,10 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
            }
          ],
          "text": "currency"
--- a/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
+++ b/devenv/dev-dashboards/datasource-loki/loki_query_splitting.json
@@ -0,0 +1,900 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "id": 7004,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "description": "Transformations:\n- Count\n- Sort by\n- Limit 10",
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 1,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": false,
+          "sortOrder": "Descending",
+          "wrapLogMessage": false
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"luna\"} | logfmt | label=\"val2\" | float > 60",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Split logs",
+        "transformations": [
+          {
+            "id": "calculateField",
+            "options": {
+              "alias": "id_count",
+              "mode": "reduceRow",
+              "reduce": {
+                "include": [
+                  "id"
+                ],
+                "reducer": "count"
+              },
+              "replaceFields": false
+            }
+          },
+          {
+            "id": "sortBy",
+            "options": {
+              "fields": {},
+              "sort": [
+                {
+                  "desc": true,
+                  "field": "tsNs"
+                }
+              ]
+            }
+          },
+          {
+            "id": "limit",
+            "options": {
+              "limitField": 10
+            }
+          }
+        ],
+        "type": "logs"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "description": "Transformations:\n- Count\n- Sort by\n- Limit 10",
+        "gridPos": {
+          "h": 7,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 2,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": false,
+          "sortOrder": "Descending",
+          "wrapLogMessage": false
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"luna\"} | logfmt | label=\"val2\" | float > 60",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "do-not-chunk"
+          }
+        ],
+        "title": "Logs without splitting",
+        "transformations": [
+          {
+            "id": "calculateField",
+            "options": {
+              "alias": "id_count",
+              "mode": "reduceRow",
+              "reduce": {
+                "include": [
+                  "id"
+                ],
+                "reducer": "count"
+              },
+              "replaceFields": false
+            }
+          },
+          {
+            "id": "sortBy",
+            "options": {
+              "fields": {},
+              "sort": [
+                {
+                  "desc": true,
+                  "field": "tsNs"
+                }
+              ]
+            }
+          },
+          {
+            "id": "limit",
+            "options": {}
+          }
+        ],
+        "type": "logs"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 7
+        },
+        "id": 3,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "count_over_time({place=\"luna\"} | logfmt | label=\"val2\" | float > 60 | drop wave, _entry, level, float, counter [$__auto])",
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Split TS",
+        "transformations": [],
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 7
+        },
+        "id": 4,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "count_over_time({place=\"luna\"} | logfmt | label=\"val2\" | float > 60 | drop wave, _entry, level, float, counter [$__auto])",
+            "queryType": "range",
+            "refId": "do-not-chunk"
+          }
+        ],
+        "title": "TS without splitting",
+        "transformations": [],
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 0,
+          "y": 15
+        },
+        "id": 5,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": false,
+          "sortOrder": "Descending",
+          "wrapLogMessage": false
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"luna\"} | logfmt",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Logs with filter transformation",
+        "transformations": [
+          {
+            "id": "filterByValue",
+            "options": {
+              "filters": [
+                {
+                  "config": {
+                    "id": "isNull",
+                    "options": {}
+                  },
+                  "fieldName": "TraceID"
+                }
+              ],
+              "match": "any",
+              "type": "exclude"
+            }
+          }
+        ],
+        "type": "logs"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "gridPos": {
+          "h": 5,
+          "w": 12,
+          "x": 12,
+          "y": 15
+        },
+        "id": 6,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": false,
+          "sortOrder": "Descending",
+          "wrapLogMessage": false
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"luna\"} | logfmt",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "do-not-chunk"
+          }
+        ],
+        "title": "Logs with filter transformation, no splitting",
+        "transformations": [
+          {
+            "id": "filterByValue",
+            "options": {
+              "filters": [
+                {
+                  "config": {
+                    "id": "isNull",
+                    "options": {}
+                  },
+                  "fieldName": "TraceID"
+                }
+              ],
+              "match": "any",
+              "type": "exclude"
+            }
+          }
+        ],
+        "type": "logs"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "auto",
+              "cellOptions": {
+                "type": "auto"
+              },
+              "inspect": false
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 20
+        },
+        "id": 7,
+        "options": {
+          "cellHeight": "sm",
+          "footer": {
+            "countRows": false,
+            "fields": "",
+            "reducer": [
+              "sum"
+            ],
+            "show": false
+          },
+          "showHeader": true
+        },
+        "pluginVersion": "10.2.0-61469",
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"luna\", age=\"new\"}",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Logs with extract fields transformation",
+        "transformations": [
+          {
+            "id": "extractFields",
+            "options": {
+              "format": "json",
+              "keepTime": true,
+              "replace": true,
+              "source": "labels"
+            }
+          },
+          {
+            "id": "calculateField",
+            "options": {
+              "alias": "Row",
+              "mode": "index",
+              "reduce": {
+                "reducer": "sum"
+              },
+              "replaceFields": false
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "auto",
+              "cellOptions": {
+                "type": "auto"
+              },
+              "inspect": false
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 20
+        },
+        "id": 8,
+        "options": {
+          "cellHeight": "sm",
+          "footer": {
+            "countRows": false,
+            "fields": "",
+            "reducer": [
+              "sum"
+            ],
+            "show": false
+          },
+          "showHeader": true
+        },
+        "pluginVersion": "10.2.0-61469",
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"luna\", age=\"new\"}",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "do-not-chunk"
+          }
+        ],
+        "title": "Logs with extract fields transformation, no splitting",
+        "transformations": [
+          {
+            "id": "extractFields",
+            "options": {
+              "format": "json",
+              "keepTime": true,
+              "replace": true,
+              "source": "labels"
+            }
+          },
+          {
+            "id": "calculateField",
+            "options": {
+              "alias": "Row",
+              "mode": "index",
+              "reduce": {
+                "reducer": "sum"
+              },
+              "replaceFields": false
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "auto",
+              "cellOptions": {
+                "type": "auto"
+              },
+              "inspect": false
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 28
+        },
+        "id": 9,
+        "options": {
+          "cellHeight": "sm",
+          "footer": {
+            "countRows": false,
+            "fields": "",
+            "reducer": [
+              "sum"
+            ],
+            "show": false
+          },
+          "showHeader": true
+        },
+        "pluginVersion": "10.2.0-61469",
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"moon\"}",
+            "maxLines": 5,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Logs with extract key=value and organize",
+        "transformations": [
+          {
+            "id": "extractFields",
+            "options": {
+              "format": "auto",
+              "keepTime": true,
+              "replace": true,
+              "source": "Line"
+            }
+          },
+          {
+            "id": "organize",
+            "options": {
+              "excludeByName": {
+                "31": true,
+                "32": true,
+                "33": true,
+                "34": true,
+                "35": true,
+                "36": true,
+                "37": true,
+                "38": true,
+                "39": true,
+                "40": true,
+                "41": true,
+                "42": true,
+                "43": true,
+                "44": true,
+                "45": true,
+                "46": true,
+                "2023-09-20T14": true,
+                "33+00": true,
+                "caller": true,
+                "main.go": true,
+                "t": true,
+                "ts": true
+              },
+              "indexByName": {},
+              "renameByName": {
+                "level": "nivel",
+                "ts": ""
+              }
+            }
+          }
+        ],
+        "type": "table"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "gdev-loki"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "custom": {
+              "align": "auto",
+              "cellOptions": {
+                "type": "auto"
+              },
+              "inspect": false
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 28
+        },
+        "id": 10,
+        "options": {
+          "cellHeight": "sm",
+          "footer": {
+            "countRows": false,
+            "fields": "",
+            "reducer": [
+              "sum"
+            ],
+            "show": false
+          },
+          "showHeader": true
+        },
+        "pluginVersion": "10.2.0-61469",
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "gdev-loki"
+            },
+            "editorMode": "code",
+            "expr": "{place=\"moon\"}",
+            "maxLines": 5,
+            "queryType": "range",
+            "refId": "do-not-chunk"
+          }
+        ],
+        "title": "Logs with extract key=value and organize, no splitting",
+        "transformations": [
+          {
+            "id": "extractFields",
+            "options": {
+              "format": "auto",
+              "keepTime": true,
+              "replace": true,
+              "source": "Line"
+            }
+          },
+          {
+            "id": "organize",
+            "options": {
+              "excludeByName": {
+                "31": true,
+                "32": true,
+                "33": true,
+                "34": true,
+                "35": true,
+                "36": true,
+                "37": true,
+                "38": true,
+                "39": true,
+                "40": true,
+                "41": true,
+                "42": true,
+                "43": true,
+                "44": true,
+                "45": true,
+                "46": true,
+                "2023-09-20T14": true,
+                "33+00": true,
+                "caller": true,
+                "main.go": true,
+                "t": true,
+                "ts": true
+              },
+              "indexByName": {},
+              "renameByName": {
+                "level": "nivel",
+                "ts": ""
+              }
+            }
+          }
+        ],
+        "type": "table"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 38,
+    "tags": [],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Datasource tests - Loki query splitting",
+    "uid": "dc4ec947-7e6b-4c3b-be8f-0abec7b0652a",
+    "version": 13,
+    "weekStart": ""
+  }
--- a/devenv/dev-dashboards/panel-dashlist/dashlist.json
+++ b/devenv/dev-dashboards/panel-dashlist/dashlist.json
@@ -0,0 +1,86 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "folderUID": "",
+        "includeVars": true,
+        "keepTime": false,
+        "maxItems": 10,
+        "query": "",
+        "showHeadings": true,
+        "showRecentlyViewed": true,
+        "showSearch": false,
+        "showStarred": false,
+        "tags": []
+      },
+      "pluginVersion": "10.3.0-pre",
+      "title": "Include time range and variables enabled",
+      "type": "dashlist"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 39,
+  "tags": ["gdev", "panel-tests"],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": "A",
+          "value": "A"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "multi": true,
+        "name": "server",
+        "query": "A,B,C,D",
+        "queryValue": "",
+        "skipUrlSync": false,
+        "type": "custom"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Panel Tests - DashList",
+  "uid": "a6801696-cc53-4196-b1f9-2403e3909185",
+  "version": 1,
+  "weekStart": ""
+}
--- a/devenv/dev-dashboards/panel-polystat/polystat_test.json
+++ b/devenv/dev-dashboards/panel-polystat/polystat_test.json
@@ -449,9 +449,13 @@
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
            },
-	    {
+	          {
              "text": "CFP franc (XPF)",
              "value": "currencyXPF"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -1611,6 +1615,10 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
            }
          ],
          "text": "currency"
@@ -2706,6 +2714,10 @@
            {
              "text": "Malaysian Ringgit (RM)",
              "value": "currencyMYR"
+            },
+            {
+              "text": "Bulgarian Lev (BGN)",
+              "value": "currencyBGN"
            }
          ],
          "text": "currency"
--- a/devenv/dev-dashboards/panel-timeseries/timeseries-bars-high-density.json
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-bars-high-density.json
@@ -0,0 +1,600 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "id": 812,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "datasource": {
+          "type": "grafana-testdata-datasource",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 1,
+        "maxDataPoints": 500,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "grafana-testdata-datasource",
+              "uid": "PD8C576611E62080A"
+            },
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "seriesCount": 1
+          }
+        ],
+        "title": "Dense (stroke only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "grafana-testdata-datasource",
+          "uid": "PD8C576611E62080A"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 4,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "grafana-testdata-datasource",
+              "uid": "PD8C576611E62080A"
+            },
+            "refId": "A",
+            "scenarioId": "random_walk",
+            "seriesCount": 1
+          }
+        ],
+        "title": "Normal (stroke only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 60,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 0,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 10
+        },
+        "id": 2,
+        "maxDataPoints": 500,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 1,
+            "refId": "A"
+          }
+        ],
+        "title": "Dense (fill only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 60,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 0,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 10
+        },
+        "id": 3,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Normal (fill only)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 20,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 0,
+          "y": 20
+        },
+        "id": 6,
+        "maxDataPoints": 500,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 1,
+            "refId": "A"
+          }
+        ],
+        "title": "Dense (stroke + fill)",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "datasource",
+          "uid": "-- Dashboard --"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisBorderShow": false,
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "bars",
+              "fillOpacity": 20,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 10,
+          "w": 12,
+          "x": 12,
+          "y": 20
+        },
+        "id": 5,
+        "maxDataPoints": 50,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "datasource",
+              "uid": "-- Dashboard --"
+            },
+            "panelId": 4,
+            "refId": "A"
+          }
+        ],
+        "title": "Normal (stroke + fill)",
+        "type": "timeseries"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 39,
+    "tags": [
+      "gdev",
+      "panel-tests",
+      "graph-ng"
+    ],
+    "templating": {
+      "list": []
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "Panel Tests - TimeSeries - bars high density (stroke + fill)",
+    "uid": "c295a76e-79d3-43b3-a688-ef0373224158",
+    "version": 3,
+    "weekStart": ""
+  }
--- a/devenv/dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json
+++ b/devenv/dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json
@@ -3,7 +3,10 @@
    "list": [
      {
        "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
@@ -19,10 +22,16 @@
    ]
  },
  "editable": true,
+  "fiscalYearStartMonth": 0,
  "graphTooltip": 0,
  "links": [],
+  "liveNow": false,
  "panels": [
    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
      "description": "",
      "fieldConfig": {
        "defaults": {
@@ -30,6 +39,9 @@
            "mode": "thresholds"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -41,6 +53,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 3,
            "pointSize": 5,
@@ -91,8 +104,9 @@
      "options": {
        "legend": {
          "calcs": [],
-          "displayMode": "hidden",
-          "placement": "bottom"
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": false
        },
        "tooltip": {
          "mode": "single",
@@ -101,6 +115,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
          "refId": "A",
          "scenarioId": "csv_metric_values",
          "stringInput": "1,10,20,30,40,50"
@@ -110,6 +128,10 @@
      "type": "timeseries"
    },
    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
      "description": "",
      "fieldConfig": {
        "defaults": {
@@ -117,6 +139,9 @@
            "mode": "thresholds"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -128,6 +153,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 3,
            "pointSize": 5,
@@ -179,7 +205,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -188,6 +215,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
          "refId": "A",
          "scenarioId": "csv_metric_values",
          "stringInput": "1,10,20,30,40,50"
@@ -197,12 +228,19 @@
      "type": "timeseries"
    },
    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -214,6 +252,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 2,
            "pointSize": 5,
@@ -265,7 +304,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -274,6 +314,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
          "refId": "A",
          "scenarioId": "csv_metric_values",
          "stringInput": "1,10,20,30,40,50"
@@ -282,6 +326,101 @@
      "title": "15 orange, 50 red",
      "type": "timeseries"
    },
+    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 25,
+            "gradientMode": "scheme",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 2,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "transparent"
+              },
+              {
+                "color": "orange",
+                "value": 20
+              },
+              {
+                "color": "red",
+                "value": 50
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 8,
+        "x": 8,
+        "y": 7
+      },
+      "id": 14,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": "1,20,90,30,5,0"
+        }
+      ],
+      "title": "Transprent base",
+      "type": "timeseries"
+    },
    {
      "datasource": {
        "type": "datasource",
@@ -293,6 +432,9 @@
            "mode": "thresholds"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -304,6 +446,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 3,
            "pointSize": 5,
@@ -347,7 +490,7 @@
        "h": 7,
        "w": 12,
        "x": 0,
-        "y": 7
+        "y": 15
      },
      "id": 9,
      "maxDataPoints": 45,
@@ -355,7 +498,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -364,6 +508,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
          "panelId": 4,
          "refId": "A"
        }
@@ -372,12 +520,19 @@
      "type": "timeseries"
    },
    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "thresholds"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -389,6 +544,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 0,
            "pointSize": 5,
@@ -432,7 +588,7 @@
        "h": 7,
        "w": 12,
        "x": 12,
-        "y": 7
+        "y": 15
      },
      "id": 4,
      "interval": "80s",
@@ -441,7 +597,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -450,6 +607,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
          "max": 40,
          "min": 0,
          "noise": 1,
@@ -473,6 +634,9 @@
            "mode": "continuous-GrYlRd"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -484,6 +648,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 3,
            "pointSize": 5,
@@ -531,7 +696,7 @@
        "h": 7,
        "w": 12,
        "x": 0,
-        "y": 14
+        "y": 22
      },
      "id": 6,
      "maxDataPoints": 50,
@@ -539,7 +704,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -548,6 +714,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
          "panelId": 4,
          "refId": "A"
        }
@@ -566,6 +736,9 @@
            "mode": "continuous-GrYlRd"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -577,6 +750,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 1,
            "pointSize": 5,
@@ -624,7 +798,7 @@
        "h": 7,
        "w": 12,
        "x": 12,
-        "y": 14
+        "y": 22
      },
      "id": 10,
      "maxDataPoints": 45,
@@ -632,7 +806,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -641,6 +816,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
          "panelId": 4,
          "refId": "A"
        }
@@ -659,6 +838,9 @@
            "mode": "continuous-GrYlRd"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -670,6 +852,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 1,
            "pointSize": 5,
@@ -717,7 +900,7 @@
        "h": 7,
        "w": 12,
        "x": 0,
-        "y": 21
+        "y": 29
      },
      "id": 7,
      "maxDataPoints": 50,
@@ -725,7 +908,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -734,6 +918,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "datasource",
+            "uid": "-- Dashboard --"
+          },
          "panelId": 4,
          "refId": "A"
        }
@@ -742,12 +930,19 @@
      "type": "timeseries"
    },
    {
+      "datasource": {
+        "type": "grafana-testdata-datasource",
+        "uid": "PD8C576611E62080A"
+      },
      "fieldConfig": {
        "defaults": {
          "color": {
            "mode": "continuous-GrYlRd"
          },
          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
@@ -759,6 +954,7 @@
              "tooltip": false,
              "viz": false
            },
+            "insertNulls": false,
            "lineInterpolation": "smooth",
            "lineWidth": 3,
            "pointSize": 5,
@@ -806,7 +1002,7 @@
        "h": 7,
        "w": 12,
        "x": 12,
-        "y": 21
+        "y": 29
      },
      "id": 8,
      "maxDataPoints": 250,
@@ -814,7 +1010,8 @@
        "legend": {
          "calcs": [],
          "displayMode": "list",
-          "placement": "bottom"
+          "placement": "bottom",
+          "showLegend": true
        },
        "tooltip": {
          "mode": "single",
@@ -823,6 +1020,10 @@
      },
      "targets": [
        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
          "max": 45,
          "min": 20,
          "noise": 0,
@@ -832,6 +1033,10 @@
          "startValue": 40
        },
        {
+          "datasource": {
+            "type": "grafana-testdata-datasource",
+            "uid": "PD8C576611E62080A"
+          },
          "hide": false,
          "max": 20,
          "min": 1,
@@ -845,8 +1050,8 @@
      "type": "timeseries"
    }
  ],
-  "refresh": false,
-  "schemaVersion": 33,
+  "refresh": "",
+  "schemaVersion": 38,
  "tags": [
    "gdev",
    "panel-tests",
@@ -863,5 +1068,6 @@
  "timezone": "",
  "title": "Panel Tests - Graph NG - By value color schemes",
  "uid": "aBXrJ0R7z",
-  "version": 11
+  "version": 4,
+  "weekStart": ""
 }
--- a/devenv/dev-dashboards/panel-xychart/xychart-example.json
+++ b/devenv/dev-dashboards/panel-xychart/xychart-example.json
--- a/devenv/dev-dashboards/transforms/regression-analysis.json
+++ b/devenv/dev-dashboards/transforms/regression-analysis.json
--- a/devenv/docker/blocks/auth/authentik/README.md
+++ b/devenv/docker/blocks/auth/authentik/README.md
@@ -85,8 +85,6 @@ auth_url = http://localhost:9000/application/o/authorize/
 token_url = http://localhost:9000/application/o/token/
 api_url = http://localhost:9000/application/o/userinfo/
 role_attribute_path = contains(groups[*], 'admin') && 'Admin' || contains(groups[*], 'editor') && 'Editor' || 'Viewer'
-
-[auth]
 signout_redirect_url = http://localhost:9000/application/o/grafana-oidc/end-session/
 ```

--- a/devenv/docker/blocks/auth/authentik/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/authentik/docker-compose.yaml
@@ -1,5 +1,5 @@
  authentikdb:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
    restart: unless-stopped
    container_name: authentikdb
    environment:
@@ -39,7 +39,7 @@
      - "authentik:authentik"

  authentik:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.5.1}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.4}
    restart: unless-stopped
    container_name: authentik
    command: server
@@ -66,7 +66,7 @@
      - "authentikredis:authentikredis"

  authentik-worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.5.1}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.4}
    restart: unless-stopped
    container_name: authentik-worker
    command: worker
--- a/devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
@@ -1,5 +1,5 @@
  oauthkeycloakdb:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
    container_name: oauthkeycloakdb
    environment:
      POSTGRES_DB: keycloak
@@ -10,7 +10,7 @@
    restart: unless-stopped

  oauthkeycloak:
-    image: quay.io/keycloak/keycloak:21.1
+    image: quay.io/keycloak/keycloak:23.0
    container_name: oauthkeycloak
    command: start-dev
    environment:
--- a/devenv/docker/blocks/auth/oauth/docker-compose.yaml
+++ b/devenv/docker/blocks/auth/oauth/docker-compose.yaml
@@ -1,5 +1,5 @@
  oauthkeycloakdb:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
    container_name: oauthkeycloakdb
    environment:
      POSTGRES_DB: keycloak
@@ -10,7 +10,7 @@
    restart: unless-stopped

  oauthkeycloak:
-    image: quay.io/keycloak/keycloak:22.0
+    image: quay.io/keycloak/keycloak:23.0
    container_name: oauthkeycloak
    command: start-dev
    environment:
--- a/devenv/docker/blocks/auth/oauth/readme.md
+++ b/devenv/docker/blocks/auth/oauth/readme.md
@@ -10,9 +10,6 @@ make devenv sources="auth/oauth"
 Here is the conf you need to add to your configuration file (conf/custom.ini):

 ```ini
-[auth]
-signout_redirect_url = http://localhost:8087/realms/grafana/protocol/openid-connect/logout?post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin
-
 [auth.generic_oauth]
 enabled = true
 name = Keycloak-OAuth
@@ -28,6 +25,7 @@ auth_url = http://localhost:8087/realms/grafana/protocol/openid-connect/auth
 token_url = http://localhost:8087/realms/grafana/protocol/openid-connect/token
 role_attribute_path = contains(roles[*], 'grafanaadmin') && 'GrafanaAdmin' || contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'
 allow_assign_grafana_admin = true
+signout_redirect_url = http://localhost:8087/realms/grafana/protocol/openid-connect/logout?post_logout_redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin
 ```

 ## Devenv setup jwt auth
--- a/devenv/docker/blocks/loki/data/data.js
+++ b/devenv/docker/blocks/loki/data/data.js
@@ -47,12 +47,12 @@ async function sleep(duration) {
  });
 }

-async function lokiSendLogLine(timestampNs, line, tags, nonIndexed = {}) {
+async function lokiSendLogLine(timestampNs, line, tags, structuredMetadata = {}) {
  const data = {
    streams: [
      {
        stream: tags,
-        values: [[timestampNs, line, nonIndexed]],
+        values: [[timestampNs, line, structuredMetadata]],
      },
    ],
  };
@@ -68,6 +68,18 @@ function getSineValue(counter, loopLength) {
  return Math.sin((Math.PI * 2 * counter) / loopLength);
 }

+function fakeTraceId() {
+  let traceId = '';
+  const chars = 'abcdef0123456789';
+  const idLength = 12;
+  let i = 0;
+  while (i < idLength) {
+    traceId += chars.charAt(Math.floor(Math.random() * chars.length));
+    i += 1;
+  }
+  return traceId;
+}
+
 function getRandomLogItem(counter) {
  const randomText = `${Math.trunc(Math.random() * 1000 * 1000 * 1000)}`;
  const maybeAnsiText = Math.random() < 0.5 ? 'with ANSI \u001b[31mpart of the text\u001b[0m' : '';
@@ -176,8 +188,8 @@ async function sendOldLogs() {
    const timestampNs = `${timestampMs}${getRandomNanosecPart()}`;
    globalCounter += 1;
    const item = getRandomLogItem(globalCounter)
-    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'old', place:'moon', ...sharedLabels});
-    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'old', place:'luna', ...sharedLabels});
+    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'old', place:'moon', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
+    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'old', place:'luna', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
  };
 }

@@ -187,8 +199,8 @@ async function sendNewLogs() {
    const nowMs = new Date().getTime();
    const timestampNs = `${nowMs}${getRandomNanosecPart()}`;
    const item = getRandomLogItem(globalCounter)
-    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'new', place:'moon', ...sharedLabels}, {nonIndexed: 'value'});
-    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'new', place:'luna', ...sharedLabels}, {nonIndexed: 'value'});
+    await lokiSendLogLine(timestampNs, JSON.stringify(item), {age:'new', place:'moon', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
+    await lokiSendLogLine(timestampNs, logFmtLine(item), {age:'new', place:'luna', ...sharedLabels}, {structuredMetadataKey: 'value', traceId: fakeTraceId()});
    const sleepDuration  = 200 + Math.random() * 800; // between 0.2 and 1 seconds
    await sleep(sleepDuration);
  }
--- a/devenv/docker/blocks/tempo/tempo.yaml
+++ b/devenv/docker/blocks/tempo/tempo.yaml
@@ -52,3 +52,5 @@ storage:

 overrides:
  metrics_generator_processors: [local-blocks, service-graphs, span-metrics]
+
+stream_over_http_enabled: true
--- a/devenv/jsonnet/dev-dashboards.libsonnet
+++ b/devenv/jsonnet/dev-dashboards.libsonnet
@@ -149,6 +149,13 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
+    dashboard.new('dashlist', import '../dev-dashboards/panel-dashlist/dashlist.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
    dashboard.new('datadata-macros', import '../dev-dashboards/feature-templating/datadata-macros.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -387,6 +394,13 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
+    dashboard.new('loki_query_splitting', import '../dev-dashboards/datasource-loki/loki_query_splitting.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
    dashboard.new('migrations', import '../dev-dashboards/migrations/migrations.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -527,6 +541,13 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
+    dashboard.new('regression-analysis', import '../dev-dashboards/transforms/regression-analysis.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
    dashboard.new('relative_time_zone_support', import '../dev-dashboards/scenarios/relative_time_zone_support.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -709,6 +730,13 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
+    dashboard.new('timeseries-bars-high-density', import '../dev-dashboards/panel-timeseries/timeseries-bars-high-density.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
    dashboard.new('timeseries-by-value-color-schemes', import '../dev-dashboards/panel-timeseries/timeseries-by-value-color-schemes.json') +
    resource.addMetadata('folder', 'dev-dashboards') +
    {
@@ -814,5 +842,12 @@ local dashboard = grafana.dashboard;
        id: 0,
      }
    },
+    dashboard.new('xychart-example', import '../dev-dashboards/panel-xychart/xychart-example.json') +
+    resource.addMetadata('folder', 'dev-dashboards') +
+    {
+      spec+: {
+        id: 0,
+      }
+    },
  ],
 } 
--- a/devenv/setup.sh
+++ b/devenv/setup.sh
@@ -59,6 +59,31 @@ devDatasources() {
 		ln -s -f ../../../devenv/datasources.yaml ../conf/provisioning/datasources/dev.yaml
 }

+undev() {
+    echo -e "\xE2\x9C\x94 Reverting all dev provisioning"
+
+    # Removing generated dashboard files from bulk-dashboards
+    rm -f bulk-dashboards/dashboard*.json
+    echo -e "    \xE2\x9C\x94 Reverting bulk-dashboards provisioning"
+
+    # Removing generated folders from bulk-folders
+    rm -rf bulk-folders/Bulk\ Folder*
+    echo -e "    \xE2\x9C\x94 Reverting bulk-folders provisioning"
+
+
+    # Removing generated dashboard and datasource files from bulk-alerting-dashboards
+    rm -f bulk_alerting_dashboards/alerting_dashboard*.json
+    rm -f "bulk_alerting_dashboards/bulk_alerting_datasources.yaml"
+    echo -e "    \xE2\x9C\x94 Reverting bulk-alerting-dashboards provisioning"
+
+    # Removing the symlinks
+    rm -f ../conf/provisioning/dashboards/custom.yaml
+    rm -f ../conf/provisioning/dashboards/bulk-folders.yaml
+    rm -f ../conf/provisioning/dashboards/dev.yaml
+    rm -f ../conf/provisioning/datasources/custom.yaml
+    rm -f ../conf/provisioning/datasources/dev.yaml
+}
+
 usage() {
 	echo -e "\n"
 	echo "Usage:"
@@ -67,6 +92,7 @@ usage() {
 	echo "  bulk-folders [folders] [dashboards]  - provision many folders with dashboards"
 	echo "  bulk-folders                         - provision 200 folders with 3 dashboards in each"
 	echo "  no args                              - provision core datasources and dev dashboards"
+	echo "  undev                                - removes any provisioning done by the setup.sh"
 }

 main() {
@@ -84,6 +110,8 @@ main() {
 		bulkDashboard
 	elif [[ $cmd == "bulk-folders" ]]; then
 		bulkFolders "$arg1"
+	elif [[ $cmd == "undev" ]]; then
+ 	   undev
 	else
 		devDashboards
 		devDatasources
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -6,3 +6,10 @@ MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rule

 include docs.mk
+
+.PHONY: sources/panels-visualizations/query-transform-data/transform-data/index.md
+sources/panels-visualizations/query-transform-data/transform-data/index.md: ## Generate the Transform Data page source.
+sources/panels-visualizations/query-transform-data/transform-data/index.md:
+	cd $(CURDIR)/.. && npx tsc ./scripts/docs/generate-transformations.ts && \
+	node ./scripts/docs/generate-transformations.js > $(CURDIR)/$@ && \
+	npx prettier -w $(CURDIR)/$@
--- a/docs/README.md
+++ b/docs/README.md
@@ -23,7 +23,23 @@ If you have the grafana/website repo checked out in the same directory as the gr

 ## Content guidelines

-Edit content in the `sources` directory.
+Generally, one can edit content in the `sources` directory.
+
+The following paths are built instead from a typescript file and are auto-generated. Please do not edit these files directly.
+Instead, navigate to the appropriate typescript source file and edit the content there, then follow the build instructions to generate the markdown files.
+
+### Transformations
+
+Auto-generated markdown location:
+
+- docs/sources/panels-visualizations/query-transform-data/transform-data/index.md
+
+Typescript location for editing and instructions:
+
+- scripts/docs/generate-transformations.ts - Includes all content not specific to a transformation.
+- public/app/features/transformers/docs/content.ts - Transformation-specific content.
+
+Only use [reference style links](https://grafana.com/docs/writers-toolkit/write/shortcodes/#docsreference) in the `content.ts` file or else link text will be visible in the UI.

 ### [Contributing](/contribute/documentation/README.md)

--- a/docs/docs.mk
+++ b/docs/docs.mk
@@ -34,11 +34,6 @@ endif
 # First project is considered the primary one used for doc-validator.
 PRIMARY_PROJECT := $(subst /,-,$(firstword $(subst :, ,$(firstword $(PROJECTS)))))

-# Name for the container.
-ifeq ($(origin DOCS_CONTAINER), undefined)
-export DOCS_CONTAINER := $(PRIMARY_PROJECT)-docs
-endif
-
 # Host port to publish container port to.
 ifeq ($(origin DOCS_HOST_PORT), undefined)
 export DOCS_HOST_PORT := 3002
--- a/docs/logo-horizontal-dark.png
+++ b/docs/logo-horizontal-dark.png
--- a/docs/make-docs
+++ b/docs/make-docs
@@ -5,107 +5,191 @@
 # Updates should conform to the guidelines in https://keepachangelog.com/en/1.1.0/.
 # [Semantic versioning](https://semver.org/) is used to help the reader identify the significance of changes.
 # Changes are relevant to this script and the support docs.mk GNU Make interface.
-
+#
+# ## 6.0.1 (2024-02-28)
+#
+# ### Added
+#
+# - Suppress new errors relating to absent content introduced in https://github.com/grafana/website/pull/17561.
+#
+# ## 6.0.0 (2024-02-16)
+#
+# ### Changed
+#
+# - Require `jq` for human readable `make doc-validator` output.
+#
+# ## 5.4.0 (2024-02-12)
+#
+# ### Changed
+#
+# - Set `WEBSITE_MOUNTS=true` when a user includes the `website` project.
+#
+#   Ensures consistent behavior across repositories.
+#   To disable website mounts, add `export WEBSITE_MOUNTS := false` to your `variables.mk` or `variables.mk.local` file.
+# - Use website mounts and container volumes also when a user includes the `grafana-cloud` project.
+#
+# ## 5.3.0 (2024-02-08)
+#
+# ### Changed
+#
+# - Updated support for plugins monorepo now that multiple projects have been moved into it.
+# - Use `printf` instead of `echo` for better portability of output.
+#
+#   https://www.in-ulm.de/~mascheck/various/echo+printf/
+#
+# ## 5.2.0 (2024-01-18)
+#
+# ### Changed
+#
+# - Updated `make vale` to use latest Vale style and configuration.
+# - Updated `make vale` to use platform appropriate image.
+#
+# ## 5.1.2 (2023-11-08)
+#
+# ### Added
+#
+# - Hide manual_mount warning messages from non-debug output.
+#   Set the DEBUG environment variable to see all hidden messages.
+#
+# ## 5.1.1 (2023-10-30)
+#
+# ### Added
+#
+# - Support for Datadog and Oracle data source plugins repositories.
+#
+# ## 5.1.0 (2023-10-20)
+#
+# ### Added
+#
+# - Support for the plugins monorepo.
+#
+# ## 5.0.0 (2023-10-18)
+#
+# ### Added
+#
+# - Improved support for website repository.
+#
+#   Mount more content and provide some feedback to users that the build can take time.
+#
+# - Ability to enter the `grafana/docs-base` container with a shell using the `ENTER` environment variable.
+#
+# ### Fixed
+#
+# - Correct key combination for interrupting the process.
+#
+#   Keyboards use capital letters so this more accurately reflects the exact key combination users are expected to press.
+#
+# ### Removed
+#
+# - Imperfect implementation of container name.
+#
+#   Facilitates running `make vale` and `make docs` at once.
+#   Container names are convenient for recognition in `docker ps` but the current implementation has more downsides than upsides.
+#
+# - Forced platform specification now that multiple architecture images exist.
+#
+#  Significantly speeds up build times on larger repositories.
+#
 # ## 4.2.2 (2023-10-05)

 # - Added support for Jira data source and MongoDB data source plugins repositories.
-
+#
 # ## 4.2.1 (2023-09-13)

 # ## Fixed
-
+#
 # - Improved consistency of the webserver request loop by polling the Hugo port rather than the proxy port.
-
+#
 # ## 4.2.0 (2023-09-01)
-
+#
 # ### Added
-
+#
 # - Retry the initial webserver request up to ten times to allow for the process to start.
 #   If it is still failing after ten seconds, an error message is logged.
-
+#
 # ## 4.1.1 (2023-07-20)
-
+#
 # ### Fixed
-
+#
 # - Replaced use of `realpath` with POSIX compatible alternative to determine default value for REPOS_PATH.
-
+#
 # ## 4.1.0 (2023-06-16)
-
+#
 # ### Added
-
+#
 # - Mounts of `layouts` and `config` directories for the `website` project.
 #   Ensures that local changes to mounts or shortcodes are reflected in the development server.
-
+#
 # ### Fixed
-
+#
 # - Version inference for versioned docs pages.
 #   Pages in versioned projects now have the `versioned: true` front matter set to ensure that "version" in $.Page.Scratch is set on builds.
-
+#
 # ## 4.0.0 (2023-06-06)
-
+#
 # ### Removed
-
+#
 # - `doc-validator/%` target.
 #   The behavior of the target was not as described.
 #   Instead, to limit `doc-validator` to only specific files, refer to https://grafana.com/docs/writers-toolkit/writing-guide/tooling-and-workflows/validate-technical-documentation/#run-on-specific-files.
-
+#
 # ## 3.0.0 (2023-05-18)
-
+#
 # ### Fixed
-
+#
 # - Compatibility with the updated Make targets in the `website` repository.
 #   `docs` now runs this script itself, `server-docs` builds the site with the `docs` Hugo environment.
-
+#
 # ## 2.0.0 (2023-05-18)
-
+#
 # ### Added
-
+#
 # - Support for the grafana-cloud/frontend-observability/faro-web-sdk project.
 # - Use of `doc-validator` v2.0.x which includes breaking changes to command line options.
-
+#
 # ### Fixed
-
+#
 # - Source grafana-cloud project from website repository.
-
+#
 # ### Added
-
+#
 # - Support for running the Vale linter with `make vale`.
-
+#
 # ## 1.2.1 (2023-05-05)
-
+#
 # ### Fixed
-
+#
 # - Use `latest` tag of `grafana/vale` image by default instead of hardcoded older version.
 # - Fix mounting multiple projects broken by the changes in 1.0.1
-
+#
 # ## 1.2.0 (2023-05-05)
-
+#
 # ### Added
-
+#
 # - Support for running the Vale linter with `make vale`.
-
+#
 # ### Fixed
-
+#
 # ## 1.1.0 (2023-05-05)
-
+#
 # ### Added
-
+#
 # - Rewrite error output so it can be followed by text editors.
-
+#
 # ### Fixed
-
+#
 # - Fix `docs-debug` container process port.
-
+#
 # ## 1.0.1 (2023-05-04)
-
+#
 # ### Fixed
-
+#
 # - Ensure complete section hierarchy so that all projects have a visible menu.
-
+#
 # ## 1.0.0 (2023-05-04)
-
+#
 # ### Added
-
+#
 # - Build multiple projects simultaneously if all projects are checked out locally.
 # - Run [`doc-validator`](https://github.com/grafana/technical-documentation/tree/main/tools/cmd/doc-validator) over projects.
 # - Redirect project root to mounted version.
@@ -135,7 +219,6 @@

 set -ef

-readonly DOCS_CONTAINER="${DOCS_CONTAINER:-make-docs}"
 readonly DOCS_HOST_PORT="${DOCS_HOST_PORT:-3002}"
 readonly DOCS_IMAGE="${DOCS_IMAGE:-grafana/docs-base:latest}"

@@ -145,8 +228,6 @@ readonly DOC_VALIDATOR_SKIP_CHECKS="${DOC_VALIDATOR_SKIP_CHECKS:-^image-}"
 readonly HUGO_REFLINKSERRORLEVEL="${HUGO_REFLINKSERRORLEVEL:-WARNING}"
 readonly VALE_MINALERTLEVEL="${VALE_MINALERTLEVEL:-error}"
 readonly WEBSITE_EXEC="${WEBSITE_EXEC:-make server-docs}"
-# If set, the docs-base image will run a prebuild script that sets up Hugo mounts.
-readonly WEBSITE_MOUNTS="${WEBSITE_MOUNTS:-}"

 PODMAN="$(if command -v podman >/dev/null 2>&1; then echo podman; else echo docker; fi)"

@@ -217,9 +298,8 @@ SOURCES_grafana_cloud_frontend_observability_faro_web_sdk='faro-web-sdk'
 SOURCES_helm_charts_mimir_distributed='mimir'
 SOURCES_helm_charts_tempo_distributed='tempo'
 SOURCES_opentelemetry='opentelemetry-docs'
-SOURCES_plugins_grafana_jira_datasource='jira-datasource'
-SOURCES_plugins_grafana_mongodb_datasource='mongodb-datasource'
-SOURCES_plugins_grafana_splunk_datasource='splunk-datasource'
+SOURCES_plugins_grafana_datadog_datasource='datadog-datasource'
+SOURCES_plugins_grafana_oracle_datasource='oracle-datasource'

 VERSIONS_as_code='UNVERSIONED'
 VERSIONS_grafana_cloud='UNVERSIONED'
@@ -229,6 +309,8 @@ VERSIONS_grafana_cloud_k6='UNVERSIONED'
 VERSIONS_grafana_cloud_data_configuration_integrations='UNVERSIONED'
 VERSIONS_grafana_cloud_frontend_observability_faro_web_sdk='UNVERSIONED'
 VERSIONS_opentelemetry='UNVERSIONED'
+VERSIONS_plugins_grafana_datadog_datasource='latest'
+VERSIONS_plugins_grafana_oracle_datasource='latest'
 VERSIONS_technical_documentation='UNVERSIONED'
 VERSIONS_website='UNVERSIONED'
 VERSIONS_writers_toolkit='UNVERSIONED'
@@ -237,8 +319,10 @@ PATHS_grafana_cloud='content/docs/grafana-cloud'
 PATHS_helm_charts_mimir_distributed='docs/sources/helm-charts/mimir-distributed'
 PATHS_helm_charts_tempo_distributed='docs/sources/helm-charts/tempo-distributed'
 PATHS_mimir='docs/sources/mimir'
+PATHS_plugins_grafana_datadog_datasource='docs/sources'
+PATHS_plugins_grafana_oracle_datasource='docs/sources'
 PATHS_tempo='docs/sources/tempo'
-PATHS_website='content/docs'
+PATHS_website='content'

 # identifier STR
 # Replace characters that are not valid in an identifier with underscores.
@@ -253,6 +337,77 @@ aget() {
  eval echo '$'"$(identifier "$1")_$(identifier "$2")"
 }

+# src returns the project source repository name for a project.
+src() {
+  _project="$1"
+
+  case "${_project}" in
+    plugins/*)
+      if [ -z "$(aget SOURCES "${_project}")" ]; then
+        echo plugins-private
+      else
+        aget SOURCES "${_project}"
+      fi
+      ;;
+    *)
+      if [ -z "$(aget SOURCES "${_project}")" ]; then
+        echo "${_project}"
+      else
+        aget SOURCES "${_project}"
+      fi
+      ;;
+  esac
+
+  unset _project
+}
+
+# path returns the relative path within the repository that contain the docs for a project.
+path() {
+  _project="$1"
+
+  case "${_project}" in
+    plugins/*)
+      if [ -z "$(aget PATHS "${_project}")" ]; then
+        echo "${_project}/docs/sources"
+      else
+        aget PATHS "${_project}"
+      fi
+      ;;
+    *)
+      if [ -z "$(aget PATHS "${_project}")" ]; then
+        echo "docs/sources"
+      else
+        aget PATHS "${_project}"
+      fi
+  esac
+
+  unset _project
+}
+
+# version returns the version for a project. Unversioned projects return the special value 'UNVERSIONED'.
+version() {
+  _project="$1"
+
+  case "${_project}" in
+    plugins/*)
+      if [ -z "$(aget VERSIONS "${_project}")" ]; then
+        echo "UNVERSIONED"
+      else
+        aget VERSIONS "${_project}"
+      fi
+      ;;
+    *)
+    if [ -z "$(aget VERSIONS "${_project}")" ]; then
+      echo latest
+    else
+      aget VERSIONS "${_project}"
+    fi
+  esac
+
+  unset _project
+}
+
+
 # new_proj populates a new project structure.
 new_proj() {
  _project="$1"
@@ -263,31 +418,19 @@ new_proj() {
  # If version is not set, use the script mapping of project to default versions if it exists.
  # Fallback to 'latest'.
  if [ -z "${_version}" ]; then
-    if [ -z "$(aget VERSIONS "${_project}")" ]; then
-      _version=latest
-    else
-      _version="$(aget VERSIONS "${_project}")"
-    fi
+    _version="$(version "${_project}")"
  fi

  # If repo is not set, use the script mapping of project to repo name if it exists.
  # Fallback to using the project name.
  if [ -z "${_repo}" ]; then
-    if [ -z "$(aget SOURCES "${_project}")" ]; then
-      _repo="${_project}"
-    else
-      _repo="$(aget SOURCES "${_project}")"
-    fi
+    _repo="$(src "${_project}")"
  fi

  # If path is not set, use the script mapping of project to docs sources path if it exists.
  # Fallback to using 'docs/sources'.
  if [ -z "${_path}" ]; then
-    if [ -z "$(aget PATHS "${_project}")" ]; then
-      _path="docs/sources"
-    else
-      _path="$(aget PATHS "${_project}")"
-    fi
+    _path="$(path "${_project}")"
  fi

  echo "${_project}:${_version}:${_repo}:${_path}"
@@ -301,7 +444,7 @@ proj_url() {
 $1
 POSIX_HERESTRING

-  if [ "${_project}" = 'website' ]; then
+  if [ "${_project}" = website ]; then
    echo "http://localhost:${DOCS_HOST_PORT}/docs/"

    unset _project _version
@@ -335,8 +478,8 @@ proj_dst() {
 $1
 POSIX_HERESTRING

-  if [ "${_project}" = 'website' ]; then
-    echo '/hugo/content/docs'
+  if [ "${_project}" = website ]; then
+    echo '/hugo/content'

    unset _project _version
    return
@@ -394,7 +537,7 @@ proj_canonical() {
 $1
 POSIX_HERESTRING

-  if [ "${_project}" = 'website' ]; then
+  if [ "${_project}" = website ]; then
    echo '/docs'

    unset _project _version
@@ -463,12 +606,11 @@ await_build() {
  while [ "${i}" -ne "${max}" ]
  do
    sleep 1
-    debg "Retrying request to webserver assuming the process is still starting up."
+    debg "Retrying request to web server assuming the process is still starting up."
    i=$((i + 1))

    if ${req} "${url}"; then
-      echo
-      echo "View documentation locally:"
+      printf '\r\nView documentation locally:\r\n'
      for x in ${url_src_dst_vers}; do
        IFS='^' read -r url _ _ <<POSIX_HERESTRING
 $x
@@ -476,37 +618,36 @@ POSIX_HERESTRING

        if [ -n "${url}" ]; then
          if [ "${_url}" != "arbitrary" ]; then
-            echo "  ${url}"
+            printf '\r  %s\r\n' "${url}"
          fi
        fi
      done
-      echo
-      echo 'Press Ctrl+c to stop the server'
+      printf '\r\nPress Ctrl+C to stop the server\r\n'

      unset i max req url
      return
    fi
  done

-  echo
+  printf '\r\n'
  errr 'The build was interrupted or a build error occurred, check the previous logs for possible causes.'
-  note 'You might need to use Ctrl+c to end the process.'
+  note 'You might need to use Ctrl+C to end the process.'

  unset i max req url
 }

 debg() {
  if [ -n "${DEBUG}" ]; then
-    echo "DEBG: $1" >&2
+    printf 'DEBG: %s\r\n' "$1" >&2
  fi
 }

 errr() {
-  echo "ERRR: $1" >&2
+  printf 'ERRR: %s\r\n' "$1" >&2
 }

 note() {
-  echo "NOTE: $1" >&2
+  printf 'NOTE: %s\r\n' "$1" >&2
 }

 url_src_dst_vers="$(url_src_dst_vers "$@")"
@@ -518,11 +659,20 @@ for arg in "$@"; do
  IFS=: read -r _project _ _repo _ <<POSIX_HERESTRING
 ${arg}
 POSIX_HERESTRING
-  if [ "${_project}" = website ]; then
+  if [ "${_project}" = website ] || [ "${_project}" = grafana-cloud ]; then
+    note "Please be patient, building the website can take some time."
+
+      # If set, the docs-base image will run a prebuild script that sets up Hugo mounts.
+    if [ "${WEBSITE_MOUNTS}" = false ]; then
+      unset WEBSITE_MOUNTS
+    else
+      readonly WEBSITE_MOUNTS=true
+    fi
+
    _repo="$(repo_path website)"
    volumes="--volume=${_repo}/config:/hugo/config"
-    volumes="${volumes} --volume=${_repo}/layouts/partials:/hugo/layouts/partials"
-    volumes="${volumes} --volume=${_repo}/layouts/shortcodes:/hugo/layouts/shortcodes"
+    volumes="${volumes} --volume=${_repo}/layouts:/hugo/layouts"
+    volumes="${volumes} --volume=${_repo}/scripts:/hugo/scripts"
  fi
  unset _project _repo
 done
@@ -540,7 +690,7 @@ POSIX_HERESTRING
    fi
  fi

-  debg "DEBG: Mounting '${_src}' at container path '${_dst}'"
+  debg "Mounting '${_src}' at container path '${_dst}'"

  if [ -z "${volumes}" ]; then
    volumes="--volume=${_src}:${_dst}"
@@ -564,12 +714,18 @@ POSIX_HERESTRING

 case "${image}" in
  'grafana/doc-validator')
+    if ! command -v jq >/dev/null 2>&1; then
+      errr '`jq` must be installed for the `doc-validator` target to work.'
+      note 'To install `jq`, refer to https://jqlang.github.io/jq/download/,'
+
+      exit 1
+    fi
+
    proj="$(new_proj "$1")"
-    echo
+    printf '\r\n'
    "${PODMAN}" run \
                --init \
                --interactive \
-                --name "${DOCS_CONTAINER}" \
                --platform linux/amd64 \
                --rm \
                --tty \
@@ -577,30 +733,37 @@ case "${image}" in
                "${DOCS_IMAGE}" \
                "--include=${DOC_VALIDATOR_INCLUDE}" \
                "--skip-checks=${DOC_VALIDATOR_SKIP_CHECKS}" \
-                /hugo/content/docs \
-                "$(proj_canonical "${proj}")" | sed "s#$(proj_dst "${proj}")#sources#"
+                "/hugo/content$(proj_canonical "${proj}")" \
+                "$(proj_canonical "${proj}")" \
+                | sed "s#$(proj_dst "${proj}")#sources#" \
+                | jq -r '"ERROR: \(.location.path):\(.location.range.start.line // 1):\(.location.range.start.column // 1): \(.message)" + if .suggestions[0].text then "\nSuggestion: \(.suggestions[0].text)" else "" end'
    ;;
  'grafana/vale')
    proj="$(new_proj "$1")"
-    echo
+    printf '\r\n'
    "${PODMAN}" run \
                --init \
                --interactive \
-                --name "${DOCS_CONTAINER}" \
-                --platform linux/amd64 \
                --rm \
+                --workdir /etc/vale \
                --tty \
                ${volumes} \
                "${DOCS_IMAGE}" \
                "--minAlertLevel=${VALE_MINALERTLEVEL}" \
-                --config=/etc/vale/.vale.ini \
-                --output=line \
+                '--glob=*.md' \
+                --output=/etc/vale/rdjsonl.tmpl \
                /hugo/content/docs | sed "s#$(proj_dst "${proj}")#sources#"
    ;;
  *)
    tempfile="$(mktemp -t make-docs.XXX)"
    cat <<EOF >"${tempfile}"
 #!/usr/bin/env bash
+
+tc() {
+  set \${*,,}
+  echo \${*^}
+}
+
 for redirect in ${redirects}; do
  IFS='^' read -r path ver <<<"\${redirect}"
  echo -e "---\\nredirectURL: \"\${path/\/hugo\/content/}\"\\ntype: redirect\\nversioned: true\\n---\\n" > "\${path/\${ver}/_index.md}"
@@ -609,8 +772,12 @@ done
 for x in "${url_src_dst_vers}"; do
  IFS='^' read -r _ _ dst _ <<<"\${x}"

+  title="\${dst%/*}"
+  title="\$(tc \${title##*/})"
  while [[ -n "\${dst}" ]]; do
-    touch "\${dst}/_index.md"
+    if [[ ! -f "\${dst}/_index.md" ]]; then
+        echo -e "---title: \${title}\\n---\\n\\n# \${title}\\n\\n{{< section >}}" > "\${dst}/_index.md"
+    fi
    dst="\${dst%/*}"
  done
 done
@@ -630,33 +797,39 @@ ${PODMAN} run \
  --env=HUGO_REFLINKSERRORLEVEL=${HUGO_REFLINKSERRORLEVEL} \
  --init \
  --interactive \
-  --name=${DOCS_CONTAINER} \
-  --platform=linux/amd64 \
  --publish=${DOCS_HOST_PORT}:3002 \
  --publish=3003:3003 \
  --rm \
  --tty \
  ${volumes} \
-  ${DOCS_IMAGE} \
-  /entrypoint
+  ${DOCS_IMAGE}
 EOF
-    await_build http://localhost:3003 &

-    if [ -n "${DEBUG}" ]; then
-      ${cmd}
+    if [ -n "${ENTER}" ]; then
+      ${cmd} /bin/bash
+    elif [ -n "${DEBUG}" ]; then
+      await_build http://localhost:3003 &
+
+      debg "${cmd} /entrypoint"
+      ${cmd} /entrypoint
    else
-      ${cmd} 2>&1| sed \
-                     -e '/Web Server is available at http:\/\/localhost:3003\/ (bind address 0.0.0.0)/ d' \
-                     -e '/^hugo server/ d' \
-                     -e '/fatal: not a git repository (or any parent up to mount point \/)/ d' \
-                     -e '/Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)./ d' \
-                     -e "/Makefile:[0-9]*: warning: overriding recipe for target 'docs'/ d" \
-                     -e "/docs.mk:[0-9]*: warning: ignoring old recipe for target 'docs'/ d" \
-                     -e '/\/usr\/bin\/make -j 2 proxy hserver-docs HUGO_PORT=3003/ d' \
-                     -e '/website-proxy/ d' \
-                     -e '/rm -rf dist*/ d' \
-                     -e '/Press Ctrl+C to stop/ d' \
-                     -e '/make/ d' || echo
+      await_build http://localhost:3003 &
+
+      ${cmd} /entrypoint  2>&1\
+        | sed -u \
+              -e '/Web Server is available at http:\/\/localhost:3003\/ (bind address 0.0.0.0)/ d' \
+              -e '/^hugo server/ d' \
+              -e '/fatal: not a git repository (or any parent up to mount point \/)/ d' \
+              -e '/Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)./ d' \
+              -e "/Makefile:[0-9]*: warning: overriding recipe for target 'docs'/ d" \
+              -e "/docs.mk:[0-9]*: warning: ignoring old recipe for target 'docs'/ d" \
+              -e '/\/usr\/bin\/make -j 2 proxy hserver-docs HUGO_PORT=3003/ d' \
+              -e '/website-proxy/ d' \
+              -e '/rm -rf dist*/ d' \
+              -e '/Press Ctrl+C to stop/ d' \
+              -e '/make/ d' \
+              -e '/WARNING: The manual_mount source directory/ d' \
+              -e '/docs\/_index.md .* not found/ d'
    fi
    ;;
 esac
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -3,6 +3,8 @@ aliases:
  - /docs/grafana/v1.1/
  - /docs/grafana/v3.1/
  - guides/reference/admin/
+cascade:
+  TEMPO_VERSION: latest
 description: Guides, installation, and feature documentation
 keywords:
  - grafana
@@ -39,6 +41,10 @@ title: Grafana documentation
        <img src="/static/img/logos/logo-docker.svg">
        <h5>Run Docker image</h5>
    </a>
+    <a href="{{< relref "setup-grafana/installation/kubernetes/" >}}" class="nav-cards__item nav-cards__item--install">
+        <img src="/static/img/logos/logo-kubernetes.svg">
+        <h5>Run on Kubernetes</h5>
+    </a>
    <a href="https://grafana.com/docs/grafana-cloud/" class="nav-cards__item nav-cards__item--install">
        <div class="nav-cards__icon fa fa-cloud">
        </div>
@@ -74,8 +80,8 @@ title: Grafana documentation
        <h4>Provisioning</h4>
        <p>Learn how to automate your Grafana configuration.</p>
    </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v10-1/" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v10.1</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v10-2/" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v10.2</h4>
        <p>Explore the features and enhancements in the latest release.</p>
    </a>

--- a/docs/sources/administration/api-keys/index.md
+++ b/docs/sources/administration/api-keys/index.md
@@ -17,6 +17,10 @@ weight: 700

 # API keys

+{{% admonition type="note" %}}
+Deprecated: [Service accounts]({{< relref "../service-accounts/" >}}) have replaced API keys as the primary way to authenticate applications that interact with Grafana.
+{{% /admonition %}}
+
 An API key is a randomly generated string that external systems use to interact with Grafana HTTP APIs.

 When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources.
@@ -45,10 +49,10 @@ To follow these instructions, you need at least one of the following:

 ### Steps

-To create an API, complete the following steps:
+To create an API key, complete the following steps:

 1. Sign in to Grafana.
-1. Click **Administration** in the left-side menu and select **API Keys**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **API Keys**.
 1. Click **Add API key**.
 1. Enter a unique name for the key.
 1. In the **Role** field, select one of the following access levels you want to assign to the key.
@@ -101,7 +105,7 @@ For more information about permissions, refer to [Roles and permissions]({{< rel

 To migrate all API keys to service accounts, complete the following steps:

-1. Sign in to Grafana, point to **Configuration** (the gear icon), and click **API Keys**.
+1. Sign in to Grafana, point to **Administration**, **Users and access**, and click **API Keys**.
 1. In the top of the page, find the section which says **Switch from API keys to service accounts**
 1. Click **Migrate to service accounts now**.
 1. A confirmation window will appear, asking to confirm the migration. Click **Yes, migrate now** if you are willing to continue.
@@ -110,7 +114,7 @@ To migrate all API keys to service accounts, complete the following steps:
 To migrate a single API key to a service account, complete the following steps:

 1. Sign in to Grafana.
-1. Click **Administration** in the left-side menu and select **API Keys**.
+1. Click **Administration** in the left-side menu, **Users and access**, and select **API Keys**.
 1. Find the API Key you want to migrate.
 1. Click **Migrate to service account**.

--- a/docs/sources/administration/correlations/_index.md
+++ b/docs/sources/administration/correlations/_index.md
@@ -14,25 +14,30 @@ weight: 900

 You can create interactive links for Explore visualizations to run queries related to presented data by setting up Correlations.

-A correlation defines how data in one [data source]({{< relref "/docs/grafana/latest/datasources/" >}}) is used to query data in another data source. Some examples:
+A correlation defines how data in one [data source]({{< relref "../../datasources" >}}) is used to query data in another data source.
+Some examples:

 - an application name returned in a logs data source can be used to query metrics related to that application in a metrics data source, or
 - a user name returned by an SQL data source can be used to query logs related to that particular user in a logs data source

-[Explore]({{< relref "/docs/grafana/latest/explore/" >}}) takes user-defined correlations to display links inside the visualizations. You can click on a link to run the related query and see results in [Explore Split View]({{< relref "/docs/grafana/latest/explore/#split-and-compare" >}}).
+[Explore]({{< relref "../../explore" >}}) takes user-defined correlations to display links inside the visualizations.
+You can click on a link to run the related query and see results in [Explore Split View]({{< relref "../../explore#split-and-compare" >}}).

 Explore visualizations that currently support showing links based on correlations:

 - [Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}})
 - [Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}})

-You can configure correlations using [Administration > Correlation page]({{< relref "/docs/grafana/latest/administration/" >}}) or with [provisioning]({{< relref "/docs/grafana/latest/administration/provisioning" >}}).
+You can configure correlations using [provisioning]({{< relref "../provisioning" >}}), the **Administration > Plugins and data > Correlations** page in Grafana or directly in [Explore]({{< relref "../../explore/correlations-editor-in-explore" >}}).

-> **Note:** Correlations are available in Grafana 10.0+ as an opt-in beta feature. Modify Grafana [configuration file]({{< relref "/docs/grafana/latest/setup-grafana/configure-grafana/#configuration-file-location" >}}) to enable the `correlations` [feature toggle]({{< relref "/docs/grafana/latest/setup-grafana/configure-grafana/#feature_toggles" >}}) to use it.
+{{% admonition type="note" %}}
+Correlations are available in Grafana 10.0+ as an opt-in beta feature.
+Modify the Grafana [configuration file]({{< relref "../../setup-grafana/configure-grafana#configuration-file-location" >}}) to enable the `correlations` [feature toggle]({{< relref "../../setup-grafana/configure-grafana#feature_toggles" >}}) to use it.
+{{% /admonition %}}

 ## Example of how links work in Explore once set up

-{{< figure src="/static/img/docs/correlations/correlations-in-explore-10-0.gif" caption="Correlations links in Explore" >}}
+{{< figure src="/static/img/docs/correlations/correlations-in-explore-10-0.gif" alt="Demonstration of following a correlation link in Grafana Explore" caption="Correlations links in Explore" >}}

 See also:

--- a/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
+++ b/docs/sources/administration/correlations/add-permissions-to-create-new-correlations/index.md
@@ -12,11 +12,11 @@ weight: 30

 ## Before you begin

-Adding access to create correlations for [Viewers and Editors]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) is available with [Role-based access control]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}).
+Adding access to create correlations for [Viewers and Editors]({{< relref "../../../administration/roles-and-permissions" >}}) is available with [Role-based access control]({{< relref "../../../administration/roles-and-permissions/access-control" >}}).

 ## Add permissions to create correlations

-1. Go to the Administration section in Grafana.
-1. Open Users page.
+1. Go to the **Administration** section in Grafana.
+1. Under **Users and access**, open the **Users** page.
 1. Select the user to be granted access to create correlations.
 1. Add _Data sources writer_ role.
--- a/docs/sources/administration/correlations/correlation-configuration/index.md
+++ b/docs/sources/administration/correlations/correlation-configuration/index.md
@@ -33,7 +33,9 @@ Learn how to create correlations using the [Administration page]({{< relref "./c

 ## Source data source and result field

-Links are shown in Explore visualizations for the results from the correlation’s source data source. A link is assigned to one of the fields from the result provided in the correlation configuration (the results field). Each visualization displays fields with links in a different way ([Correlations in Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}}) and see [Correlations in Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}}))
+Links are shown in Explore visualizations for the results from the correlation’s source data source.
+A link is assigned to one of the fields from the result provided in the correlation configuration (the results field).
+Each visualization displays fields with links in a different way ([Correlations in Logs Panel]({{< relref "./use-correlations-in-visualizations#correlations-in-logs-panel">}}) and see [Correlations in Table]({{< relref "./use-correlations-in-visualizations#correlations-in-table">}})).

 ## Target query

@@ -41,9 +43,11 @@ The target query is run when a link is clicked in the visualization. You can use

 ### Correlation Variables

-You can use variables inside the target query to access the source data related to the query. Correlations use [Grafana variable syntax]({{< relref "/docs/grafana/latest/dashboards/variables/variable-syntax" >}}). Variables are filled with values from the source results when the link is clicked. There are two types of variables you can use:
+You can use variables inside the target query to access the source data related to the query.
+Correlations use [Grafana variable syntax]({{< relref "../../../dashboards/variables/variable-syntax" >}}).
+Variables are filled with values from the source results when the link is clicked. There are two types of variables you can use:

- [field variables]({{< relref "/docs/grafana/latest/panels-visualizations/configure-data-links#field-variables" >}}) (allows to access field values and labels)
+- [field variables]({{< relref "../../../panels-visualizations/configure-data-links#field-variables" >}}) (allows to access field values and labels)
 - correlation variables (allows to access field values and transformations)

 Example: If source results contain a field called “employee”, the value of the field can be accessed with:
--- a/docs/sources/administration/correlations/correlation-permissions/index.md
+++ b/docs/sources/administration/correlations/correlation-permissions/index.md
@@ -9,11 +9,11 @@ weight: 20

 # Permissions

-Users with [Viewer base role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) or with [datasources:query RBAC role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}) can:
+Users with [Viewer base role]({{< relref "../../../administration/roles-and-permissions" >}}) or with [datasources:query RBAC role]({{< relref "../../../administration/roles-and-permissions/access-control" >}}) can:

- Use correlations in Explore’s visualizations
- List all available correlations in read-only mode
+- Use correlations in Explore’s visualizations.
+- List all available correlations in read-only mode.

-Users with [Admin base role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/" >}}) or with [datasources:write RBAC role]({{< relref "/docs/grafana/latest/administration/roles-and-permissions/access-control/" >}}) can:
+Users with [Admin base role]({{< relref "../../../administration/roles-and-permissions" >}}) or with [datasources:write RBAC role]({{< relref "../../../administration/roles-and-permissions/access-control" >}}) can:

- Add, edit and delete correlations
+- Add, edit and delete correlations.
--- a/docs/sources/administration/correlations/create-a-new-correlation/index.md
+++ b/docs/sources/administration/correlations/create-a-new-correlation/index.md
@@ -13,29 +13,14 @@ weight: 40

 Make sure you have permission to add new correlations. Only users with write permissions to data sources can define new correlations.

-## Create a correlation in Explore's Correlations Editor
+## Create a correlation in Explore's correlations editor

-1. Go to Explore page.
-1. Select a data source that you would like to be [the source data source]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration#source-data-source-and-result-field" >}}) for a new correlation.
-1. Run a query producing data in [a supported visualization]({{< relref "/docs/grafana/latest/administration/correlations/#correlations" >}}).
-1. Click "+ Add" button in the top toolbar and select "Add correlation" (you can also select "Correlations Editor" from the [Command Palette]({{< relref "/docs/grafana/latest/search/#command-palette" >}})).
-1. Explore is now in Correlations Editor mode indicated by a blue border and top bar. You can exit Correlations Editor using the Exit button in the top bar.
-1. The visualization is enriched with links allowing to create new correlations. Links are attached to the data that you can use to build a new query:
-   - Logs: links are displayed next to field values inside log details for each log row
-   - Table: every table cell is a link
-1. Click on a link to begin adding new correlation. Links are associated with a field that will be used as [a results field of a correlation]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration" >}}). This means the correlation link will be created on the link you select once the correlation is saved.
-1. Explore opens a split view. Use the right pane to setup [the target query source of the correlation]({{< relref "/docs/grafana/latest/administration/correlations/correlation-configuration#target-query" >}}).
-1. Build target query using [variables syntax]({{< relref "/docs/grafana/latest/dashboards/variables/variable-syntax" >}}) with variables from the list provided at the top of the pane. The list contains sample values from the selected data row.
-1. Provide optional label and description. Label is used as the name of the link inside the visualization. It can contain variables.
-1. Click "Save" button in the top bar to save the correlation and exit Correlations Editor mode.
-1. The link used to create the correlation will be replaced with a data link in each row. The variables will be dynamically replaced with values from a selected row.
-
-Please check [an example]({{< relref "/docs/grafana/latest/administration/correlations/use-correlations-editor-in-explore" >}}) to see how to create a sample correlation using test data source.
+To learn more, refer to Explore's [documentation]({{< relref "../../../explore/correlations-editor-in-explore" >}}) about building correlations in Explore.

 ## Create a correlation in Administration page

-1. Go to the Administration section in Grafana.
-1. Open Correlations page.
+1. Go to the **Administration** section in Grafana.
+1. Under **Plugins and data**, open the **Correlations** page.
 1. Click the “Add” button in the top right corner.
 1. Provide a **label** for the correlation.
 1. Provide an optional **description**.
@@ -99,7 +84,7 @@ Description of provisioning properties:
 : Correlation type. “query” is the only supported type at the moment

 **config.target**
-: [Target query model]({{< relref "#determine-target-query-model-structure" >}})
+: [Target query model](#determine-target-query-model-structure)

 **config.field**
 : Name of the field where link is shown
--- a/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md
+++ b/docs/sources/administration/correlations/use-correlations-editor-in-explore/index.md
@@ -1,57 +0,0 @@
---
-labels:
-  products:
-    - enterprise
-    - oss
-title: Use Correlations Editor in Explore
-weight: 70
---
-
-# Use Correlations Editor in Explore
-
-## Before you begin
-
-This example shows how to create a correlation using Correlations Editor in Explore.
-
-Correlations allow you to use results of one query to run a new query in any data source. In this example you will run a query that renders tabular data. The data will be used to run a different query that yields a graph result.
-
-Please make sure you have setup up [a test data source]({{< relref "/docs/grafana/latest/datasources/testdata/#testdata-data-source" >}}).
-
-## Create a new correlation
-
-1. Go to Explore.
-1. Select `test data source`.
-1. Click on "+ Add" dropdown and select "Add correlation" button.
-1. Explore is now in Correlations Editor mode indicated by a blue border.
-1. Select scenario: `CSV File`.
-1. Select file: `population_by_state.csv`.
-1. Note that each cell is a link that you can click on to start creating a new correlation.
-
-   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-source-10.2.png" max-width="600px" caption="Selecting the source of a correlation" >}}
-
-1. Create new correlation that attaches a data link in the `State` column: click on any cell in the `State` column, e.g. "California".
-1. Explore opens in split view. Select the same data source you selected in the left pane.
-1. The helper above the query editor contains all available variables you can use the target query. Variables contain all data fields (table columns) from the selected row.
-1. Select Scenario: `CSV Metric Values`.
-1. In the Query Editor's `String Input` field provide variables with population values for each year: `${1980},${2000},${2020}`. This will generate a graph using variable values.
-1. In the Query Editor's `Alias` field, write `${State}`
-
-   {{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-target-10.2.png" max-width="600px" caption="Setting up the target of a correlation" >}}
-
-1. Run a query to see that it produces a graph using sample values from the variables.
-1. Save the correlation using "Save" button in the top.
-
-## Test a newly created correlations
-
-1. Once the correlation is saved Explore will exit Correlations Editor automatically and re-rerun the query in the left pane.
-1. Click on a state name. Note how values from the row are inserted into the query on the right and the graph changes using the values for each row. The query is rerun with updates values every time you click on a state name.
-
-   {{< figure src="/static/img/docs/correlations/screenshot-correlations-example-link-10.2.png" max-width="600px" caption="Result of clicking on a data link" >}}
-
-You can apply the same steps to any data source. Correlations allow you to create links in visualizations to run dynamic queries based on selected data. In this example we used data returned by a query to build a new query generating different visualization using the same data source. However, you can create correlations between any data sources to create custom exploration flows.
-
-## Correlations in the logs panel
-
-Correlations links in the logs panel show slightly differently than the table panel. When you enter the Correlation Editor mode when looking at logs, you will need to expand a log line to see the button that serves as the correlation link.
-
-{{< figure src="/static/img/docs/correlations/screenshot-correlations-editor-logs-10.2.png" max-width="600px" caption="Logs panel in the Correlations Editor" >}}
--- a/Show More
+++ b/Show More