[v9.2.x] NPM: Stop using the folder path before the name path (#65156)

NPM: Stop using the folder path before the name path (#63851)

Stop using the folder path before the name path

(cherry picked from commit 177aa254c5)

Co-authored-by: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>

.betterer.results

@@ -4272,12 +4272,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/dimensions/resource.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/features/dimensions/scale.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -7339,6 +7333,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
+    "public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
+    ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -7351,7 +7351,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -7416,8 +7417,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/state.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/state.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]

.bra.toml

@@ -1,9 +1,8 @@
 [run]
 init_cmds = [
   ["make", "gen-go"],
-  ["GO_BUILD_DEV=1", "make", "build-cli"],
-  ["GO_BUILD_DEV=1", "make", "build-server"],
-  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["GO_BUILD_DEV=1", "make", "build-go"],
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
 follow_symlinks = true
@@ -17,6 +16,6 @@ ignore_files = [".*_gen.go"]
 build_delay = 1500
 cmds = [
   ["make", "gen-go"],
-  ["GO_BUILD_DEV=1", "make", "build-server"],
-  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["GO_BUILD_DEV=1", "make", "build-go"],
+  ["./bin/grafana", "server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.drone.star

@@ -3,20 +3,55 @@
 # 2. Login to drone and export the env variables (token and server) shown here: https://drone.grafana.net/account
 # 3. Run `make drone`
 # More information about this process here: https://github.com/grafana/deployment_tools/blob/master/docs/infrastructure/drone/signing.md
+"""
+This module returns a Drone configuration including pipelines and secrets.
+"""
 
-load('scripts/drone/events/pr.star', 'pr_pipelines')
-load('scripts/drone/events/main.star', 'main_pipelines')
-load('scripts/drone/pipelines/docs.star', 'docs_pipelines')
-load('scripts/drone/events/release.star', 'release_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'artifacts_page_pipeline')
-load('scripts/drone/pipelines/publish_images.star', 'publish_image_pipelines_public', 'publish_image_pipelines_security')
-load('scripts/drone/version.star', 'version_branch_pipelines')
-load('scripts/drone/events/cron.star', 'cronjobs')
-load('scripts/drone/vault.star', 'secrets')
+load("scripts/drone/events/pr.star", "pr_pipelines")
+load("scripts/drone/events/main.star", "main_pipelines")
+load(
+    "scripts/drone/events/release.star",
+    "artifacts_page_pipeline",
+    "enterprise2_pipelines",
+    "enterprise_pipelines",
+    "oss_pipelines",
+    "publish_artifacts_pipelines",
+    "publish_npm_pipelines",
+    "publish_packages_pipeline",
+)
+load(
+    "scripts/drone/pipelines/publish_images.star",
+    "publish_image_pipelines_public",
+    "publish_image_pipelines_security",
+)
+load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
+load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
+load("scripts/drone/version.star", "version_branch_pipelines")
+load("scripts/drone/events/cron.star", "cronjobs")
+load("scripts/drone/vault.star", "secrets")
 
-def main(ctx):
-    edition = 'oss'
-    return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \
-        publish_image_pipelines_public() + publish_image_pipelines_security() + \
-        publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \
-        publish_npm_pipelines('public') + publish_packages_pipeline() + artifacts_page_pipeline() + \
-        version_branch_pipelines() + cronjobs(edition=edition) + secrets()
+def main(_ctx):
+    return (
+        pr_pipelines() +
+        main_pipelines() +
+        oss_pipelines() +
+        enterprise_pipelines() +
+        enterprise2_pipelines() +
+        enterprise2_pipelines(
+            prefix = "custom-",
+            trigger = {"event": ["custom"]},
+        ) +
+        publish_image_pipelines_public() +
+        publish_image_pipelines_security() +
+        publish_github_pipeline("public") +
+        publish_github_pipeline("security") +
+        publish_aws_marketplace_pipeline("public") +
+        publish_artifacts_pipelines("security") +
+        publish_artifacts_pipelines("public") +
+        publish_npm_pipelines() +
+        publish_packages_pipeline() +
+        artifacts_page_pipeline() +
+        version_branch_pipelines() +
+        cronjobs() +
+        secrets()
+    )

.github/CODEOWNERS

@@ -12,205 +12,601 @@
 # This should make it easy to add new rules without breaking existing ones.
 
 # Documentation
-/docs/ @grafana/docs-squad
-/contribute/ @grafana/docs-squad
-/docs/sources/developers/plugins/ @grafana/docs-squad @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/docs/sources/developers/plugins/backend @grafana/docs-squad @grafana/plugins-platform-backend
-# Administration, data sources, querying, release updates: Garrett Guillotte
+/docs/ @grafana/docs-grafana
+/contribute/ @grafana/docs-grafana
+/docs/sources/developers/plugins/ @grafana/docs-grafana @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/backend/ @grafana/docs-grafana @grafana/plugins-platform-backend
+/.changelog-archive @grafana/docs-grafana
+CHANGELOG.md @grafana/docs-grafana
+CODE_OF_CONDUCT.md @grafana/docs-grafana
+CONTRIBUTING.md @grafana/docs-grafana
+GOVERNANCE.md @RichiH
+HALL_OF_FAME.md @grafana/docs-grafana
+ISSUE_TRIAGE.md @grafana/grafana-community-support
+LICENSE @torkelo
+LICENSING.md @torkelo
+MAINTAINERS.md @RichiH
+NOTICE.md @torkelo
+README.md @grafana/docs-grafana
+ROADMAP.md @torkelo
+SECURITY.md @grafana/security-team
+SUPPORT.md @torkelo
+UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
+WORKFLOW.md @torkelo
+
+
 # Set up, dashboards/visualization, best practices: Chris Moyer
 # Alerting: Brenda Muir
-/docs/sources/administration/ @gguillotte-grafana
-/docs/sources/alerting @brendamuir
-/docs/sources/best-practices/ @chri2547
+/docs/sources/administration/ @Eve832 @GrafanaWriter
+/docs/sources/alerting/ @brendamuir
 /docs/sources/dashboards/ @chri2547
-/docs/sources/datasources/ @gguillotte-grafana
-/docs/sources/enterprise/ @gguillotte-grafana
-/docs/sources/explore/ @gguillotte-grafana
+/docs/sources/datasources/ @Eve832 @GrafanaWriter
+/docs/sources/explore/ @Eve832 @GrafanaWriter
 /docs/sources/getting-started/ @chri2547
-/docs/sources/old-alerting @brendamuir
-/docs/sources/panels/ @chri2547
-/docs/sources/release-notes/ @gguillotte-grafana
-/docs/sources/visualization/ @chri2547
-/docs/sources/whatsnew/ @gguillotte-grafana
+/docs/sources/old-alerting/ @brendamuir
+/docs/sources/release-notes/ @Eve832 @GrafanaWriter
+/docs/sources/setup-grafana/ @chri2547
+/docs/sources/whatsnew/ @Eve832 @GrafanaWriter
 
 # Backend code
-*.go @grafana/backend-platform
-go.mod @grafana/backend-platform
-go.sum @grafana/backend-platform
-/.bingo @grafana/backend-platform
+/go.mod @grafana/backend-platform
+/go.sum @grafana/backend-platform
+/.bingo/ @grafana/backend-platform
+/pkg/README.md @grafana/backend-platform
+/pkg/ruleguard.rules.go @grafana/backend-platform
+/.bra.toml @grafana/backend-platform
+/.golangci.toml @grafana/backend-platform
+/build.go @grafana/backend-platform
 
+/pkg/api/ @grafana/backend-platform
+/pkg/bus/ @grafana/backend-platform
+/pkg/cmd/ @grafana/backend-platform
+/pkg/components/apikeygen/ @grafana/grafana-authnz-team
+/pkg/components/apikeygenprefixed/ @grafana/grafana-authnz-team
+/pkg/components/dashdiffs/ @grafana/backend-platform
+/pkg/components/imguploader/ @grafana/backend-platform
+/pkg/components/loki/ @grafana/backend-platform
+/pkg/components/null/ @grafana/backend-platform
+/pkg/components/simplejson/ @grafana/backend-platform
+/pkg/events/ @grafana/backend-platform
+/pkg/extensions/ @grafana/backend-platform
+/pkg/ifaces/ @grafana/backend-platform
+/pkg/infra/appcontext/ @grafana/backend-platform
+/pkg/infra/db/ @grafana/backend-platform
+/pkg/infra/grn/ @grafana/backend-platform
+/pkg/infra/localcache/ @grafana/backend-platform
+/pkg/infra/log/ @grafana/backend-platform
+/pkg/infra/metrics/ @grafana/backend-platform
+/pkg/infra/network/ @grafana/backend-platform
+/pkg/infra/process/ @grafana/backend-platform
+/pkg/infra/remotecache/ @grafana/backend-platform
+/pkg/infra/serverlock/ @grafana/backend-platform
+/pkg/infra/slugify/ @grafana/backend-platform
+/pkg/infra/tracing/ @grafana/backend-platform
+/pkg/infra/usagestats/ @grafana/backend-platform
+/pkg/middleware/ @grafana/backend-platform
+/pkg/mocks/ @grafana/backend-platform
+/pkg/models/ @grafana/backend-platform
+/pkg/server/ @grafana/backend-platform
+/pkg/services/annotations/ @grafana/backend-platform
+/pkg/services/apikey/ @grafana/backend-platform
+/pkg/services/cleanup/ @grafana/backend-platform
+/pkg/services/comments/ @grafana/backend-platform
+/pkg/services/contexthandler/ @grafana/backend-platform
+/pkg/services/correlations/ @grafana/backend-platform
+/pkg/services/dashboardimport/ @grafana/backend-platform
+/pkg/services/dashboards/ @grafana/backend-platform
+/pkg/services/dashboardsnapshots/ @grafana/backend-platform
+/pkg/services/dashboardversion/ @grafana/backend-platform
+/pkg/services/encryption/ @grafana/backend-platform
+/pkg/services/featuremgmt/ @grafana/backend-platform
+/pkg/services/folder/ @grafana/backend-platform
+/pkg/services/hooks/ @grafana/backend-platform
+/pkg/services/kmsproviders/ @grafana/backend-platform
+/pkg/services/licensing/ @grafana/backend-platform
+/pkg/services/navtree/ @grafana/backend-platform
+/pkg/services/notifications/ @grafana/backend-platform
+/pkg/services/org/ @grafana/backend-platform
+/pkg/services/playlist/ @grafana/backend-platform
+/pkg/services/plugindashboards/ @grafana/backend-platform
+/pkg/services/pluginsettings/ @grafana/backend-platform
+/pkg/services/preference/ @grafana/backend-platform
+/pkg/services/provisioning/ @grafana/backend-platform
+/pkg/services/publicdashboards/ @grafana/dashboards-squad
+/pkg/services/query/ @grafana/backend-platform
+/pkg/services/queryhistory/ @grafana/backend-platform
+/pkg/services/quota/ @grafana/backend-platform
+/pkg/services/rendering/ @grafana/backend-platform
+/pkg/services/screenshot/ @grafana/backend-platform
+/pkg/services/search/ @grafana/backend-platform
+/pkg/services/searchusers/ @grafana/backend-platform
+/pkg/services/secrets/ @grafana/backend-platform
+/pkg/services/shorturls/ @grafana/backend-platform
+/pkg/services/sqlstore/ @grafana/backend-platform
+/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/temp_user/ @grafana/backend-platform
+/pkg/services/updatechecker/ @grafana/backend-platform
+/pkg/services/user/ @grafana/backend-platform
+/pkg/services/validations/ @grafana/backend-platform
+/pkg/setting/ @grafana/backend-platform
+/pkg/tests/ @grafana/backend-platform
+/pkg/tsdb/grafanads/ @grafana/backend-platform
+/pkg/tsdb/intervalv2/ @grafana/backend-platform
+/pkg/tsdb/legacydata/ @grafana/backend-platform
+/pkg/tsdb/opentsdb/ @grafana/backend-platform
+/pkg/tsdb/sqleng/ @grafana/backend-platform
+/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
+
+
+# devenv
 # Backend code, developers environment
-/devenv/docker/blocks/auth @grafana/grafana-authnz-team
+/devenv/docker/blocks/auth/ @grafana/grafana-authnz-team
 
 # Logs code, developers environment
 /devenv/docker/blocks/loki* @grafana/observability-logs
 /devenv/docker/blocks/elastic* @grafana/observability-logs
 
+# Performance tests
+/devenv/docker/loadtest-ts/ @grafana/multitenancy-squad
+
+/devenv/bulk-dashboards/ @grafana/dashboards-squad
+/devenv/bulk_alerting_dashboards/ @grafana/alerting-squad-backend
+/devenv/create_docker_compose.sh @grafana/backend-platform
+/devenv/dashboards.yaml @grafana/dashboards-squad
+/devenv/datasources.yaml @grafana/backend-platform
+/devenv/datasources_docker.yaml @grafana/backend-platform
+/devenv/dev-dashboards-without-uid/ @grafana/dashboards-squad
+/devenv/dev-dashboards/ @grafana/dashboards-squad
+/devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-squad-backend
+/devenv/docker/blocks/clickhouse/ @grafana/partner-plugins
+/devenv/docker/blocks/collectd/ @grafana/observability-metrics
+/devenv/docker/blocks/grafana/ @grafana/grafana-as-code
+/devenv/docker/blocks/graphite/ @grafana/observability-metrics
+/devenv/docker/blocks/graphite09/ @grafana/observability-metrics
+/devenv/docker/blocks/graphite1/ @grafana/observability-metrics
+/devenv/docker/blocks/influxdb/ @grafana/observability-metrics
+/devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
+/devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
+/devenv/docker/blocks/maildev/ @grafana/alerting-squad-frontend
+/devenv/docker/blocks/memcached/ @grafana/backend-platform
+/devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql_tests/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mssql_tls/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mysql/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mysql_exporter/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mysql_opendata/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/mysql_tests/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/opentsdb/ @grafana/observability-metrics
+/devenv/docker/blocks/phlare/ @grafana/observability-traces-and-profiling
+/devenv/docker/blocks/postgres/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/postgres_tests/ @grafana/grafana-bi-squad
+/devenv/docker/blocks/prometheus/ @grafana/observability-metrics
+/devenv/docker/blocks/prometheus_random_data/ @grafana/observability-metrics
+/devenv/docker/blocks/redis/ @bergquist
+/devenv/docker/blocks/sensugo/ @grafana/backend-platform
+/devenv/docker/blocks/slow_proxy/ @bergquist
+/devenv/docker/blocks/smtp/ @bergquist
+/devenv/docker/blocks/tempo/ @grafana/observability-traces-and-profiling
+/devenv/docker/blocks/traefik/ @mckn
+/devenv/docker/blocks/zipkin/ @grafana/observability-traces-and-profiling
+/devenv/docker/buildcontainer/ @bergquist
+/devenv/docker/compose_header.yml @grafana/backend-platform
+/devenv/docker/debtest/ @bergquist
+/devenv/docker/ha-test-unified-alerting/ @grafana/alerting-squad-backend
+/devenv/docker/ha_test/ @grafana/backend-platform
+/devenv/docker/loadtest/ @grafana/backend-platform
+/devenv/docker/rpmtest/ @grafana/backend-platform
+/devenv/jsonnet/ @grafana/grafana-edge-squad
+/devenv/local-npm/ @grafana/frontend-ops
+/devenv/vscode/ @grafana/frontend-ops
+/devenv/setup.sh @grafana/backend-platform
+
+# Emails
+/emails/ @grafana/alerting-squad-frontend
+
+#Packaging
+/packaging/ @DanCech
+
+
 # Continuous Integration
 .drone.yml @grafana/grafana-release-eng
 .drone.star @grafana/grafana-release-eng
 /scripts/drone/ @grafana/grafana-release-eng
 /pkg/build/ @grafana/grafana-release-eng
+/.dockerignore @grafana/grafana-release-eng
+/Dockerfile @grafana/grafana-release-eng
+/Makefile @grafana/grafana-release-eng
+/scripts/build/ @grafana/grafana-release-eng
 
-# Cloud Datasources backend code
-/pkg/tsdb/cloudwatch @grafana/aws-plugins
-/pkg/tsdb/azuremonitor @grafana/cloud-provider-plugins
-/pkg/tsdb/cloudmonitoring @grafana/cloud-provider-plugins
+# OSS Plugin Partnerships backend code
+/pkg/tsdb/cloudwatch/ @grafana/aws-plugins
+/pkg/tsdb/azuremonitor/ @grafana/partner-plugins
+/pkg/tsdb/cloudmonitoring/ @grafana/partner-plugins
 
 # Observability backend code
-/pkg/tsdb/prometheus @grafana/observability-metrics
-/pkg/tsdb/influxdb @grafana/observability-metrics
-/pkg/tsdb/elasticsearch @grafana/observability-logs
-/pkg/tsdb/graphite @grafana/observability-metrics
-/pkg/tsdb/jaeger @grafana/observability-traces-and-profiling
-/pkg/tsdb/loki @grafana/observability-logs
-/pkg/tsdb/zipkin @grafana/observability-traces-and-profiling
-/pkg/tsdb/tempo @grafana/observability-traces-and-profiling
+/pkg/tsdb/prometheus/ @grafana/observability-metrics
+/pkg/tsdb/influxdb/ @grafana/observability-metrics
+/pkg/tsdb/elasticsearch/ @grafana/observability-logs
+/pkg/tsdb/graphite/ @grafana/observability-metrics
+/pkg/tsdb/loki/ @grafana/observability-logs
+/pkg/tsdb/tempo/ @grafana/observability-traces-and-profiling
+/pkg/tsdb/phlare/ @grafana/observability-traces-and-profiling
+/pkg/tsdb/parca/ @grafana/observability-traces-and-profiling
 
 # BI backend code
-/pkg/tsdb/mysql @grafana/grafana-bi-squad
-/pkg/tsdb/postgres @grafana/grafana-bi-squad
-/pkg/tsdb/mssql @grafana/grafana-bi-squad
+/pkg/tsdb/mysql/ @grafana/grafana-bi-squad
+/pkg/tsdb/postgres/ @grafana/grafana-bi-squad
+/pkg/tsdb/mssql/ @grafana/grafana-bi-squad
 
 # Database migrations
-/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team
+/pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
 *_mig.go @grafana/backend-platform @grafana/hosted-grafana-team
 
-# Grafana edge
-/pkg/services/live/ @grafana/grafana-edge-squad
-/pkg/services/searchV2/ @grafana/grafana-edge-squad
-/pkg/services/store/ @grafana/grafana-edge-squad
-/pkg/services/export/ @grafana/grafana-edge-squad
-/pkg/infra/filestore/ @grafana/grafana-edge-squad
-/pkg/tsdb/testdatasource/sims/ @grafana/grafana-edge-squad
+# Grafana multitenancy
+/pkg/services/live/ @grafana/multitenancy-squad
+/pkg/services/searchV2/ @grafana/multitenancy-squad
+/pkg/services/store/ @grafana/multitenancy-squad
+/pkg/services/querylibrary/ @grafana/multitenancy-squad
+/pkg/services/export/ @grafana/multitenancy-squad
+/pkg/infra/filestorage/ @grafana/multitenancy-squad
+/pkg/util/converter/ @grafana/multitenancy-squad
 
 # Alerting
-/pkg/services/ngalert @grafana/alerting-squad-backend
-/pkg/services/sqlstore/migrations/ualert @grafana/alerting-squad-backend
-/pkg/services/alerting @grafana/alerting-squad-backend
-/pkg/tests/api/alerting @grafana/alerting-squad-backend
-/public/app/features/alerting @grafana/alerting-squad-frontend
+/pkg/services/ngalert/ @grafana/alerting-squad-backend
+/pkg/services/sqlstore/migrations/ualert/ @grafana/alerting-squad-backend
+/pkg/services/alerting/ @grafana/alerting-squad-backend
+/pkg/tests/api/alerting/ @grafana/alerting-squad-backend
+/public/app/features/alerting/ @grafana/alerting-squad-frontend
 
 # Library Services
-/pkg/services/libraryelements @grafana/user-essentials
-/pkg/services/librarypanels @grafana/user-essentials
+/pkg/services/libraryelements/ @grafana/user-essentials
+/pkg/services/librarypanels/ @grafana/user-essentials
 
 # Plugins
-/pkg/api/pluginproxy @grafana/plugins-platform-backend
-/pkg/plugins @grafana/plugins-platform-backend
-/pkg/services/datasourceproxy @grafana/plugins-platform-backend
-/pkg/services/datasources @grafana/plugins-platform-backend
-/pkg/plugins/pfs @grafana/plugins-platform-backend @grafana/grafana-as-code
+/pkg/api/pluginproxy/ @grafana/plugins-platform-backend
+/pkg/infra/httpclient/ @grafana/plugins-platform-backend
+/pkg/plugins/ @grafana/plugins-platform-backend
+/pkg/services/datasourceproxy/ @grafana/plugins-platform-backend
+/pkg/services/datasources/ @grafana/plugins-platform-backend
+/pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
+/pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
+/pkg/tsdb/testdatasource/ @grafana/plugins-platform-backend
 
 # Dashboard previews / crawler (behind feature flag)
-/pkg/services/thumbs @grafana/grafana-edge-squad
+/pkg/services/thumbs/ @grafana/multitenancy-squad
 
 # Backend code docs
-/contribute/style-guides/backend.md @grafana/backend-platform
-/contribute/architecture/backend @grafana/backend-platform
-/contribute/engineering/backend @grafana/backend-platform
+/contribute/backend/ @grafana/backend-platform
 
-/e2e @grafana/user-essentials
-/packages @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/packages/grafana-e2e-selectors @grafana/user-essentials
-/packages/grafana-e2e @grafana/user-essentials
-/packages/grafana-toolkit @grafana/plugins-platform-frontend
-/packages/grafana-ui/.storybook @grafana/plugins-platform-frontend
-/packages/grafana-ui/src/components/DateTimePickers @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/GraphNG @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/Logs @grafana/observability-logs
-/packages/grafana-ui/src/components/Table @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/TimeSeries @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/uPlot @grafana/grafana-bi-squad
-/packages/grafana-ui/src/utils/storybook @grafana/plugins-platform-frontend
-/packages/jaeger-ui-components/ @grafana/observability-traces-and-profiling
-/plugins-bundled @grafana/plugins-platform-frontend
-# public folder
-/public/app/core/components/TimePicker @grafana/grafana-bi-squad
-/public/app/core/components/Layers @grafana/grafana-edge-squad
-/public/app/features/canvas/ @grafana/grafana-edge-squad
-/public/app/features/comments/ @grafana/grafana-edge-squad
-/public/app/features/dimensions/ @grafana/grafana-edge-squad
-/public/app/features/geo/ @grafana/grafana-edge-squad
-/public/app/features/storage/ @grafana/grafana-edge-squad
-/public/app/features/live/ @grafana/grafana-edge-squad
-/public/app/features/explore/ @grafana/observability-experience-squad
-/public/app/features/plugins @grafana/plugins-platform-frontend
-/public/app/features/transformers/spatial @grafana/grafana-edge-squad
-/public/app/plugins/panel/alertlist @grafana/alerting-squad-frontend
-/public/app/plugins/panel/barchart @grafana/grafana-bi-squad
-/public/app/plugins/panel/heatmap @grafana/grafana-bi-squad
-/public/app/plugins/panel/histogram @grafana/grafana-bi-squad
-/public/app/plugins/panel/logs @grafana/observability-logs
-/public/app/plugins/panel/nodeGraph @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/traces @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/piechart @grafana/grafana-bi-squad
-/public/app/plugins/panel/state-timeline @grafana/grafana-bi-squad
-/public/app/plugins/panel/status-history @grafana/grafana-bi-squad
-/public/app/plugins/panel/table @grafana/grafana-bi-squad
-/public/app/plugins/panel/timeseries @grafana/grafana-bi-squad
-/public/app/plugins/panel/geomap @grafana/grafana-edge-squad
-/public/app/plugins/panel/canvas @grafana/grafana-edge-squad
-/public/app/plugins/panel/candlestick @grafana/grafana-edge-squad
-/public/app/plugins/panel/icon @grafana/grafana-edge-squad
-/scripts/build/release-packages.sh @grafana/plugins-platform-frontend
-/scripts/circle-release-next-packages.sh @grafana/plugins-platform-frontend
-/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/scripts/grunt @grafana/frontend-ops
-/scripts/webpack @grafana/frontend-ops
-/scripts/generate-a11y-report.sh @grafana/user-essentials
+
+/crowdin.yml @grafana/user-essentials
+/public/locales/ @grafana/user-essentials
+/public/app/core/internationalization/ @grafana/user-essentials
+/e2e/ @grafana/user-essentials
+/e2e/cloud-plugins-suite/ @grafana/partner-plugins
+/packages/ @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/packages/grafana-e2e-selectors/ @grafana/user-essentials
+/packages/grafana-e2e/ @grafana/user-essentials
+/packages/grafana-toolkit/ @grafana/plugins-platform-frontend
+/packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
+/packages/grafana-ui/src/components/DateTimePickers/ @grafana/user-essentials
+/packages/grafana-ui/src/components/GraphNG/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/Logs/ @grafana/observability-logs
+/packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/TimeSeries/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/uPlot/ @grafana/grafana-bi-squad
+/packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
+/packages/grafana-data/src/**/*logs* @grafana/observability-logs
+/plugins-bundled/ @grafana/plugins-platform-frontend
+
+
+# root files, mostly frontend
+.browserslistrc @grafana/frontend-ops
 package.json @grafana/frontend-ops
 tsconfig.json @grafana/frontend-ops
+/.editorconfig @grafana/frontend-ops
+/.eslintignore @grafana/frontend-ops
+/.gitattributes @grafana/frontend-ops
+/.gitignore @grafana/frontend-ops
+/.husky/pre-commit @grafana/frontend-ops
+/.nvmrc @grafana/frontend-ops
+/.prettierignore @grafana/frontend-ops
+/.yarn @grafana/frontend-ops
+/.yarnrc.yml @grafana/frontend-ops
+/yarn.lock @grafana/frontend-ops
+/.linguirc @grafana/user-essentials
+/babel.config.json @grafana/frontend-ops
 lerna.json @grafana/frontend-ops
-.babelrc @grafana/frontend-ops
-.prettierrc.js @grafana/frontend-ops
-.eslintrc @grafana/frontend-ops
+/.prettierrc.js @grafana/frontend-ops
+/.eslintrc @grafana/frontend-ops
+/.vim @zoltanbedi
+/jest.config.js @grafana/frontend-ops
+/latest.json @grafana/frontend-ops
+/metadata.md @grafana/plugins-platform
+/stylelint.config.js @grafana/frontend-ops
+/tools/ @grafana/frontend-ops
+
+
+# public folder
+/public/app/core/ @grafana/user-essentials
+/public/app/core/components/TimePicker/ @grafana/user-essentials
+/public/app/core/components/Layers/ @grafana/grafana-edge-squad
+/public/app/features/all.ts @grafana/user-essentials
+/public/app/features/admin/ @grafana/grafana-authnz-team
+/public/app/features/annotations/ @grafana/user-essentials
+/public/app/features/api-keys/ @grafana/user-essentials
+/public/app/features/canvas/ @grafana/grafana-edge-squad
+/public/app/features/commandPalette/ @grafana/user-essentials
+/public/app/features/comments/ @grafana/grafana-edge-squad
+/public/app/features/connections/ @grafana/plugins-platform-frontend
+/public/app/features/correlations/ @grafana/explore-squad
+/public/app/features/dashboard/ @grafana/dashboards-squad
+/public/app/features/datasources/ @grafana/user-essentials
+/public/app/features/dimensions/ @grafana/grafana-edge-squad
+/public/app/features/explore/ @grafana/explore-squad
+/public/app/features/expressions/ @grafana/observability-metrics
+/public/app/features/folders/ @grafana/user-essentials
+/public/app/features/inspector/ @grafana/user-essentials
+/public/app/features/invites/ @grafana/user-essentials
+/public/app/features/geo/ @grafana/grafana-edge-squad
+/public/app/features/library-panels/ @grafana/user-essentials
+/public/app/features/logs/ @grafana/observability-logs
+/public/app/features/live/ @grafana/multitenancy-squad
+/public/app/features/manage-dashboards/ @grafana/dashboards-squad
+/public/app/features/notifications/ @grafana/user-essentials
+/public/app/features/org/ @grafana/user-essentials
+/public/app/features/panel/ @grafana/user-essentials
+/public/app/features/playlist/ @grafana/dashboards-squad
+/public/app/features/plugins/ @grafana/plugins-platform-frontend
+/public/app/features/profile/ @grafana/user-essentials
+/public/app/features/runtime/ @ryantxu
+/public/app/features/query/ @grafana/dashboards-squad
+/public/app/features/query-library/ @grafana/grafana-edge-squad
+/public/app/features/sandbox/ @grafana/user-essentials
+/public/app/features/scenes/ @grafana/dashboards-squad
+/public/app/features/search/ @grafana/user-essentials
+/public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
+/public/app/features/storage/ @grafana/multitenancy-squad
+/public/app/features/teams/ @grafana/grafana-authnz-team
+/public/app/features/templating/ @grafana/dashboards-squad
+/public/app/features/transformers/ @grafana/grafana-edge-squad
+/public/app/features/users/ @grafana/grafana-authnz-team
+/public/app/features/variables/ @grafana/dashboards-squad
+/public/app/plugins/panel/alertGroups/ @grafana/alerting-squad-frontend
+/public/app/plugins/panel/alertlist/ @grafana/alerting-squad-frontend
+/public/app/plugins/panel/annolist/ @grafana/user-essentials
+/public/app/plugins/panel/barchart/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/bargauge/ @grafana/user-essentials
+/public/app/plugins/panel/dashlist/ @grafana/user-essentials
+/public/app/plugins/panel/debug/ @ryantxu
+/public/app/plugins/panel/gauge/ @grafana/user-essentials
+/public/app/plugins/panel/gettingstarted/ @grafana/user-essentials
+/public/app/plugins/panel/graph/ @grafana/user-essentials
+/public/app/plugins/panel/heatmap/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/histogram/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/logs/ @grafana/observability-logs
+/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
+/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/grafana-bi-squad
+/public/app/plugins/panel/state-timeline/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/status-history/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/table/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/table-old/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/timeseries/ @grafana/grafana-bi-squad
+/public/app/plugins/panel/geomap/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/canvas/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/candlestick/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/icon/ @grafana/grafana-edge-squad
+/public/app/plugins/panel/live/ @grafana/multitenancy-squad
+/public/app/plugins/panel/news/ @grafana/user-essentials
+/public/app/plugins/panel/stat/ @grafana/user-essentials
+/public/app/plugins/panel/text/ @grafana/user-essentials
+/public/app/plugins/panel/welcome/ @grafana/user-essentials
+/public/app/plugins/panel/xychart/ @grafana/grafana-bi-squad
+/public/app/plugins/sdk.ts @grafana/plugins-platform-frontend
+/public/app/polyfills/old-mediaquerylist.ts @grafana/user-essentials
+/public/app/routes/ @grafana/user-essentials
+/public/app/store/ @grafana/user-essentials
+/public/app/types/ @grafana/user-essentials
+/public/dashboards/ @grafana/dashboards-squad
+/public/fonts/ @grafana/alerting-squad-frontend
+/public/emails/ @grafana/user-essentials
+/public/gazetteer/ @ryantxu
+/public/img/ @grafana/user-essentials
+/public/lib/ @grafana/user-essentials
+/public/maps/ @ryantxu
+/public/robots.txt @grafana/frontend-ops
+/public/sass/ @grafana/user-essentials
+/public/test/ @grafana/user-essentials
+/public/testdata/ @grafana/user-essentials
+/public/views/ @grafana/user-essentials
+
+/public/app/features/explore/Logs.tsx @grafana/observability-logs
+/public/app/features/explore/LogsContainer.tsx @grafana/observability-logs
+
+/public/app/features/explore/TraceView/ @grafana/observability-traces-and-profiling
+
+/public/api-merged.json @grafana/backend-platform
+/public/api-spec.json @grafana/backend-platform
+/public/openapi3.json @grafana/backend-platform
+/public/app/angular/ @torkelo
+/public/app/app.ts @grafana/frontend-ops
+/public/app/dev.ts @grafana/frontend-ops
+/public/app/index.ts @grafana/frontend-ops
+/public/app/AppWrapper.tsx @grafana/frontend-ops
+/public/app/partials/ @grafana/user-essentials
+
+
+
+
+/scripts/benchmark-access-control.sh @grafana/grafana-authnz-team
+/scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
+/scripts/ci-* @grafana/grafana-release-eng
+/scripts/circle-* @grafana/grafana-release-eng
+/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/scripts/cli/ @grafana/user-essentials
+/scripts/clean-git-or-error.sh @grafana/grafana-as-code
+/scripts/grafana-server/ @grafana/user-essentials
+/scripts/helpers/ @grafana/grafana-release-eng
+/scripts/import_many_dashboards.sh @torkelo
+/scripts/mixin-check.sh @bergquist
+/scripts/openapi3/ @grafana/grafana-partnerships-team
+/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-release-eng
+/scripts/trigger_docker_build.sh @grafana/grafana-release-eng
+/scripts/trigger_grafana_packer.sh @grafana/grafana-release-eng
+/scripts/trigger_windows_build.sh @grafana/grafana-release-eng
+/scripts/validate-devenv-dashboards.sh @grafana/grafana-release-eng
+/scripts/verify-repo-update/ @grafana/grafana-release-eng
+
+/scripts/webpack/ @grafana/frontend-ops
+/scripts/generate-a11y-report.sh @grafana/user-essentials
 .pa11yci.conf.js @grafana/user-essentials
 .pa11yci-pr.conf.js @grafana/user-essentials
 .betterer.results @joshhunt
+.betterer.ts @joshhunt
 
 # @grafana/ui component documentation
-*.mdx @jessover9000 @grafana/plugins-platform-frontend
+*.mdx @grafana/plugins-platform-frontend
+
+# Design system
+/public/img/icons/unicons/ @grafana/design-system
 
 # Core datasources
-/public/app/plugins/datasource/cloudwatch @grafana/aws-plugins
-/public/app/plugins/datasource/elasticsearch @grafana/observability-logs
-/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/cloud-provider-plugins
-/public/app/plugins/datasource/graphite @grafana/observability-metrics
-/public/app/plugins/datasource/influxdb @grafana/observability-metrics
-/public/app/plugins/datasource/jaeger @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/loki @grafana/observability-logs
-/public/app/plugins/datasource/mssql @grafana/grafana-bi-squad
-/public/app/plugins/datasource/mysql @grafana/grafana-bi-squad
-/public/app/plugins/datasource/opentsdb @grafana/backend-platform
-/public/app/plugins/datasource/postgres @grafana/grafana-bi-squad
-/public/app/plugins/datasource/prometheus @grafana/observability-metrics
-/public/app/plugins/datasource/cloud-monitoring @grafana/cloud-provider-plugins
-/public/app/plugins/datasource/zipkin @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/tempo @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/alertmanager @grafana/alerting-squad
+/public/app/plugins/datasource/dashboard/ @grafana/dashboards-squad
+/public/app/plugins/datasource/cloudwatch/ @grafana/aws-plugins
+/public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs
+/public/app/plugins/datasource/grafana/ @grafana/user-essentials
+/public/app/plugins/datasource/testdata/ @grafana/plugins-platform-frontend
+/public/app/plugins/datasource/grafana-azure-monitor-datasource/ @grafana/partner-plugins
+/public/app/plugins/datasource/graphite/ @grafana/observability-metrics
+/public/app/plugins/datasource/influxdb/ @grafana/observability-metrics
+/public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/loki/ @grafana/observability-logs
+/public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
+/public/app/plugins/datasource/mssql/ @grafana/grafana-bi-squad
+/public/app/plugins/datasource/mysql/ @grafana/grafana-bi-squad
+/public/app/plugins/datasource/opentsdb/ @grafana/backend-platform
+/public/app/plugins/datasource/postgres/ @grafana/grafana-bi-squad
+/public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
+/public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-plugins
+/public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/phlare/ @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling
+/public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad
+
+# SSE - Server Side Expressions
+/pkg/expr/ @grafana/observability-metrics
 
 # Cloud middleware
 /grafana-mixin/ @grafana/hosted-grafana-team
 
 # Grafana authentication and authorization
-/pkg/services/accesscontrol @grafana/grafana-authnz-team
-/pkg/services/auth @grafana/grafana-authnz-team
+/pkg/login/ @grafana/grafana-authnz-team
+/pkg/services/accesscontrol/ @grafana/grafana-authnz-team
+/pkg/services/auth/ @grafana/grafana-authnz-team
 /pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
-/pkg/services/datasources/permissions @grafana/grafana-authnz-team
-/pkg/services/datasources/permissions/accesscontrol.go @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/multildap @grafana/grafana-authnz-team
-/pkg/services/oauthtoken @grafana/grafana-authnz-team
-/pkg/services/teamguardian @grafana/grafana-authnz-team
-/pkg/services/serviceaccounts @grafana/grafana-authnz-team
+/pkg/services/datasources/permissions/ @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/multildap/ @grafana/grafana-authnz-team
+/pkg/services/oauthtoken/ @grafana/grafana-authnz-team
+/pkg/services/teamguardian/ @grafana/grafana-authnz-team
+/pkg/services/serviceaccounts/ @grafana/grafana-authnz-team
+/pkg/services/loginattempt/ @grafana/grafana-authnz-team
+/pkg/services/authn/ @grafana/grafana-authnz-team
+
+# Support bundles
+/public/app/features/support-bundles/ @grafana/grafana-authnz-team
+/pkg/services/supportbundles/ @grafana/grafana-authnz-team
 
 # Grafana Partnerships Team
 /pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-partnerships-team
+/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-partnerships-team
 
-# Schema framework and code generation
-/pkg/codegen @grafana/grafana-as-code
-/pkg/framework/coremodel @grafana/grafana-as-code
+# Kind definitions
+/kinds/dashboard @grafana/dashboards-squad
+/kinds/ @grafana/grafana-as-code
+
+# Kind system and code generation
+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/codegen/ @grafana/grafana-as-code
+/pkg/kindsys/ @grafana/grafana-as-code
+/pkg/kindsys/kindcat_custom.cue @grafana/cloud-app-platform-squad
+/pkg/kinds/*/*_gen.go @grafana/grafana-as-code
+/pkg/registry/corekind/ @grafana/grafana-as-code
 /public/app/plugins/*gen.go @grafana/grafana-as-code
+/cue.mod/ @grafana/grafana-as-code
+
+# GitHub Workflows and Templates
+/.github/CODEOWNERS @tolzhabayev
+/.github/ISSUE_TEMPLATE/ @torkelo
+/.github/PULL_REQUEST_TEMPLATE.md @torkelo
+/.github/bot.md @torkelo
+/.github/commands.json @torkelo
+/.github/dependabot.yml @grafana/frontend-ops
+/.github/metrics-collector.json @torkelo
+/.github/pr-checks.json @marefr
+/.github/pr-commands.json @marefr
+/.github/renovate.json5 @grafana/frontend-ops
+/.github/teams.yml @armandgrillet
+/.github/workflows/backport.yml @grafana/grafana-release-eng
+/.github/workflows/bump-version.yml @grafana/grafana-release-eng
+/.github/workflows/close-milestone.yml @grafana/grafana-release-eng
+/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-plugins @grafana/aws-plugins
+/.github/workflows/codeowners-validator.yml @tolzhabayev
+/.github/workflows/codeql-analysis.yml @DanCech
+/.github/workflows/commands.yml @torkelo
+/.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
+/.github/workflows/doc-validator.yml @grafana/docs-grafana
+/.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
+/.github/workflows/github-release.yml @torkelo
+/.github/workflows/issue-labeled.yml @armandgrillet
+/.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-closed.yml @tolzhabayev
+/.github/workflows/pr-commands.yml @marefr
+/.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana
+/.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana
+/.github/workflows/remove-milestone.yml @grafana/user-essentials
+/.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/user-essentials
+/.github/workflows/update-changelog.yml @grafana/grafana-release-eng
+
+
+# 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/provisioning/alerting/ @grafana/alerting-squad-backend
+/conf/provisioning/dashboards/ @grafana/dashboards-squad
+/conf/provisioning/datasources/ @grafana/plugins-platform-backend
+/conf/provisioning/notifiers/ @bergquist
+/conf/provisioning/plugins/ @grafana/plugins-platform-backend

.github/workflows/cloud-data-sources-code-coverage.yml

@@ -14,7 +14,7 @@ on:
 
 jobs:
   workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.11
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.12
     with:
       frontend-path-regexp: public\/app\/plugins\/datasource\/(grafana-azure-monitor-datasource|cloud-monitoring|cloudwatch)
       backend-path-regexp: pkg\/tsdb\/(azuremonitor|cloudmonitoring|cloudwatch)

.github/workflows/codeql-analysis.yml

@@ -6,6 +6,7 @@
 name: "CodeQL"
 
 on:
+  workflow_dispatch:
   push:
     branches: [main, v1.8.x, v2.0.x, v2.1.x, v2.6.x, v3.0.x, v3.1.x, v4.0.x, v4.1.x, v4.2.x, v4.3.x, v4.4.x, v4.5.x, v4.6.x, v4.7.x, v5.0.x, v5.1.x, v5.2.x, v5.3.x, v5.4.x, v6.0.x, v6.1.x, v6.2.x, v6.3.x, v6.4.x, v6.5.x, v6.6.x, v6.7.x, v7.0.x, v7.1.x, v7.2.x]
     paths-ignore:
@@ -39,6 +40,12 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
+    - if: matrix.language == 'go'
+      name: Set go version
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.19.2'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
@@ -49,5 +56,11 @@ jobs:
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
+    - if: matrix.language == 'go'
+      name: Build go files
+      run: |
+        go mod verify
+        make build-go
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/detect-breaking-changes-build-skip.yml

@@ -0,0 +1,34 @@
+# Workflow for skipping the Levitate detection
+# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github.
+# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.)
+
+name: Levitate / Detect breaking changes
+
+on:
+  pull_request:
+    paths-ignore:
+      - "packages/**"
+    branches:
+      - 'main'
+
+jobs:
+  detect:
+    name: Detect breaking changes
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Skipping
+        run: echo "No modifications in the public API (packages/), skipping."
+
+        # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped)
+      - name: Persisting the check output
+        run: |
+          mkdir -p ./levitate
+          echo "{ \"shouldSkip\": true }" > ./levitate/result.json
+
+      # Upload artifact (so it can be used in the more privileged "report" workflow)
+      - name: Upload check output as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: levitate
+          path: levitate/

.github/workflows/detect-breaking-changes-build.yml

@@ -1,6 +1,11 @@
 name: Levitate / Detect breaking changes
 
-on: pull_request
+on: 
+  pull_request:
+    paths:
+      - 'packages/**'
+    branches:
+      - 'main'
 
 jobs:
   buildPR:

.github/workflows/doc-validator.yml

@@ -7,7 +7,7 @@ jobs:
   doc-validator:
     runs-on: "ubuntu-latest"
     container:
-      image: "grafana/doc-validator:latest"
+      image: "grafana/doc-validator:v1.5.0"
     steps:
       - name: "Checkout code"
         uses: "actions/checkout@v3"

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

@@ -1,26 +0,0 @@
-name: Enterprise PR check
-on:
-  pull_request:
-    branches:
-      - main
-      - 'v[0-9]+.[0-9]+.x'
-jobs:
-  dispatch:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Actions
-        uses: actions/checkout@v2
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: ./actions
-          ref: main
-      - name: Install Actions
-        run: npm install --production --prefix ./actions
-      - name: Repository Dispatch
-        uses: ./actions/repository-dispatch
-        with:
-          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-          repository: grafana/grafana-enterprise
-          event_type: oss-pull-request
-          client_payload:
-            '{"source_branch": "${{ github.head_ref }}", "target_branch": "${{ github.base_ref }}", "pr_number": "${{ github.event.number }}"}'

.github/workflows/ox-code-coverage.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.11
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.12
     with:
       frontend-path-regexp: public\/app\/features\/(explore|correlations)
       backend-path-regexp: pkg\/services\/(queryhistory)

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

@@ -1,6 +1,7 @@
 name: "CodeQL for PR / go"
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: [main]
     paths:
@@ -19,11 +20,21 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
+    - name: Set go version
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.19.2'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: "go"
 
+    - name: Build go files
+      run: |
+        go mod verify
+        make build-go
+
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

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

@@ -1,6 +1,7 @@
 name: "CodeQL for PR / javascript"
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: [main]
     paths:

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

@@ -1,6 +1,7 @@
 name: "CodeQL for PR / python"
 
 on:
+  workflow_dispatch:
   pull_request:
     branches: [main]
     paths:

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

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

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

@@ -0,0 +1,68 @@
+name: "publish-technical-documentation-release"
+
+on:
+  push:
+    branches:
+      - v[0-9]+.[0-9]+.x
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+    paths:
+      - "docs/sources/**"
+  workflow_dispatch:
+jobs:
+  sync:
+    if: "github.repository == 'grafana/grafana'"
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: "Checkout Grafana repo"
+        uses: "actions/checkout@v3"
+        with:
+          fetch-depth: 0
+
+      - name: "Checkout Actions library"
+        uses: "actions/checkout@v3"
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: "./actions"
+
+      - name: "Install Actions from library"
+        run: "npm install --production --prefix ./actions"
+
+      - name: "Determine if there is a matching release tag"
+        id: "has-matching-release-tag"
+        uses: "./actions/has-matching-release-tag"
+        with:
+          ref_name: "${{ github.ref_name }}"
+          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
+          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
+
+      - name: "Determine technical documentation version"
+        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
+        uses: "./actions/docs-target"
+        id: "target"
+        with:
+          ref_name: "${{ github.ref_name }}"
+
+      - name: "Clone website-sync Action"
+        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
+        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
+        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
+        # GitHub administrator to update the organization secret.
+        # The IT helpdesk can update the organization secret.
+        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
+
+      - name: "Publish to website repository (release)"
+        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
+        uses: "./.github/actions/website-sync"
+        id: "publish-release"
+        with:
+          repository: "grafana/website"
+          branch: "master"
+          host: "github.com"
+          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
+          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
+          # GitHub administrator to update the organization secret.
+          # The IT helpdesk can update the organization secret.
+          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
+          source_folder: "docs/sources"
+          target_folder: "content/docs/grafana/${{ steps.target.outputs.target }}"

.github/workflows/publish.yml

@@ -1,48 +0,0 @@
-name: publish_docs
-
-on:
-  push:
-    branches:
-    - v9.2.x
-    paths:
-    - 'docs/sources/**'
-    - 'packages/grafana-*/**'
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
-    - name: generate-packages-docs
-      uses: actions/setup-node@v3.4.0
-      id: generate-docs
-      with:
-        node-version: '16'
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-    - uses: actions/cache@v2.1.7
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-            yarn-
-    - run: yarn install --immutable
-    - name: publish-to-git
-      uses: ./.github/actions/website-sync
-      id: publish
-      with:
-        repository: grafana/website
-        branch: master
-        host: github.com
-        github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
-        source_folder: docs/sources
-        target_folder: content/docs/grafana/latest
-        allow_no_changes: 'true'
-    - shell: bash
-      run: |
-        test -n "${{ steps.publish.outputs.commit_hash }}"
-        test -n "${{ steps.publish.outputs.working_directory }}"

.pa11yci-pr.conf.js

@@ -62,7 +62,7 @@ var config = {
       url: '${HOST}/login',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 12,
+      threshold: 13,
     },
     {
       url: '${HOST}/login',
@@ -74,7 +74,7 @@ var config = {
         "click element button[aria-label='Login button']",
         "wait for element [aria-label='Skip change password button'] to be visible",
       ],
-      threshold: 13,
+      threshold: 14,
       rootElement: '.main-view',
     },
     {
@@ -101,49 +101,49 @@ var config = {
       rootElement: '.main-view',
       // the unified alerting promotion alert's content contrast is too low
       // see https://github.com/grafana/grafana/pull/41829
-      threshold: 5,
+      threshold: 6,
     },
     {
       url: '${HOST}/datasources',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
     {
       url: '${HOST}/org/users',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
     {
       url: '${HOST}/org/teams',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
     {
       url: '${HOST}/plugins',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
     {
       url: '${HOST}/org',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
     {
       url: '${HOST}/org/apikeys',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 3,
+      threshold: 4,
     },
     {
       url: '${HOST}/dashboards',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 0,
+      threshold: 1,
     },
   ],
 };

.yarnrc.yml

@@ -60,9 +60,6 @@ packageExtensions:
       react-simple-compat: 1.2.2
     peerDependencies:
       framework-utils: ^1.1.0
-  react-docgen-typescript-loader@3.7.2:
-    peerDependencies:
-      webpack: 4.41.5
   react-icons@2.2.7:
     peerDependencies:
       prop-types: "*"

CHANGELOG.md

@@ -1,3 +1,194 @@
+<!-- 9.2.10 START -->
+
+# 9.2.10 (2023-01-24)
+
+### Features and enhancements
+
+- **TextPanel:** Refactor to functional component (#60885). [#61940](https://github.com/grafana/grafana/pull/61940), [@ryantxu](https://github.com/ryantxu)
+- **[v9.2.x] Chore:** Upgrade Go to 1.19.4. [#60826](https://github.com/grafana/grafana/pull/60826), [@sakjur](https://github.com/sakjur)
+
+### Bug fixes
+
+- **Live:** Fix `Subscription to the channel already exists` live streaming error. [#61420](https://github.com/grafana/grafana/pull/61420), [@grafanabot](https://github.com/grafanabot)
+- **Live:** Fix `Subscription to the channel already exists` live streaming error. [#61419](https://github.com/grafana/grafana/pull/61419), [@grafanabot](https://github.com/grafanabot)
+- **Live:** Fix `Subscription to the channel already exists` live streaming error. [#61406](https://github.com/grafana/grafana/pull/61406), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
+
+<!-- 9.2.10 END -->
+
+<!-- 9.2.7 START -->
+
+# 9.2.7 (2022-11-29)
+
+### Bug fixes
+
+- **Access Control:** Clear user's permission cache after resource creation. [#59318](https://github.com/grafana/grafana/pull/59318), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Azure Monitor:** Fix empty/errored responses for Logs variables. [#59240](https://github.com/grafana/grafana/pull/59240), [@andresmgot](https://github.com/andresmgot)
+- **Azure Monitor:** Fix resource picker selection for subresources. [#56392](https://github.com/grafana/grafana/pull/56392), [@andresmgot](https://github.com/andresmgot)
+- **Navigation:** Fix crash when Help is disabled. [#58919](https://github.com/grafana/grafana/pull/58919), [@lpskdl](https://github.com/lpskdl)
+- **PostgreSQL:** Fix missing CA field from configuration. [#59280](https://github.com/grafana/grafana/pull/59280), [@oscarkilhed](https://github.com/oscarkilhed)
+- **SQL Datasources:** Fix annotation migration. [#59438](https://github.com/grafana/grafana/pull/59438), [@zoltanbedi](https://github.com/zoltanbedi)
+- **SQL:** Fix code editor for SQL datasources. [#58116](https://github.com/grafana/grafana/pull/58116), [@zoltanbedi](https://github.com/zoltanbedi)
+- **SSE:** Make sure to forward headers, user and cookies/OAuth token. [#58897](https://github.com/grafana/grafana/pull/58897), [@kylebrandt](https://github.com/kylebrandt)
+- **TimeseriesPanel:** Preserve string fields for data link interpolation. [#58424](https://github.com/grafana/grafana/pull/58424), [@mdvictor](https://github.com/mdvictor)
+
+<!-- 9.2.7 END -->
+<!-- 9.2.6 START -->
+
+# 9.2.6 (2022-11-22)
+
+### Features and enhancements
+
+- **Alerting:** Support Prometheus durations in Provisioning API. [#58293](https://github.com/grafana/grafana/pull/58293), [@bartpeeters](https://github.com/bartpeeters)
+- **SSE:** Keep value name from numeric table. [#58831](https://github.com/grafana/grafana/pull/58831), [@kylebrandt](https://github.com/kylebrandt)
+- **Transformations:** Make Card Descriptions Clickable. [#58717](https://github.com/grafana/grafana/pull/58717), [@zuchka](https://github.com/zuchka)
+
+### Bug fixes
+
+- **MS/My/PostgresSQL:** Migrate annotation query. [#58847](https://github.com/grafana/grafana/pull/58847), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Search:** Fixes issue with Recent/Starred section always displaying "General" folder. [#58746](https://github.com/grafana/grafana/pull/58746), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **Server:** Write internal server error on missing write. [#57813](https://github.com/grafana/grafana/pull/57813), [@sakjur](https://github.com/sakjur)
+
+<!-- 9.2.6 END -->
+<!-- 9.2.5 START -->
+
+# 9.2.5 (2022-11-16)
+
+### Features and enhancements
+
+- **Alerting:** Log when alert rule cannot be screenshot to help debugging. [#58537](https://github.com/grafana/grafana/pull/58537), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Suggest previously entered custom labels. [#57783](https://github.com/grafana/grafana/pull/57783), [@VikaCep](https://github.com/VikaCep)
+- **Canvas:** Improve disabled inline editing UX. [#58610](https://github.com/grafana/grafana/pull/58610), [@nmarrs](https://github.com/nmarrs)
+- **Canvas:** Improve disabled inline editing UX. [#58609](https://github.com/grafana/grafana/issues/58609)
+- **Chore:** Upgrade go-sqlite3 to v1.14.16. [#58581](https://github.com/grafana/grafana/pull/58581), [@sakjur](https://github.com/sakjur)
+- **Plugins:** Ensure CallResource responses contain valid Content-Type header. [#58506](https://github.com/grafana/grafana/pull/58506), [@xnyo](https://github.com/xnyo)
+- **Prometheus:** Handle errors and warnings in buffered client. [#58657](https://github.com/grafana/grafana/pull/58657), [@itsmylife](https://github.com/itsmylife)
+- **Prometheus:** Upgrade HTTP client library to v1.13.1. [#58363](https://github.com/grafana/grafana/pull/58363), [@marefr](https://github.com/marefr)
+
+### Bug fixes
+
+- **Alerting:** Fix screenshots were not cached. [#58493](https://github.com/grafana/grafana/pull/58493), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Canvas:** Fix setting icon from field data. [#58499](https://github.com/grafana/grafana/pull/58499), [@nmarrs](https://github.com/nmarrs)
+- **Plugins:** Fix don't set Content-Type header if status is 204 for call resource. [#50780](https://github.com/grafana/grafana/pull/50780), [@sd2k](https://github.com/sd2k)
+
+### Plugin development fixes & changes
+
+- **Toolkit:** Fix compilation loop when watching plugins for changes. [#58167](https://github.com/grafana/grafana/pull/58167), [@jackw](https://github.com/jackw)
+- **Tooltips:** Make tooltips in FormField and FormLabel interactive and keyboard friendly. [#57706](https://github.com/grafana/grafana/pull/57706), [@asimpson](https://github.com/asimpson)
+
+<!-- 9.2.5 END -->
+<!-- 9.2.4 START -->
+
+# 9.2.4 (2022-11-07)
+
+### Features and enhancements
+
+- **Access Control:** Add an endpoint for setting several managed resource permissions. [#57893](https://github.com/grafana/grafana/pull/57893), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Accessibility:** Increase `Select` placeholder contrast to be WCAG AA compliant. [#58034](https://github.com/grafana/grafana/pull/58034), [@ashharrison90](https://github.com/ashharrison90)
+- **Alerting:** Append org ID to alert notification URLs. [#57123](https://github.com/grafana/grafana/pull/57123), [@neel1996](https://github.com/neel1996)
+- **Alerting:** Make the Grouped view the default one for Rules. [#58271](https://github.com/grafana/grafana/pull/58271), [@VikaCep](https://github.com/VikaCep)
+- **Build:** Remove unnecessary alpine package updates. [#58005](https://github.com/grafana/grafana/pull/58005), [@DanCech](https://github.com/DanCech)
+- **Chore:** Upgrade Go to 1.19.3. [#58052](https://github.com/grafana/grafana/pull/58052), [@sakjur](https://github.com/sakjur)
+- **Google Cloud Monitoring:** Set frame interval to draw null values. [#57768](https://github.com/grafana/grafana/pull/57768), [@andresmgot](https://github.com/andresmgot)
+- **Instrumentation:** Expose when the binary was built as a gauge. [#57951](https://github.com/grafana/grafana/pull/57951), [@bergquist](https://github.com/bergquist)
+- **Loki:** Preserve `X-ID-Token` header. [#57878](https://github.com/grafana/grafana/pull/57878), [@siiimooon](https://github.com/siiimooon)
+- **Search:** Reduce requests in folder view. [#55876](https://github.com/grafana/grafana/pull/55876), [@mvsousa](https://github.com/mvsousa)
+- **TimeSeries:** More thorough detection of negative values for auto-stacking direction. [#57863](https://github.com/grafana/grafana/pull/57863), [@leeoniya](https://github.com/leeoniya)
+
+### Bug fixes
+
+- **Alerting:** Attempt to preserve UID from migrated legacy channel. [#57639](https://github.com/grafana/grafana/pull/57639), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix response is not returned for invalid Duration in Provisioning API. [#58046](https://github.com/grafana/grafana/pull/58046), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Fix screenshot is not taken for stale series. [#57982](https://github.com/grafana/grafana/pull/57982), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Auth:** Fix admins not seeing pending invites. [#58217](https://github.com/grafana/grafana/pull/58217), [@joshhunt](https://github.com/joshhunt)
+- **MSSQL/Postgres:** Fix visual query editor filter disappearing. [#58248](https://github.com/grafana/grafana/pull/58248), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Tempo:** Fix dropdown issue on tag field focus. [#57616](https://github.com/grafana/grafana/pull/57616), [@xiyu95](https://github.com/xiyu95)
+- **Timeseries:** Fix null pointer when matching fill below to field. [#58030](https://github.com/grafana/grafana/pull/58030), [@mdvictor](https://github.com/mdvictor)
+
+### Plugin development fixes & changes
+
+- **Toolkit:** Fix Webpack less-loader config. [#57950](https://github.com/grafana/grafana/pull/57950), [@dessen-xu](https://github.com/dessen-xu)
+
+<!-- 9.2.4 END -->
+<!-- 9.2.3 START -->
+
+# 9.2.3 (2022-10-31)
+
+### Features and enhancements
+
+- **Docs:** Add information about DB version support to upgrade guide. [#57643](https://github.com/grafana/grafana/pull/57643), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Footer:** Update footer release notes link to Github changelog. [#57871](https://github.com/grafana/grafana/pull/57871), [@joshhunt](https://github.com/joshhunt)
+- **Prometheus:** Do not drop errors in streaming parser. [#57698](https://github.com/grafana/grafana/pull/57698), [@kylebrandt](https://github.com/kylebrandt)
+- **Prometheus:** Flavor/version configuration. [#57554](https://github.com/grafana/grafana/pull/57554), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Prometheus:** Provide label values match parameter API when supported prometheus instance is configured. [#57553](https://github.com/grafana/grafana/pull/57553), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Security:** Upgrade x/text to version unaffected by CVE-2022-32149. [#57797](https://github.com/grafana/grafana/pull/57797), [@yong-jie-gong](https://github.com/yong-jie-gong)
+
+### Bug fixes
+
+- **Access control:** Fix a bug with argument order for data source managed permission updates. (Enterprise)
+- **Auth:** Fix GF_AUTH_JWT_URL_LOGIN env variable doesn't work. [#57689](https://github.com/grafana/grafana/pull/57689), [@Jguer](https://github.com/Jguer)
+- **Live:** Explicitly reply with http 200. [#57428](https://github.com/grafana/grafana/pull/57428), [@sh0rez](https://github.com/sh0rez)
+- **Prometheus:** Fix builder operation mode changing multiselect to single select behaviour. [#57780](https://github.com/grafana/grafana/pull/57780), [@itsmylife](https://github.com/itsmylife)
+- **Prometheus:** Fix builder operation mode changing multiselect to single select behaviour. [#57493](https://github.com/grafana/grafana/pull/57493), [@yinjialu](https://github.com/yinjialu)
+- **Security:** Fix vulnerabilities in webpack loader-utils. [#57533](https://github.com/grafana/grafana/pull/57533), [@jackw](https://github.com/jackw)
+
+<!-- 9.2.3 END -->
+<!-- 9.2.2 START -->
+
+# 9.2.2 (2022-10-25)
+
+### Features and enhancements
+
+- **Alerting:** Add support for wecom apiapp. [#55991](https://github.com/grafana/grafana/pull/55991), [@aimuz](https://github.com/aimuz)
+- **Canvas:** Improve resource picker initialization. [#57319](https://github.com/grafana/grafana/pull/57319), [@nmarrs](https://github.com/nmarrs)
+- **Canvas:** Improve text element readability. [#57371](https://github.com/grafana/grafana/pull/57371), [@adela-almasan](https://github.com/adela-almasan)
+- **CloudWatch:** Make sure adoption tracking is done on valid, migrated queries. [#56872](https://github.com/grafana/grafana/pull/56872), [@sunker](https://github.com/sunker)
+- **Dashboard:** Alerts user to incorrect tag format for JSON import. [#54657](https://github.com/grafana/grafana/pull/54657), [@iamelDuderino](https://github.com/iamelDuderino)
+- **MSSQL:** Support tables from all schemas. [#53099](https://github.com/grafana/grafana/pull/53099), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Opentsdb:** Allow template variables for filter keys. [#57226](https://github.com/grafana/grafana/pull/57226), [@bohandley](https://github.com/bohandley)
+- **Prometheus:** Provide label values match parameter API when supported prometheus instance is configured. [#56510](https://github.com/grafana/grafana/pull/56510), [@gtk-grafana](https://github.com/gtk-grafana)
+- **QueryEditor:** Revert components from grafana-ui. [#57436](https://github.com/grafana/grafana/pull/57436), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TeamSync:** Allow team sync when external organization mapping returns no organization role. (Enterprise)
+
+### Bug fixes
+
+- **Browse:** Fix General folder not showing in FolderPicker. [#57156](https://github.com/grafana/grafana/pull/57156), [@eledobleefe](https://github.com/eledobleefe)
+- **Elasticsearch:** Fix calculation of trimEdges in alert mode. [#56148](https://github.com/grafana/grafana/pull/56148), [@jorgelbg](https://github.com/jorgelbg)
+- **Elasticsearch:** Fix trimEdges delete logic in alert mode. [#56985](https://github.com/grafana/grafana/pull/56985), [@gabor](https://github.com/gabor)
+- **GoogleOAuth:** Unlock User Admin UI. [#57350](https://github.com/grafana/grafana/pull/57350), [@gamab](https://github.com/gamab)
+- **LogContext:** Fix wrong color of `show context` icon in light theme. [#57427](https://github.com/grafana/grafana/pull/57427), [@svennergr](https://github.com/svennergr)
+- **Loki:** Fix adding of adhoc filters to stream selector when query with empty stream selector. [#57280](https://github.com/grafana/grafana/pull/57280), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Fix double stringified log-lines when copied via Copy button. [#57243](https://github.com/grafana/grafana/pull/57243), [@svennergr](https://github.com/svennergr)
+- **Loki:** Fix explain section about $\_\_interval variable. [#57188](https://github.com/grafana/grafana/pull/57188), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Remove already selected options from next label filter options in builder. [#57187](https://github.com/grafana/grafana/pull/57187), [@ivanahuckova](https://github.com/ivanahuckova)
+- **NodeGraph:** Fix rendering issues when values of arc are over 1. [#57460](https://github.com/grafana/grafana/pull/57460), [@aocenas](https://github.com/aocenas)
+- **PublicDashboards:** Fix hidden queries execution. [#57194](https://github.com/grafana/grafana/pull/57194), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Fix hidden queries execution. [#57004](https://github.com/grafana/grafana/pull/57004), [@juanicabanas](https://github.com/juanicabanas)
+- **Tempo:** Fix Node Graph visualization type in dashboard. [#56931](https://github.com/grafana/grafana/pull/56931), [@CrypticSignal](https://github.com/CrypticSignal)
+- **TimeSeries:** Fix stacking when first value is negative zero. [#57257](https://github.com/grafana/grafana/pull/57257), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TimeseriesPanel:** Fix variables in data links. [#56729](https://github.com/grafana/grafana/pull/56729), [@mdvictor](https://github.com/mdvictor)
+- **User:** Fix externalUserId not being populated. [#57341](https://github.com/grafana/grafana/pull/57341), [@joshhunt](https://github.com/joshhunt)
+
+### Breaking changes
+
+We added some components a bit too early to @grafana/ui in 9.2 so we are moving them back to @grafana/experimental. If you used any of these components
+
+- AccessoryButton
+- EditorFieldGroup
+- EditorHeader
+- EditorField
+- EditorRow
+- EditorList
+- EditorRows
+- EditorSwitch
+- FlexItem
+- Stack
+- InlineSelect
+- InputGroup
+- Space
+
+Please use them from grafana/experimental from now on. Issue [#57436](https://github.com/grafana/grafana/issues/57436)
+
+<!-- 9.2.2 END -->
 <!-- 9.2.1 START -->
 
 # 9.2.1 (2022-10-18)
@@ -270,6 +461,27 @@ Issue [#55364](https://github.com/grafana/grafana/issues/55364)
 - **CustomScrollbar:** Add optional scroll indicators to `CustomScrollbar`. [#54705](https://github.com/grafana/grafana/pull/54705), [@ashharrison90](https://github.com/ashharrison90)
 - **Build:** Introduce ESM and Treeshaking to NPM package builds. [#51517](https://github.com/grafana/grafana/pull/51517), [@jackw](https://github.com/jackw)
 
+<!-- 9.1.8 START -->
+
+# 9.1.8 (2022-10-11)
+
+### Features and enhancements
+
+- **Alerting:** Update imported prometheus alertmanager version. Backport (#56228). [#56429](https://github.com/grafana/grafana/pull/56429), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Chore:** Upgrade Go to 1.19.2. [#56355](https://github.com/grafana/grafana/pull/56355), [@sakjur](https://github.com/sakjur)
+
+### Bug fixes
+
+- **Alerting:** Fix evaluation interval validation. [#56115](https://github.com/grafana/grafana/pull/56115), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Fix migration to create rules with group index 1. [#56511](https://github.com/grafana/grafana/pull/56511), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Fix migration to not add label "alertname". [#56509](https://github.com/grafana/grafana/pull/56509), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Azure Monitor:** Fix empty Logs response for Alerting. [#56378](https://github.com/grafana/grafana/pull/56378), [@andresmgot](https://github.com/andresmgot)
+- **Azure Monitor:** Fix subscription selector when changing data sources. [#56284](https://github.com/grafana/grafana/pull/56284), [@andresmgot](https://github.com/andresmgot)
+- **Caching:** Fix wrong memcached setting name in defaults. (Enterprise)
+- **Google Cloud Monitoring:** Fix bucket bound for distributions. [#56565](https://github.com/grafana/grafana/pull/56565), [@andresmgot](https://github.com/andresmgot)
+
+<!-- 9.1.8 END -->
+
 <!-- 9.1.7 START -->
 
 # 9.1.7 (2022-10-04)
@@ -1465,6 +1677,26 @@ In the Loki data source, for consistency and performance reasons, we changed how
 
 The dependency to [grafana/aws-sdk](https://github.com/grafana/grafana-aws-sdk-react) is moved from [grafana/ui](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/package.json) to the plugin. This means that any plugin that use SIGV4 auth need to pass a SIGV4 editor component as a prop to the `DataSourceHttpSettings` component. Issue [#43559](https://github.com/grafana/grafana/issues/43559)
 
+<!-- 8.5.15 START -->
+
+# 8.5.15 (2022-11-08)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go to 1.19.2. [#56857](https://github.com/grafana/grafana/pull/56857), [@sakjur](https://github.com/sakjur)
+
+<!-- 8.5.15 END -->
+
+<!-- 8.5.14 START -->
+
+# 8.5.14 (2022-10-11)
+
+### Features and enhancements
+
+- **Access Control:** Allow org admins to invite new users. [#55585](https://github.com/grafana/grafana/pull/55585), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+
+<!-- 8.5.14 END -->
+
 <!-- 8.5.13 START -->
 
 # 8.5.13 (2022-09-20)

Dockerfile

@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.19.2-alpine3.15 as go-builder
+FROM golang:1.19.4-alpine3.17 as go-builder
 
 RUN apk add --no-cache gcc g++ make
 
@@ -57,8 +57,6 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 WORKDIR $GF_PATHS_HOME
 
 RUN apk add --no-cache ca-certificates bash tzdata musl-utils
-RUN apk add --no-cache openssl ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
-RUN apk upgrade ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk info -vv | sort
 
 COPY conf ./conf
@@ -84,7 +82,7 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
   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-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli ./bin/
+COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli /grafana/bin/*/grafana ./bin/
 COPY --from=js-builder /grafana/public ./public
 COPY --from=js-builder /grafana/tools ./tools
 

Dockerfile.ubuntu

@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.19.2 AS go-builder
+FROM golang:1.19.4 AS go-builder
 
 WORKDIR /src/grafana
 
@@ -77,7 +77,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$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-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli bin/
+COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli /grafana/bin/*/grafana bin/
 COPY --from=js-builder /usr/src/app/public public
 COPY --from=js-builder /usr/src/app/tools tools
 

Makefile

@@ -7,7 +7,7 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue
+.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue
 
 GO = go
 GO_FILES ?= ./pkg/...
@@ -76,6 +76,10 @@ build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build
 
+build-backend: ## Build Grafana backend.
+	@echo "build backend"
+	$(GO) run build.go $(GO_BUILD_FLAGS) build-backend
+
 build-server: ## Build Grafana server.
 	@echo "build server"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build-server

conf/defaults.ini

@@ -139,6 +139,12 @@ type = database
 # memcache: 127.0.0.1:11211
 connstr =
 
+# prefix prepended to all the keys in the remote cache
+prefix =
+
+# This enables encryption of values stored in the remote cache
+encryption =
+
 #################################### Data proxy ###########################
 [dataproxy]
 
@@ -210,10 +216,10 @@ check_for_updates = true
 check_for_plugin_updates = true
 
 # Google Analytics universal tracking code, only enabled if you specify an id here
-google_analytics_ua_id = 
+google_analytics_ua_id =
 
 # Google Analytics 4 tracking code, only enabled if you specify an id here
-google_analytics_4_id = 
+google_analytics_4_id =
 
 # Google Tag Manager ID, only enabled if you specify an id here
 google_tag_manager_id =
@@ -626,6 +632,7 @@ key_file =
 role_attribute_path =
 role_attribute_strict = false
 auto_sign_up = false
+url_login = false
 allow_assign_grafana_admin = false
 
 #################################### Auth LDAP ###########################

conf/provisioning/alerting/sample.yaml

@@ -23,7 +23,7 @@ apiVersion: 1
 #       #                  evaluation - should be obtained via the API
 #       data:
 #       - refId: A
-#         datasourceUid: "-100"
+#         datasourceUid: "__expr__"
 #         model:
 #           conditions:
 #           - evaluator:
@@ -40,7 +40,7 @@ apiVersion: 1
 #             type: query
 #           datasource:
 #             type: __expr__
-#             uid: "-100"
+#             uid: "__expr__"
 #           expression: 1==0
 #           intervalMs: 1000
 #           maxDataPoints: 43200

conf/sample.ini

@@ -145,6 +145,12 @@
 # memcache: 127.0.0.1:11211
 ;connstr =
 
+# prefix prepended to all the keys in the remote cache
+; prefix =
+
+# This enables encryption of values stored in the remote cache
+;encryption =
+
 #################################### Data proxy ###########################
 [dataproxy]
 

devenv/datasources.yaml

@@ -54,6 +54,8 @@ datasources:
     jsonData:
       manageAlerts: true
       alertmanagerUid: gdev-alertmanager
+      prometheusType: Prometheus #Cortex | Mimir | Prometheus | Thanos
+      prometheusVersion: 2.40.0
 
   - name: gdev-slow-prometheus
     type: prometheus

docs/Makefile

@@ -1,6 +1,6 @@
 .PHONY: pull docs docs-quick docs-no-pull docs-test docs-local-static
 
-IMAGE = grafana/grafana-docs-dev:latest
+IMAGE = grafana/docs-base:latest
 CONTENT_PATH = /hugo/content/docs/grafana/next
 LOCAL_STATIC_PATH = ../../website/static
 PORT = 3002:3002
@@ -10,10 +10,7 @@ pull:
 
 docs: pull
 	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server"
-
-docs-quick: pull
-	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server-quick"
-
+	
 docs-no-pull:
 	docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server"
 

docs/sources/_index.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/
-  - /docs/grafana/latest/guides/reference/admin/
   - /docs/grafana/v1.1/
   - /docs/grafana/v3.1/
+  - guides/reference/admin/
 description: Guides, Installation and Feature Documentation
 keywords:
   - grafana

docs/sources/administration/_index.md

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/administration/
 description: Administration
 title: Administration
 weight: 40

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/api-keys/about-api-keys/
-  - /docs/grafana/latest/administration/api-keys/
-  - /docs/grafana/latest/administration/api-keys/create-api-key/
+  - about-api-keys/
+  - create-api-key/
 description: This section contains information about API keys in Grafana
 keywords:
   - API keys

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

@@ -1,12 +1,12 @@
 ---
 aliases:
-  - /docs/grafana/latest/datasources/add-a-data-source/
-  - /docs/grafana/latest/features/datasources/add-a-data-source/
-  - /docs/grafana/latest/enterprise/datasource_permissions/
-  - /docs/grafana/latest/permissions/datasource_permissions/
-  - /docs/grafana/latest/administration/data-source-management/
-title: Data source management
+  - ../datasources/add-a-data-source/
+  - ../enterprise/datasource_permissions/
+  - ../enterprise/query-caching/
+  - ../features/datasources/add-a-data-source/
+  - ../permissions/datasource_permissions/
 description: Data source management information for Grafana administrators
+title: Data source management
 weight: 100
 ---
 
@@ -22,11 +22,8 @@ Before you can create your first dashboard, you need to add your data source.
 
 To add a data source:
 
-1. Move your cursor to the cog icon on the side menu which will show the configuration options.
-
-   {{< figure src="/static/img/docs/v75/sidemenu-datasource-7-5.png" max-width="150px" class="docs-image--no-shadow">}}
-
-1. Click on **Data sources**. The data sources page opens showing a list of previously configured data sources for the Grafana instance.
+1. Select the cog icon on the side menu to show the configuration options.
+1. Select **Data sources**.
 
 1. Click **Add data source** to see a list of all supported data sources.
 
@@ -36,9 +33,7 @@ To add a data source:
 
 1. Move the cursor over the data source you want to add.
 
-   {{< figure src="/static/img/docs/v75/select-data-source-7-5.png" max-width="700px" class="docs-image--no-shadow">}}
-
-1. Click **Select**. The data source configuration page opens.
+1. Click **Select**.
 
 1. Configure the data source following instructions specific to that data source. See [Data sources]({{< relref "../../datasources" >}}) for links to configuration instructions for all supported data sources.
 
@@ -46,12 +41,10 @@ To add a data source:
 
 Data source permissions allow you to restrict access for users to query a data source. For each data source there is a permission page that allows you to enable permissions and restrict query permissions to specific **Users** and **Teams**.
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud).
 
 ### Enable data source permissions
 
-{{< figure src="/static/img/docs/enterprise/datasource_permissions_enable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_enable.gif" >}}
-
 By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just
 queries that exist on dashboards they have access to.
 
@@ -69,8 +62,6 @@ When permissions are enabled for a data source in an organization, the user who
 
 ### Allow users and teams to query a data source
 
-{{< figure src="/static/img/docs/enterprise/datasource_permissions_add_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_add.gif" >}}
-
 After you have enabled permissions for a data source you can assign query permissions to users and teams which will allow access to query the data source.
 
 **Assign query permission to users and teams:**
@@ -85,8 +76,6 @@ After you have enabled permissions for a data source you can assign query permis
 
 ### Disable data source permissions
 
-{{< figure src="/static/img/docs/enterprise/datasource_permissions_disable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_disable.gif" >}}
-
 If you have enabled permissions for a data source and want to return data source permissions to the default, then you can disable permissions with a click of a button.
 
 Note that _all_ existing permissions created for the data source will be deleted.
@@ -98,3 +87,86 @@ Note that _all_ existing permissions created for the data source will be deleted
 1. On the Permissions tab, click **Disable Permissions**.
 
 <div class="clearfix"></div>
+
+## Query caching
+
+When query caching is enabled, Grafana temporarily stores the results of data source queries. When you or another user submit the exact same query again, the results will come back from the cache instead of from the data source (like Splunk or ServiceNow) itself.
+
+Query caching works for all backend data sources. You can enable the cache globally and configure the cache duration (also called Time to Live, or TTL).
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
+
+The following cache backends are available: in-memory, Redis, and Memcached.
+
+> **Note:** Storing cached queries in-memory can increase Grafana's memory footprint. In production environments, a Redis or Memcached backend is highly recommended.
+
+When a panel queries a cached data source, the time until this query fetches fresh data is determined by the panel's **interval.** This means that wider panels and dashboards with shorter time ranges fetch new data more frequently than narrower panels and dashboards with longer time ranges.
+
+Interval is visible in a panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}). It is calculated like this: `(max data points) / time range`. Max data points are calculated based on the width of the panel. For example, a full-width panel on a dashboard with a time range of `last 7 days` will retrieve fresh data every 10 minutes. In this example, cached data for this panel will be served for up to 10 minutes before Grafana queries the data source again and returns new data.
+
+You can make a panel retrieve fresh data more frequently by increasing the **Max data points** setting in the panel's [query options]({{< relref "../../panels-visualizations/query-transform-data/" >}}).
+
+### Query caching benefits
+
+- Faster dashboard load times, especially for popular dashboards.
+- Reduced API costs.
+- Reduced likelihood that APIs will rate-limit or throttle requests.
+
+### Data sources that work with query caching
+
+Query caching works for all [Enterprise data sources](https://grafana.com/grafana/plugins/?type=datasource&enterprise=1) as well as the following [built-in data sources]({{< relref "../../datasources/" >}}):
+
+- CloudWatch Metrics
+- Google Cloud Monitoring
+- InfluxDB
+- Microsoft SQL Server
+- MySQL
+- Postgres
+- Tempo
+
+Some data sources, such as Elasticsearch, Prometheus, and Loki, cache queries themselves, so Grafana query caching does not improve performance.
+
+Query caching also works for all data sources that include a backend. More specifically, caching works with data sources that extend the `DataSourceWithBackend` class in the plugins SDK.
+
+To tell if a data source works with query caching, follow the instructions below to **Enable and Configure query caching**. If caching is enabled in Grafana but the Caching tab is not visible for the given data source, then query caching is not available for that data source.
+
+### Enable and configure query caching
+
+You must be an Org admin or Grafana admin to enable query caching for a data source. For more information on Grafana roles and permissions, refer to [About users and permissions]({{< relref "../roles-and-permissions/" >}}).
+
+By default, data source queries are not cached. To enable query caching for a single data source:
+
+1. On the side menu, click Configuration > Data Sources.
+1. In the data source list, click the data source that you want to turn on caching for.
+1. Open the Cache tab.
+1. Press the Enable button.
+1. (Optional) Choose custom TTLs for the data source's queries and resources caching. If you skip this step, then Grafana uses the default TTL.
+
+> **Note:** If query caching is enabled and the Cache tab is not visible in a data source's settings, then query caching is not available for that data source.
+
+To configure global settings for query caching, refer to the [Query caching section of Enterprise Configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}).
+
+### Disable query caching
+
+To disable query caching for a single data source:
+
+1. On the side menu, click Configuration > Data Sources.
+1. In the data source list, click the data source that you want to turn off caching for.
+1. In the Cache tab, click Disable.
+
+To disable query caching for an entire Grafana instance, set the `enabled` flag to `false` in the [Query caching section of Enterprise Configuration]({{< relref "../../setup-grafana/configure-grafana/enterprise-configuration/#caching" >}}). You will no longer see the Cache tab on any data sources, and no data source queries will be cached.
+
+### Clear cache
+
+If you experience performance issues or repeated queries become slower to execute, consider clearing your cache.
+
+> **Note:** This action impacts all cache-enabled data sources. If you are using Memcached, the system clears all data from the Memcached instance.
+
+1. Sign in to Grafana and click **Settings > Data Sources**.
+1. Select a data source.
+1. Click the **Cache** tab.
+1. Click **Clear cache**.
+
+### Sending a request without cache
+
+If a data source query request contains an `X-Cache-Skip` header, then Grafana skips the caching middleware, and does not search the cache for a response. This can be particularly useful when debugging data source queries using cURL.

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

@@ -1,14 +1,13 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/license/
-  - /docs/grafana/latest/enterprise/activate-license/
-  - /docs/grafana/latest/enterprise/license/activate-license/
-  - /docs/grafana/latest/enterprise/license-expiration/
-  - /docs/grafana/latest/enterprise/license/license-expiration/
-  - /docs/grafana/latest/enterprise/license-restrictions/
-  - /docs/grafana/latest/enterprise/license/license-restrictions/
-  - /docs/grafana/latest/administration/enterprise-licensing/
-  - /docs/grafana/latest/administration/enterprise-licensing/license-restrictions/
+  - ../enterprise/activate-license/
+  - ../enterprise/license-expiration/
+  - ../enterprise/license-restrictions/
+  - ../enterprise/license/
+  - ../enterprise/license/activate-license/
+  - ../enterprise/license/license-expiration/
+  - ../enterprise/license/license-restrictions/
+  - license-restrictions/
 description: Activate and manage a Grafana Enterprise license
 keywords:
   - grafana
@@ -20,7 +19,7 @@ weight: 500
 
 # Grafana Enterprise license
 
-When you become a Grafana Enterprise customer, you gain access to Grafana's premium observability features, including enterprise data source plugins, reporting, and role-based access control. In order to use these [enhanced features of Grafana Enterprise]({{< relref "../../enterprise/" >}}), you must purchase and activate a Grafana Enterprise license.
+When you become a Grafana Enterprise customer, you gain access to Grafana's premium observability features, including enterprise data source plugins, reporting, and role-based access control. In order to use these [enhanced features of Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise" >}}), you must purchase and activate a Grafana Enterprise license.
 
 To purchase a license directly from Grafana Labs, [Contact a Grafana Labs representative](https://grafana.com/contact?about=grafana-enterprise). To activate an Enterprise license purchased from Grafana Labs, refer to [Activate an Enterprise license]({{< ref "#activate-an-enterprise-license" >}}).
 

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

@@ -1,10 +1,10 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/
-  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/
-  - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/
-description: Activate your Grafana Enterprise license purchased in AWS Marketplace to take advantage of Grafana Enterprise observability features
+  - ../../enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/
+  - ../../enterprise/license/activate-aws-marketplace-license/
+  - ../../enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/
+description: Activate your Grafana Enterprise license purchased in AWS Marketplace
+  to take advantage of Grafana Enterprise observability features
 keywords:
   - grafana
   - aws

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-ecs/
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/
-  - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/
+  - ../../../enterprise/activate-aws-marketplace-license/activate-license-on-ecs/
+  - ../../../enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/
 description: Activate a Grafana Enterprise license from AWS Marketplace on ECS
 keywords:
   - grafana

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-eks/
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/
-  - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/
+  - ../../../enterprise/activate-aws-marketplace-license/activate-license-on-eks/
+  - ../../../enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/
 description: Activate a Grafana Enterprise license from AWS Marketplace on EKS
 keywords:
   - grafana

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
-  - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
+  - ../../../enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
+  - ../../../enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/
 description: Activate a Grafana Enterprise license from AWS on an instance deployed
   outside of AWS
 keywords:

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
-  - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
+  - ../../../enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
+  - ../../../enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/
 description: Manage your Grafana Enterprise license in AWS Marketplace
 keywords:
   - grafana

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/transfer-ge-license/
-  - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/transfer-ge-license/
-  - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/
+  - ../../../enterprise/activate-aws-marketplace-license/transfer-ge-license/
+  - ../../../enterprise/license/activate-aws-marketplace-license/transfer-ge-license/
 description: Transfer your AWS Marketplace Grafana Enterprise license
 keywords:
   - grafana

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

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-organizations/
-  - /docs/grafana/latest/manage-users/server-admin/
-  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/
-  - /docs/grafana/latest/administration/organization-management/
+  - ../manage-users/server-admin/
+  - ../manage-users/server-admin/server-admin-manage-orgs/
+  - manage-organizations/
 description: Describes how to use organizations to isolate dashboard to users and
   teams.
 keywords:
@@ -60,8 +59,6 @@ Complete this task when you want to view a list of existing organizations.
 
 A list of organizations appears.
 
-![Server Admin organization list](/static/img/docs/manage-users/server-org-list-7-3.png)
-
 ## Create an organization
 
 Create an organization when you want to isolate dashboards and other resources from each other.
@@ -117,5 +114,3 @@ Edit an organization when you want to change its name.
 1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**.
 1. Click the organization you want to edit.
 1. Update the organization name and click **Update**.
-
-![Server admin Edit Organization](/static/img/docs/manage-users/server-admin-edit-org-7-3.png)

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

@@ -1,12 +1,11 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/preferences/
-  - /docs/grafana/latest/administration/preferences/change-grafana-name/
-  - /docs/grafana/latest/administration/preferences/change-grafana-theme/
-  - /docs/grafana/latest/administration/preferences/change-grafana-timezone/
-  - /docs/grafana/latest/administration/change-home-dashboard/
-  - /docs/grafana/latest/administration/preferences/change-home-dashboard/
-  - /docs/grafana/latest/administration/organization-preferences/
+  - change-home-dashboard/
+  - preferences/
+  - preferences/change-grafana-name/
+  - preferences/change-grafana-theme/
+  - preferences/change-grafana-timezone/
+  - preferences/change-home-dashboard/
 title: Organization preferences
 weight: 500
 ---

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

@@ -1,11 +1,10 @@
 ---
 aliases:
-  - /docs/grafana/latest/plugins/
-  - /docs/grafana/latest/plugins/catalog/
-  - /docs/grafana/latest/plugins/installation/
-  - /docs/grafana/latest/plugins/plugin-signature-verification/
-  - /docs/grafana/latest/plugins/plugin-signatures/
-  - /docs/grafana/latest/administration/plugin-management/
+  - ../plugins/
+  - ../plugins/catalog/
+  - ../plugins/installation/
+  - ../plugins/plugin-signature-verification/
+  - ../plugins/plugin-signatures/
 title: Plugin management
 weight: 600
 ---
@@ -88,8 +87,6 @@ To browse for available plugins:
 1. Click the **All** filter to browse all available plugins.
 1. Click the **Data sources**, **Panels**, or **Applications** buttons to filter by plugin type.
 
-![Plugin catalog browse](/static/img/docs/plugins/plugins-catalog-browse-9.2.png)
-
 ### Install a plugin
 
 To install a plugin:
@@ -101,8 +98,6 @@ To install a plugin:
 
 When the update is complete, you see a confirmation message that the installation was successful.
 
-![Plugin catalog install](/static/img/docs/plugins/plugins-catalog-install-8-1.png)
-
 ### Update a plugin
 
 To update a plugin:
@@ -113,8 +108,6 @@ To update a plugin:
 
 When the update is complete, you see a confirmation message that the update was successful.
 
-![Plugin catalog update](/static/img/docs/plugins/plugins-catalog-update-8-1.png)
-
 ### Uninstall a plugin
 
 To uninstall a plugin:
@@ -125,8 +118,6 @@ To uninstall a plugin:
 
 When the update is complete, you see a confirmation message that the uninstall was successful.
 
-![Plugin catalog uninstall](/static/img/docs/plugins/plugins-catalog-uninstall-8-1.png)
-
 ## Install Grafana plugins
 
 Grafana supports data source, panel, and app plugins. Having panels as plugins makes it easy to create and add any kind of panel, to show your data, or improve your favorite dashboards. Apps enable the bundling of data sources, panels, dashboards, and Grafana pages into a cohesive experience.

docs/sources/administration/provisioning/index.md

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/provisioning/
-  - /docs/grafana/latest/installation/provisioning/
+  - ../installation/provisioning/
 description: Describes provisioning settings for Grafana using configuration files.
 keywords:
   - grafana
@@ -157,6 +156,7 @@ Since not all datasources have the same configuration settings we only have the
 | httpMethod                 | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                                                                                                                                                                                        |
 | customQueryParameters      | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                                                                                                                                                                                   |
 | manageAlerts               | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                                                                                                                                                                                       |
+| alertmanagerUid            | string  | Prometheus and Loki                                              | UID of Alert Manager that manages Alert for this data source.                                                                                                                                                                                                                                                       |
 | esVersion                  | string  | Elasticsearch                                                    | Elasticsearch version (E.g. `7.0.0`, `7.6.1`)                                                                                                                                                                                                                                                                       |
 | timeField                  | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                                                                                                                                                                                        |
 | interval                   | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                                                                                                                                                                                         |
@@ -189,6 +189,8 @@ Since not all datasources have the same configuration settings we only have the
 | maxIdleConns               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of connections in the idle connection pool (Grafana v5.4+)                                                                                                                                                                                                                                           |
 | connMaxLifetime            | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+)                                                                                                                                                                                                                                        |
 | keepCookies                | array   | _HTTP\*_                                                         | Cookies that needs to be passed along while communicating with datasources                                                                                                                                                                                                                                          |
+| prometheusVersion          | string  | Prometheus                                                       | The version of the Prometheus datasource (e.g. `2.37.0`, `2.24.0`)                                                                                                                                                                                                                                                  |
+| prometheusType             | string  | Prometheus                                                       | The type of the Prometheus datasources (i.e. `Prometheus`, `Cortex`, `Thanos`, or `Mimir`)                                                                                                                                                                                                                          |
 
 #### Secure Json Data
 

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

@@ -1,6 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/recorded-queries/
+  - ../enterprise/recorded-queries/
 description: Grafana Enterprise recorded queries
 keywords:
   - grafana
@@ -17,7 +17,7 @@ Recorded queries allow you to see trends over time by taking a snapshot of a dat
 
 For our plugins that do not return time series, it might be useful to plot historical data. For example, you might want to query ServiceNow to see a history of request response times but it can only return current point-in-time metrics.
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../enterprise/" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}).
 
 ## How recorded queries work
 

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

@@ -1,11 +1,10 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/
-  - /docs/grafana/latest/manage-users/
-  - /docs/grafana/latest/permissions/
-  - /docs/grafana/latest/permissions/organization_roles/
-  - /docs/grafana/latest/permissions/overview/
-  - /docs/grafana/latest/administration/roles-and-permissions/
+  - ../manage-users/
+  - ../permissions/
+  - ../permissions/organization_roles/
+  - ../permissions/overview/
+  - manage-users-and-permissions/about-users-and-permissions/
 description: Information about Grafana user, team, and organization roles and permissions
 title: Roles and permissions
 weight: 300
@@ -147,7 +146,7 @@ For details on managing teams, see [Team management]({{< relref "../team-managem
 
 While Grafana OSS includes a robust set of permissions and settings that you can use to manage user access to server and organization resources, you might find that you require additional capabilities.
 
-[Grafana Enterprise]({{< relref "../../enterprise/">}}) provides the following permissions-related features:
+[Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise">}}) provides the following permissions-related features:
 
 - Data source permissions
 - Role-based access control (RBAC)

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

@@ -1,10 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/
-  - /docs/grafana/latest/enterprise/access-control/
-  - /docs/grafana/latest/enterprise/access-control/about-rbac/
-  - /docs/grafana/latest/enterprise/access-control/roles/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/
+  - ../../enterprise/access-control/
+  - ../../enterprise/access-control/about-rbac/
+  - ../../enterprise/access-control/roles/
 description: Role-based access control (RBAC) provides a standardized way of granting,
   changing, and revoking access so that users can view and modify Grafana resources,
   such as users and reports.
@@ -90,7 +88,7 @@ Assign fixed roles when the basic roles do not meet your permission requirements
 - [Provisioning]({{< relref "../../provisioning/" >}})
 - [Reports]({{< relref "../../../dashboards/create-reports/" >}})
 - [Roles]({{< relref "../../" >}})
-- [Settings]({{< relref "../../../enterprise/settings-updates/" >}})
+- [Settings]({{< relref "../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}})
 - [Service accounts]({{< relref "../../service-accounts/" >}})
 - [Teams]({{< relref "../../team-management/" >}})
 - [Users]({{< relref "../../user-management/" >}})

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

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/assign-rbac-roles/
-  - /docs/grafana/latest/enterprise/access-control/manage-role-assignments/manage-built-in-role-assignments/
-  - /docs/grafana/latest/enterprise/access-control/manage-role-assignments/manage-user-role-assignments/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/assign-rbac-roles/
+  - ../../../enterprise/access-control/assign-rbac-roles/
+  - ../../../enterprise/access-control/manage-role-assignments/manage-built-in-role-assignments/
+  - ../../../enterprise/access-control/manage-role-assignments/manage-user-role-assignments/
 description: Learn how to assign RBAC roles to users and teams in Grafana.
 menuTitle: Assign RBAC roles
 title: Assign Grafana RBAC roles
@@ -53,8 +52,6 @@ In both cases, the assignment applies only to the user, team or service account
 4. In the **Role** column, select the fixed role that you want to assign to the user, team or service account.
 5. Click **Update**.
 
-![User role picker in an organization](/static/img/docs/enterprise/user_role_picker_in_org.png)
-
 **To assign a fixed role as a server administrator:**
 
 1. Sign in to Grafana, hover your cursor over **Server Admin** (the shield icon) in the left navigation menu, and click **Users**.
@@ -62,8 +59,6 @@ In both cases, the assignment applies only to the user, team or service account
 1. In the **Organizations** section, select a role within an organization that you want to assign to the user.
 1. Click **Update**.
 
-![User role picker in Organization](/static/img/docs/enterprise/user_role_picker_global.png)
-
 ## Assign fixed or custom roles to a team using provisioning
 
 Instead of using the Grafana role picker, you can use file-based provisioning to assign fixed roles to teams. If you have a large number of teams, provisioning can provide an easier approach to assigning and managing role assignments.

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

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/configure-rbac/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/configure-rbac/
+  - ../../../enterprise/access-control/configure-rbac/
 description: Learn how to configure RBAC.
 menuTitle: Configure RBAC
 title: Configure RBAC in Grafana
@@ -14,9 +13,10 @@ weight: 30
 
 The table below describes all RBAC configuration options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../../../../setup-grafana/configure-grafana/#configure-with-environment-variables" >}}).
 
-| Setting            | Required | Description                                                                  | Default |
-| ------------------ | -------- | ---------------------------------------------------------------------------- | ------- |
-| `permission_cache` | No       | Enable to use in memory cache for loading and evaluating users' permissions. | `true`  |
+| Setting                         | Required | Description                                                                                                                                                                                                                                                                                                                     | Default |
+| ------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `permission_cache`              | No       | Enable to use in memory cache for loading and evaluating users' permissions.                                                                                                                                                                                                                                                    | `true`  |
+| `permission_validation_enabled` | No       | Grafana enforces validation for permissions when a user creates or updates a role. The system checks the internal list of scopes and actions for each permission to determine they are valid. By default, if a scope or action is not recognized, Grafana logs a warning message. When set to `true`, Grafana returns an error. | `false` |
 
 ## Example RBAC configuration
 

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/custom-role-actions-scopes/
-  - /docs/grafana/latest/enterprise/access-control/permissions/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes/
+  - ../../../enterprise/access-control/custom-role-actions-scopes/
+  - ../../../enterprise/access-control/permissions/
 description: Learn about Grafana RBAC permissions, actions, and scopes.
 menuTitle: RBAC permissions, actions, and scopes
 title: Grafana RBAC permissions, actions, and scopes
@@ -116,7 +115,7 @@ The following list contains role-based access control actions.
 | `serviceaccounts.permissions:write`  | `serviceaccounts:*`                                                                     | Update Grafana service account permissions to control who can do what with the service account.                                                                                                  |
 | `serviceaccounts.permissions:read`   | `serviceaccounts:*`                                                                     | Read Grafana service account permissions to see who can do what with the service account.                                                                                                        |
 | `settings:read`                      | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Read the [Grafana configuration settings]({{< relref "../../../../setup-grafana/configure-grafana/" >}})                                                                                         |
-| `settings:write`                     | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update any Grafana configuration settings that can be [updated at runtime]({{< relref "../../../../enterprise/settings-updates/" >}}).                                                           |
+| `settings:write`                     | `settings:*`<br>`settings:auth.saml:*`<br>`settings:auth.saml:enabled` (property level) | Update any Grafana configuration settings that can be [updated at runtime]({{< relref "../../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}).                            |
 | `status:accesscontrol`               | `services:accesscontrol`                                                                | Get access-control enabled status.                                                                                                                                                               |
 | `teams.permissions:read`             | `teams:*`<br>`teams:id:*`                                                               | Read members and External Group Synchronization setup for teams.                                                                                                                                 |
 | `teams.permissions:write`            | `teams:*`<br>`teams:id:*`                                                               | Add, remove and update members and manage External Group Synchronization setup for teams.                                                                                                        |

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

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/manage-rbac-roles/
-  - /docs/grafana/latest/enterprise/access-control/manage-role-assignments/
-  - /docs/grafana/latest/enterprise/access-control/provisioning/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/manage-rbac-roles/
+  - ../../../enterprise/access-control/manage-rbac-roles/
+  - ../../../enterprise/access-control/manage-role-assignments/
+  - ../../../enterprise/access-control/provisioning/
 description: Learn how to view permissions associated with roles, create custom roles,
   and update and delete roles in Grafana.
 menuTitle: Manage RBAC roles

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/plan-rbac-rollout-strategy/
-  - /docs/grafana/latest/enterprise/access-control/usage-scenarios/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/
+  - ../../../enterprise/access-control/plan-rbac-rollout-strategy/
+  - ../../../enterprise/access-control/usage-scenarios/
 description: Plan your RBAC rollout strategy before you begin assigning roles to users
   and teams.
 menuTitle: Plan your RBAC rollout strategy

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/fine-grained-access-control-references/
-  - /docs/grafana/latest/enterprise/access-control/rbac-fixed-basic-role-definitions/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/
+  - ../../../enterprise/access-control/fine-grained-access-control-references/
+  - ../../../enterprise/access-control/rbac-fixed-basic-role-definitions/
 description: This topic includes a table that lists permission associated with Grafana
   fixed and basic roles.
 menuTitle: RBAC role definitions

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

@@ -1,15 +1,15 @@
 ---
 aliases:
-  - /docs/grafana/latest/enterprise/access-control/rbac-provisioning/
-  - /docs/grafana/latest/administration/roles-and-permissions/access-control/rbac-provisioning/
-description: Learn about RBAC provisioning and view an example YAML provisioning file
-  that configures Grafana role assignments.
-menuTitle: RBAC provisioning
-title: Grafana RBAC provisioning
+  - ../../../enterprise/access-control/rbac-provisioning/
+  - rbac-provisioning/
+description: Learn about RBAC Grafana provisioning and view an example YAML provisioning
+  file that configures Grafana role assignments.
+menuTitle: Provisioning RBAC with Grafana
+title: Provisioning RBAC with Grafana
 weight: 60
 ---
 
-# Grafana RBAC provisioning
+# Provisioning RBAC with Grafana
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced]({{< ref "/docs/grafana-cloud" >}}).
 
@@ -117,3 +117,9 @@ teams:
         # <string> state of the assignment. Defaults to 'present'. If 'absent', the assignment will be revoked.
         state: absent
 ```
+
+## Useful Links
+
+[Provisioning RBAC setup with Terraform]({{< relref "./rbac-terraform-provisioning">}})
+
+[Grafana provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/)

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

@@ -0,0 +1,151 @@
+---
+aliases:
+  - ../../../enterprise/access-control/rbac-provisioning/rbac-terraform-provisioning/
+description: Learn about RBAC Terraform provisioning and view an example of provisioning
+  configuration for Grafana roles and role assignments.
+menuTitle: Provisioning RBAC with Terraform
+title: Provisioning RBAC with Terraform
+weight: 60
+---
+
+# Provisioning RBAC with Terraform
+
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced]({{< ref "/docs/grafana-cloud" >}}).
+
+You can create, change or remove [Custom roles](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/role) and create or remove [basic and custom role assignments](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/role_assignment), by using [Terraform's Grafana provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
+
+## Before you begin
+
+- Ensure you have the grafana/grafana [Terraform provider](https://registry.terraform.io/providers/grafana/grafana/) 1.29.0 or higher.
+
+- Ensure you are using Grafana 9.2 or higher.
+
+## Create a Service Account Token for provisioning
+
+We recommend using service account tokens for provisioning. [Service accounts](https://grafana.com/docs/grafana/latest/administration/service-accounts/) support fine grained permissions, which allows you to easily authenticate and use the minimum set of permissions needed to provision your RBAC infrastructure.
+
+To create a service account token for provisioning, complete the following steps.
+
+1. [Create a new service account](https://grafana.com/docs/grafana/latest/administration/service-accounts/#create-a-service-account-in-grafana) for your CI pipeline.
+1. [Assign permissions to service account](https://grafana.com/docs/grafana/latest/administration/service-accounts/#assign-roles-to-a-service-account-in-grafana):
+1. You will need roles “Role reader”, "Role writer" and roles including any permissions that will be provisioned. For example, to create or assign a role that allows creating users, a service account needs permissions to create users.
+1. Alternatively, you can assign "Admin" basic role to the service account.
+1. [Create a new service account token](https://grafana.com/docs/grafana/latest/administration/service-accounts/#to-add-a-token-to-a-service-account) for use in Terraform.
+
+Alternatively, you can use basic authentication. To view all the supported authentication formats, see [here](https://registry.terraform.io/providers/grafana/grafana/latest/docs#authentication).
+
+## Configure the Terraform provider
+
+RBAC support is included as part of the [Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
+
+The following is an example you can use to configure the Terraform provider.
+
+```terraform
+terraform {
+    required_providers {
+        grafana = {
+            source = "grafana/grafana"
+            version = ">= 1.29.0"
+        }
+    }
+}
+
+provider "grafana" {
+    url = <YOUR_GRAFANA_URL>
+    auth = <YOUR_GRAFANA_SERVICE_ACCOUNT_TOKEN>
+}
+```
+
+## Provision custom roles
+
+The following example shows how to provision a custom role with some permissions.
+
+1. Copy this code block into a .tf file on your local machine.
+
+```terraform
+resource "grafana_role" "my_new_role" {
+  name  = "my_new_role"
+  description = "My test role"
+  version = 1
+  uid = "newroleuid"
+  global = true
+
+  permissions {
+    action = "org.users:add"
+    scope = "users:*"
+  }
+  permissions {
+    action = "org.users:write"
+    scope = "users:*"
+  }
+  permissions {
+    action = "org.users:read"
+    scope = "users:*"
+  }
+  permissions {
+	  action = "teams:create"
+  }
+  permissions {
+	  action = "teams:read"
+	  scope = "teams:*"
+  }
+  permissions {
+	  action = "teams:write"
+	  scope = "teams:*"
+  }
+}
+```
+
+2. Run the command `terraform apply`.
+3. Go to Grafana's UI and check that the new role appears in the role picker:
+   ![Role Picker](/static/img/docs/enterprise/tf_custom_role.png)
+
+## Provision role assignments
+
+The following example shows how to provision role assignments.
+In this example a team, user and service account are provisioned, and the custom role from the previous example is assigned to them.
+
+1. Extend the configuration file from the [previous example]({{##}}) with the following:
+
+```terraform
+resource "grafana_team" "test_team" {
+	name = "terraform_test_team"
+}
+
+resource "grafana_user" "test_user" {
+	email = "terraform_user@test.com"
+	login    = "terraform_test_user"
+	password = <TEST_PASSWORD>
+}
+
+resource "grafana_service_account" "test_sa" {
+  name = "terraform_test_sa"
+  role = "Viewer"
+}
+
+resource "grafana_role_assignment" "my_new_role_assignment" {
+  role_uid = grafana_role.my_new_role.uid
+  users = [grafana_user.test_user.id]
+  teams = [grafana_team.test_team.id]
+  service_accounts = [grafana_service_account.test_sa.id]
+}
+```
+
+1. Substitute `<TEST_PASSWORD>` with a test password for your test user.
+
+1. Run the command `terraform apply`.
+
+1. Go to Grafana's UI and check that a user, team and service account have been created, and that the role has been assigned to them:
+   ![User Role Assignment](/static/img/docs/enterprise/tf_user_role_assignment.png)
+   ![Team Role Assignment](/static/img/docs/enterprise/tf_team_role_assignment.png)
+   ![Service Account Role Assignment](/static/img/docs/enterprise/tf_service_account_role_assignment.png)
+
+Note that instead of using a provisioned role, you can also look up the `uid` of an already existing fixed or custom role and use that instead.
+You can use the [API endpoint for listing roles](https://grafana.com/docs/grafana/latest/developers/http_api/access_control/#create-and-manage-custom-roles) to look up role `uid`s.
+Similarly, you can look up and use `id`s of users, teams and service accounts that have not been provisioned to assign roles to them.
+
+## Useful Links
+
+[RBAC setup with Grafana provisioning]({{< relref "./rbac-grafana-provisioning">}})
+
+[Grafana Cloud Terraform provisioning](https://grafana.com/docs/grafana-cloud/infrastructure-as-code/terraform/)

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

@@ -1,10 +1,9 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/service-accounts/
-  - /docs/grafana/latest/administration/service-accounts/about-service-accounts/
-  - /docs/grafana/latest/administration/service-accounts/add-service-account-token/
-  - /docs/grafana/latest/administration/service-accounts/create-service-account/
-  - /docs/grafana/latest/administration/service-accounts/enable-service-accounts/
+  - about-service-accounts/
+  - add-service-account-token/
+  - create-service-account/
+  - enable-service-accounts/
 description: This page contains information about service accounts in Grafana
 keywords:
   - API keys
@@ -27,7 +26,7 @@ A common use case for creating a service account is to perform operations on aut
 - Set up an external SAML authentication provider
 - Interact with Grafana without signing in as a user
 
-In [Grafana Enterprise]({{< relref "../../enterprise/" >}}), you can also use service accounts in combination with [role-based access control]({{< relref "../roles-and-permissions/access-control/" >}}) to grant very specific permissions to applications that interact with Grafana.
+In [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}), you can also use service accounts in combination with [role-based access control]({{< relref "../roles-and-permissions/access-control/" >}}) to grant very specific permissions to applications that interact with Grafana.
 
 > **Note:** Service accounts can only act in the organization they are created for. If you have the same task that is needed for multiple organizations, we recommend creating service accounts in each organization.
 
@@ -106,7 +105,7 @@ You can create a service account token using the Grafana UI or via the API. For
 You can assign roles to a Grafana service account to control access for the associated service account tokens.
 You can assign roles to a service account using the Grafana UI or via the API. For more information about assigning a role to a service account via the API, refer to [Update service account using the HTTP API]({{< relref "../../developers/http_api/serviceaccount/#update-service-account" >}}).
 
-In [Grafana Enterprise]({{< relref "../../enterprise/" >}}), you can also [assign RBAC roles]({{< relref "../roles-and-permissions/access-control/assign-rbac-roles" >}}) to grant very specific permissions to applications that interact with Grafana.
+In [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}), you can also [assign RBAC roles]({{< relref "../roles-and-permissions/access-control/assign-rbac-roles" >}}) to grant very specific permissions to applications that interact with Grafana.
 
 ### Before you begin
 

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

@@ -1,11 +1,10 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/view-server/
-  - /docs/grafana/latest/admin/view-server-settings/
-  - /docs/grafana/latest/administration/view-server/view-server-settings/
-  - /docs/grafana/latest/admin/view-server-stats/
-  - /docs/grafana/latest/administration/view-server/view-server-stats/
-  - /docs/grafana/latest/administration/stats-and-license/
+  - ../admin/view-server-settings/
+  - ../admin/view-server-stats/
+  - view-server/
+  - view-server/view-server-settings/
+  - view-server/view-server-stats/
 description: How to view server settings in the Grafana UI
 keywords:
   - grafana

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

@@ -1,10 +1,9 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/
-  - /docs/grafana/latest/manage-users/add-or-remove-user-from-team/
-  - /docs/grafana/latest/manage-users/create-or-remove-team/
-  - /docs/grafana/latest/manage-users/manage-teams/
-  - /docs/grafana/latest/administration/team-management/
+  - ../manage-users/add-or-remove-user-from-team/
+  - ../manage-users/create-or-remove-team/
+  - ../manage-users/manage-teams/
+  - manage-users-and-permissions/manage-teams/
 title: Team management
 weight: 400
 ---
@@ -19,18 +18,27 @@ For more information about teams, refer to [Teams and permissions]({{< relref ".
 
 For information about how to optimize your teams, refer to [How to best organize your teams and resources in Grafana](https://grafana.com/blog/2022/03/14/how-to-best-organize-your-teams-and-resources-in-grafana/).
 
+This topic describes how to:
+
+- Create a team
+- Add a team member
+- Grant team member permissions
+- Remove a team member
+- Delete a team
+- View a list of teams
+
+## Before you begin
+
+- Ensure that you have either organization administrator permissions or team administrator permissions
+- Make a plan for which users belong to which teams and the permissions team members receive
+
 ## Create a team
 
 A team is a group of users within an organization that have common dashboard and data source permission needs. Use teams to help make user-permission management more efficient.
 
 A user can belong to multiple teams.
 
-**Before you begin:**
-
-- Ensure that you have either organization administrator permissions or team administrator permissions
-- Make a plan for which users belong to which teams and the permissions team members receive
-
-**To create a team**:
+To create a team:
 
 1. Sign in to Grafana as an organization administrator or team administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
@@ -42,14 +50,9 @@ A user can belong to multiple teams.
 
 ## Add a team member
 
-Add a team member to an existing team whenever you want to provide access to team dashboards and folders to another user.
+Add a team member to an existing team whenever you want to provide access to team dashboards and folders to another user. This task requires that you have organization administrator permissions.
 
-**Before you begin:**
-
-- Ensure that you have organization administrator permissions
-- [Create a team](#create-a-team).
-
-**To add a team member**:
+To add a team member:
 
 1. Sign in to Grafana as an organization administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
@@ -58,17 +61,11 @@ Add a team member to an existing team whenever you want to provide access to tea
 1. Choose if you want to add the user as a team Member or an Admin.
 1. Click **Add to team**.
 
-![Add team member](/static/img/docs/manage-users/add-team-member-7-3.png)
-
 ## Grant team member permissions
 
 Complete this task when you want to add or modify team member permissions.
 
-**Before you begin:**
-
-- Ensure that you have either organization administrator permissions or team administrator permissions
-
-**To grant team member permissions**:
+To grant team member permissions:
 
 1. Sign in to Grafana as an organization administrator or a team administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
@@ -76,17 +73,11 @@ Complete this task when you want to add or modify team member permissions.
 1. In the team member list, find and click the user that you want to change. You can use the search field to filter the list if necessary.
 1. Click the **Permission** list, and then click the new user permission level.
 
-![Change team member permissions](/static/img/docs/manage-users/change-team-permissions-7-3.png)
-
 ## Remove a team member
 
 You can remove a team member when you no longer want to apply team permissions to the user
 
-**Before you begin:**
-
-- Ensure that you have either organization administrator permissions or team administrator permissions
-
-**To remove a team member**:
+To remove a team member:
 
 1. Sign in to Grafana as an organization administrator or team administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
@@ -96,13 +87,9 @@ You can remove a team member when you no longer want to apply team permissions t
 
 ## Delete a team
 
-Delete a team when you no longer need it. This action permanently deletes the team and removes all team permissions from dashboards and folders.
+Delete a team when you no longer need it. This action permanently deletes the team and removes all team permissions from dashboards and folders. This task requires that you have organization administrator permissions.
 
-**Before you begin:**
-
-- Ensure that you have organization administrator permissions
-
-**To delete a team**:
+To delete a team:
 
 1. Sign in to Grafana as an organization administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
@@ -113,24 +100,20 @@ Delete a team when you no longer need it. This action permanently deletes the te
 
 See the complete list of teams in your Grafana organization.
 
-**Before you begin:**
-
-- Ensure that you have either organization administrator permissions or team administrator permissions
-
-**To view a list of teams**:
+To view a list of teams:
 
 1. Sign in to Grafana as an organization administrator or a team administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
 
 The role you use to sign in to Grafana determines how you see team lists.
 
-**Organization administrator view**
+## Organization administrator view
 
 The following example shows a list as it appears to an organization administrator.
 
 ![Team list](/static/img/docs/manage-users/org-admin-team-list-7-3.png)
 
-**Team administrator view**
+## Team administrator view
 
 The following example shows a list as it appears to a team administrator.
 

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

@@ -1,6 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/
+  - manage-users-and-permissions/
 title: User management
 weight: 200
 ---

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/
-  - /docs/grafana/latest/permissions/dashboard_folder_permissions/
-  - /docs/grafana/latest/administration/user-management/manage-dashboard-permissions/
+  - ../../permissions/dashboard_folder_permissions/
+  - ../manage-users-and-permissions/manage-dashboard-permissions/
 title: Manage dashboard permissions
 weight: 500
 ---

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

@@ -1,13 +1,12 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/
-  - /docs/grafana/latest/manage-users/org-admin/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/
-  - /docs/grafana/latest/administration/user-management/manage-org-users/
+  - ../../manage-users/org-admin/
+  - ../manage-users-and-permissions/manage-org-users/
+  - ../manage-users-and-permissions/manage-org-users/change-user-org-permissions/
+  - ../manage-users-and-permissions/manage-org-users/invite-user-join-org/
+  - ../manage-users-and-permissions/manage-org-users/manage-pending-invites/
+  - ../manage-users-and-permissions/manage-org-users/remove-user-from-org/
+  - ../manage-users-and-permissions/manage-org-users/view-list-org-users/
 title: Manage users in an organization
 weight: 400
 ---
@@ -33,8 +32,6 @@ You can see a list of users with accounts in your Grafana organization. If neces
 1. Sign in to Grafana as an organization administrator.
 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
 
-![Org Admin user list](/static/img/docs/manage-users/org-user-list-7-3.png)
-
 > **Note:** If you have [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../server-user-management#view-a-list-of-users" >}}) in the Server Admin section of Grafana.
 
 ## Change a user's organization permissions
@@ -96,8 +93,6 @@ When you invite users to join an organization, you assign the **Admin**, **Edito
 
 If the invitee is not already a user, the system adds them.
 
-![Invite User](/static/img/docs/manage-users/org-invite-user-7-3.png).
-
 ## Manage a pending invitation
 
 Periodically review invitations you have sent so that you can see a list of users that have not yet accepted the invitation or cancel a pending invitation.
@@ -116,14 +111,10 @@ Periodically review invitations you have sent so that you can see a list of user
 
    The **Pending Invites** button appears only when there are unaccepted invitations.
 
-   ![Pending Invites button](/static/img/docs/manage-users/pending-invites-button-7-3.png)
-
 To cancel an invitation, click the red **X** next to the invitation.
 
 To copy an invitation link and send it directly to a user, click Copy Invite. You can then paste the invite link into a message.
 
-![Pending Invites list](/static/img/docs/manage-users/pending-invites-list-7-3.png)
-
 ## Remove a user from an organization
 
 You can remove a user from an organization when they no longer require access to the dashboard or data sources owned by the organization. No longer requiring access to an organization might occur when the user has left your company or has internally moved to another organization.

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

@@ -1,14 +1,13 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/
-  - /docs/grafana/latest/manage-users/server-admin/
-  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/
-  - /docs/grafana/latest/administration/user-management/server-user-management/
+  - ../../manage-users/server-admin/
+  - ../../manage-users/server-admin/server-admin-manage-users/
+  - ../manage-users-and-permissions/manage-server-users/
+  - ../manage-users-and-permissions/manage-server-users/add-user/
+  - ../manage-users-and-permissions/manage-server-users/force-user-logout/
+  - ../manage-users-and-permissions/manage-server-users/view-edit-user-account/
+  - ../manage-users-and-permissions/manage-server-users/view-list-users/
+  - ../manage-users-and-permissions/manage-server-users/view-user-account-details/
 title: Server user management
 weight: 100
 ---
@@ -38,8 +37,6 @@ You can see a list of users with accounts on your Grafana server. This action mi
 1. Sign in to Grafana as a server administrator.
 1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
 
-![Server Admin user list](/static/img/docs/manage-users/server-user-list-7-3.png)
-
 > **Note:** If you have [organization administrator]({{< relref "../../roles-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../manage-org-users/#view-a-list-of-organization-users" >}}).
 
 ## View user details
@@ -62,26 +59,18 @@ A user account contains the following sections.
 
 This section contains basic user information, which users can update.
 
-![Server Admin user information section](/static/img/docs/manage-users/server-admin-user-information-7-3.png)
-
 #### Permissions
 
 This indicates whether the user account has the Grafana administrator flag applied. If the flag is set to **Yes**, then the user is a Grafana server administrator.
 
-![Server Admin Permissions section](/static/img/docs/manage-users/server-admin-permissions-7-3.png)
-
 #### Organizations
 
 This section lists the organizations the user belongs to and their assigned role.
 
-![Server Admin Organizations section](/static/img/docs/manage-users/server-admin-organisations-7-3.png)
-
 #### Sessions
 
 This section includes recent user sessions and information about the time the user logged in and they system they used. You can force logouts, if necessary.
 
-![Server Admin Sessions section](/static/img/docs/manage-users/server-admin-sessions-7-3.png)
-
 ## Edit a user account
 
 Edit a user account when you want to modify user login credentials, or delete, disable, or enable a user.

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

@@ -1,10 +1,10 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/
-  - /docs/grafana/latest/administration/user-management/server-user-management/add-remove-user-to-org/
+  - ../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org/
+  - ../../manage-users-and-permissions/manage-server-users/add-user-to-org/
+description: Describes how a Grafana server administrator can add or remove users
+  in an organization
 title: Add or remove a user in an organization
-description: Describes how a Grafana server administrator can add or remove users in an organization
 weight: 30
 ---
 

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

@@ -1,9 +1,9 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/
-  - /docs/grafana/latest/administration/user-management/server-user-management/assign-remove-server-admin-privileges/
+  - ../../manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/
+description: Describes how to assign and remove Grafana administrator privileges from
+  a server user.
 title: Assign or remove Grafana server administrator privileges
-description: Describes how to assign and remove Grafana administrator privileges from a server user.
 weight: 20
 ---
 

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

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/
-  - /docs/grafana/latest/administration/user-management/server-user-management/change-user-org-permissions/
+  - ../../manage-users-and-permissions/manage-server-users/change-user-org-permissions/
 title: Change a user's organization permissions
 weight: 50
 ---

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

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
-  - /docs/grafana/latest/administration/user-management/server-user-management/grant-editor-admin-permissions/
+  - ../../manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/
 title: Grant editors administrator permissions
 weight: 60
 ---

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/administration/change-your-password/
-  - /docs/grafana/latest/administration/manage-user-preferences/
-  - /docs/grafana/latest/administration/user-management/user-preferences/
+  - ../change-your-password/
+  - ../manage-user-preferences/
 description: Learn how to update your user preferences and switch organizations
 keywords:
   - password

docs/sources/alerting/_index.md

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting/
-  - /docs/grafana/latest/about-alerting
+  - about-alerting/
+  - unified-alerting/alerting/
 title: Alerting
 weight: 114
 ---

docs/sources/alerting/alert-groups/_index.md

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alert-groups/
-  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+  - unified-alerting/alert-groups/
 description: Alert groups
 keywords:
   - grafana

docs/sources/alerting/alert-groups/filter-alerts.md

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alert-groups/filter-alerts/
-  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+  - ../unified-alerting/alert-groups/
 description: Alert groups
 keywords:
   - grafana

docs/sources/alerting/alert-groups/view-alert-grouping.md

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alert-groups/
-  - /docs/grafana/latest/alerting/alert-groups/view-alert-grouping/
-  - /docs/grafana/latest/alerting/unified-alerting/alert-groups/
+  - ../unified-alerting/alert-groups/
+  - ./
 description: Alert groups
 keywords:
   - grafana

docs/sources/alerting/alerting-limitations.md

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/alerting-limitations/
 title: Limitations
 weight: 552
 ---

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

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/
-  - /docs/grafana/latest/alerting/old-alerting/create-alerts/
-  - /docs/grafana/latest/alerting/rules/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/
+  - old-alerting/create-alerts/
+  - rules/
+  - unified-alerting/alerting-rules/
 title: Create and manage rules
 weight: 130
 ---

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

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/
+  - ../unified-alerting/alerting-rules/create-grafana-managed-rule/
 description: Create Grafana managed alert rule
 keywords:
   - grafana

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
 description: Create Grafana Mimir or Loki managed recording rule
 keywords:
   - grafana

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

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
+  - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/
+  - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/
 description: Create Grafana Mimir or Loki managed alerting rule
 keywords:
   - grafana

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
+  - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/
+  - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/
 description: Edit Grafana Mimir or Loki rule groups and namespaces
 keywords:
   - grafana

docs/sources/alerting/alerting-rules/rule-list.md

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/rule-list/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/
+  - ../unified-alerting/alerting-rules/rule-list/
 description: Manage alerting rules
 keywords:
   - grafana

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

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/
-  - /docs/grafana/latest/alerting/unified-alerting/contact-points/
+  - unified-alerting/contact-points/
 description: Create or edit contact point
 keywords:
   - grafana

docs/sources/alerting/contact-points/create-contact-point.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/create-contact-point/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
+  - message-templating/
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/delete-contact-point.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/delete-contact-point/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
+  - message-templating/
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/edit-alertmanager-config.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/edit-alertmanager-config/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
+  - message-templating/
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/edit-contact-point.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/edit-contact-point/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
+  - message-templating/
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/message-templating/_index.md

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
 description: Message templating
 keywords:
   - grafana

docs/sources/alerting/contact-points/message-templating/create-message-template.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/create-message-template/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../../message-templating/
+  - ../../unified-alerting/message-templating/
+  - ./
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/message-templating/delete-message-template.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/delete-message-template/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../../message-templating/
+  - ../../unified-alerting/message-templating/
+  - ./
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/message-templating/edit-message-template.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/edit-message-template/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../../message-templating/
+  - ../../unified-alerting/message-templating/
+  - ./
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/message-templating/example-template.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/example-template/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../../message-templating/
+  - ../../unified-alerting/message-templating/
+  - ./
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/message-templating/template-data.md

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/template-data/
-  - /docs/grafana/latest/alerting/message-templating/template-data/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/
+  - ../../message-templating/template-data/
+  - ../../unified-alerting/message-templating/template-data/
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/notifiers/_index.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/notifiers/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
+  - message-templating/
 keywords:
   - grafana
   - alerting
@@ -31,7 +30,6 @@ The following table lists the contact point types supported by Grafana.
 | [Pagerduty](https://www.pagerduty.com/)          | `pagerduty`               | Supported            | Supported                                                                                                |
 | [Prometheus Alertmanager](https://prometheus.io) | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
 | [Pushover](https://pushover.net/)                | `pushover`                | Supported            | Supported                                                                                                |
-| [Sensu](https://sensu.io/)                       | `sensu`                   | Supported            | N/A                                                                                                      |
 | [Sensu Go](https://docs.sensu.io/sensu-go/)      | `sensugo`                 | Supported            | N/A                                                                                                      |
 | [Slack](https://slack.com/)                      | `slack`                   | Supported            | Supported                                                                                                |
 | [Telegram](https://telegram.org/)                | `telegram`                | Supported            | N/A                                                                                                      |

docs/sources/alerting/contact-points/notifiers/webhook-notifier.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/notifiers/webhook-notifier/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../../message-templating/
+  - ../../unified-alerting/message-templating/
+  - ../message-templating/
 keywords:
   - grafana
   - alerting

docs/sources/alerting/contact-points/test-contact-point.md

@@ -1,9 +1,8 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/contact-points/message-templating/
-  - /docs/grafana/latest/alerting/contact-points/test-contact-point/
-  - /docs/grafana/latest/alerting/message-templating/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/
+  - ../message-templating/
+  - ../unified-alerting/message-templating/
+  - message-templating/
 keywords:
   - grafana
   - alerting

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

@@ -1,7 +1,6 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/difference-old-new/
-  - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/
+  - unified-alerting/difference-old-new/
 description: What's New with Grafana alerts
 draft: true
 keywords:

docs/sources/alerting/fundamentals/_index.md

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/fundamentals/
-  - /docs/grafana/latest/alerting/metrics/
-  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/
+  - metrics/
+  - unified-alerting/fundamentals/
 title: Explore Grafana Alerting
 weight: 105
 ---

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

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/fundamentals/alert-rules/
 description: About Grafana alert rules
 keywords:
   - grafana

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

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/fundamentals/alert-rules/alert-instances/
 description: Learn about Grafana alert instances
 keywords:
   - grafana

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

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/fundamentals/alert-rules/alert-rule-types/
 description: Learn about the different alert rule types
 keywords:
   - grafana

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

@@ -1,6 +1,4 @@
 ---
-aliases:
-  - /docs/grafana/latest/alerting/fundamentals/alert-rules/organising-alerts/
 description: Learn how to organize alert rules
 keywords:
   - grafana

docs/sources/alerting/fundamentals/alertmanager.md

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/fundamentals/alertmanager/
-  - /docs/grafana/latest/alerting/metrics/
-  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/
+  - ../metrics/
+  - ../unified-alerting/fundamentals/alertmanager/
 title: Alertmanager
 weight: 116
 ---

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

@@ -1,8 +1,7 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/alerting-rules/alert-annotation-label/
-  - /docs/grafana/latest/alerting/fundamentals/annotation-label/
-  - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/
+  - ../alerting-rules/alert-annotation-label/
+  - ../unified-alerting/alerting-rules/alert-annotation-label/
 description: Annotations and labels for alerting
 keywords:
   - grafana