"Release: Updated versions in package to 9.0.1" (#381)

.betterer.ts

@@ -1,69 +1,5 @@
 import { regexp } from '@betterer/regexp';
-import { BettererFileTest } from '@betterer/betterer';
-import { ESLint, Linter } from 'eslint';
-import { existsSync } from 'fs';
 
 export default {
   'no enzyme tests': () => regexp(/from 'enzyme'/g).include('**/*.test.*'),
-  'better eslint': () => countEslintErrors().include('**/*.{ts,tsx}'),
-  'no undocumented stories': () => countUndocumentedStories().include('**/*.story.tsx'),
 };
-
-function countUndocumentedStories() {
-  return new BettererFileTest(async (filePaths, fileTestResult) => {
-    filePaths.forEach((filePath) => {
-      if (!existsSync(filePath.replace(/\.story.tsx$/, '.mdx'))) {
-        // In this case the file contents don't matter:
-        const file = fileTestResult.addFile(filePath, '');
-        // Add the issue to the first character of the file:
-        file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
-      }
-    });
-  });
-}
-
-function countEslintErrors() {
-  return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
-    const { baseDirectory } = resolver;
-    const cli = new ESLint({ cwd: baseDirectory });
-
-    await Promise.all(
-      filePaths.map(async (filePath) => {
-        const linterOptions = (await cli.calculateConfigForFile(filePath)) as Linter.Config;
-
-        const rules: Partial<Linter.RulesRecord> = {
-          '@typescript-eslint/no-explicit-any': 'error',
-        };
-
-        if (!filePath.endsWith('.test.tsx') && !filePath.endsWith('.test.ts')) {
-          rules['@typescript-eslint/consistent-type-assertions'] = [
-            'error',
-            {
-              assertionStyle: 'never',
-            },
-          ];
-        }
-
-        const runner = new ESLint({
-          baseConfig: {
-            ...linterOptions,
-            rules,
-          },
-          useEslintrc: false,
-          cwd: baseDirectory,
-        });
-
-        const lintResults = await runner.lintFiles([filePath]);
-        lintResults
-          .filter((lintResult) => lintResult.source)
-          .forEach((lintResult) => {
-            const { messages } = lintResult;
-            const file = fileTestResult.addFile(filePath, '');
-            messages.forEach((message, index) => {
-              file.addIssue(0, 0, message.message, `${index}`);
-            });
-          });
-      })
-    );
-  });
-}

.bingo/.gitignore

@@ -5,7 +5,6 @@
 # But not these files:
 !.gitignore
 !*.mod
-!*.sum
 !README.md
 !Variables.mk
 !variables.env

.bingo/Variables.mk

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
@@ -17,11 +17,11 @@ GO     ?= $(shell which go)
 #	@echo "Running drone"
 #	@$(DRONE) <flags/args..>
 #
-DRONE := $(GOBIN)/drone-v1.5.0
+DRONE := $(GOBIN)/drone-v1.4.0
 $(DRONE): $(BINGO_DIR)/drone.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
+	@echo "(re)installing $(GOBIN)/drone-v1.4.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone"
 
 WIRE := $(GOBIN)/wire-v0.5.0
 $(WIRE): $(BINGO_DIR)/wire.mod

.bingo/drone.mod

@@ -4,4 +4,4 @@ go 1.17
 
 replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
 
-require github.com/drone/drone-cli v1.5.0 // drone
+require github.com/drone/drone-cli v1.4.0 // drone

.bingo/variables.env

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.6. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
 GOBIN=${GOBIN:=$(go env GOBIN)}
@@ -8,7 +8,7 @@ if [ -z "$GOBIN" ]; then
 fi
 
 
-DRONE="${GOBIN}/drone-v1.5.0"
+DRONE="${GOBIN}/drone-v1.4.0"
 
 WIRE="${GOBIN}/wire-v0.5.0"
 

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

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

.github/workflows/doc-validator.yml

@@ -1,16 +0,0 @@
-name: "doc-validator"
-on:
-  pull_request:
-    paths: ["docs/sources/**"]
-  workflow_dispatch:
-jobs:
-  doc-validator:
-    runs-on: "ubuntu-latest"
-    container:
-      image: "grafana/doc-validator:latest"
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
-      - name: "Run doc-validator tool"
-        # Ensure that the CI always passes until all errors are resolved.
-        run: "doc-validator ./docs/sources || true"

.gitignore

@@ -165,4 +165,3 @@ public/locales/**/*.js
 
 deployment_tools_config.json
 
-.betterer.cache

CHANGELOG.md

@@ -1,212 +1,3 @@
-<!-- 9.0.5 START -->
-
-# 9.0.5 (2022-07-26)
-
-### Features and enhancements
-
-- **Access control:** Show dashboard settings to users who can edit dashboard. [#52535](https://github.com/grafana/grafana/pull/52535), [@grafanabot](https://github.com/grafanabot)
-- **Alerting:** Allow the webhook notifier to support a custom Authorization header. [#52515](https://github.com/grafana/grafana/pull/52515), [@gotjosh](https://github.com/gotjosh)
-- **Chore:** Upgrade to Go version 1.17.12. [#52523](https://github.com/grafana/grafana/pull/52523), [@sakjur](https://github.com/sakjur)
-- **Plugins:** Add signature wildcard globbing for dedicated private plugin type. [#52163](https://github.com/grafana/grafana/pull/52163), [@wbrowne](https://github.com/wbrowne)
-- **Prometheus:** Don't show errors from unsuccessful API checks like rules or exemplar checks. [#52193](https://github.com/grafana/grafana/pull/52193), [@darrenjaneczek](https://github.com/darrenjaneczek)
-
-### Bug fixes
-
-- **Access control:** Allow organisation admins to add existing users to org (#51668). [#52553](https://github.com/grafana/grafana/pull/52553), [@vtorosyan](https://github.com/vtorosyan)
-- **Alerting:** Fix alert panel instance-based rules filtering. [#52583](https://github.com/grafana/grafana/pull/52583), [@konrad147](https://github.com/konrad147)
-- **Apps:** Fixes navigation between different app plugin pages. [#52571](https://github.com/grafana/grafana/pull/52571), [@torkelo](https://github.com/torkelo)
-- **Cloudwatch:** Upgrade grafana-aws-sdk to fix auth issue with secret keys. [#52420](https://github.com/grafana/grafana/pull/52420), [@sarahzinger](https://github.com/sarahzinger)
-- **Grafana/toolkit:** Fix incorrect image and font generation for plugin builds. [#52661](https://github.com/grafana/grafana/pull/52661), [@academo](https://github.com/academo)
-- **Loki:** Fix `show context` not working in some occasions. [#52458](https://github.com/grafana/grafana/pull/52458), [@svennergr](https://github.com/svennergr)
-- **RBAC:** Fix permissions on dashboards and folders created by anonymous users. [#52615](https://github.com/grafana/grafana/pull/52615), [@gamab](https://github.com/gamab)
-
-<!-- 9.0.5 END -->
-<!-- 9.0.4 START -->
-
-# 9.0.4 (2022-07-20)
-
-### Features and enhancements
-
-- **Browse/Search:** Make browser back work properly when visiting Browse or search. [#52271](https://github.com/grafana/grafana/pull/52271), [@torkelo](https://github.com/torkelo)
-- **Logs:** Improve getLogRowContext API. [#52130](https://github.com/grafana/grafana/pull/52130), [@gabor](https://github.com/gabor)
-- **Loki:** Improve handling of empty responses. [#52397](https://github.com/grafana/grafana/pull/52397), [@gabor](https://github.com/gabor)
-- **Plugins:** Always validate root URL if specified in signature manfiest. [#52332](https://github.com/grafana/grafana/pull/52332), [@wbrowne](https://github.com/wbrowne)
-- **Preferences:** Get home dashboard from teams. [#52225](https://github.com/grafana/grafana/pull/52225), [@sakjur](https://github.com/sakjur)
-- **SQLStore:** Support Upserting multiple rows. [#52228](https://github.com/grafana/grafana/pull/52228), [@joeblubaugh](https://github.com/joeblubaugh)
-- **Traces:** Add more template variables in Tempo & Zipkin. [#52306](https://github.com/grafana/grafana/pull/52306), [@joey-grafana](https://github.com/joey-grafana)
-- **Traces:** Remove serviceMap feature flag. [#52375](https://github.com/grafana/grafana/pull/52375), [@joey-grafana](https://github.com/joey-grafana)
-
-### Bug fixes
-
-- **Access Control:** Fix missing folder permissions. [#52410](https://github.com/grafana/grafana/pull/52410), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Access control:** Fix org user removal for OSS users. [#52473](https://github.com/grafana/grafana/pull/52473), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Alerting:** Fix Slack notification preview. [#50230](https://github.com/grafana/grafana/pull/50230), [@ekrucio](https://github.com/ekrucio)
-- **Alerting:** Fix Slack push notifications. [#52391](https://github.com/grafana/grafana/pull/52391), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **Alerting:** Fixes slack push notifications. [#50267](https://github.com/grafana/grafana/pull/50267), [@jgillick](https://github.com/jgillick)
-- **Alerting:** Preserve new-lines from custom email templates in rendered email. [#52253](https://github.com/grafana/grafana/pull/52253), [@alexweav](https://github.com/alexweav)
-- **Insights:** Fix dashboard and data source insights pages. (Enterprise)
-- **Log:** Fix text logging for unsupported types. [#51306](https://github.com/grafana/grafana/pull/51306), [@papagian](https://github.com/papagian)
-- **Loki:** Fix incorrect TopK value type in query builder. [#52226](https://github.com/grafana/grafana/pull/52226), [@ivanahuckova](https://github.com/ivanahuckova)
-
-<!-- 9.0.4 END -->
-<!-- 9.0.3 START -->
-
-# 9.0.3 (2022-07-14)
-
-### Features and enhancements
-
-- **Access Control:** Allow dashboard admins to query org users. [#51652](https://github.com/grafana/grafana/pull/51652), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Access control:** Allow organisation admins to add existing users to org. [#51668](https://github.com/grafana/grafana/pull/51668), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Alerting:** Add method to provisioning API for obtaining a group and its rules. [#51761](https://github.com/grafana/grafana/pull/51761), [@alexweav](https://github.com/alexweav)
-- **Alerting:** Add method to provisioning API for obtaining a group and its rules. [#51398](https://github.com/grafana/grafana/pull/51398), [@alexweav](https://github.com/alexweav)
-- **Alerting:** Allow filtering of contact points by name. [#51933](https://github.com/grafana/grafana/pull/51933), [@alexweav](https://github.com/alexweav)
-- **Alerting:** Disable /api/admin/pause-all-alerts with Unified Alerting. [#51895](https://github.com/grafana/grafana/pull/51895), [@joeblubaugh](https://github.com/joeblubaugh)
-- **Analytics:** Add total queries and cached queries in usage insights logs. (Enterprise)
-- **Annotations:** Use point marker for short time range annotations. [#51520](https://github.com/grafana/grafana/pull/51520), [@codeincarnate](https://github.com/codeincarnate)
-- **AzureMonitor:** Update UI to experimental package. [#52123](https://github.com/grafana/grafana/pull/52123), [@asimpson](https://github.com/asimpson)
-- **AzureMonitor:** Update resource and namespace metadata. [#52030](https://github.com/grafana/grafana/pull/52030), [@despian](https://github.com/despian)
-- **CloudWatch:** Remove simplejson in favor of 'encoding/json'. [#51062](https://github.com/grafana/grafana/pull/51062), [@asimpson](https://github.com/asimpson)
-- **DashboardRow:** Collapse shortcut prevent to move the collapsed rows. [#51589](https://github.com/grafana/grafana/pull/51589), [@ivanortegaalba](https://github.com/ivanortegaalba)
-- **Insights:** Add dashboard UID to exported logs. (Enterprise)
-- **Navigation:** Highlight active nav item when Grafana is served from subpath. [#51767](https://github.com/grafana/grafana/pull/51767), [@kianelbo](https://github.com/kianelbo)
-- **Plugins:** InfluxDB datasource - set epoch query param value as "ms". [#51651](https://github.com/grafana/grafana/pull/51651), [@itsmylife](https://github.com/itsmylife)
-- **Plugins:** InfluxDB update time range query. [#51833](https://github.com/grafana/grafana/pull/51833), [@itsmylife](https://github.com/itsmylife)
-- **StateTimeline:** Try to sort time field. [#51569](https://github.com/grafana/grafana/pull/51569), [@zoltanbedi](https://github.com/zoltanbedi)
-
-### Bug fixes
-
-- **API:** Do not validate/save legacy alerts when saving a dashboard if legacy alerting is disabled. [#51883](https://github.com/grafana/grafana/pull/51883), [@papagian](https://github.com/papagian)
-- **Access Control:** Fix missing folder permissions. [#52153](https://github.com/grafana/grafana/pull/52153), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
-- **Alerting:** Add method to reset notification policy tree back to the default. [#51934](https://github.com/grafana/grafana/pull/51934), [@alexweav](https://github.com/alexweav)
-- **Alerting:** Fix Teams notifier not failing on 200 response with error. [#52254](https://github.com/grafana/grafana/pull/52254), [@JacobsonMT](https://github.com/JacobsonMT)
-- **Alerting:** Fix bug where state did not change between Alerting and Error. [#52204](https://github.com/grafana/grafana/pull/52204), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **Alerting:** Fix consistency errors in OpenAPI documentation. [#51935](https://github.com/grafana/grafana/pull/51935), [@alexweav](https://github.com/alexweav)
-- **Alerting:** Fix normalization of alert states for panel annotations. [#51637](https://github.com/grafana/grafana/pull/51637), [@gillesdemey](https://github.com/gillesdemey)
-- **Alerting:** Provisioning API respects global rule quota. [#52180](https://github.com/grafana/grafana/pull/52180), [@alexweav](https://github.com/alexweav)
-- **CSRF:** Fix additional headers option. [#50629](https://github.com/grafana/grafana/pull/50629), [@sakjur](https://github.com/sakjur)
-- **Chore:** Bump parse-url to 6.0.2 to fix security vulnerabilities. [#51796](https://github.com/grafana/grafana/pull/51796), [@jackw](https://github.com/jackw)
-- **Chore:** Fix CVE-2020-7753. [#51752](https://github.com/grafana/grafana/pull/51752), [@jackw](https://github.com/jackw)
-- **Chore:** Fix CVE-2021-3807. [#51753](https://github.com/grafana/grafana/pull/51753), [@jackw](https://github.com/jackw)
-- **Chore:** Fix CVE-2021-3918. [#51745](https://github.com/grafana/grafana/pull/51745), [@jackw](https://github.com/jackw)
-- **Chore:** Fix CVE-2021-43138. [#51751](https://github.com/grafana/grafana/pull/51751), [@jackw](https://github.com/jackw)
-- **Chore:** Fix CVE-2022-0155. [#51755](https://github.com/grafana/grafana/pull/51755), [@jackw](https://github.com/jackw)
-- **Custom Branding:** Fix login logo size. (Enterprise)
-- **Dashboard:** Fixes tooltip issue with TimePicker and Setting buttons. [#51836](https://github.com/grafana/grafana/pull/51836), [@torkelo](https://github.com/torkelo)
-- **Dashboard:** Prevent unnecessary scrollbar when viewing single panel. [#52122](https://github.com/grafana/grafana/pull/52122), [@lpskdl](https://github.com/lpskdl)
-- **Logs:** Fixed wrapping log lines from detected fields. [#52108](https://github.com/grafana/grafana/pull/52108), [@svennergr](https://github.com/svennergr)
-- **Loki:** Add missing operators in label filter expression. [#51880](https://github.com/grafana/grafana/pull/51880), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Loki:** Fix error when changing operations with different parameters. [#51779](https://github.com/grafana/grafana/pull/51779), [@svennergr](https://github.com/svennergr)
-- **Loki:** Fix suggesting of correct operations in query builder. [#52034](https://github.com/grafana/grafana/pull/52034), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Plugins:** InfluxDB variable interpolation fix. [#51917](https://github.com/grafana/grafana/pull/51917), [@itsmylife](https://github.com/itsmylife)
-- **Plugins:** InfluxDB variable interpolation fix for influxdbBackendMigration feature flag. [#51624](https://github.com/grafana/grafana/pull/51624), [@itsmylife](https://github.com/itsmylife)
-- **Reports:** Fix line breaks in message. (Enterprise)
-- **Reports:** Fix saving report formats. (Enterprise)
-- **SQLstore:** Fix fetching an inexistent playlist. [#51962](https://github.com/grafana/grafana/pull/51962), [@papagian](https://github.com/papagian)
-- **Security:** Fixes for CVE-2022-31107 and CVE-2022-31097. [#52279](https://github.com/grafana/grafana/pull/52279), [@kminehart](https://github.com/kminehart)
-- **Snapshots:** Fix deleting external snapshots when using RBAC. [#51897](https://github.com/grafana/grafana/pull/51897), [@idafurjes](https://github.com/idafurjes)
-- **Table:** Fix scrollbar being hidden by pagination. [#51501](https://github.com/grafana/grafana/pull/51501), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Templating:** Changing between variables with the same name now correctly triggers a dashboard refresh. [#51490](https://github.com/grafana/grafana/pull/51490), [@ashharrison90](https://github.com/ashharrison90)
-- **Time series panel:** Fix an issue with stacks being not complete due to the incorrect data frame length. [#51910](https://github.com/grafana/grafana/pull/51910), [@dprokop](https://github.com/dprokop)
-- **[v9.0.x] Snapshots:** Fix deleting external snapshots when using RBAC (#51897). [#51904](https://github.com/grafana/grafana/pull/51904), [@idafurjes](https://github.com/idafurjes)
-
-<!-- 9.0.3 END -->
-<!-- 9.0.2 START -->
-
-# 9.0.2 (2022-06-28)
-
-### Features and enhancements
-
-- **Alerting:** Add support for images in Pushover alerts. [#51372](https://github.com/grafana/grafana/pull/51372), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **Alerting:** Don't stop the migration when alert rule tags are invalid. [#51253](https://github.com/grafana/grafana/pull/51253), [@gotjosh](https://github.com/gotjosh)
-- **Alerting:** Don't stop the migration when alert rule tags are invalid (…. [#51341](https://github.com/grafana/grafana/pull/51341), [@gotjosh](https://github.com/gotjosh)
-- **Alerting:** Skip the default data source if incompatible. [#51452](https://github.com/grafana/grafana/pull/51452), [@gillesdemey](https://github.com/gillesdemey)
-- **AzureMonitor:** Parse non-fatal errors for Logs. [#51320](https://github.com/grafana/grafana/pull/51320), [@andresmgot](https://github.com/andresmgot)
-- **OAuth:** Restore debug log behavior. [#51244](https://github.com/grafana/grafana/pull/51244), [@Jguer](https://github.com/Jguer)
-- **Plugins:** Improved handling of symlinks. [#51324](https://github.com/grafana/grafana/pull/51324), [@marefr](https://github.com/marefr)
-
-### Bug fixes
-
-- **Alerting:** Code-gen parsing of URL parameters and fix related bugs. [#51353](https://github.com/grafana/grafana/pull/51353), [@alexweav](https://github.com/alexweav)
-- **Alerting:** Code-gen parsing of URL parameters and fix related bugs. [#50731](https://github.com/grafana/grafana/pull/50731), [@alexweav](https://github.com/alexweav)
-- **Annotations:** Fix annotation autocomplete causing panels to crash. [#51164](https://github.com/grafana/grafana/pull/51164), [@ashharrison90](https://github.com/ashharrison90)
-- **Barchart:** Fix warning not showing. [#51190](https://github.com/grafana/grafana/pull/51190), [@joshhunt](https://github.com/joshhunt)
-- **CloudWatch:** Enable custom session duration in AWS plugin auth. [#51322](https://github.com/grafana/grafana/pull/51322), [@sunker](https://github.com/sunker)
-- **Dashboards:** Fixes issue with the initial panel layout counting as an unsaved change. [#51315](https://github.com/grafana/grafana/pull/51315), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
-- **Plugins:** Use a Grafana specific SDK logger implementation for core plugins. [#51229](https://github.com/grafana/grafana/pull/51229), [@marefr](https://github.com/marefr)
-- **Search:** Fix pagination in the new search page. [#51366](https://github.com/grafana/grafana/pull/51366), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
-
-<!-- 9.0.2 END -->
-<!-- 9.0.1 START -->
-
-# 9.0.1 (2022-06-21)
-
-### Features and enhancements
-
-- **Alerting:** Add support for image annotation in Alertmanager alerts. [#50686](https://github.com/grafana/grafana/pull/50686), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **Alerting:** Add support for images in SensuGo alerts. [#50718](https://github.com/grafana/grafana/pull/50718), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **Alerting:** Add support for images in Threema alerts. [#50734](https://github.com/grafana/grafana/pull/50734), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **Alerting:** Adds Mimir to Alertmanager data source implementation. [#50943](https://github.com/grafana/grafana/pull/50943), [@gillesdemey](https://github.com/gillesdemey)
-- **Alerting:** Invalid setting of enabled for unified alerting should return error. [#49876](https://github.com/grafana/grafana/pull/49876), [@grobinson-grafana](https://github.com/grobinson-grafana)
-- **AzureMonitor:** Clean namespace when changing the resource. [#50311](https://github.com/grafana/grafana/pull/50311), [@andresmgot](https://github.com/andresmgot)
-- **AzureMonitor:** Update supported namespaces and filter resources by the right type. [#50788](https://github.com/grafana/grafana/pull/50788), [@andresmgot](https://github.com/andresmgot)
-- **CLI:** Allow relative symlinks in zip archives when installing plugins. [#50537](https://github.com/grafana/grafana/pull/50537), [@marefr](https://github.com/marefr)
-- **Dashboard:** Don't show unsaved changes modal for automatic schema changes. [#50822](https://github.com/grafana/grafana/pull/50822), [@torkelo](https://github.com/torkelo)
-- **Dashboard:** Unsaved changes warning should not trigger when only pluginVersion has changed. [#50677](https://github.com/grafana/grafana/pull/50677), [@torkelo](https://github.com/torkelo)
-- **Expression:** Execute hidden expressions. [#50636](https://github.com/grafana/grafana/pull/50636), [@yesoreyeram](https://github.com/yesoreyeram)
-- **Geomap:** Support showing tooltip content on click (not just hover). [#50985](https://github.com/grafana/grafana/pull/50985), [@ryantxu](https://github.com/ryantxu)
-- **Heatmap:** Remove alpha flag from new heatmap panel. [#50733](https://github.com/grafana/grafana/pull/50733), [@ryantxu](https://github.com/ryantxu)
-- **Instrumentation:** Define handlers for requests that are not handled with named handlers. [#50613](https://github.com/grafana/grafana/pull/50613), [@bergquist](https://github.com/bergquist)
-- **Log Panel:** Improve log row hover contrast and visibility. [#50908](https://github.com/grafana/grafana/pull/50908), [@Seyaji](https://github.com/Seyaji)
-- **Logs:** Handle backend-mode errors in histogram. [#50535](https://github.com/grafana/grafana/pull/50535), [@gabor](https://github.com/gabor)
-- **Loki:** Do not show histogram for instant queries. [#50711](https://github.com/grafana/grafana/pull/50711), [@gabor](https://github.com/gabor)
-- **Loki:** Handle data source configs with path in the url. [#50971](https://github.com/grafana/grafana/pull/50971), [@gabor](https://github.com/gabor)
-- **Loki:** Handle invalid query type values. [#50755](https://github.com/grafana/grafana/pull/50755), [@gabor](https://github.com/gabor)
-- **OAuth:** Redirect to login if no oauth module is found or if module is not configured. [#50661](https://github.com/grafana/grafana/pull/50661), [@kalleep](https://github.com/kalleep)
-- **OptionsUI:** Move internal options editors out of @grafana/ui. [#50739](https://github.com/grafana/grafana/pull/50739), [@ryantxu](https://github.com/ryantxu)
-- **Prometheus:** Don't show undefined for step in collapsed options in query editor when value is "auto". [#50511](https://github.com/grafana/grafana/pull/50511), [@aocenas](https://github.com/aocenas)
-- **Prometheus:** Show query patterns in all editor modes for Prometheus and Loki. [#50263](https://github.com/grafana/grafana/pull/50263), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Tempo:** Add link to Tempo Search with node service selected. [#49776](https://github.com/grafana/grafana/pull/49776), [@joey-grafana](https://github.com/joey-grafana)
-- **Time Series Panel:** Add Null Filling and "No Value" Support. [#50907](https://github.com/grafana/grafana/pull/50907), [@codeincarnate](https://github.com/codeincarnate)
-- **TimeSeries:** Add an option to set legend width. [#49126](https://github.com/grafana/grafana/pull/49126), [@bobrik](https://github.com/bobrik)
-- **Timeseries:** Improve cursor Y sync behavior. [#50740](https://github.com/grafana/grafana/pull/50740), [@ryantxu](https://github.com/ryantxu)
-- **Traces:** Do not use red in span colors as this looks like an error. [#50074](https://github.com/grafana/grafana/pull/50074), [@joey-grafana](https://github.com/joey-grafana)
-
-### Bug fixes
-
-- **Alerting:** Fix AM config overwrite when SQLite db is locked during sync. [#50951](https://github.com/grafana/grafana/pull/50951), [@JacobsonMT](https://github.com/JacobsonMT)
-- **Alerting:** Fix alert instances filtering for prom rules. [#50850](https://github.com/grafana/grafana/pull/50850), [@konrad147](https://github.com/konrad147)
-- **Alerting:** Fix alert rule page crashing when datasource contained URL unsafe characters. [#51105](https://github.com/grafana/grafana/pull/51105), [@gillesdemey](https://github.com/gillesdemey)
-- **Alerting:** Fix automatically select newly created folder option. [#50949](https://github.com/grafana/grafana/pull/50949), [@gillesdemey](https://github.com/gillesdemey)
-- **Alerting:** Fix removal of notification policy without labels matchers. [#50678](https://github.com/grafana/grafana/pull/50678), [@konrad147](https://github.com/konrad147)
-- **CloudWatch:** Allow hidden queries to be executed in case an ID is provided. [#50987](https://github.com/grafana/grafana/pull/50987), [@sunker](https://github.com/sunker)
-- **Dashboard:** Prevent non-repeating panels being dropped from repeated rows when collapsed/expanded. [#50764](https://github.com/grafana/grafana/pull/50764), [@ashharrison90](https://github.com/ashharrison90)
-- **Dashboards:** Fix folder picker not showing correct results when typing too fast. [#50303](https://github.com/grafana/grafana/pull/50303), [@joshhunt](https://github.com/joshhunt)
-- **Datasource:** Prevent panic when proxying for non-existing data source. [#50667](https://github.com/grafana/grafana/pull/50667), [@wbrowne](https://github.com/wbrowne)
-- **Explore:** Fix log context scroll to bottom. [#50600](https://github.com/grafana/grafana/pull/50600), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Explore:** Revert "Remove support for compact format URLs (#49350)". [#50873](https://github.com/grafana/grafana/pull/50873), [@gelicia](https://github.com/gelicia)
-- **Expressions:** Fixes dashboard schema migration issue that casued Expression datasource to be set on panel level. [#50945](https://github.com/grafana/grafana/pull/50945), [@torkelo](https://github.com/torkelo)
-- **Formatting:** Fixes valueFormats for a value of 0. [#50719](https://github.com/grafana/grafana/pull/50719), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
-- **GrafanaData:** Fix week start for non-English browsers. [#50582](https://github.com/grafana/grafana/pull/50582), [@AgnesToulet](https://github.com/AgnesToulet)
-- **LibraryPanel:** Resizing a library panel to 6x3 no longer crashes the dashboard on startup. [#50400](https://github.com/grafana/grafana/pull/50400), [@ashharrison90](https://github.com/ashharrison90)
-- **LogRow:** Fix placement of icon. [#51010](https://github.com/grafana/grafana/pull/51010), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Loki:** Fix bug in labels framing. [#51015](https://github.com/grafana/grafana/pull/51015), [@gabor](https://github.com/gabor)
-- **Loki:** Fix issues with using query patterns. [#50414](https://github.com/grafana/grafana/pull/50414), [@ivanahuckova](https://github.com/ivanahuckova)
-- **Loki:** Fix showing of duplicated label values in dropdown in query builder. [#50680](https://github.com/grafana/grafana/pull/50680), [@ivanahuckova](https://github.com/ivanahuckova)
-- **MSSQL:** Fix ParseFloat error. [#50815](https://github.com/grafana/grafana/pull/50815), [@zoltanbedi](https://github.com/zoltanbedi)
-- **Panels:** Fixes issue with showing 'Cannot visualize data' when query returned 0 rows. [#50485](https://github.com/grafana/grafana/pull/50485), [@torkelo](https://github.com/torkelo)
-- **Playlists:** Disable Create Playlist buttons for users with viewer role. [#50840](https://github.com/grafana/grafana/pull/50840), [@asymness](https://github.com/asymness)
-- **Plugins:** Fix typo in plugin data frames documentation. [#50554](https://github.com/grafana/grafana/pull/50554), [@osisoft-mbishop](https://github.com/osisoft-mbishop)
-- **Prometheus:** Fix body not being included in resource calls if they are POST. [#50833](https://github.com/grafana/grafana/pull/50833), [@aocenas](https://github.com/aocenas)
-- **RolePicker:** Fix submenu position on horizontal space overflow. [#50769](https://github.com/grafana/grafana/pull/50769), [@Clarity-89](https://github.com/Clarity-89)
-- **Tracing:** Fix trace links in traces panel. [#50028](https://github.com/grafana/grafana/pull/50028), [@connorlindsey](https://github.com/connorlindsey)
-
-### Deprecations
-
-Support for compact Explore URLs is deprecated and will be removed in a future release. Until then, when navigating to Explore using the deprecated format the URLs are automatically converted. If you have existing links pointing to Explore update them using the format generated by Explore upon navigation.
-
-You can identify a compact URL by its format. Compact URLs have the left (and optionally right) url parameter as an array of strings, for example `&left=["now-1h","now"...]`. The standard explore URLs follow a key/value pattern, for example `&left={"datasource":"test"...}`. Please be sure to check your dashboards for any hardcoded links to Explore and update them to the standard URL pattern. Issue [#50873](https://github.com/grafana/grafana/issues/50873)
-
-<!-- 9.0.1 END -->
 <!-- 9.0.0 START -->
 
 # 9.0.0 (2022-06-10)
@@ -485,34 +276,34 @@ to
     console.log(`Text "${copiedText}" was copied!`);
   }}
 />
-```
+``` Issue [#49847](https://github.com/grafana/grafana/issues/49847)
 
-Issue [#49847](https://github.com/grafana/grafana/issues/49847)
 
 The following RBAC action renames have been carried out:
 
-- `users.authtoken:update` -> `users.authtoken:write`;
-- `users.password:update` -> `users.password:write`;
-- `users.permissions:update` -> `users.permissions:write`;
-- `users.quotas:update` -> `users.quotas:write`;
-- `org.users.role:update` -> `org.users:write`;
-- `alert.instances:update` -> `alert.instances:write`;
-- `alert.rules:update` -> `alert.rules:write`;
-- `users.authtoken:list` -> `users.authtoken:read`;
-- `users.quotas:list` -> `users.quotas:read`;
-- `users.teams:read` -> replaced by `users.read` + `teams:read`
+* `users.authtoken:update` -> `users.authtoken:write`;
+* `users.password:update` -> `users.password:write`;
+* `users.permissions:update` -> `users.permissions:write`;
+* `users.quotas:update` -> `users.quotas:write`;
+* `org.users.role:update` -> `org.users:write`;
+* `alert.instances:update` -> `alert.instances:write`;
+* `alert.rules:update` -> `alert.rules:write`;
+* `users.authtoken:list` -> `users.authtoken:read`;
+* `users.quotas:list` -> `users.quotas:read`;
+* `users.teams:read` -> replaced by `users.read` + `teams:read`
 
 We've added a migration from the old action names to the new names and have updated our documentation. But you will have to update any scripts and provisioning files that are using the old action names. Issue [#49730](https://github.com/grafana/grafana/issues/49730)
 
+
 The following RBAC action renames have been carried out:
 
-- `reports.admin:write` -> `reports:write`;
-- `reports.admin:create` -> `reports:create`;
-- `licensing:update` -> `licensing:write`;
-- `roles:list` -> `roles:read`;
-- `teams.roles:list` -> `teams.roles:read`;
-- `users.roles:list` -> `users.roles:read`;
-- `users.permissions:list` -> `users.permissions:read`
+* `reports.admin:write` -> `reports:write`;
+* `reports.admin:create` -> `reports:create`;
+* `licensing:update` -> `licensing:write`;
+* `roles:list` -> `roles:read`;
+* `teams.roles:list` -> `teams.roles:read`;
+* `users.roles:list` -> `users.roles:read`;
+* `users.permissions:list` -> `users.permissions:read`
 
 We've added a migration from the old action names to the new names and have updated our documentation. But you will have to update any scripts and provisioning files that are using the old action names. Issue [#3372](https://github.com/grafana/grafana/issues/3372)
 
@@ -600,7 +391,7 @@ module.exports.getWebpackConfig = (config, options) => ({
     },
   },
 });
-```
+````
 
 Please refer to the webpack build error messages or the [official migration guide](https://webpack.js.org/migrate/5/) for assistance with fallbacks.
 
@@ -860,7 +651,7 @@ The change in behavior is that negative-valued series are now stacked downwards
 
 The meaning of the default data source has now changed from being a persisted property in a panel. Before when you selected the default data source for a panel and later changed the default data source to another data source it would change all panels who were configured to use the default data source. From now on the default data source is just the default for new panels and changing the default will not impact any currently saved dashboards. Issue [#45132](https://github.com/grafana/grafana/issues/45132)
 
-The Tooltip component provided by `@grafana/ui` is no longer automatically interactive (that is you can hover onto it and click a link or select text). It will from now on by default close automatically when you mouse out from the trigger element. To make tooltips behave like before set the new `interactive` property to true.
+The Tooltip component provided by `@grafana/ui` is no longer automatically interactive (that is you can hover onto it and click a link or select text). It will from now on by default close automatically when you mouse out from the trigger element. To make tooltips behave like before set the new `interactive` property to true.  
  Issue [#45053](https://github.com/grafana/grafana/issues/45053)
 
 ### Deprecations
@@ -5299,4 +5090,3 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
 - **Dashboard**: Panel property `minSpan` replaced by `maxPerRow`. Dashboard migration will automatically migrate all dashboard panels using the `minSpan` property to the new `maxPerRow` property [#12991](https://github.com/grafana/grafana/pull/12991)
 
 For older release notes, refer to the [CHANGELOG_ARCHIVE.md](https://github.com/grafana/grafana/blob/master/CHANGELOG_ARCHIVE.md)
-````

Dockerfile

@@ -20,13 +20,14 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.17.12-alpine3.15 as go-builder
+FROM golang:1.17.11-alpine3.15 as go-builder
 
 RUN apk add --no-cache gcc g++ make
 
 WORKDIR /grafana
 
 COPY go.mod go.sum embed.go Makefile build.go package.json ./
+COPY cue cue
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY public/api-spec.json public/api-spec.json

Dockerfile.ubuntu

@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.17.12 AS go-builder
+FROM golang:1.17.11 AS go-builder
 
 WORKDIR /src/grafana
 
@@ -29,6 +29,7 @@ COPY go.mod go.sum embed.go ./
 COPY Makefile build.go package.json ./
 COPY .bingo .bingo
 COPY pkg pkg/
+COPY cue cue/
 COPY cue.mod cue.mod/
 COPY packages/grafana-schema packages/grafana-schema/
 COPY public/app/plugins public/app/plugins/

conf/defaults.ini

@@ -842,8 +842,8 @@ max_attempts = 3
 min_interval = 10s
 
 [unified_alerting.screenshots]
-# Enable screenshots in notifications. This option requires the Grafana Image Renderer plugin.
-# For more information on configuration options, refer to [rendering].
+# Enable screenshots in notifications. This option requires a remote HTTP image rendering service. Please
+# see [rendering] for further configuration options.
 capture = false
 
 # The maximum number of screenshots that can be taken at the same time. This option is different from

devenv/dev-dashboards/feature-templating/global-variables-and-interpolation.json

@@ -34,7 +34,7 @@
       },
       "id": 11,
       "options": {
-        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n* `__user.email` = `${__user.email}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n* `Server:text` = `${Server:text}`\n* `Server:queryparam` = `${Server:queryparam}`\n\n## Sanitization\n\n * `1 < 2`\n\n## Link interpolation\n\n* [Example: ${__url_time_range}](https://example.com/?${__url_time_range})",
+        "content": "## Global variables\n\n* `__dashboard` = `${__dashboard}`\n* `__dashboard.name` = `${__dashboard.name}`\n* `__dashboard.uid` = `${__dashboard.uid}`\n* `__org.name` = `${__org.name}`\n* `__org.id` = `${__org.id}`\n* `__user.id` = `${__user.id}`\n* `__user.login` = `${__user.login}`\n* `__user.email` = `${__user.email}`\n         \n## Formats\n\n* `Server:raw` = `${Server:raw}`\n* `Server:regex` = `${Server:regex}`\n* `Server:lucene` = `${Server:lucene}`\n* `Server:glob` = `${Server:glob}`\n* `Server:pipe` = `${Server:pipe}`\n* `Server:distributed` = `${Server:distributed}`\n* `Server:csv` = `${Server:csv}`\n* `Server:html` = `${Server:html}`\n* `Server:json` = `${Server:json}`\n* `Server:percentencode` = `${Server:percentencode}`\n* `Server:singlequote` = `${Server:singlequote}`\n* `Server:doublequote` = `${Server:doublequote}`\n* `Server:sqlstring` = `${Server:sqlstring}`\n* `Server:date` = `${Server:date}`\n* `Server:text` = `${Server:text}`\n* `Server:queryparam` = `${Server:queryparam}`\n\n",
         "mode": "markdown"
       },
       "pluginVersion": "7.1.0",

devenv/dev-dashboards/panel-graph/graph-ng-stacking2.json

@@ -3382,89 +3382,6 @@
       ],
       "title": "'undefined' join artifacts (lines)",
       "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "testdata",
-        "uid": "PD8C576611E62080A"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMin": 0,
-            "fillOpacity": 80,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineWidth": 1,
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 65
-      },
-      "id": 39,
-      "options": {
-        "barRadius": 0,
-        "barWidth": 0.97,
-        "groupWidth": 0.7,
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom"
-        },
-        "orientation": "auto",
-        "showValue": "auto",
-        "stacking": "percent",
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        },
-        "xTickLabelRotation": 0,
-        "xTickLabelSpacing": 0
-      },
-      "pluginVersion": "9.1.0-pre",
-      "targets": [
-        {
-          "csvContent": "name, number, number2, number3, number4\nName1, 40, 5, 20, 10\nName2, 0,0,0,0\nName3, 6, 3, 5, 1\nName4, 1, 1, 1, 2",
-          "datasource": {
-            "type": "testdata",
-            "uid": "PD8C576611E62080A"
-          },
-          "refId": "A",
-          "scenarioId": "csv_content"
-        }
-      ],
-      "title": "Bar chart stack with 0 only series",
-      "type": "barchart"
     }
   ],
   "refresh": false,
@@ -3488,4 +3405,4 @@
   "uid": "1KxMUdE7k",
   "version": 5,
   "weekStart": ""
-}
+}

devenv/docker/blocks/influxdb/config.yaml

@@ -0,0 +1 @@
+http-bind-address: :8086

devenv/docker/blocks/influxdb/docker-compose.yaml

@@ -5,7 +5,6 @@
       - '8086:8086'
     environment:
       INFLUXD_REPORTING_DISABLED: 'true'
-      INFLUXD_HTTP_BIND_ADDRESS: ':8086'
       DOCKER_INFLUXDB_INIT_MODE: 'setup'
       DOCKER_INFLUXDB_INIT_USERNAME: 'grafana'
       DOCKER_INFLUXDB_INIT_PASSWORD: 'grafana12345'
@@ -13,6 +12,7 @@
       DOCKER_INFLUXDB_INIT_BUCKET: 'mybucket'
       DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: 'mytoken'
     volumes:
+      - ./docker/blocks/influxdb/config.yaml:/etc/influxdb2/config.yaml
       - ./docker/blocks/influxdb/setup_influxql.sh:/docker-entrypoint-initdb.d/setup_influxql.sh
 
   telegraf:

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

@@ -29,7 +29,7 @@ If the user is aware of the change and intended it, then that's great! But if th
 
 In Grafana, you can change your names and emails associated with groups or accounts in the Settings or Preferences. This topic provides instructions for each task.
 
-Some tasks require certain permissions. For more information about roles, refer to [Roles and permissions]({{< relref "../roles-and-permissions/" >}}).
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
 
 ### Change organization name
 
@@ -39,20 +39,24 @@ Grafana server administrators and organization administrators can change organiz
 
 Follow these instructions if you are a Grafana Server Admin.
 
-1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears.
-1. Click **Orgs**.
+{{< docs/list >}}
+{{< docs/shared "manage-users/view-server-org-list.md" >}}
+
 1. In the organization list, click the name of the organization that you want to change.
 1. In **Name**, enter the new organization name.
 1. Click **Update**.
+   {{< /docs/list >}}
 
 #### Organization Admin change organization name
 
 If you are an Organization Admin, follow these steps:
 
-1. Hover your cursor over the **Configuration** (gear) icon.
-1. Click **Preferences**.
+{{< docs/list >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+
 1. In **Organization name**, enter the new name.
 1. Click **Update organization name**.
+   {{< /docs/list >}}
 
 ### Change team name or email
 
@@ -76,7 +80,7 @@ To learn how to edit your user information, refer to [Edit your profile]({{< rel
 
 In Grafana, you can modify the UI theme configured in the Settings or Preferences. Set the UI theme for the server, an organization, a team, or your personal user account using the instructions in this topic.
 
-Some tasks require certain permissions. For more information about roles, refer to [Roles and permissions]({{< relref "../roles-and-permissions/" >}}).
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
 
 ### Theme options
 
@@ -108,34 +112,36 @@ To see what the current settings are, refer to [View server settings]({{< relref
 
 Organization administrators can change the UI theme for all users in an organization.
 
-1. Hover your cursor over the **Configuration** (gear) icon.
-1. Click **Preferences**.
-1. In the Preferences section, select the **UI theme**.
-1. Click **Save**.
+{{< docs/list >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+{{< docs/shared "preferences/select-ui-theme-list.md" >}}
+{{< /docs/list >}}
 
 ### Change team UI theme
 
 Organization and team administrators can change the UI theme for all users in a team.
 
-1. Hover your cursor over the **Configuration** (gear) icon in the side menu.
-1. Click **Teams**. Grafana displays the team list.
+{{< docs/list >}}
+{{< docs/shared "manage-users/view-team-list.md" >}}
+
 1. Click on the team that you want to change the UI theme for and then navigate to the **Settings** tab.
-1. In the Preferences section, select the **UI theme**.
-1. Click **Save**.
+   {{< docs/shared "preferences/select-ui-theme-list.md" >}}
+   {{< /docs/list >}}
 
 ### Change your personal UI theme
 
 You can change the UI theme for your user account. This setting overrides UI theme settings at higher levels.
 
-1. On the left menu, hover your cursor over your avatar and then click **Preferences**.
-1. In the Preferences section, select the **UI theme**.
-1. Click **Save**.
+{{< docs/list >}}
+{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
+{{< docs/shared "preferences/select-ui-theme-list.md" >}}
+{{< /docs/list >}}
 
 ## Change the Grafana default timezone
 
 By default, Grafana uses the timezone in your web browser. However, you can override this setting at the server, organization, team, or individual user level. This topic provides instructions for each task.
 
-Some tasks require certain permissions. For more information about roles, refer to [Roles and permissions]({{< relref "../roles-and-permissions/" >}}).
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
 
 ### Set server timezone
 
@@ -145,34 +151,36 @@ Grafana server administrators can choose a default timezone for all users on the
 
 Organization administrators can choose a default timezone for their organization.
 
-1. Hover your cursor over the **Configuration** (gear) icon.
-1. Click **Preferences**.
-1. Click to select an option in the **Timezone** list. **Default** is either the browser local timezone or the timezone selected at a higher level. Refer to [Time range controls]({{< relref "../../dashboards/time-range-controls/" >}}) for more information about Grafana time settings.
-1. Click **Save**.
+{{< docs/list >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+{{< docs/shared "preferences/select-timezone-list.md" >}}
+{{< /docs/list >}}
 
 ### Set team timezone
 
 Organization administrators and team administrators can choose a default timezone for all users in a team.
 
-1. Hover your cursor over the **Configuration** (gear) icon in the side menu.
-1. Click **Teams**. Grafana displays the team list.
+{{< docs/list >}}
+{{< docs/shared "manage-users/view-team-list.md" >}}
+
 1. Click on the team you that you want to change the timezone for and then navigate to the **Settings** tab.
-1. Click to select an option in the **Timezone** list. **Default** is either the browser local timezone or the timezone selected at a higher level. Refer to [Time range controls]({{< relref "../../dashboards/time-range-controls/" >}}) for more information about Grafana time settings.
-1. Click **Save**.
+   {{< docs/shared "preferences/select-timezone-list.md" >}}
+   {{< /docs/list >}}
 
 ### Set your personal timezone
 
 You can change the timezone for your user account. This setting overrides timezone settings at higher levels.
 
-1. On the left menu, hover your cursor over your avatar and then click **Preferences**.
-1. Click to select an option in the **Timezone** list. **Default** is either the browser local timezone or the timezone selected at a higher level. Refer to [Time range controls]({{< relref "../../dashboards/time-range-controls/" >}}) for more information about Grafana time settings.
-1. Click **Save**.
+{{< docs/list >}}
+{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
+{{< docs/shared "preferences/select-timezone-list.md" >}}
+{{< /docs/list >}}
 
 ## Change the default home dashboard
 
 The home dashboard you set is the one all users will see by default when they log in. You can set the home dashboard for the server, an organization, a team, or your personal user account. This topic provides instructions for each task.
 
-Some tasks require certain permissions. For more information about roles, refer to [Roles and permissions]({{< relref "../roles-and-permissions/" >}}).
+{{< docs/shared "preferences/some-tasks-require-permissions.md" >}}
 
 ### Navigate to the home dashboard
 
@@ -208,31 +216,30 @@ default_home_dashboard_path = data/main-dashboard.json
 
 Organization administrators can choose a home dashboard for their organization.
 
-1. Navigate to the dashboard you want to set as the home dashboard.
-1. Click the star next to the dashboard title to mark the dashboard as a favorite if it is not already.
-1. Hover your cursor over the **Configuration** (gear) icon.
-1. Click **Preferences**.
-1. In the **Home Dashboard** field, select the dashboard that you want to use for your home dashboard. Options include all starred dashboards.
-1. Click **Save**.
+{{< docs/list >}}
+{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
+{{< docs/shared "preferences/org-preferences-list.md" >}}
+{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
+{{< /docs/list >}}
 
 ### Set home dashboard for your team
 
 Organization administrators and Team Admins can choose a home dashboard for a team.
 
-1. Navigate to the dashboard you want to set as the home dashboard.
-1. Click the star next to the dashboard title to mark the dashboard as a favorite if it is not already.
-1. Hover your cursor over the **Configuration** (gear) icon in the side menu.
-1. Click **Teams**. Grafana displays the team list.
+{{< docs/list >}}
+{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
+{{< docs/shared "manage-users/view-team-list.md" >}}
+
 1. Click on the team that you want to change the home dashboard for and then navigate to the **Settings** tab.
-1. In the **Home Dashboard** field, select the dashboard that you want to use for your home dashboard. Options include all starred dashboards.
-1. Click **Save**.
+   {{< docs/shared "preferences/select-home-dashboard-list.md" >}}
+   {{< /docs/list >}}
 
 ### Set your personal home dashboard
 
 You can choose your own personal home dashboard. This setting overrides all home dashboards set at higher levels.
 
-1. Navigate to the dashboard you want to set as the home dashboard.
-1. Click the star next to the dashboard title to mark the dashboard as a favorite if it is not already.
-1. On the left menu, hover your cursor over your avatar and then click **Preferences**.
-1. In the **Home Dashboard** field, select the dashboard that you want to use for your home dashboard. Options include all starred dashboards.
-1. Click **Save**.
+{{< docs/list >}}
+{{< docs/shared "preferences/navigate-to-the-dashboard-list.md" >}}
+{{< docs/shared "preferences/navigate-user-preferences-list.md" >}}
+{{< docs/shared "preferences/select-home-dashboard-list.md" >}}
+{{< /docs/list >}}

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

@@ -11,7 +11,7 @@ weight: 300
 
 # Roles and permissions
 
-A _user_ is any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system. For example, the **Admin** role includes permissions for an administrator to create and delete users.
+A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system. For example, the **Admin** role includes permissions for an administrator to create and delete users.
 
 You can assign a user one of three types of permissions:
 

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

@@ -77,7 +77,7 @@ The following list contains role-based access control actions.
 | `licensing:read`                     | n/a                                                                                     | Read licensing information.                                                                                                                                                                      |
 | `licensing:write`                    | n/a                                                                                     | Update the license token.                                                                                                                                                                        |
 | `org.users:write`                    | `users:*` <br> `users:id:*`                                                             | Update the organization role (`Viewer`, `Editor`, or `Admin`) of a user.                                                                                                                         |
-| `org.users:add`                      | `users:*`                                                                               | Add a user to an organization or invite a new user to an organization.                                                                                                                           |
+| `org.users:add`                      | `users:*`                                                                               | Add a user to an organization.                                                                                                                                                                   |
 | `org.users:read`                     | `users:*` <br> `users:id:*`                                                             | Get user profiles within an organization.                                                                                                                                                        |
 | `org.users:remove`                   | `users:*` <br> `users:id:*`                                                             | Remove a user from an organization.                                                                                                                                                              |
 | `org:create`                         | n/a                                                                                     | Create an organization.                                                                                                                                                                          |

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

@@ -60,7 +60,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:licensing:reader`               | `licensing:read`<br>`licensing.reports:read`                                                                                                                                                                                                                         | Read licensing information and licensing reports.                                                                                                                                                                                                                                     |
 | `fixed:licensing:writer`               | All permissions from `fixed:licensing:viewer` and <br>`licensing:write`<br>`licensing:delete`                                                                                                                                                                        | Read licensing information and licensing reports, update and delete the license token.                                                                                                                                                                                                |
 | `fixed:org.users:reader`               | `org.users:read`                                                                                                                                                                                                                                                     | Read users within a single organization.                                                                                                                                                                                                                                              |
-| `fixed:org.users:writer`               | All permissions from `fixed:org.users:reader` and <br>`org.users:add`<br>`org.users:remove`<br>`org.users:write`                                                                                                                                                     | Within a single organization, add a user, invite a new user, read information about a user and their role, remove a user from that organization, or change the role of a user.                                                                                                        |
+| `fixed:org.users:writer`               | All permissions from `fixed:org.users:reader` and <br>`org.users:add`<br>`org.users:remove`<br>`org.users:write`                                                                                                                                                     | Within a single organization, add a user, invite a user, read information about a user and their role, remove a user from that organization, or change the role of a user.                                                                                                            |
 | `fixed:organization:maintainer`        | All permissions from `fixed:organization:reader` and <br> `orgs:write`<br>`orgs:create`<br>`orgs:delete`<br>`orgs.quotas:write`                                                                                                                                      | Create, read, write, or delete an organization. Read or write its quotas. This role needs to be assigned globally.                                                                                                                                                                    |
 | `fixed:organization:reader`            | `orgs:read`<br>`orgs.quotas:read`                                                                                                                                                                                                                                    | Read an organization and its quotas.                                                                                                                                                                                                                                                  |
 | `fixed:organization:writer`            | All permissions from `fixed:organization:reader` and <br> `orgs:write`<br>`orgs.preferences:read`<br>`orgs.preferences:write`                                                                                                                                        | Read an organization, its quotas, or its preferences. Update organization properties, or its preferences.                                                                                                                                                                             |

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

@@ -16,7 +16,13 @@ weight: 800
 
 # Service accounts
 
-You can use a service account to run automated workloads in Grafana, such as dashboard provisioning, configuration, or report generation. Create service accounts and tokens to authenticate applications, such as Terraform, with the Grafana API.
+You can use service accounts to run automated or compute workloads.
+
+{{< section >}}
+
+## About service accounts
+
+A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. Create service accounts and tokens to authenticate applications like Terraform with the Grafana API.
 
 > **Note:** Service accounts are available in Grafana 8.5+ as a beta feature. To enable service accounts, refer to [Enable service accounts]({{< relref "enable-service-accounts/#" >}}) section. Service accounts will eventually replace [API keys]({{< relref "../api-keys/" >}}) as the primary way to authenticate applications that interact with Grafana.
 

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

@@ -69,7 +69,7 @@ This indicates whether the user account has the Grafana administrator flag appli
 
 ![Server Admin Permissions section](/static/img/docs/manage-users/server-admin-permissions-7-3.png)
 
-#### Organizations
+#### Organisations
 
 This section lists the organizations the user belongs to and their assigned role.
 

docs/sources/alerting/_index.md

@@ -2,71 +2,39 @@
 aliases:
   - /docs/grafana/latest/alerting/
   - /docs/grafana/latest/alerting/unified-alerting/alerting/
-  - /docs/grafana/latest/about-alerting
 title: Alerting
 weight: 114
 ---
 
 # Grafana Alerting
 
-Grafana Alerting allows you to learn about problems in your systems moments after they occur. Create, manage, and take action on your alerts in a single, consolidated view, and improve your team’s ability to identify and resolve issues quickly.
+Grafana Alerting allows you to learn about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. It centralizes alerting information in a single, searchable view that allows you to:
 
-Grafana Alerting is available for Grafana OSS, Grafana Enterprise, or Grafana Cloud. With Mimir and Loki alert rules you can run alert expressions closer to your data and at massive scale, all managed by the Grafana UI you are already familiar with.
+- Create and manage Grafana alerts
+- Create and manage Grafana Mimir and Loki managed alerts
+- View alerting information from Prometheus and Alertmanager compatible data sources
 
 Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}
 
-## Overview
+For new installations or existing installs without alerting configured, Grafana Alerting is enabled by default.
 
-The following diagram gives you an overview of how Grafana Alerting works and introduces you to some of the key concepts that work together and form the core of our flexible and powerful alerting engine.
+| Release     | Cloud         | Enterprise    | OSS           |
+| ----------- | ------------- | ------------- | ------------- |
+| Grafana 9.0 | On by default | On by default | On by default |
 
-{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram-latest.png" caption="Grafana Alerting overview" >}}
+Existing installations that upgrade to v9.0 will have Grafana Alerting enabled by default. For more information on migrating from legacy or the cloud alerting plugin, see [Migrating to Grafana Alerting]({{< relref "migrating-alerts/" >}}).
 
-1. Alert rules
+Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "fundamentals/" >}}) of Grafana Alerting. Refer to [Role-based access control]({{< relref "../administration/roles-and-permissions/access-control/" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.
 
-   Set evaluation criteria that determines whether an alert instance will fire. An alert rule consists of one or more queries and expressions, a condition, the frequency of evaluation, and optionally, the duration over which the condition is met.
-
-   Grafana managed alerts support multi-dimensional alerting, which means that each alert rule can create multiple alert instances. This is exceptionally powerful if you are observing multiple series in a single expression.
-
-   Once an alert rule has been created, they go through various states and transitions. The state and health of alert rules help you understand several key status indicators about your alerts.
-
-1. Labels
-
-   Match an alert rule and its instances to notification policies and silences. They can also be used to group your alerts by severity.
-
-1. Notification policies
-
-   Set where, when, and how the alerts get routed. Each notification policy specifies a set of label matchers to indicate which alerts they are responsible for. A notification policy has a contact point assigned to it that consists of one or more notifiers.
-
-1. Contact points
-
-   Define how your contacts are notified when an alert fires. We support a multitude of ChatOps tools to ensure the alerts come to your team.
-
-## Features
-
-**One page for all alerts**
-
-A single Grafana Alerting page consolidates both Grafana-managed alerts and alerts that reside in your Prometheus-compatible data source in one single place.
-
-**Multi-dimensional alerts**
-
-Alert rules can create multiple individual alert instances per alert rule, known as multi-dimensional alerts, giving you the power and flexibility to gain visibility into your entire system with just a single alert.
-
-**Routing alerts**
-
-Route each alert instance to a specific contact point based on labels you define. Notification policies are the set of rules for where, when, and how the alerts are routed to contact points.
-
-**Silencing alerts**
-
-Silences allow you to stop receiving persistent notifications from one or more alerting rules. You can also partially pause an alert based on certain criteria. Silences have their own dedicated section for better organization and visibility, so that you can scan your paused alert rules without cluttering the main alerting view.
-
-**Mute timings**
-
-With mute timings, you can specify a time interval when you don’t want new notifications to be generated or sent. You can also freeze alert notifications for recurring periods of time, such as during a maintenance period.
-
-## Useful links
-
-- [Fundamental concepts]({{< relref "fundamentals/" >}}) of Grafana Alerting.
-
-- [Role-based access control]({{< relref "../administration/roles-and-permissions/access-control/" >}}) in Grafana Enterprise.
-
-- [Alertmanager]({{< relref "fundamentals/alertmanager/" >}}) and [High availability]({{< relref "./high-availability/" >}})
+- [About alert rules]({{< relref "fundamentals/alert-rules/" >}})
+- [Migrating legacy alerts]({{< relref "migrating-alerts/" >}})
+- [Disable Grafana Alerting in OSS]({{< relref "migrating-alerts/opt-out/" >}})
+- [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule/" >}})
+- [Create Grafana Mimir or Loki managed alerting rules]({{< relref "alerting-rules/create-mimir-loki-managed-rule/" >}})
+- [View existing alerting rules and manage their current state]({{< relref "alerting-rules/rule-list/" >}})
+- [View the state and health of alerting rules]({{< relref "fundamentals/state-and-health/" >}})
+- [View alert groupings]({{< relref "alert-groups/" >}})
+- [Add or edit an alert contact point]({{< relref "contact-points/" >}})
+- [Add or edit notification policies]({{< relref "notifications/" >}})
+- [Add or edit silences]({{< relref "silences/" >}})
+- [Performance considerations for alerting]({{< relref "performance/" >}})

docs/sources/alerting/about-alerting.md

@@ -0,0 +1,35 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/about-alerting/
+description: A quick overview of Grafana Alerting
+keywords:
+  - grafana
+  - alerting
+  - overview
+  - concepts
+  - basics
+title: About Grafana Alerting
+weight: 100
+---
+
+# About Grafana Alerting
+
+Grafana Alerting consists of several individual concepts that are at the core of a flexible and powerful alerting engine.
+
+This topic explains how to create [alert rules]({{< relref "fundamentals/alert-rules/" >}}), their relationship with [alert instances]({{< relref "fundamentals/alert-rules/alert-instances/" >}}) and the various alert rule [states and transitions]({{< relref "fundamentals/state-and-health/" >}}), [notification policies]({{< relref "notifications/" >}}) and [contact points]({{< relref "contact-points/" >}}).
+
+These three individual concepts are the minimum necessities to successfully create alerts and receive notifications.
+
+We will also touch on various other concepts such as [silences]({{< relref "silences/" >}}) and [mute timings]({{< relref "notifications/mute-timings/" >}}) to more granularly manage alert notifications, [role-based access control]({{< relref "../enterprise/access-control/" >}}) to limit access and manage permissions and additional advanced topics such as [external alertmanagers]({{< relref "fundamentals/alertmanager/#add-a-new-external-alertmanager" >}}) and [high availability]({{< relref "high-availability/" >}}).
+
+Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
+
+## Overview
+
+{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram.jpg" caption="Grafana Alerting overview" >}}
+
+As shown in the diagram above, Grafana Alerting uses [labels]({{< relref "fundamentals/annotation-label/how-to-use-labels/" >}}) to match an alert rule and its instances to a specific notification policy. This concept of labels and label matching is important and is also used in [silences]({{< relref "silences/" >}}).
+
+Each notification policy specifies a set of [label matchers]({{< relref "fundamentals/annotation-label/labels-and-label-matchers/" >}}) to indicate what alerts they are responsible for.
+
+A notification policy has a [contact point]({{< relref "contact-points/" >}}) assigned to it that consists of one or more [notifiers]({{< relref "contact-points/#list-of-notifiers-supported-by-grafana" >}}).

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

@@ -15,7 +15,7 @@ weight: 400
 
 # Create a Grafana managed alerting rule
 
-Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fix thresholds. When these are executed, Grafana sends notifications to the contact point. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
+Grafana allows you to create alerting rules that query one or more data sources, reduce or transform the results and compare them to each other or to fix thresholds. When these are executed, Grafana sends notifications to the contact point. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../about-alerting/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
 
 Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 

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

@@ -27,7 +27,7 @@ You can create and manage recording rules for an external Grafana Mimir or Loki
 
   - **Loki** - The `local` rule storage type, default for the Loki data source, supports only viewing of rules. To edit rules, configure one of the other rule storage types.
 
-  - **Grafana Mimir** - use the `/prometheus` prefix. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
+  - **Grafana Mimir** - use the [legacy `/api/prom` prefix](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#path-prefixes), not `/prometheus`. The Prometheus data source supports both Grafana Mimir and Prometheus, and Grafana expects that both the [Query API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#querier--query-frontend) and [Ruler API](https://grafana.com/docs/mimir/latest/operators-guide/reference-http-api/#ruler) are under the same URL. You cannot provide a separate URL for the Ruler API.
 
 > **Note:** If you do not want to manage alerting rules for a particular Loki or Prometheus data source, go to its settings and clear the **Manage alerts via Alerting UI** checkbox.
 

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

@@ -17,7 +17,7 @@ weight: 400
 
 # Create a Grafana Mimir or Loki managed alerting rule
 
-Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance that has ruler API enabled. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
+Grafana allows you to create alerting rules for an external Grafana Mimir or Loki instance that has ruler API enabled. For information on Grafana Alerting, see [About Grafana Alerting]({{< relref "../about-alerting/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
 
 ## Before you begin
 

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

@@ -20,7 +20,7 @@ Use contact points to define how your contacts are notified when an alert fires.
 
 You can configure Grafana managed contact points as well as contact points for an [external Alertmanager data source]({{< relref "../../datasources/alertmanager/" >}}). For more information, see [Alertmanager]({{< relref "../fundamentals/alertmanager/" >}}).
 
-Before you begin, see [Grafana Alerting]({{< relref "../../alerting/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
+Before you begin, see [About Grafana Alerting]({{< relref "../about-alerting/" >}}) which explains the various components of Grafana Alerting. We also recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "../fundamentals/" >}}) of Grafana Alerting.
 
 - [Create contact point]({{< relref "create-contact-point/" >}})
 - [Edit contact point]({{< relref "edit-contact-point/" >}})

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

@@ -1,7 +1,9 @@
 ---
 aliases:
   - /docs/grafana/latest/alerting/contact-points/message-templating/example-template-functions/
-  - /docs/grafana/latest/alerting/fundamentals/annotation-label/example-template-functions/
+  - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
 keywords:
   - grafana
   - alerting

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

@@ -3,8 +3,6 @@ aliases:
   - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/
   - /docs/grafana/latest/alerting/message-templating/template-functions/
   - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
-  - /docs/grafana/latest/alerting/fundamentals/annotation-label/template-functions/
-  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/annotation-label/template-functions/
 keywords:
   - grafana
   - alerting
@@ -17,7 +15,7 @@ weight: 125
 
 # Template Functions
 
-Template functions allow you to process alert evaluation results to generate dynamic notifications.
+Template functions allow you to process labels and annotations to generate dynamic notifications.
 
 | Name                                      | Argument type                                                | Return type            | Description                                                                                                                                 |
 | ----------------------------------------- | ------------------------------------------------------------ | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |

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

@@ -10,33 +10,33 @@ keywords:
   - guide
   - contact point
   - templating
-title: List of contact point types
+title: List of notifiers
 weight: 130
 ---
 
-# List of supported contact point types
+# List of supported notifiers
 
-The following table lists the contact point types supported by Grafana.
+The following table lists the notifiers (contact point types) supported by Grafana.
 
-| Name                                             | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
-| ------------------------------------------------ | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
-| [DingDing](https://www.dingtalk.com/en)          | `dingding`                | Supported            | N/A                                                                                                      |
-| [Discord](https://discord.com/)                  | `discord`                 | Supported            | N/A                                                                                                      |
-| [Email](#email)                                  | `email`                   | Supported            | Supported                                                                                                |
-| [Google Hangouts](https://hangouts.google.com/)  | `googlechat`              | Supported            | N/A                                                                                                      |
-| [Kafka](https://kafka.apache.org/)               | `kafka`                   | Supported            | N/A                                                                                                      |
-| [Line](https://line.me/en/)                      | `line`                    | Supported            | N/A                                                                                                      |
-| [Microsoft Teams](https://teams.microsoft.com/)  | `teams`                   | Supported            | N/A                                                                                                      |
-| [Opsgenie](https://atlassian.com/opsgenie/)      | `opsgenie`                | Supported            | Supported                                                                                                |
-| [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                                                                                                      |
-| [Threema](https://threema.ch/)                   | `threema`                 | Supported            | N/A                                                                                                      |
-| [VictorOps](https://help.victorops.com/)         | `victorops`               | Supported            | Supported                                                                                                |
-| [Webhook](#webhook)                              | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
-| [WeCom](#wecom)                                  | `wecom`                   | Supported            | N/A                                                                                                      |
-| [Zenduty](https://www.zenduty.com/)              | `webhook`                 | Supported            | N/A                                                                                                      |
+| Name                                          | Type                      | Grafana Alertmanager | Other Alertmanagers                                                                                      |
+| --------------------------------------------- | ------------------------- | -------------------- | -------------------------------------------------------------------------------------------------------- |
+| [DingDing](#dingdingdingtalk)                 | `dingding`                | Supported            | N/A                                                                                                      |
+| [Discord](#discord)                           | `discord`                 | Supported            | N/A                                                                                                      |
+| [Email](#email)                               | `email`                   | Supported            | Supported                                                                                                |
+| [Google Hangouts Chat](#google-hangouts-chat) | `googlechat`              | Supported            | N/A                                                                                                      |
+| [Kafka](#kafka)                               | `kafka`                   | Supported            | N/A                                                                                                      |
+| Line                                          | `line`                    | Supported            | N/A                                                                                                      |
+| Microsoft Teams                               | `teams`                   | Supported            | N/A                                                                                                      |
+| [Opsgenie](#opsgenie)                         | `opsgenie`                | Supported            | Supported                                                                                                |
+| [Pagerduty](#pagerduty)                       | `pagerduty`               | Supported            | Supported                                                                                                |
+| Prometheus Alertmanager                       | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
+| [Pushover](#pushover)                         | `pushover`                | Supported            | Supported                                                                                                |
+| Sensu                                         | `sensu`                   | Supported            | N/A                                                                                                      |
+| [Sensu Go](#sensu-go)                         | `sensugo`                 | Supported            | N/A                                                                                                      |
+| [Slack](#slack)                               | `slack`                   | Supported            | Supported                                                                                                |
+| Telegram                                      | `telegram`                | Supported            | N/A                                                                                                      |
+| Threema                                       | `threema`                 | Supported            | N/A                                                                                                      |
+| VictorOps                                     | `victorops`               | Supported            | Supported                                                                                                |
+| [Webhook](#webhook)                           | `webhook`                 | Supported            | Supported ([different format](https://prometheus.io/docs/alerting/latest/configuration/#webhook_config)) |
+| [WeCom](#wecom)                               | `wecom`                   | Supported            | N/A                                                                                                      |
+| [Zenduty](#zenduty)                           | `webhook`                 | Supported            | N/A                                                                                                      |

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

@@ -16,7 +16,7 @@ weight: 401
 
 # Annotations and labels for alerting rules
 
-Annotations and labels are key value pairs associated with alerts originating from the alerting rule, datasource response, and as a result of alerting rule evaluation. They can be used in alert notifications directly or in [templates]({{< relref "../../contact-points/message-templating/" >}}) and [template functions]({{< relref "../../contact-points/fundamentals/annotation-label/template-functions/" >}}) to create notification contact dynamically.
+Annotations and labels are key value pairs associated with alerts originating from the alerting rule, datasource response, and as a result of alerting rule evaluation. They can be used in alert notifications directly or in [templates]({{< relref "../../contact-points/message-templating/" >}}) and [template functions]({{< relref "../../contact-points/message-templating/template-functions/" >}}) to create notification contact dynamically.
 
 ## Annotations
 

docs/sources/alerting/fundamentals/data-source-alerting.md

@@ -1,39 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/alerting/fundamentals/data-source-alerting/
-description: Data sources in Grafana Alerting
-title: Data sources
-weight: 100
----
-
-# Data sources
-
-There are a number of data sources that are compatible with Grafana Alerting. Each data source is supported by a plugin. You can use one of the built-in data sources listed below, use [external data source plugins](https://grafana.com/grafana/plugins/?type=datasource), or create your own data source plugin.
-
-If you are creating your own data source plugin, make sure it is a backend plugin as Grafana Alerting requires this in order to be able to evaluate rules using the data source. Frontend data sources are not supported, because the evaluation engine runs on the backend.
-
-Specifying { "alerting": true, “backend”: true } in the plugin.json file indicates that the data source plugin is compatible with Grafana Alerting and includes the backend data-fetching code. For more information, refer to [Build a data source backend plugin](https://grafana.com/tutorials/build-a-data-source-backend-plugin/).
-
-These are the data sources that are compatible with and supported by Grafana Alerting.
-
-- [AWS CloudWatch]({{< relref "../../datasources/aws-cloudwatch/" >}})
-- [Azure Monitor]({{< relref "../../datasources/azuremonitor/" >}})
-- [Elasticsearch]({{< relref "../../datasources/elasticsearch/" >}})
-- [Google Cloud Monitoring]({{< relref "../../datasources/google-cloud-monitoring/" >}})
-- [Graphite]({{< relref "../../datasources/graphite/" >}})
-- [InfluxDB]({{< relref "../../datasources/influxdb/" >}})
-- [Loki]({{< relref "../../datasources/loki/" >}})
-- [Microsoft SQL Server (MSSQL)]({{< relref "../../datasources/mssql/" >}})
-- [MySQL]({{< relref "../../datasources/mysql/" >}})
-- [Open TSDB]({{< relref "../../datasources/opentsdb/" >}})
-- [PostgreSQL]({{< relref "../../datasources/postgres/" >}})
-- [Prometheus]({{< relref "../../datasources/prometheus/" >}})
-- [Jaeger]({{< relref "../../datasources/jaeger/" >}})
-- [Zipkin]({{< relref "../../datasources/zipkin/" >}})
-- [Tempo]({{< relref "../../datasources/tempo/" >}})
-- [Testdata]({{< relref "../../datasources/testdata/" >}})
-
-## Useful links
-
-- [Grafana data sources]({{< relref "../../datasources/" >}})
-- [Add a data source]({{< relref "../../datasources/add-a-data-source/" >}})

docs/sources/alerting/images-in-notifications.md

@@ -11,7 +11,7 @@ title: Images in notifications
 
 # Images in notifications
 
-Images in notifications helps recipients of alert notifications better understand why an alert has fired or resolved by including an image of the panel associated with the Grafana managed alert rule.
+Images in notifications helps recipients of alert notifications better understand why an alert has fired or resolved by including an image of the panel for the Grafana managed alert rule.
 
 > **Note**: Images in notifications are not available for Grafana Mimir and Loki managed alert rules, or when Grafana is set up to send alert notifications to an external Alertmanager.
 
@@ -20,8 +20,6 @@ If Grafana is set up to send images in notifications, it takes a screenshot of t
 1. The alert rule transitions from pending to firing
 2. The alert rule transitions from firing to OK
 
-Grafana does not support images for alert rules that are not associated with a panel. An alert rule is associated with a panel when it has both Dashboard UID and Panel ID annotations.
-
 Images are stored in the [data]({{< relref "../setup-grafana/configure-grafana/#paths" >}}) path and so Grafana must have write-access to this path. If Grafana cannot write to this path then screenshots cannot be saved to disk and an error will be logged for each failed screenshot attempt. In addition to storing images on disk, Grafana can also store the image in an external image store such as Amazon S3, Azure Blob Storage, Google Cloud Storage and even Grafana where screenshots are stored in `public/img/attachments`. Screenshots older than `temp_data_lifetime` are deleted from disk but not the external image store. If Grafana is the external image store then screenshots are deleted from `data` but not from `public/img/attachments`.
 
 > **Note**: It is recommended that you use an external image store, as not all contact points support uploading images from disk. It is also possible that the image on disk is deleted before an alert notification is sent if `temp_data_lifetime` is less than the `group_wait` and `group_interval` options used in Alertmanager.
@@ -34,8 +32,8 @@ To use images in notifications, Grafana must be set up to use [image rendering](
 
 If Grafana has been set up to use [image rendering]({{< relref "../setup-grafana/image-rendering/" >}}) images in notifications can be turned on via the `capture` option in `[unified_alerting.screenshots]`:
 
-    # Enable screenshots in notifications. This option requires the Grafana Image Renderer plugin.
-    # For more information on configuration options, refer to [rendering].
+    # Enable screenshots in notifications. This option requires a remote HTTP image rendering service. Please
+    # see [rendering] for further configuration options.
     capture = true
 
 It is recommended that `max_concurrent_screenshots` is set to a value that is less than or equal to `concurrent_render_request_limit`. The default value for both `max_concurrent_screenshots` and `concurrent_render_request_limit` is `5`:
@@ -71,13 +69,14 @@ Images in notifications are supported in the following notifiers and additional
 | Opsgenie                | No                      | Yes                     |
 | Pagerduty               | No                      | Yes                     |
 | Prometheus Alertmanager | No                      | No                      |
-| Pushover                | Yes                     | No                      |
+| Pushover                | No                      | No                      |
 | Sensu Go                | No                      | No                      |
 | Slack                   | No                      | Yes                     |
 | Telegram                | No                      | No                      |
 | Threema                 | No                      | No                      |
 | VictorOps               | No                      | No                      |
 | Webhook                 | No                      | Yes                     |
+| WeCom                   | No                      | No                      |
 
 Include images from URL refers to using the external image store.
 

docs/sources/alerting/migrating-alerts/_index.md

@@ -3,7 +3,6 @@ aliases:
   - /docs/grafana/latest/alerting/migrating-alerts/
   - /docs/grafana/latest/alerting/unified-alerting/
   - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/
-  - /docs/grafana/latest/alerting/difference-old-new/
 description: Upgrade Grafana alerts
 title: Upgrade to Grafana Alerting
 weight: 101
@@ -13,7 +12,7 @@ weight: 101
 
 Grafana Alerting is enabled by default for new installations or existing installations whether or not legacy alerting is configured.
 
-> **Note**: When upgrading, your dashboard alerts are migrated to a new format. This migration can be rolled back easily by [opting out]({{< relref "opt-out/" >}}). If you have any questions regarding this migration, please contact us.
+> **Note**: We recommend that Grafana Enterprise customers with more than a dozen Grafana dashboard alert rules do not upgrade and remain on legacy alerting for now by [opting out]({{< relref "opt-out/" >}}). If you do want to upgrade to Grafana Alerting, contact customer support.
 
 Existing installations that do not use legacy alerting will have Grafana Alerting enabled by default unless alerting is disabled in the configuration.
 

docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md

@@ -1,6 +1,5 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/migrating-alerts/differences-and-limitations/
   - /docs/grafana/latest/alerting/migrating-alerts/migrating-legacy-alerts/
   - /docs/grafana/latest/alerting/migrating-legacy-alerts/
   - /docs/grafana/latest/alerting/unified-alerting/opt-in/
@@ -11,27 +10,22 @@ weight: 106
 
 # Differences and limitations
 
-There are some differences between Grafana Alerting and legacy dashboard alerts, and a number of features that are no
-longer supported. We refer to these as [Differences]({{< relref "#differences" >}}) and [Limitations]({{< relref "#limitations" >}}).
+When Grafana Alerting is enabled or upgraded to Grafana 9.0 or later, existing legacy dashboard alerts migrate in a format compatible with the Grafana Alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside any new alerts.
+This topic explains how legacy dashboard alerts are migrated and some limitations of the migration.
 
-## Differences
+> **Note:** This topic is only relevant for OSS and Enterprise customers. Contact customer support to enable or disable Grafana Alerting for your Cloud stack.
 
-1. When Grafana Alerting is enabled or upgraded to Grafana 9.0 or later, existing legacy dashboard alerts migrate in a format compatible with the Grafana Alerting. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside any new alerts.
-   This topic explains how legacy dashboard alerts are migrated and some limitations of the migration.
-
-2. Read and write access to legacy dashboard alerts and Grafana alerts are governed by the permissions of the folders storing them. During migration, legacy dashboard alert permissions are matched to the new rules permissions as follows:
+Read and write access to legacy dashboard alerts and Grafana alerts are governed by the permissions of the folders storing them. During migration, legacy dashboard alert permissions are matched to the new rules permissions as follows:
 
 - If alert's dashboard has permissions, it will create a folder named like `Migrated {"dashboardUid": "UID", "panelId": 1, "alertId": 1}` to match permissions of the dashboard (including the inherited permissions from the folder).
 - If there are no dashboard permissions and the dashboard is under a folder, then the rule is linked to this folder and inherits its permissions.
 - If there are no dashboard permissions and the dashboard is under the General folder, then the rule is linked to the `General Alerting` folder, and the rule inherits the default permissions.
 
-3. Since there is no `Keep Last State` option for [`No Data`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) in Grafana Alerting, this option becomes `NoData` during the legacy rules migration. Option "Keep Last State" for [`Error handling`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a [silence]({{< relref "../silences/" >}}) for each alert rule with a duration of 1 year.
+> **Note:** Since there is no `Keep Last State` option for [`No Data`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) in Grafana Alerting, this option becomes `NoData` during the legacy rules migration. Option "Keep Last State" for [`Error handling`]({{< relref "../alerting-rules/create-grafana-managed-rule/#no-data--error-handling" >}}) is migrated to a new option `Error`. To match the behavior of the `Keep Last State`, in both cases, during the migration Grafana automatically creates a [silence]({{< relref "../silences/" >}}) for each alert rule with a duration of 1 year.
 
-4. Notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
-
-5. Unlike legacy dashboard alerts where images in notifications are enabled per contact point, images in notifications for Grafana Alerting must be enabled in the Grafana configuration, either in the configuration file or environment variables, and are enabled for either all or no contact points. Please refer to the [documentation for images in notifications]({{< relref "../images-in-notifications" >}}).
+Notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
 
 ## Limitations
 
-1. Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana Alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts.
-   Silences (expiring after one year) are created for all paused dashboard alerts.
+Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana Alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts.
+Silences (expiring after one year) are created for all paused dashboard alerts.

docs/sources/alerting/silences/linking-to-silence-form.md

@@ -14,8 +14,8 @@ weight: 451
 
 # Create a URL to link to a silence form
 
-When linking to a silence form, provide the default matching labels and comment via `matcher` and `comment` query parameters. The `matcher` parameter should be in the following format `[label][operator][value]` where the `operator` parameter can be one of the following: `=` (equals, not regex), `!=` (not equals, not regex), `=~` (equals, regex), `!~` (not equals, regex).
-The URL can contain many query parameters with the key `matcher`.
-For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/alerting/silence/new?matcher=severity%3Dcritical&matcher=cluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
+When linking to a silence form, provide the default matching labels and comment via `matchers` and `comment` query parameters. The `matchers` parameter requires one more matching labels of the type `[label][operator][value]` joined by a comma while the `operator` parameter can be one of the following: `=` (equals, not regex), `!=` (not equals, not regex), `=~` (equals, regex), `!~` (not equals, regex).
+
+For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/alerting/silence/new?matchers=severity%3Dcritical%2Ccluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
 
 To link to a new silence page for an [external Alertmanager]({{< relref "../../datasources/alertmanager/" >}}), add a `alertmanager` query parameter with the Alertmanager data source name.

docs/sources/best-practices/best-practices-for-creating-dashboards.md

@@ -51,6 +51,6 @@ Once you have a strategy or design guidelines, write them down to help maintain
 - Use the left and right Y-axes when displaying time series with different units or ranges.
 - Add documentation to dashboards and panels.
   - To add documentation to a dashboard, add a [Text panel visualization]({{< relref "../visualizations/text-panel/" >}}) to the dashboard. Record things like the purpose of the dashboard, useful resource links, and any instructions users might need to interact with the dashboard. Check out this [Wikimedia example](https://grafana.wikimedia.org/d/000000066/resourceloader?orgId=1).
-  - To add documentation to a panel, edit the panel settings and add a description. Any text you add will appear if you hover your cursor over the small `i` in the top left corner of the panel.
+  - To add documentation to a panel, [edit the panel settings]({{< relref "../panels/working-with-panels/add-panel/" >}}) and add a description. Any text you add will appear if you hover your cursor over the small `i` in the top left corner of the panel.
 - Reuse your dashboards and enforce consistency by using [templates and variables]({{< relref "../variables/" >}}).
 - Be careful with stacking graph data. The visualizations can be misleading, and hide important data. We recommend turning it off in most cases.

docs/sources/best-practices/best-practices-for-managing-dashboards.md

@@ -31,9 +31,9 @@ What is your dashboard maturity level? Analyze your current dashboard setup and
   - If you create a temporary dashboard, perhaps to test something, prefix the name with `TEST: `. Delete the dashboard when you are finished.
 - Copying dashboards with no significant changes is not a good idea.
   - You miss out on updates to the original dashboard, such as documentation changes, bug fixes, or additions to metrics.
-  - In many cases copies are being made to simply customize the view by setting template parameters. This should instead be done by maintaining a link to the master dashboard and customizing the view with [URL parameters]({{< relref "../panels/configure-data-links/#data-link-variables" >}}).
+  - In many cases copies are being made to simply customize the view by setting template parameters. This should instead be done by maintaining a link to the master dashboard and customizing the view with [URL parameters]({{< relref "../linking/data-link-variables/" >}}).
 - When you must copy a dashboard, clearly rename it and _do not_ copy the dashboard tags. Tags are important metadata for dashboards that are used during search. Copying tags can result in false matches.
 - Maintain a dashboard of dashboards or cross-reference dashboards. This can be done in several ways:
-  - Create dashboard links, panel, or data links. Links can go to other dashboards or to external systems. For more information, refer to [Manage dashboard links]({{< relref "../dashboards/manage-dashboard-links/" >}}).
+  - Create dashboard links, panel, or data links. Links can go to other dashboards or to external systems. For more information, refer to [Linking]({{< relref "../linking/" >}}).
   - Add a [Dashboard list panel]({{< relref "../visualizations/dashboard-list-panel/" >}}). You can then customize what you see by doing tag or folder searches.
   - Add a [Text panel]({{< relref "../visualizations/text-panel/" >}}) and use markdown to customize the display.

docs/sources/best-practices/dashboard-management-maturity-levels.md

@@ -53,7 +53,7 @@ How can you tell you are here?
 - Directed browsing cuts down on "guessing."
   - Template variables make it harder to “just browse” randomly or aimlessly.
   - Most dashboards should be linked to by alerts.
-  - Browsing is directed with links. For more information, refer to [Manage dashboard links]({{< relref "../dashboards/manage-dashboard-links/" >}}).
+  - Browsing is directed with links. For more information, refer to [Linking]({{< relref "../linking/" >}}).
 - Version-controlled dashboard JSON.
 
 ## High - optimized use

docs/sources/dashboards/_index.md

@@ -14,12 +14,14 @@ Dashboard snapshots are static . Queries and expressions cannot be re-executed f
 
 Before you begin, ensure that you have configured a data source. See also:
 
-- [Use dashboards]({{< relref "use-dashboards/" >}})
+- [Working with Grafana dashboard UI]({{< relref "dashboard-ui/" >}})
 - [Dashboard folders]({{< relref "dashboard-folders/" >}})
-- [Add and organize panels]({{< relref "add-organize-panels/" >}})
+- [Create dashboard]({{< relref "dashboard-create/" >}})
 - [Manage dashboards]({{< relref "dashboard-manage/" >}})
 - [Annotations]({{< relref "annotations/" >}})
 - [Playlist]({{< relref "playlist/" >}})
+- [Search]({{< relref "search/" >}})
+- [Keyboard shortcuts]({{< relref "shortcuts/" >}})
 - [Reporting]({{< relref "reporting/" >}})
 - [Time range controls]({{< relref "time-range-controls/" >}})
 - [Dashboard version history]({{< relref "dashboard-history/" >}})

docs/sources/dashboards/add-organize-panels.md

@@ -1,104 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/working-with-panels/navigate-panel-editor/
-  - /docs/grafana/latest/panels/working-with-panels/navigate-inspector-panel/
-  - /docs/grafana/latest/dashboards/dashboard-create/
-  - /docs/grafana/latest/features/dashboard/dashboards/
-  - /docs/grafana/latest/panels/working-with-panels/add-panel/
-  - /docs/grafana/latest/dashboards/add-organize-panels/
-title: Add and organize panels
-menuTitle: Add and organize panels
-weight: 2
----
-
-# Add and organize panels
-
-This section describes the areas of the Grafana panel editor.
-
-1. Panel header: The header section lists the dashboard in which the panel appears and the following controls:
-
-   - **Dashboard settings (gear) icon -** Click to access the dashboard settings.
-   - **Discard -** Discards changes you have made to the panel since you last saved the dashboard.
-   - **Save -** Saves changes you made to the panel.
-   - **Apply -** Applies changes you made and closes the panel editor, returning you to the dashboard. You will have to save the dashboard to persist the applied changes.
-
-1. Visualization preview: The visualization preview section contains the following options:
-
-   - **Table view -** Convert any visualization to a table so that you can see the data. Table views are useful for troubleshooting.
-   - **Fill -** The visualization preview fills the available space. If you change the width of the side pane or height of the bottom pane the visualization changes to fill the available space.
-   - **Actual -** The visualization preview will have the exact size as the size on the dashboard. If not enough space is available, the visualization will scale down preserving the aspect ratio.
-   - **Time range controls -** For more information, refer to [Time range controls]({{< relref "time-range-controls/" >}}).
-
-1. Data section: The data section contains tabs where you enter queries, transform your data, and create alert rules (if applicable).
-
-   - **Query tab -** Select your data source and enter queries here. For more information, refer to [Add a query]({{< relref "../panels/query-a-data-source/add-a-query/" >}}).
-   - **Transform tab -** Apply data transformations. For more information, refer to [Transform data]({{< relref "../panels/transform-data/" >}}).
-   - **Alert tab -** Write alert rules. For more information, refer to [Overview of Grafana 8 alerting]({{< relref "../alerting/" >}}).
-
-1. Panel display options: The display options section contains tabs where you configure almost every aspect of your data visualization.
-
-> Not all options are available for each visualization.
-
-{{< figure src="/static/img/docs/panel-editor/panel-editor-8-0.png" class="docs-image--no-shadow" max-width="1500px" >}}
-
-## Open the panel inspect drawer
-
-The inspect drawer helps you understand and troubleshoot your panels. You can view the raw data for any panel, export that data to a comma-separated values (CSV) file, view query requests, and export panel and data JSON.
-
-> **Note:** Not all panel types include all tabs. For example, dashboard list panels do not have raw data to inspect, so they do not display the Stats, Data, or Query tabs.
-
-The panel inspector consists of the following options:
-
-1. The panel inspect drawer displays opens a drawer on the right side. Click the arrow in the upper right corner to expand or reduce the drawer pane.
-
-1. **Data tab -** Shows the raw data returned by the query with transformations applied. Field options such as overrides and value mappings are not applied by default.
-
-1. **Stats tab -** Shows how long your query takes and how much it returns.
-
-1. **JSON tab -** Allows you to view and copy the panel JSON, panel data JSON, and data frame structure JSON. This is useful if you are provisioning or administering Grafana.
-
-1. **Query tab -** Shows you the requests to the server sent when Grafana queries the data source.
-
-1. **Error tab -** Shows the error. Only visible when query returns error.
-
-## Create a dashboard and add a panel
-
-Dashboards and panels allow you to show your data in visual form. Each panel needs at least one query to display a visualization.
-
-**Before you begin:**
-
-- Ensure that you have the proper permissions. For more information about permissions, refer to [About users and permissions]({{< relref "../administration/roles-and-permissions/" >}}).
-- Identify the dashboard to which you want to add the panel.
-- Understand the query language of the target data source.
-- Ensure that data source for which you are writing a query has been added. For more information about adding a data source, refer to [Add a data source]({{< relref "../datasources/add-a-data-source/" >}}) if you need instructions.
-
-**To create a dashboard and add a panel**:
-
-1. Sign in to Grafana, hover your cursor over **Dashboard**, and click **+ New Dashboard**.
-1. Click **Add a new panel**.
-1. In the first line of the **Query** tab, click the drop-down list and select a data source.
-1. Write or construct a query in the query language of your data source.
-
-   For more information about data sources, refer to [Data sources]({{< relref "../datasources/" >}}) for specific guidelines.
-
-1. In the Visualization list, select a visualization type.
-
-   Grafana displays a preview of your query results with the visualization applied.
-
-   ![](/static/img/docs/panel-editor/select-visualization-8-0.png)
-
-   For more information about individual visualizations, refer to [Visualizations options]({{< relref "../visualizations/" >}}).
-
-1. Refer to the following documentation for ways you can adjust panel settings.
-
-   While not required, most visualizations need some adjustment before they properly display the information that you need.
-
-   - [Format data using value mapping]({{< relref "../panels/format-data/about-value-mapping/" >}})
-   - [Visualization-specific options]({{< relref "../visualizations/" >}})
-   - [Override field values]({{< relref "../panels/override-field-values/about-field-overrides/" >}})
-   - [Configure thresholds]({{< relref "../panels/configure-thresholds/" >}})
-   - [Configure standard options]({{< relref "../panels/configure-standard-options/" >}})
-
-1. Add a note to describe the visualization (or describe your changes) and then click **Save** in the upper-right corner of the page.
-
-   Notes can be helpful if you need to revert the dashboard to a previous version.

docs/sources/dashboards/dashboard-create.md

@@ -0,0 +1,13 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-create/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Create dashboards
+weight: 7
+---
+
+## Create dashboard
+
+To create a new dashboard:
+
+Click the new dashboard link on the right side of the time picker. A blank dashboard is created.

docs/sources/dashboards/dashboard-folders.md

@@ -18,7 +18,7 @@ weight: 6
 
 Folders are a way to organize and group dashboards - very useful if you have a lot of dashboards or multiple teams using the same Grafana instance.
 
-> **Note:** Only Grafana Admins and Super Admins can create, edit, or delete folders. Refer to [Dashboard permissions]({{< relref "../administration/roles-and-permissions/#dashboard-permissions" >}}) for more information.
+> **Note:** Only Grafana Admins and Super Admins can create, edit, or delete folders. Refer to [Dashboard permissions]({{< relref "../administration/manage-users-and-permissions/about-users-and-permissions/#dashboard-permissions" >}}) for more information.
 
 ## How To Create A Folder
 
@@ -55,5 +55,5 @@ The Dashboard Folder Page is similar to the Manage Dashboards page and is where
 
 Permissions can be assigned to a folder and inherited by the containing dashboards. An Access Control List (ACL) is used where
 **Organization Role**, **Team** and Individual **User** can be assigned permissions. Read the
-[Dashboard permissions]({{< relref "../administration/roles-and-permissions/#dashboard-permissions" >}}) docs for more detail
+[Dashboard permissions]({{< relref "../administration/manage-users-and-permissions/about-users-and-permissions/#dashboard-permissions" >}}) docs for more detail
 about permissions.

docs/sources/dashboards/dashboard-ui/_index.md

@@ -0,0 +1,21 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-ui/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: ' Dashboard UI'
+weight: 2
+---
+
+# Working with Grafana dashboard UI
+
+The dashboard UI has the following sections to allow you to customize the presentation of data.
+
+<img src="/static/img/docs/v50/dashboard_annotated.png" class="no-shadow" width="700px">
+
+- **Zoom out time range** (1)
+- **Time picker dropdown** (2). Access relative time range options, auto refresh options and set custom absolute time ranges.
+- **Manual refresh option** (3) Fetch new data.
+- **Dashboard panel** (4) Click the panel title to edit panels.
+- **Graph legend** (5) Change series colors, y-axis and series visibility directly from the legend.
+
+For more details, see [Dashboard header]({{< relref "dashboard-header/" >}}) and [Dashboard rows]({{< relref "dashboard-row/" >}}).

docs/sources/dashboards/dashboard-ui/dashboard-header.md

@@ -0,0 +1,23 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-header/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Dashboard header
+weight: 80
+---
+
+## Dashboard header
+
+The dashboard header has the following sections.
+
+<img class="no-shadow" src="/static/img/docs/v50/top_nav_annotated.png" width="580px">
+
+- **Side menubar toggle** (1): This option toggles the side menu. It provides access to features unrelated to a dashboard such as users, organizations, data sources, and alerting.
+- **Dashboard dropdown** (2): Use this option to view the current dashboard name. From here, you can:
+  - Select another dashboard name to easily switch to that dashboard.
+  - Create a new dashboard or folder, import existing dashboards, and manage dashboard playlists.
+- **Add panel** (3): Use this option to add a new panel to the current dashboard.
+- **Star dashboard** (4): Use this option to star (or unstar) the current dashboard. Starred dashboards show up on your own home dashboard by default. It is a convenient way to mark Dashboards that you're interested in.
+- **Share dashboard** (5): Use this option to share the current dashboard by creating a link or create a static snapshot of it. You must save the dashboard before sharing.
+- **Save dashboard** (6): Use this option to save the current dashboard using its current name.
+- **Settings** (7): Use this option to manage dashboard settings and configure templates and annotations.

docs/sources/dashboards/dashboard-ui/dashboard-row.md

@@ -0,0 +1,23 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-row/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+title: Dashboard rows
+weight: 80
+---
+
+# Dashboard rows
+
+A dashboard row is a logical divider within a dashboard. It is used to group panels together.
+
+Grafana uses a base unit abstraction so that dashboards and panels look great on all screen sizes. Dashboard rows are always 12 “units” wide. These units are automatically scaled dependent on the horizontal resolution of your browser. You can control the relative width of panels within a row by setting their specific width.
+
+> **Note:** With MaxDataPoint functionality, Grafana can show you the perfect number of data points, regardless of resolution or time range.
+
+## Create or remove rows
+
+Use the [repeating rows]({{< relref "../../variables/#repeating-rows" >}}) functionality to dynamically create or remove entire rows, which can be filled with panels, based on the template variables selected.
+
+## Collapse rows
+
+Collapse a row by clicking on the row title. If you save a dashboard with a row collapsed, then it saves in that state and does not load those graphs until you expand the row.

docs/sources/dashboards/manage-library-panels.md

@@ -1,87 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/panel-library/
-  - /docs/grafana/latest/panels/library-panels/
-  - /docs/grafana/latest/panels/library-panels/create-library-panel/
-  - /docs/grafana/latest/panels/library-panels/add-library-panel/
-  - /docs/grafana/latest/panels/library-panels/unlink-library-panel/
-  - /docs/grafana/latest/panels/library-panels/manage-library-panel/
-  - /docs/grafana/latest/panels/library-panels/delete-library-panel/
-  - /docs/grafana/latest/dashboards/manage-library-panels/
-title: Manage Grafana library panels
-menuTitle: Manage library panels
-weight: 3
----
-
-# Manage Grafana library panels
-
-A library panel is a reusable panel that you can use in any dashboard. When you make a change to a library panel, that change propagates to all instances of where the panel is used. Library panels streamline reuse of panels across multiple dashboards.
-
-You can save a library panel in a folder alongside saved dashboards.
-
-## Create a library panel
-
-When you create a library panel, the panel on the source dashboard is converted to a library panel as well. You need to save the original dashboard once a panel is converted.
-
-1. Open a panel in edit mode.
-1. In the panel display options, click the down arrow option to bring changes to the visualization.
-   {{< figure src="/static/img/docs/library-panels/create-lib-panel-from-edit-8-0.png" class="docs-image--no-shadow" max-width= "800px" caption="Screenshot of the edit panel" >}}
-1. Click the **Library panels** option, and then click **Create library panel** to open the create dialog.
-   {{< figure src="/static/img/docs/library-panels/create-lib-panel-8-0.png" class="docs-image--no-shadow" max-width= "500px" caption="Screenshot of the create library panel dialog" >}}
-1. In **Library panel name**, enter the name.
-1. In **Save in folder**, select the folder to save the library panel.
-1. Click **Create library panel** to save your changes.
-1. Save the dashboard.
-
-Once created, you can modify the library panel using any dashboard on which it appears. After you save the changes, all instances of the library panel reflect these modifications.
-
-{{< figure src="/static/img/docs/library-panels/create-from-more-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
-
-## Add a library panel to a dashboard
-
-Add a Grafana library panel to a dashboard when you want to provide visualizations to other dashboard users.
-
-1. Hover over the **Dashboards** option on the left menu, then select **New dashboard** from the drop-down options.
-
-   The **Add** panel dialog opens.
-   {{< figure src="/static/img/docs/library-panels/add-library-panel-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
-
-1. Click the **Add a panel from the panel library** option.
-
-   You will see a list of your library panels.
-
-1. Filter the list or search to find the panel you want to add.
-1. Click a panel to add it to the dashboard.
-
-## Unlink a library panel
-
-Unlink a library panel when you want to make a change to the panel and not affect other instances of the library panel.
-
-1. Hover over **Dashboard** on the left menu, and then click **Library panels**.
-1. Select a library panel that is being used in different dashboards.
-1. Select the panel you want to unlink.
-1. Click the title of the panel and then click **Edit**. The panel opens in edit mode.
-1. Click the **Unlink** option on the top right corner of the page.
-
-## View a list of library panels
-
-You can view a list of available library panels and search for a library panel.
-
-1. Hover over the **Dashboard** option on the left menu, then click **Library panels**.
-
-   You can see a list of previously defined library panels.
-   {{< figure src="/static/img/docs/library-panels/library-panel-list-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
-
-1. Search for a specific library panel if you know its name.
-
-   You can also filter the panels by folder or type.
-
-## Delete a library panel
-
-Delete a library panel when you no longer need it.
-
-1. Hover over **Dashboard** on the left menu, and select **Library panels**.
-
-1. Select the panel you want to delete.
-
-1. Click the delete icon next to the library panel name.

docs/sources/dashboards/search.md

@@ -0,0 +1,49 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/search/
+  - /docs/grafana/latest/reference/search/
+keywords:
+  - grafana
+  - dashboard
+  - documentation
+  - search
+title: Search
+weight: 9
+---
+
+# Dashboard Search
+
+Dashboards can be searched by the dashboard name, filtered by one (or many) tags or filtered by starred status. The dashboard search is accessed through the dashboard picker, available in the dashboard top nav area. The dashboard search can also be opened by using the shortcut `F`.
+
+<img class="no-shadow" src="/static/img/docs/v50/dashboard_search_annotated.png" width="700px">
+
+1. `Search Bar`: The search bar allows you to enter any string and search both database and file based dashboards in real-time.
+1. `Starred`: Here you find all your starred dashboards.
+1. `Recent`: Here you find the latest created dashboards.
+1. `Folders`: The tags filter allows you to filter the list by dashboard tags.
+1. `Root`: The root contains all dashboards that are not placed in a folder.
+1. `Tags`: The tags filter allows you to filter the list by dashboard tags.
+
+When using only a keyboard, you can use your keyboard arrow keys to navigate the results, hit enter to open the selected dashboard.
+
+## Find by dashboard name
+
+Begin typing any part of the desired dashboard names in the search bar. Search will return results for any partial string match in real-time, as you type.
+
+Dashboard search is:
+
+- Real-time
+- _Not_ case sensitive
+- Functional across stored _and_ file based dashboards.
+
+## Filter by Tag(s)
+
+Tags are a great way to organize your dashboards, especially as the number of dashboards grow. Tags can be added and managed in the dashboard `Settings`.
+
+To filter the dashboard list by tag, click on any tag appearing in the right column. The list may be further filtered by clicking on additional tags:
+
+Alternately, to see a list of all available tags, click the tags dropdown menu. All tags will be shown, and when a tag is selected, the dashboard search will be instantly filtered:
+
+When using only a keyboard: `tab` to focus on the _tags_ link, `▼` down arrow key to find a tag and select with the `Enter` key.
+
+> **Note:** When multiple tags are selected, Grafana will show dashboards that include **all**.

docs/sources/dashboards/shortcuts.md

@@ -0,0 +1,18 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/shortcuts/
+title: Keyboard shortcuts
+weight: 10
+---
+
+# Keyboard shortcuts
+
+Grafana has a number of keyboard shortcuts available. Press `?` or `h` on your keyboard to display all keyboard shortcuts available in your version of Grafana.
+
+**Popular shortcuts:**
+
+- Ctrl+S saves the current dashboard.
+- Ctrl+F opens the dashboard finder / search.
+- Ctrl+H hides all controls (good for tv displays).
+- Ctrl+K opens the command palette.
+- Press Escape to exit graph when in fullscreen or edit mode.

docs/sources/dashboards/use-dashboards.md

@@ -1,115 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/dashboards/dashboard-ui/
-  - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-header/
-  - /docs/grafana/latest/features/dashboard/dashboards/
-  - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-row/
-  - /docs/grafana/latest/features/dashboard/dashboards/
-  - /docs/grafana/latest/dashboards/shortcuts/
-  - /docs/grafana/latest/dashboards/search/
-  - /docs/grafana/latest/reference/search/
-title: 'Use dashboards'
-menuTitle: Use dashboards
-weight: 1
-keywords:
-  - dashboard
-  - search
-  - shortcuts
----
-
-# Use dashboards
-
-The dashboard UI has the following sections to allow you to customize the presentation of data.
-
-{{< figure src="/static/img/docs/v50/dashboard_annotated.png" class="no-shadow" width="700px" >}}
-
-- **Zoom out time range** (1)
-- **Time picker dropdown** (2). Access relative time range options, auto refresh options and set custom absolute time ranges.
-- **Refresh option** (3) Click to trigger queries or set auto refresh.
-- **Dashboard panel** (4) Click the panel title to open panel menu.
-- **Graph legend** (5) Change series colors, y-axis and series visibility directly from the legend.
-
-For more details, see [Dashboard header]({{< relref "#dashboard-header" >}}) and [Dashboard rows]({{< relref "#dashboard-rows" >}}).
-
-## Dashboard header
-
-The dashboard header has the following sections.
-
-{{< figure src="/static/img/docs/v50/top_nav_annotated.png" width="450px" >}}
-
-- **Dashboard title** (2): This also opens the dashboard search when clicked.
-- **Add panel** (3): Use this option to add a new panel or row to the current dashboard.
-- **Star dashboard** (4): Use this option to star (or unstar) the current dashboard. Starred dashboards show up on your own home dashboard by default. It is a convenient way to mark Dashboards that you're interested in.
-- **Share dashboard** (5): Use this option to share the current dashboard by link or snapshot. You can also export the dashboard definition from the share modal.
-- **Save dashboard** (6): Use this option to save the current dashboard using its current name.
-- **Settings** (7): Use this option to open dashboard settings. Here you change dashboard name, folder, tags as well as manage variables and annotation queries.
-
-## Dashboard panels
-
-The main building block of dashboard is the panel. You add new panels via the `Add panel` button at the top of the dashboard. This will add view at the top where you can choose if you want to add a new panel, row or library panel. Library panels are panels that can be shared (reused) in many dashboards. You can move panels around by just dragging the panel header. To resize panel use the lower right corner.
-
-## Dashboard rows
-
-A dashboard row is a logical divider within a dashboard. It is used to group panels together. Rows can be collapsed or expanded allowing you to hide parts of the dashboard. Panels inside a collapsed row will not issue any queries.
-
-Use the [repeating rows]({{< relref "../panels/add-panels-dynamically/configure-repeating-rows" >}}) to dynamically create rows based on a template variable.
-
-## Keyboard shortcuts
-
-Grafana has a number of keyboard shortcuts available. Press `?` or `h` on your keyboard to display all keyboard shortcuts available in your version of Grafana.
-
-- `Ctrl+S`: Saves the current dashboard.
-- `f`: Opens the dashboard finder / search.
-- `d+k`: Toggle kiosk mode (hides the menu).
-- `d+e`: Expand all rows.
-- `d+s`: Dashboard settings.
-- `Ctrl+K`: Opens the command palette.
-- `Esc`: Exits panel when in fullscreen view or edit mode. Also returns you to the dashboard from dashboard settings.
-
-**Focused Panel**
-
-By hovering over a panel with the mouse you can use some shortcuts that will target that panel.
-
-- `e`: Toggle panel edit view
-- `v`: Toggle panel fullscreen view
-- `ps`: Open Panel Share Modal
-- `pd`: Duplicate Panel
-- `pr`: Remove Panel
-- `pl`: Toggle panel legend
-
-## Dashboard Search
-
-Dashboards can be searched by the dashboard name, filtered by one (or many) tags or filtered by starred status. The dashboard search is accessed through the dashboard picker, available in the dashboard top nav area. The dashboard search can also be opened by using the shortcut `F`.
-
-{{< figure src="/static/img/docs/v50/dashboard_search_annotated.png" width="700px" >}}
-
-1. `Search Bar`: The search bar allows you to enter any string and search both database and file based dashboards in real-time.
-1. `Starred`: Here you find all your starred dashboards.
-1. `Recent`: Here you find the latest created dashboards.
-1. `Folders`: The tags filter allows you to filter the list by dashboard tags.
-1. `Root`: The root contains all dashboards that are not placed in a folder.
-1. `Tags`: The tags filter allows you to filter the list by dashboard tags.
-
-When using only a keyboard, you can use your keyboard arrow keys to navigate the results, hit enter to open the selected dashboard.
-
-### Find by dashboard name
-
-Begin typing any part of the desired dashboard names in the search bar. Search will return results for any partial string match in real-time, as you type.
-
-Dashboard search is:
-
-- Real-time
-- _Not_ case sensitive
-- Functional across stored _and_ file based dashboards.
-
-### Filter by Tag(s)
-
-Tags are a great way to organize your dashboards, especially as the number of dashboards grow. Tags can be added and managed in the dashboard `Settings`.
-
-To filter the dashboard list by tag, click on any tag appearing in the right column. The list may be further filtered by clicking on additional tags:
-
-Alternately, to see a list of all available tags, click the tags dropdown menu. All tags will be shown, and when a tag is selected, the dashboard search will be instantly filtered:
-
-When using only a keyboard: `tab` to focus on the _tags_ link, `▼` down arrow key to find a tag and select with the `Enter` key.
-
-> **Note:** When multiple tags are selected, Grafana will show dashboards that include **all**.

docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md

@@ -30,7 +30,6 @@ Read more about the available dimensions in the [CloudWatch Metrics and Dimensio
 | `EC2 Instance Attributes` | Returns a list of attributes matching the specified `region`, `attribute_name`, and `filters`.                                                                                |
 | `Resource ARNs`           | Returns a list of ARNs matching the specified `region`, `resource_type` and `tags`.                                                                                           |
 | `Statistics`              | Returns a list of all the standard statistics.                                                                                                                                |
-| `LogGroups`               | Returns a list of all log groups matching the specified `region`.                                                                                                             |
 
 For details about the metrics CloudWatch provides, please refer to the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html).
 

docs/sources/datasources/azuremonitor/_index.md

@@ -103,7 +103,7 @@ Further documentation on multi-dimensional metrics is available [here](https://d
 
 #### Supported Azure Monitor metrics
 
-Not all metrics returned by the Azure Monitor Metrics API have values. To make it easier for you when building a query, the Grafana data source has a list of supported metrics and ignores metrics which will never have values. This list is updated regularly as new services and metrics are added to the Azure cloud. For more information about the list of metrics, refer to [current supported namespaces](https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/azureMetadata/metricNamespaces.ts).
+Not all metrics returned by the Azure Monitor Metrics API have values. To make it easier for you when building a query, the Grafana data source has a list of supported metrics and ignores metrics which will never have values. This list is updated regularly as new services and metrics are added to the Azure cloud. For more information about the list of metrics, refer to [current supported namespaces](https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/supported_namespaces.ts).
 
 ### Querying Azure Monitor Logs
 

docs/sources/datasources/azuremonitor/template-variables.md

@@ -62,67 +62,3 @@ Perf
 | summarize avg(CounterValue) by bin(TimeGenerated, $__interval), Computer
 | order by TimeGenerated asc
 ```
-
-## Limitations
-
-As of Grafana 9.0, a resource URI is constructed to identify resources using the resource picker. On dashboards created prior to Grafana 9.0, Grafana automatically migrates any queries using the prior resource-picking mechanism to use this method.
-
-Some resource types use nested namespaces and resource names, such as `Microsoft.Storage/storageAccounts/tableServices` and `storageAccount/default`, or `Microsoft.Sql/servers/databases` and `serverName/databaseName`. Such template variables cannot be used because the result could be a malformed resource URI.
-
-### Supported cases
-
-#### Standard namespaces and resource names
-
-```kusto
-metricDefinition = $ns
-$ns = Microsoft.Compute/virtualMachines
-resourceName = $rs
-$rs = testvirtualmachine
-```
-
-#### Namespaces with a non-templated sub-namespace
-
-```kusto
-metricDefinition = $ns/tableServices
-$ns = Microsoft.Storage/storageAccounts
-resourceName = $rs/default
-$rs = storageaccount
-```
-
-#### Storage namespaces missing the `default` keyword
-
-```kusto
-metricDefinition = $ns/tableServices
-$ns = Microsoft.Storage/storageAccounts
-resourceName = $rs
-$rs = storageaccount
-```
-
-#### Namespaces with a templated sub-namespace
-
-```kusto
-metricDefinition = $ns/$sns
-$ns = Microsoft.Storage/storageAccounts
-$sns = tableServices
-resourceName = $rs
-$rs = storageaccount
-```
-
-### Unsupported case
-
-If a dashboard uses this unsupported case, migrate it to one of the [supported cases](#supported-cases).
-
-If a namespace or resource name template variable contains multiple segments, Grafana will construct the resource URI incorrectly because the template variable cannot be appropriately split.
-
-For example:
-
-```kusto
-metricDefinition = $ns
-resourceName = $rs
-$ns = 'Microsoft.Storage/storageAccounts/tableServices'
-$rs = 'storageaccount/default'
-```
-
-This would result in an incorrect resource URI containing `Microsoft.Storage/storageAccounts/tableServices/storageaccount/default`. However, the correct URI would have the format `Microsoft.Storage/storageAccounts/storageaccount/tableServices/default`.
-
-An appropriate fix would be to update the template variable that does not match a supported case. If the namespace variable `$ns` is of the form `Microsoft.Storage/storageAccounts/tableServices` this could be split into two variables: `$ns1 = Microsoft.Storage/storageAccounts` and `$ns2 = tableServices`. The metric definition would then take the form `$ns1/$ns2` which leads to a correctly formatted URI.

docs/sources/datasources/mssql.md

@@ -182,7 +182,7 @@ A time series query result is returned in a [wide data frame format]({{< relref
 
 > For backward compatibility, there's an exception to the above rule for queries that return three columns including a string column named metric. Instead of transforming the metric column into field labels, it becomes the field name, and then the series name is formatted as the value of the metric column. See the example with the metric column below.
 
-To optionally customize the default series name formatting, refer to [Standard options definitions]({{< relref "../panels/configure-standard-options/#display-name" >}}).
+To optionally customize the default series name formatting, refer to [Standard field definitions]({{< relref "../panels/standard-field-definitions/#display-name" >}}).
 
 **Example with `metric` column:**
 
@@ -226,7 +226,7 @@ GROUP BY
 ORDER BY 1
 ```
 
-Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard options definitions]({{< relref "../panels/configure-standard-options/#display-name" >}}) display name value of `${__field.labels.hostname}`.
+Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard field definition]({{< relref "../panels/standard-field-definitions/#display-name" >}}) display name value of `${__field.labels.hostname}`.
 
 Data frame result:
 

docs/sources/datasources/mysql.md

@@ -191,7 +191,7 @@ A time series query result is returned in a [wide data frame format]({{< relref
 
 > For backward compatibility, there's an exception to the above rule for queries that return three columns including a string column named metric. Instead of transforming the metric column into field labels, it becomes the field name, and then the series name is formatted as the value of the metric column. See the example with the metric column below.
 
-To optionally customize the default series name formatting, refer to [Standard options definitions]({{< relref "../panels/configure-standard-options/#display-name" >}}).
+To optionally customize the default series name formatting, refer to [Standard field definitions]({{< relref "../panels/standard-field-definitions/#display-name" >}}).
 
 **Example with `metric` column:**
 
@@ -233,7 +233,7 @@ GROUP BY time, hostname
 ORDER BY time
 ```
 
-Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [[Standard options definitions]({{< relref "../panels/configure-standard-options/#display-name" >}}) display value of `${__field.labels.hostname}`.
+Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard field definition]({{< relref "../panels/standard-field-definitions/#display-name" >}}) display value of `${__field.labels.hostname}`.
 
 Data frame result:
 

docs/sources/datasources/postgres.md

@@ -196,7 +196,7 @@ A time series query result is returned in a [wide data frame format]({{< relref
 
 > For backward compatibility, there's an exception to the above rule for queries that return three columns including a string column named metric. Instead of transforming the metric column into field labels, it becomes the field name, and then the series name is formatted as the value of the metric column. See the example with the metric column below.
 
-To optionally customize the default series name formatting, refer to [Standard options definitions]({{< relref "../panels/configure-standard-options/#display-name" >}}).
+To optionally customize the default series name formatting, refer to [Standard field definitions]({{< relref "../panels/standard-field-definitions/#display-name" >}}).
 
 **Example with `metric` column:**
 
@@ -238,7 +238,7 @@ GROUP BY time, hostname
 ORDER BY time
 ```
 
-Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard options definitions]({{< relref "../panels/configure-standard-options/#display-name" >}}) display value of `${__field.labels.hostname}`.
+Given the data frame result in the following example and using the graph panel, you will get two series named _value 10.0.1.1_ and _value 10.0.1.2_. To render the series with a name of _10.0.1.1_ and _10.0.1.2_ , use a [Standard field definition]({{< relref "../panels/standard-field-definitions/#display-name" >}}) display value of `${__field.labels.hostname}`.
 
 Data frame result:
 

docs/sources/developers/contribute.md

@@ -22,13 +22,13 @@ These resources are useful for all developers.
 
 - [Developer guide](https://github.com/grafana/grafana/blob/main/contribute/developer-guide.md): A guide to help you get started developing Grafana software, includes instructions for how to configure Grafana for development.
 
-- [Contributing to documentation](https://github.com/grafana/grafana/blob/main/contribute/documentation): A guide to help you contribute to Grafana documentation, includes links to beginner-friendly issues.
+- [Contributing to documentation](https://github.com/grafana/grafana/blob/main/contribute/documentation.md): A guide to help you contribute to Grafana documentation, includes links to beginner-friendly issues.
 
 - [Architecture guides](https://github.com/grafana/grafana/tree/main/contribute/architecture): These guides explain Grafana’s background architecture.
 
 - [Create a pull request](https://github.com/grafana/grafana/blob/main/contribute/create-pull-request.md): A guide for new contributors about how to create your first Grafana pull request.
 
-- [REST APIs](https://grafana.com/docs/grafana/next/developers/http_api) allow you to interact programmatically with the Grafana backend.
+- [REST APIs](https://grafana.com/docs/grafana/next/http_api/) allow you to interact programmatically with the Grafana backend.
 
 ## Best practices and style
 

docs/sources/developers/http_api/admin.md

@@ -471,8 +471,6 @@ Content-Type: application/json
 POST /api/admin/ldap/reload HTTP/1.1
 Accept: application/json
 Content-Type: application/json
-Accept: application/json
-Content-Type: application/json
 ```
 
 **Example Response**:

docs/sources/developers/http_api/alerting.md

@@ -15,7 +15,7 @@ title: 'Alerting HTTP API '
 
 # Alerting API
 
-> **Note:** This topic is relevant for the [legacy dashboard alerts](https://grafana.com/docs/grafana/v8.5/alerting/old-alerting/) only.
+> **Note:** This topic is relevant for the [legacy dashboard alerts]({{< ref "/docs/grafana/v8.5/alerting/old-alerting/" >}}) only.
 
 You can find Grafana alerting API specification details [here](https://editor.swagger.io/?url=https://raw.githubusercontent.com/grafana/grafana/main/pkg/services/ngalert/api/tooling/post.json). Also, refer to [Grafana alerting alerts documentation]({{< relref "../../alerting/" >}}) for details on how to create and manage new alerts.
 

docs/sources/developers/http_api/alerting_notification_channels.md

@@ -185,7 +185,7 @@ Content-Type: application/json
 
 ```
 
-**Example response**:
+**Example response**:
 
 ```http
 HTTP/1.1 200

docs/sources/developers/http_api/annotations.md

@@ -11,14 +11,14 @@ keywords:
   - annotation
   - annotations
   - comment
-title: 'Annotations HTTP API'
+title: 'Annotations HTTP API '
 ---
 
 # Annotations API
 
 This is the API documentation for the new Grafana Annotations feature released in Grafana 4.6. Annotations are saved in the Grafana database (sqlite, mysql or postgres). Annotations can be organization annotations that can be shown on any dashboard by configuring an annotation data source - they are filtered by tags. Or they can be tied to a panel on a dashboard and are then only shown on that panel.
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Find Annotations
 

docs/sources/developers/http_api/auth.md

@@ -15,7 +15,7 @@ title: 'Authentication HTTP API '
 
 # Authentication API
 
-> If you are running Grafana Enterprise, for some endpoints you would need to have relevant permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you would need to have relevant permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Tokens
 

docs/sources/developers/http_api/dashboard.md

@@ -9,12 +9,12 @@ keywords:
   - documentation
   - api
   - dashboard
-title: 'Dashboard HTTP API'
+title: 'Dashboard HTTP API '
 ---
 
 # Dashboard API
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Identifier (id) vs unique identifier (uid)
 

docs/sources/developers/http_api/dashboard_permissions.md

@@ -13,7 +13,7 @@ keywords:
   - permission
   - permissions
   - acl
-title: 'Dashboard Permissions HTTP API'
+title: 'Dashboard Permissions HTTP API '
 ---
 
 # Dashboard Permissions API
@@ -28,7 +28,7 @@ The permission levels for the permission field:
 - 2 = Edit
 - 4 = Admin
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Get permissions for a dashboard
 

docs/sources/developers/http_api/data_source.md

@@ -10,12 +10,12 @@ keywords:
   - documentation
   - api
   - data source
-title: 'Data source HTTP API'
+title: 'Data source HTTP API '
 ---
 
 # Data source API
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Get all data sources
 

docs/sources/developers/http_api/datasource_permissions.md

@@ -14,14 +14,14 @@ keywords:
   - permissions
   - acl
   - enterprise
-title: 'Datasource Permissions HTTP API'
+title: 'Datasource Permissions HTTP API '
 ---
 
 # Data Source Permissions API
 
 > The Data Source Permissions is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../../enterprise/" >}}).
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 This API can be used to enable, disable, list, add and remove permissions for a data source.
 

docs/sources/developers/http_api/external_group_sync.md

@@ -13,14 +13,14 @@ keywords:
   - group
   - member
   - enterprise
-title: 'External Group Sync HTTP API'
+title: 'External Group Sync HTTP API '
 ---
 
 # External Group Synchronization API
 
 > External Group Synchronization is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../../enterprise/" >}}).
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Get External Groups
 

docs/sources/developers/http_api/folder.md

@@ -9,12 +9,12 @@ keywords:
   - documentation
   - api
   - folder
-title: 'Folder HTTP API'
+title: 'Folder HTTP API '
 ---
 
 # Folder API
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Identifier (id) vs unique identifier (uid)
 

docs/sources/developers/http_api/folder_dashboard_search.md

@@ -11,7 +11,7 @@ keywords:
   - search
   - folder
   - dashboard
-title: 'Folder/Dashboard Search HTTP API'
+title: 'Folder/Dashboard Search HTTP API '
 ---
 
 # Folder/Dashboard Search API
@@ -20,7 +20,7 @@ title: 'Folder/Dashboard Search HTTP API'
 
 `GET /api/search/`
 
-> Note: When using [Role-based access control]({{< relref "../../administration/roles-and-permissions/access-control/" >}}), search results will contain only dashboards and folders which you have access to.
+> Note: When using [Role-based access control]({{< relref "../../enterprise/access-control/" >}}), search results will contain only dashboards and folders which you have access to.
 
 Query parameters:
 

docs/sources/developers/http_api/folder_permissions.md

@@ -13,7 +13,7 @@ keywords:
   - permission
   - permissions
   - acl
-title: 'Folder Permissions HTTP API'
+title: 'Folder Permissions HTTP API '
 ---
 
 # Folder Permissions API
@@ -28,7 +28,7 @@ The permission levels for the permission field:
 - 2 = Edit
 - 4 = Admin
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Get permissions for a folder
 

docs/sources/developers/http_api/licensing.md

@@ -10,14 +10,14 @@ keywords:
   - api
   - licensing
   - enterprise
-title: 'Licensing HTTP API'
+title: 'Licensing HTTP API '
 ---
 
 # Enterprise License API
 
 Licensing is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../../enterprise/" >}}).
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Check license availability
 

docs/sources/developers/http_api/org.md

@@ -10,7 +10,7 @@ keywords:
   - documentation
   - api
   - organization
-title: 'Organization HTTP API'
+title: 'Organization HTTP API '
 ---
 
 # Organization API
@@ -19,7 +19,7 @@ The Organization HTTP API is divided in two resources, `/api/org` (current organ
 and `/api/orgs` (admin organizations). One big difference between these are that
 the admin of all organizations API only works with basic authentication, see [Admin Organizations API](#admin-organizations-api) for more information.
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Current Organization API
 

docs/sources/developers/http_api/reporting.md

@@ -17,7 +17,7 @@ This API allows you to interact programmatically with the [Reporting]({{< relref
 
 > Reporting is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../../enterprise/" >}}).
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Send a report
 

docs/sources/developers/http_api/serviceaccount.md

@@ -9,12 +9,12 @@ keywords:
   - documentation
   - api
   - serviceaccount
-title: 'Service account HTTP API'
+title: 'Service account HTTP API '
 ---
 
 # Service account API
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Search service accounts with Paging
 

docs/sources/developers/http_api/team.md

@@ -11,7 +11,7 @@ keywords:
   - team
   - teams
   - group
-title: 'Team HTTP API'
+title: 'Team HTTP API '
 ---
 
 # Team API
@@ -25,7 +25,7 @@ Access to these API endpoints is restricted as follows:
 - If you enable `editors_can_admin` configuration flag, then Organization Editors can create teams and manage teams where they are Admin.
   - If you enable `editors_can_admin` configuration flag, Editors can find out whether a team that they are not members of exists by trying to create a team with the same name.
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Team Search With Paging
 

docs/sources/developers/http_api/user.md

@@ -9,12 +9,12 @@ keywords:
   - documentation
   - api
   - user
-title: 'User HTTP API'
+title: 'User HTTP API '
 ---
 
 # User API
 
-> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.
+> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../enterprise/access-control/custom-role-actions-scopes/" >}}) for more information.
 
 ## Search Users
 

docs/sources/developers/plugins/_index.md

@@ -3,7 +3,6 @@ aliases:
   - /docs/grafana/latest/developers/plugins/
   - /docs/grafana/latest/plugins/developing/
 title: Build a plugin
-description: Resources for creating Grafana plugins
 weight: 200
 ---
 
@@ -25,8 +24,8 @@ npx @grafana/toolkit plugin:create my-grafana-plugin
 
 If you want a more guided introduction to plugin development, check out our tutorials:
 
-- [Build a panel plugin]({{< ref "build-a-panel-plugin.md" >}})
-- [Build a data source plugin]({{< ref "build-a-data-source-plugin.md" >}})
+- [Build a panel plugin]({{< ref "/tutorials/build-a-panel-plugin/" >}})
+- [Build a data source plugin]({{< ref "/tutorials/build-a-data-source-plugin/" >}})
 
 ## Go further
 
@@ -36,13 +35,13 @@ Learn more about specific areas of plugin development.
 
 If you're looking to build your first plugin, check out these introductory tutorials:
 
-- [Build a panel plugin]({{< ref "build-a-panel-plugin.md" >}})
-- [Build a data source plugin]({{< ref "build-a-data-source-plugin.md" >}})
-- [Build a data source backend plugin]({{< ref "build-a-data-source-backend-plugin.md" >}})
+- [Build a panel plugin]({{< ref "/tutorials/build-a-panel-plugin/" >}})
+- [Build a data source plugin]({{< ref "/tutorials/build-a-data-source-plugin/" >}})
+- [Build a data source backend plugin]({{< ref "/tutorials/build-a-data-source-backend-plugin/" >}})
 
 Ready to learn more? Check out our other tutorials:
 
-- [Build a panel plugin with D3.js]({{< ref "build-a-panel-plugin-with-d3.md" >}})
+- [Build a panel plugin with D3.js]({{< ref "/tutorials/build-a-panel-plugin-with-d3/" >}})
 
 ### Guides
 

docs/sources/developers/plugins/add-support-for-annotations.md

@@ -8,9 +8,9 @@ title: Add support for annotations
 
 This guide explains how to add support for [annotations]({{< relref "../../dashboards/annotations/" >}}) to an existing data source plugin.
 
-This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "build-a-data-source-plugin.md" >}}).
+This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "/tutorials/build-a-data-source-plugin/" >}}).
 
-> **Note:** Annotation support for React plugins was released in Grafana 7.2. To support earlier versions, refer to [Add support for annotation for Grafana 7.1](https://grafana.com/docs/grafana/v7.1/developers/plugins/add-support-for-annotations/).
+> **Note:** Annotation support for React plugins was released in Grafana 7.2. To support earlier versions, refer to the [Add support for annotation for Grafana 7.1](https://grafana.com/docs/grafana/v7.1/developers/plugins/add-support-for-annotations/).
 
 ## Add annotations support to your data source
 

docs/sources/developers/plugins/add-support-for-explore-queries.md

@@ -8,7 +8,7 @@ title: Add support for Explore queries
 
 This guide explains how to improve support for [Explore]({{< relref "../../explore/" >}}) in an existing data source plugin.
 
-This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "build-a-data-source-plugin.md" >}}).
+This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "/tutorials/build-a-data-source-plugin/" >}}).
 
 With Explore, users can make ad-hoc queries without the use of a dashboard. This is useful when users want to troubleshoot or to learn more about the data.
 

docs/sources/developers/plugins/build-a-logs-data-source-plugin.md

@@ -8,7 +8,7 @@ title: Build a logs data source plugin
 
 This guide explains how to build a logs data source plugin.
 
-Data sources in Grafana supports both metrics and log data. The steps to build a logs data source plugin are largely the same as for a metrics data source. This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "build-a-data-source-plugin.md" >}}) for metrics.
+Data sources in Grafana supports both metrics and log data. The steps to build a logs data source plugin are largely the same as for a metrics data source. This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "/tutorials/build-a-data-source-plugin/" >}}) for metrics.
 
 ## Add logs support to your data source
 

docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md

@@ -8,7 +8,7 @@ title: Build a streaming data source plugin
 
 This guide explains how to build a streaming data source plugin.
 
-This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "build-a-data-source-plugin.md" >}}).
+This guide assumes that you're already familiar with how to [Build a data source plugin]({{< ref "/tutorials/build-a-data-source-plugin/" >}}).
 
 When monitoring critical applications, you want your dashboard to refresh as soon as your data does. In Grafana, you can set your dashboards to automatically refresh at a certain interval, no matter what data source you use. Unfortunately, this means that your queries are requesting all the data to be sent again, regardless of whether the data has actually changed.
 

docs/sources/developers/plugins/migration-guide.md

@@ -8,7 +8,7 @@ title: Plugin migration guide
 
 ## Introduction
 
-This guide helps you identify the steps required to update a plugin from the Grafana version it currently supports to newer versions of Grafana.
+This guide helps you identify the steps you need to take based on the Grafana version your plugin supports and explains how to migrate the plugin to the 8.2.x or a later version.
 
 > **Note:** If you've successfully migrated your plugin using this guide, then share your experiences with us! If you find missing information, then we encourage you to [submit an issue on GitHub](https://github.com/grafana/grafana/issues/new?title=Docs%20feedback:%20/developers/plugins/migration-guide.md) so that we can improve this guide!
 
@@ -17,15 +17,6 @@ This guide helps you identify the steps required to update a plugin from the Gra
 - [Plugin migration guide](#plugin-migration-guide)
   - [Introduction](#introduction)
   - [Table of contents](#table-of-contents)
-  - [From version 8.x to 9.x](#from-version-8x-to-9x)
-    - [9.0 breaking changes](#90-breaking-changes)
-      - [theme.visualization.getColorByName replaces getColorForTheme](#themevisualizationgetcolorbyname-replaces-getcolorfortheme)
-      - [VizTextDisplayOptions replaces TextDisplayOptions](#viztextdisplayoptions-replaces-textdisplayoptions)
-      - [Changes in the internal of `backendSrv.fetch()`](#changes-in-the-internal-of-backendsrvfetch)
-      - [GrafanaTheme2 and useStyles2 replaces getFormStyles](#grafanatheme2-and-usestyles2-replaces-getformstyles)
-      - [/api/ds/query replaces /api/tsdb/query](#apidsquery-replaces-apitsdbquery)
-      - [selectOptionInTest has been removed](#selectoptionintest-has-been-removed)
-      - [Toolkit 9 and webpack](#toolkit-9-and-webpack)
   - [From version 8.3.x to 8.4.x](#from-version-83x-to-84x)
     - [Value Mapping Editor has been removed from @grafana-ui library](#value-mapping-editor-has-been-removed-from-grafana-ui-library)
     - [Thresholds Editor has been removed from @grafana-ui library](#thresholds-editor-has-been-removed-from-grafana-ui-library)
@@ -60,106 +51,6 @@ This guide helps you identify the steps required to update a plugin from the Gra
       - [Migrate to data frames](#migrate-to-data-frames)
     - [Troubleshoot plugin migration](#troubleshoot-plugin-migration)
 
-## From version 8.x to 9.x
-
-### 9.0 breaking changes
-
-#### theme.visualization.getColorByName replaces getColorForTheme
-
-`getColorForTheme` was removed, use `theme.visualization.getColorByName` instead
-
-Example:
-
-```ts
-// before
-fillColor: getColorForTheme(panel.sparkline.fillColor, config.theme)
-
-// after
-fillColor: config.theme.visualization.getColorByName(panel.sparkline.fillColor),
-```
-
-#### VizTextDisplayOptions replaces TextDisplayOptions
-
-`TextDisplayOptions` was removed, use `VizTextDisplayOptions` instead
-
-Example:
-
-```ts
-// before
-interface Options {
-...
-text?: TextDisplayOptions;
-...
-}
-
-// after
-interface Options {
-...
-text?: VizTextDisplayOptions;
-...
-}
-```
-
-#### Changes in the internal of `backendSrv.fetch()`
-
-We have changed the internals of `backendSrv.fetch()` to throw an error when the response is an incorrect JSON. Make sure to handle possible errors on the callsite where using `backendSrv.fetch()` (or any other `backendSrv` methods)
-
-```ts
-// PREVIOUSLY: this was returning with an empty object {} - in case the response is an invalid JSON
-return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
-
-// AFTER THIS CHANGE: the following will throw an error - in case the response is an invalid JSON
-return await getBackendSrv().post(`${API_ROOT}/${id}/install`);
-```
-
-#### GrafanaTheme2 and useStyles2 replaces getFormStyles
-
-We have removed the deprecated `getFormStyles` function from [grafana-ui](https://www.npmjs.com/package/@grafana/ui). Use `GrafanaTheme2` and the `useStyles2` hook instead
-
-#### /api/ds/query replaces /api/tsdb/query
-
-We have removed the deprecated `/api/tsdb/query` metrics endpoint. Use [/api/ds/query]({{< relref "../http_api/data_source/#query-a-data-source" >}}) instead
-
-#### selectOptionInTest has been removed
-
-The `@grafana/ui` package helper function `selectOptionInTest` used in frontend tests has been removed as it caused testing libraries to be bundled in the production code of Grafana. If you were using this helper function in your tests please update your code accordingly:
-
-```ts
-// before
-import { selectOptionInTest } from '@grafana/ui';
-// ...test usage
-await selectOptionInTest(selectEl, 'Option 2');
-
-// after
-import { select } from 'react-select-event';
-// ...test usage
-await select(selectEl, 'Option 2', { container: document.body });
-```
-
-#### Toolkit 9 and webpack
-
-Plugins using custom Webpack configs could potentially break due to the changes between webpack@4 and webpack@5. Please refer to the [official migration guide](https://webpack.js.org/migrate/5/) for assistance.
-
-Webpack 5 does not include polyfills for node.js core modules by default (e.g. `buffer`, `stream`, `os`). This can result in failed builds for plugins. If polyfills are required it is recommended to create a custom webpack config in the root of the plugin repo and add the required fallbacks:
-
-```js
-// webpack.config.js
-
-module.exports.getWebpackConfig = (config, options) => ({
-  ...config,
-  resolve: {
-    ...config.resolve,
-    fallback: {
-      os: require.resolve('os-browserify/browser'),
-      stream: require.resolve('stream-browserify'),
-      timers: require.resolve('timers-browserify'),
-    },
-  },
-});
-```
-
-Please refer to the webpack build error messages or the [official migration guide](https://webpack.js.org/migrate/5/) for assistance with fallbacks.
-
 ## From version 8.3.x to 8.4.x
 
 This section explains how to migrate Grafana v8.3.x plugins to the updated plugin system available in Grafana v8.4.x. Depending on your plugin, you need to perform one or more of the following steps.

docs/sources/enterprise/_index.md

@@ -63,7 +63,7 @@ Grafana Enterprise adds the following features:
 - [Data source query caching]({{< relref "query-caching/" >}}) to temporarily store query results in Grafana to reduce data source load and rate limiting.
 - [Reporting]({{< relref "reporting/" >}}) to generate a PDF report from any dashboard and set up a schedule to have it emailed to whoever you choose.
 - [Export dashboard as PDF]({{< relref "export-pdf/" >}})
-- [Custom branding]({{< relref "../setup-grafana/configure-grafana/configure-custom-branding/" >}}) to customize Grafana from the brand and logo to the footer links.
+- [White labeling]({{< relref "../setup-grafana/enable-custom-branding/" >}}) to customize Grafana from the brand and logo to the footer links.
 - [Usage insights]({{< relref "usage-insights/" >}}) to understand how your Grafana instance is used.
 - [Vault integration]({{< relref "../setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault/" >}}) to manage your configuration or provisioning secrets with Vault.
 - [Auditing]({{< relref "../setup-grafana/configure-security/audit-grafana/" >}}) tracks important changes to your Grafana instance to help you manage and mitigate suspicious activity and meet compliance requirements.

docs/sources/enterprise/query-caching.md

@@ -15,7 +15,7 @@ weight: 300
 
 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).
+Query caching works for all backend data sources, and queries sent through the data source proxy. You can enable the cache globally and configure the cache duration (also called Time to Live, or TTL).
 
 > **Note:** Available in [Grafana Enterprise]({{< relref "../enterprise/" >}}) and [Grafana Cloud Pro and Advanced]({{< ref "/docs/grafana-cloud" >}}).
 

docs/sources/explore/query-management.md

@@ -19,9 +19,7 @@ This functionality is similar to the panel inspector tasks [Inspect query perfor
 
 ## Query history
 
-Query history is a list of queries that you used in Explore. The history is stored in the Grafana database and it is not shared with other users. The retention period for queries in history is two weeks. Queries older than two weeks are automatically deleted. To open and interact with your history, click the **Query history** button in Explore.
-
-> **Note**: Starred queries are not subject to the two weeks retention period and they are not deleted.
+Query history is a list of queries that you have used in Explore. The history is local to your browser and is not shared. To open and interact with your history, click the **Query history** button in Explore.
 
 ### View query history
 
@@ -45,6 +43,10 @@ By default, query history shows you the most recent queries. You can sort your h
 1. Select one of the following options:
    - Newest first
    - Oldest first
+   - Data source A-Z
+   - Data source Z-A
+
+> **Note:** If you are in split mode, then the chosen sorting mode applies only to the active panel.
 
 ### Filter query history
 
@@ -59,6 +61,8 @@ In **Query history** tab it is also possible to filter queries by date using the
 - By dragging top handle, adjust start date.
 - By dragging top handle, adjust end date.
 
+> **Note:** If you are in split mode, filters are applied only to your currently active panel.
+
 ### Search in query history
 
 You can search in your history across queries and your comments. Search is possible for queries in the Query history tab and Starred tab.
@@ -70,9 +74,12 @@ You can search in your history across queries and your comments. Search is possi
 
 You can customize the query history in the Settings tab. Options are described in the table below.
 
-| Setting                       | Default value     |
-| ----------------------------- | ----------------- |
-| Change the default active tab | Query history tab |
+| Setting                                                       | Default value                           |
+| ------------------------------------------------------------- | --------------------------------------- |
+| Period of time for which Grafana will save your query history | 1 week                                  |
+| Change the default active tab                                 | Query history tab                       |
+| Only show queries for data source currently active in Explore | True                                    |
+| Clear query history                                           | Permanently deletes all stored queries. |
 
 > **Note:** Query history settings are global, and applied to both panels in split mode.
 

docs/sources/getting-started/build-first-dashboard.md

@@ -27,15 +27,9 @@ Grafana can be installed on many different operating systems. For a list of the
 
 To sign in to Grafana for the first time:
 
-1. Open your web browser and go to http://localhost:3000/.
-
-   The default HTTP port that Grafana listens to is `3000` unless you have configured a different port.
-
-1. On the sign-in page, enter `admin` for the username and password.
-1. Click **Sign in**.
-
-   If successful, you will see a prompt to change the password.
-
+1. Open your web browser and go to http://localhost:3000/. The default HTTP port that Grafana listens to is `3000` unless you have configured a different port.
+1. On the signin page, enter `admin` for username and password.
+1. Click **Sign in**. If successful, you will see a prompt to change the password.
 1. Click **OK** on the prompt and change your password.
 
 > **Note:** We strongly recommend that you change the default administrator password.
@@ -47,10 +41,7 @@ To create your first dashboard:
 1. Click the **New dashboard** item under the **Dashboards** icon in the side menu.
 1. On the dashboard, click **Add an empty panel**.
 1. In the New dashboard/Edit panel view, go to the **Query** tab.
-1. Configure your [query]({{< relref "../panels/query-a-data-source/add-a-query/" >}}) by selecting `-- Grafana --` from the data source selector.
-
-   This generates the Random Walk dashboard.
-
+1. Configure your [query]({{< relref "../panels/query-a-data-source/add-a-query/" >}}) by selecting `-- Grafana --` from the data source selector. This generates the Random Walk dashboard.
 1. Click the **Save** icon in the top right corner of your screen to save the dashboard.
 1. Add a descriptive name, and then click **Save**.
 
@@ -62,7 +53,7 @@ Continue to experiment with what you have built, try the [explore workflow]({{<
 
 - [Panels]({{< relref "../panels/" >}})
 - [Dashboards]({{< relref "../dashboards/" >}})
-- [Keyboard shortcuts]({{< relref "../dashboards/use-dashboards/#keyboard-shortcuts" >}})
+- [Keyboard shortcuts]({{< relref "../dashboards/shortcuts/" >}})
 - [Plugins](https://grafana.com/grafana/plugins?orderBy=weight&direction=asc)
 
 ##### Admins
@@ -71,6 +62,6 @@ The following topics are of interest to Grafana server admin users:
 
 - [Grafana configuration]({{< relref "../setup-grafana/configure-grafana/" >}})
 - [Authentication]({{< relref "../setup-grafana/configure-security/configure-authentication/" >}})
-- [User permissions and roles]({{< relref "../administration/roles-and-permissions/" >}})
+- [User permissions and roles]({{< relref "../administration/manage-users-and-permissions/about-users-and-permissions/" >}})
 - [Provisioning]({{< relref "../administration/provisioning/" >}})
-- [Grafana CLI]({{< relref "../cli/" >}})
+- [Grafana CLI]({{< relref "../administration/cli/" >}})

docs/sources/introduction/grafana-enterprise.md

@@ -54,7 +54,7 @@ Grafana Enterprise adds the following features:
 - [Data source query caching]({{< relref "../enterprise/query-caching.md" >}}) to temporarily store query results in Grafana to reduce data source load and rate limiting.
 - [Reporting]({{< relref "../enterprise/reporting.md" >}}) to generate a PDF report from any dashboard and set up a schedule to have it emailed to whoever you choose.
 - [Export dashboard as PDF]({{< relref "../enterprise/export-pdf.md" >}})
-- [Custom branding]({{< relref "../setup-grafana/configure-grafana/configure-custom-branding/" >}}) to customize Grafana from the brand and logo to the footer links.
+- [White labeling]({{< relref "../setup-grafana/enable-custom-branding/" >}}) to customize Grafana from the brand and logo to the footer links.
 - [Usage insights]({{< relref "../enterprise/usage-insights/" >}}) to understand how your Grafana instance is used.
 - [Vault integration]({{< relref "../setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/" >}}) to manage your configuration or provisioning secrets with Vault.
 - [Auditing]({{< relref "../setup-grafana/configure-security/audit-grafana/" >}}) tracks important changes to your Grafana instance to help you manage and mitigate suspicious activity and meet compliance requirements.

docs/sources/linking/_index.md

@@ -0,0 +1,31 @@
+---
+aliases:
+  - /docs/grafana/latest/linking/
+title: Linking
+weight: 120
+---
+
+# Linking overview
+
+You can use links to navigate between commonly-used dashboards or to connect others to your visualizations. Links let you create shortcuts to other dashboards, panels, and even external websites.
+
+Grafana supports dashboard links, panel links, and data links. Dashboard links are displayed at the top of the dashboard. Panel links are accessible by clicking an icon on the top left corner of the panel.
+
+## Which link should you use?
+
+Start by figuring out how you're currently navigating between dashboards. If you're often jumping between a set of dashboards and struggling to find the same context in each, links can help optimize your workflow.
+
+The next step is to figure out which link type is right for your workflow. Even though all the link types in Grafana are used to create shortcuts to other dashboards or external websites, they work in different contexts.
+
+- If the link relates to most if not all of the panels in the dashboard, use [dashboard links]({{< relref "dashboard-links/" >}}).
+- If you want to drill down into specific panels, use [panel links]({{< relref "panel-links/" >}}).
+- If you want to link to an external site, you can use either a dashboard link or a panel link.
+- If you want to drill down into a specific series, or even a single measurement, use [data links]({{< relref "data-links/" >}}).
+
+## Controlling time range using the URL
+
+You can control the time range of a panel or dashboard by providing following query parameters in dashboard URL:
+
+- `from` - defines lower limit of the time range, specified in ms epoch
+- `to` - defines upper limit of the time range, specified in ms epoch
+- `time` and `time.window` - defines a time range from `time-time.window/2` to `time+time.window/2`. Both params should be specified in ms. For example `?time=1500000000000&time.window=10000` will result in 10s time range from 1499999995000 to 1500000005000

docs/sources/linking/dashboard-links.md

@@ -1,53 +1,20 @@
 ---
 aliases:
-  - /docs/grafana/latest/linking/
-  - /docs/grafana/latest/features/navigation-links/
-  - /docs/grafana/latest/linking/linking-overview/
   - /docs/grafana/latest/linking/dashboard-links/
-  - /docs/grafana/latest/dashboards/manage-dashboard-links/
-  - /docs/grafana/latest/panels/working-with-panels/add-link-to-panel/
-description: How to link Grafana dashboards.
+description: ''
 keywords:
-  - link
-  - dashboard
   - grafana
   - linking
   - create links
   - link dashboards
   - navigate
-title: Manage dashboard links
-menuTitle: Manage dashboard links
-weight: 400
+title: Dashboard links
+weight: 200
 ---
 
-# Manage dasboard links
+# Dashboard links
 
-You can use links to navigate between commonly-used dashboards or to connect others to your visualizations. Links let you create shortcuts to other dashboards, panels, and even external websites.
-
-Grafana supports dashboard links, panel links, and data links. Dashboard links are displayed at the top of the dashboard. Panel links are accessible by clicking an icon on the top left corner of the panel.
-
-## Which link should you use?
-
-Start by figuring out how you're currently navigating between dashboards. If you're often jumping between a set of dashboards and struggling to find the same context in each, links can help optimize your workflow.
-
-The next step is to figure out which link type is right for your workflow. Even though all the link types in Grafana are used to create shortcuts to other dashboards or external websites, they work in different contexts.
-
-- If the link relates to most if not all of the panels in the dashboard, use [dashboard links]({{< relref "#dashboard-links" >}}).
-- If you want to drill down into specific panels, use [panel links]({{< relref "#panel-links" >}}).
-- If you want to link to an external site, you can use either a dashboard link or a panel link.
-- If you want to drill down into a specific series, or even a single measurement, use [data links]({{< relref "../../panels/configure-data-links/#data-links" >}}).
-
-## Controlling time range using the URL
-
-You can control the time range of a panel or dashboard by providing following query parameters in dashboard URL:
-
-- `from` - defines lower limit of the time range, specified in ms epoch
-- `to` - defines upper limit of the time range, specified in ms epoch
-- `time` and `time.window` - defines a time range from `time-time.window/2` to `time+time.window/2`. Both params should be specified in ms. For example `?time=1500000000000&time.window=10000` will result in 10s time range from 1499999995000 to 1500000005000
-
-## Dashboard links
-
-When you create a dashboard link, you can include the time range and current template variables to directly jump to the same context in another dashboard. This way, you don’t have to worry whether the person you send the link to is looking at the right data. For other types of links, refer to [Data link variables]({{< relref "../../panels/configure-data-links/#data-link-variables/" >}}).
+When you create a dashboard link, you can include the time range and current template variables to directly jump to the same context in another dashboard. This way, you don’t have to worry whether the person you send the link to is looking at the right data. For other types of links, refer to [Data link variables]({{< relref "data-link-variables/" >}}).
 
 Dashboard links can also be used as shortcuts to external systems, such as submitting [a GitHub issue with the current dashboard name](https://github.com/grafana/grafana/issues/new?title=Dashboard%3A%20HTTP%20Requests).
 
@@ -58,7 +25,7 @@ To see an example of dashboard links in action, check out:
 
 Once you've added a dashboard link, it appears in the upper right corner of your dashboard.
 
-### Add links to dashboards
+## Add links to dashboards
 
 Add links to other dashboards at the top of your current dashboard.
 
@@ -73,7 +40,7 @@ Add links to other dashboards at the top of your current dashboard.
    - **Open in new tab** – Select this option if you want the dashboard link to open in a new tab or window.
 1. Click **Add**.
 
-### Add a URL link to a dashboard
+## Add a URL link to a dashboard
 
 Add a link to a URL at the top of your current dashboard. You can link to any available URL, including dashboards, panels, or external sites. You can even control the time range to ensure the user is zoomed in on the right data in Grafana.
 
@@ -93,7 +60,7 @@ Add a link to a URL at the top of your current dashboard. You can link to any av
    - **Open in new tab** – Select this option if you want the dashboard link to open in a new tab or window.
 1. Click **Add**.
 
-### Update a dashboard link
+## Update a dashboard link
 
 To change or update an existing dashboard link, follow this procedure.
 
@@ -104,43 +71,6 @@ To change or update an existing dashboard link, follow this procedure.
 
 To duplicate an existing dashboard link, click the duplicate icon next to the existing link that you want to duplicate.
 
-### Delete a dashboard link
+## Delete a dashboard link
 
 To delete an existing dashboard link, click the trash icon next to the duplicate icon that you want to delete.
-
-## Panel links
-
-Each panel can have its own set of links that are shown in the upper left corner of the panel. You can link to any available URL, including dashboards, panels, or external sites. You can even control the time range to ensure the user is zoomed in on the right data in Grafana.
-
-Click the icon on the top left corner of a panel to see available panel links.
-
-{{< figure src="/static/img/docs/linking/panel-links.png" width="200px" >}}
-
-### Add a panel link
-
-1. Hover your cursor over the panel that you want to add a link to and then press `e`. Or click the dropdown arrow next to the panel title and then click **Edit**.
-1. On the Panel tab, scroll down to the Links section.
-1. Expand Links and then click **Add link**.
-1. Enter a **Title**. **Title** is a human-readable label for the link that will be displayed in the UI.
-1. Enter the **URL** you want to link to.
-   You can even add one of the template variables defined in the dashboard. Press Ctrl+Space or Cmd+Space and click in the **URL** field to see the available variables. By adding template variables to your panel link, the link sends the user to the right context, with the relevant variables already set. You can also use time variables:
-   - `from` - Defines the lower limit of the time range, specified in ms epoch.
-   - `to` - Defines the upper limit of the time range, specified in ms epoch.
-   - `time` and `time.window` - Define a time range from `time-time.window/2` to `time+time.window/2`. Both params should be specified in ms. For example `?time=1500000000000&time.window=10000` will result in 10s time range from 1499999995000 to 1500000005000.
-1. If you want the link to open in a new tab, then select **Open in a new tab**.
-1. Click **Save** to save changes and close the window.
-1. Click **Save** in the upper right to save your changes to the dashboard.
-
-### Update a panel link
-
-1. On the Panel tab, find the link that you want to make changes to.
-1. Click the Edit (pencil) icon to open the Edit link window.
-1. Make any necessary changes.
-1. Click **Save** to save changes and close the window.
-1. Click **Save** in the upper right to save your changes to the dashboard.
-
-### Delete a panel link
-
-1. On the Panel tab, find the link that you want to delete.
-1. Click the **X** icon next to the link you want to delete.
-1. Click **Save** in the upper right to save your changes to the dashboard.

docs/sources/linking/data-link-variables.md

@@ -0,0 +1,62 @@
+---
+aliases:
+  - /docs/grafana/latest/linking/data-link-variables/
+  - /docs/grafana/latest/variables/url-variables/
+  - /docs/grafana/latest/variables/variable-types/url-variables/
+keywords:
+  - grafana
+  - url variables
+  - documentation
+  - variables
+  - data link
+title: URL variables
+weight: 400
+---
+
+# Data link variables
+
+You can use variables in data links to refer to series fields, labels, and values. For more information about data links, refer to [Data links]({{< relref "data-links/" >}}).
+
+To see a list of available variables, type `$` in the data link **URL** field to see a list of variables that you can use.
+
+> **Note:** These variables changed in 6.4 so if you have an older version of Grafana, then use the version picker to select docs for an older version of Grafana.
+
+You can also use template variables in your data links URLs, refer to [Templates and variables]({{< relref "../variables/" >}}) for more information on template variables.
+
+## Time range panel variables
+
+These variables allow you to include the current time range in the data link URL.
+
+- `__url_time_range` - current dashboard's time range (i.e. `?from=now-6h&to=now`)
+- `$__from and $__to` - For more information, refer to [Global variables]({{< relref "../variables/variable-types/global-variables/#__from-and-__to" >}}).
+
+## Series variables
+
+Series specific variables are available under `__series` namespace:
+
+- `__series.name` - series name to the URL
+
+## Field variables
+
+Field-specific variables are available under `__field` namespace:
+
+- `__field.name` - the name of the field
+- `__field.labels.<LABEL>` - label's value to the URL. If your label contains dots, then use `__field.labels["<LABEL>"]` syntax.
+
+## Value variables
+
+Value-specific variables are available under `__value` namespace:
+
+- `__value.time` - value's timestamp (Unix ms epoch) to the URL (i.e. `?time=1560268814105`)
+- `__value.raw` - raw value
+- `__value.numeric` - numeric representation of a value
+- `__value.text` - text representation of a value
+- `__value.calc` - calculation name if the value is result of calculation
+
+## Template variables
+
+When linking to another dashboard that uses template variables, select variable values for whoever clicks the link.
+
+`${myvar:queryparams}` - where `myvar` is a name of the template variable that matches one in the current dashboard that you want to use.
+
+If you want to add all of the current dashboard's variables to the URL, then use `__all_variables`.

docs/sources/linking/data-links.md

@@ -0,0 +1,54 @@
+---
+aliases:
+  - /docs/grafana/latest/linking/data-links/
+  - /docs/grafana/latest/reference/datalinks/
+keywords:
+  - grafana
+  - data links
+  - documentation
+  - playlist
+title: Data links
+---
+
+# Data links
+
+Data links allow you to provide more granular context to your links. You can create links that include the series name or even the value under the cursor. For example, if your visualization showed four servers, you could add a data link to one or two of them.
+
+The link itself is accessible in different ways depending on the visualization. For the Graph you need to click on a data point or line, for a panel like
+Stat, Gauge, or Bar Gauge you can click anywhere on the visualization to open the context menu.
+
+You can use variables in data links to send people to a detailed dashboard with preserved data filters. For example, you could use variables to specify a time range, series, and variable selection. For more information, refer to [Data link variables]({{< relref "data-link-variables/" >}}).
+
+## Typeahead suggestions
+
+When creating or updating a data link, press Cmd+Space or Ctrl+Space on your keyboard to open the typeahead suggestions to more easily add variables to your URL.
+
+{{< figure src="/static/img/docs/data_link_typeahead.png"  max-width= "800px" >}}
+
+## Add a data link
+
+1. Hover your cursor over the panel that you want to add a link to and then press `e`. Or click the dropdown arrow next to the panel title and then click **Edit**.
+1. On the Field tab, scroll down to the Data links section.
+1. Expand Data links and then click **Add link**.
+1. Enter a **Title**. **Title** is a human-readable label for the link that will be displayed in the UI.
+1. Enter the **URL** you want to link to.
+
+   You can even add one of the template variables defined in the dashboard. Click in the **URL** field and then type `$` or press Ctrl+Space or Cmd+Space to see a list of available variables. By adding template variables to your panel link, the link sends the user to the right context, with the relevant variables already set. For more information, refer to [Data link variables]({{< relref "data-link-variables/" >}}).
+
+1. If you want the link to open in a new tab, then select **Open in a new tab**.
+1. Click **Save** to save changes and close the window.
+1. Click **Save** in the upper right to save your changes to the dashboard.
+
+## Update a data link
+
+1. On the Field tab, find the link that you want to make changes to.
+1. Click the Edit (pencil) icon to open the Edit link window.
+1. Make any necessary changes.
+1. Click **Save** to save changes and close the window.
+1. Click **Save** in the upper right to save your changes to the dashboard.
+
+## Delete a data link
+
+1. On the Field tab, find the link that you want to delete.
+1. Click the **X** icon next to the link you want to delete.
+1. Click **Save** in the upper right to save your changes to the dashboard.

docs/sources/linking/linking-overview.md

@@ -0,0 +1,39 @@
+---
+aliases:
+  - /docs/grafana/latest/features/navigation-links/
+  - /docs/grafana/latest/linking/linking-overview/
+keywords:
+  - grafana
+  - linking
+  - create links
+  - link panels
+  - link dashboards
+  - navigate
+title: Linking overview
+weight: 100
+---
+
+# Linking overview
+
+You can use links to navigate between commonly-used dashboards or to connect others to your visualizations. Links let you create shortcuts to other dashboards, panels, and even external websites.
+
+Grafana supports dashboard links, panel links, and data links. Dashboard links are displayed at the top of the dashboard. Panel links are accessible by clicking an icon on the top left corner of the panel.
+
+## Which link should you use?
+
+Start by figuring out how you're currently navigating between dashboards. If you're often jumping between a set of dashboards and struggling to find the same context in each, links can help optimize your workflow.
+
+The next step is to figure out which link type is right for your workflow. Even though all the link types in Grafana are used to create shortcuts to other dashboards or external websites, they work in different contexts.
+
+- If the link relates to most if not all of the panels in the dashboard, use [dashboard links]({{< relref "dashboard-links/" >}}).
+- If you want to drill down into specific panels, use [panel links]({{< relref "panel-links/" >}}).
+- If you want to link to an external site, you can use either a dashboard link or a panel link.
+- If you want to drill down into a specific series, or even a single measurement, use [data links]({{< relref "data-links/" >}}).
+
+## Controlling time range using the URL
+
+You can control the time range of a panel or dashboard by providing following query parameters in dashboard URL:
+
+- `from` - defines lower limit of the time range, specified in ms epoch
+- `to` - defines upper limit of the time range, specified in ms epoch
+- `time` and `time.window` - defines a time range from `time-time.window/2` to `time+time.window/2`. Both params should be specified in ms. For example `?time=1500000000000&time.window=10000` will result in 10s time range from 1499999995000 to 1500000005000

docs/sources/linking/panel-links.md

@@ -0,0 +1,52 @@
+---
+aliases:
+  - /docs/grafana/latest/features/navigation-links/
+  - /docs/grafana/latest/linking/panel-links/
+description: ''
+keywords:
+  - grafana
+  - linking
+  - create links
+  - link panels
+  - link dashboards
+  - navigate
+title: Panel links
+weight: 300
+---
+
+# Panel links
+
+{{< docs/shared "panels/panel-links-intro.md" >}}
+
+Click the icon on the top left corner of a panel to see available panel links.
+
+<img class="no-shadow" src="/static/img/docs/linking/panel-links.png" width="500px">
+
+## Add a panel link
+
+1. Hover your cursor over the panel that you want to add a link to and then press `e`. Or click the dropdown arrow next to the panel title and then click **Edit**.
+1. On the Panel tab, scroll down to the Links section.
+1. Expand Links and then click **Add link**.
+1. Enter a **Title**. **Title** is a human-readable label for the link that will be displayed in the UI.
+1. Enter the **URL** you want to link to.
+   You can even add one of the template variables defined in the dashboard. Press Ctrl+Space or Cmd+Space and click in the **URL** field to see the available variables. By adding template variables to your panel link, the link sends the user to the right context, with the relevant variables already set. You can also use time variables:
+   - `from` - Defines the lower limit of the time range, specified in ms epoch.
+   - `to` - Defines the upper limit of the time range, specified in ms epoch.
+   - `time` and `time.window` - Define a time range from `time-time.window/2` to `time+time.window/2`. Both params should be specified in ms. For example `?time=1500000000000&time.window=10000` will result in 10s time range from 1499999995000 to 1500000005000.
+1. If you want the link to open in a new tab, then select **Open in a new tab**.
+1. Click **Save** to save changes and close the window.
+1. Click **Save** in the upper right to save your changes to the dashboard.
+
+## Update a panel link
+
+1. On the Panel tab, find the link that you want to make changes to.
+1. Click the Edit (pencil) icon to open the Edit link window.
+1. Make any necessary changes.
+1. Click **Save** to save changes and close the window.
+1. Click **Save** in the upper right to save your changes to the dashboard.
+
+## Delete a panel link
+
+1. On the Panel tab, find the link that you want to delete.
+1. Click the **X** icon next to the link you want to delete.
+1. Click **Save** in the upper right to save your changes to the dashboard.

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

@@ -1,114 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/linking/data-link-variables/
-  - /docs/grafana/latest/variables/url-variables/
-  - /docs/grafana/latest/variables/variable-types/url-variables/
-  - /docs/grafana/latest/linking/data-links/
-  - /docs/grafana/latest/reference/datalinks/
-  - /docs/grafana/latest/panels/configure-data-links/
-keywords:
-  - grafana
-  - url variables
-  - variables
-  - data link
-  - documentation
-  - playlist
-title: Configure data links
-menuTitle: Configure data links
-weight: 400
----
-
-# Configure data links
-
-You can use data link variables or data links to create links between panels.
-
-## Data link variables
-
-You can use variables in data links to refer to series fields, labels, and values. For more information about data links, refer to [Data links]({{< relref "#data-links" >}}).
-
-To see a list of available variables, type `$` in the data link **URL** field to see a list of variables that you can use.
-
-> **Note:** These variables changed in 6.4 so if you have an older version of Grafana, then use the version picker to select docs for an older version of Grafana.
-
-You can also use template variables in your data links URLs, refer to [Templates and variables]({{< relref "../../variables/" >}}) for more information on template variables.
-
-## Time range panel variables
-
-These variables allow you to include the current time range in the data link URL.
-
-- `__url_time_range` - current dashboard's time range (i.e. `?from=now-6h&to=now`)
-- `$__from and $__to` - For more information, refer to [Global variables]({{< relref "../../variables/variable-types/global-variables/#__from-and-__to" >}}).
-
-## Series variables
-
-Series specific variables are available under `__series` namespace:
-
-- `__series.name` - series name to the URL
-
-## Field variables
-
-Field-specific variables are available under `__field` namespace:
-
-- `__field.name` - the name of the field
-- `__field.labels.<LABEL>` - label's value to the URL. If your label contains dots, then use `__field.labels["<LABEL>"]` syntax.
-
-## Value variables
-
-Value-specific variables are available under `__value` namespace:
-
-- `__value.time` - value's timestamp (Unix ms epoch) to the URL (i.e. `?time=1560268814105`)
-- `__value.raw` - raw value
-- `__value.numeric` - numeric representation of a value
-- `__value.text` - text representation of a value
-- `__value.calc` - calculation name if the value is result of calculation
-
-## Template variables
-
-When linking to another dashboard that uses template variables, select variable values for whoever clicks the link.
-
-`${myvar:queryparam}` - where `myvar` is a name of the template variable that matches one in the current dashboard that you want to use.
-
-If you want to add all of the current dashboard's variables to the URL, then use `__all_variables`.
-
-## Data links
-
-Data links allow you to provide more granular context to your links. You can create links that include the series name or even the value under the cursor. For example, if your visualization showed four servers, you could add a data link to one or two of them.
-
-The link itself is accessible in different ways depending on the visualization. For the Graph you need to click on a data point or line, for a panel like
-Stat, Gauge, or Bar Gauge you can click anywhere on the visualization to open the context menu.
-
-You can use variables in data links to send people to a detailed dashboard with preserved data filters. For example, you could use variables to specify a time range, series, and variable selection. For more information, refer to [Data link variables]({{< relref "#data-link-variables" >}}).
-
-### Typeahead suggestions
-
-When creating or updating a data link, press Cmd+Space or Ctrl+Space on your keyboard to open the typeahead suggestions to more easily add variables to your URL.
-
-{{< figure src="/static/img/docs/data_link_typeahead.png"  max-width= "800px" >}}
-
-### Add a data link
-
-1. Hover your cursor over the panel that you want to add a link to and then press `e`. Or click the dropdown arrow next to the panel title and then click **Edit**.
-1. On the Field tab, scroll down to the Data links section.
-1. Expand Data links and then click **Add link**.
-1. Enter a **Title**. **Title** is a human-readable label for the link that will be displayed in the UI.
-1. Enter the **URL** you want to link to.
-
-   You can even add one of the template variables defined in the dashboard. Click in the **URL** field and then type `$` or press Ctrl+Space or Cmd+Space to see a list of available variables. By adding template variables to your panel link, the link sends the user to the right context, with the relevant variables already set. For more information, refer to [Data link variables]({{< relref "#data-link-variables" >}}).
-
-1. If you want the link to open in a new tab, then select **Open in a new tab**.
-1. Click **Save** to save changes and close the window.
-1. Click **Save** in the upper right to save your changes to the dashboard.
-
-### Update a data link
-
-1. On the Field tab, find the link that you want to make changes to.
-1. Click the Edit (pencil) icon to open the Edit link window.
-1. Make any necessary changes.
-1. Click **Save** to save changes and close the window.
-1. Click **Save** in the upper right to save your changes to the dashboard.
-
-### Delete a data link
-
-1. On the Field tab, find the link that you want to delete.
-1. Click the **X** icon next to the link you want to delete.
-1. Click **Save** in the upper right to save your changes to the dashboard.

docs/sources/panels/format-data/edit-value-mapping.md

@@ -12,6 +12,7 @@ You can change a value mapping at any time.
 
 ## Before you begin
 
+- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
 - Ensure you have an existing value mapping to edit.
 
 **To edit a value mapping**:

docs/sources/panels/format-data/map-a-range.md

@@ -10,6 +10,12 @@ weight: 30
 
 Map a range of values when you want to format multiple, continuous values.
 
+## Before you begin
+
+- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
+
+**To map a range**:
+
 1. Edit the panel for which you want to map a range of values.
 1. In panel display options, in the **Value mappings** section, click **Add value mappings**.
 1. Click **Add a new mapping** and then select **Range**.