[v9.2.x] MS/My/PostgresSQL: Migrate annotation query (#58847) (#59072)

MS/My/PostgresSQL: Migrate annotation query (#58847)

(cherry picked from commit 38f25a0bf5)

.betterer.results

@@ -1639,7 +1639,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "8"],
       [0, 0, 0, "Do not use any type assertions.", "9"],
       [0, 0, 0, "Do not use any type assertions.", "10"],
-      [0, 0, 0, "Do not use any type assertions.", "11"]
+      [0, 0, 0, "Do not use any type assertions.", "11"],
+      [0, 0, 0, "Do not use any type assertions.", "12"],
+      [0, 0, 0, "Do not use any type assertions.", "13"]
     ],
     "packages/grafana-ui/src/components/Table/TableCell.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
@@ -1692,7 +1694,10 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "9"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "10"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "12"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "15"]
     ],
     "packages/grafana-ui/src/components/Tags/Tag.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -4225,8 +4230,7 @@ exports[`better eslint`] = {
     ],
     "public/app/features/dimensions/editors/ResourceDimensionEditor.tsx:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/features/dimensions/editors/ResourcePicker.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -4268,12 +4272,6 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
-    "public/app/features/dimensions/resource.ts:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
-    ],
     "public/app/features/dimensions/scale.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
@@ -6001,11 +5999,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "12"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "13"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "14"],
-      [0, 0, 0, "Do not use any type assertions.", "15"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "16"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "17"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "18"]
+      [0, 0, 0, "Do not use any type assertions.", "14"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "15"],
+      [0, 0, 0, "Unexpected any. Specify a different type.", "16"]
     ],
     "public/app/plugins/datasource/elasticsearch/components/AddRemove.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -7337,6 +7333,12 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "0"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
+    "public/app/plugins/datasource/prometheus/querybuilder/components/LabelFilterItem.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"],
+      [0, 0, 0, "Do not use any type assertions.", "2"],
+      [0, 0, 0, "Do not use any type assertions.", "3"]
+    ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/LabelParamEditor.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
       [0, 0, 0, "Do not use any type assertions.", "1"],
@@ -7349,7 +7351,8 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "3"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx:5381": [
-      [0, 0, 0, "Do not use any type assertions.", "0"]
+      [0, 0, 0, "Do not use any type assertions.", "0"],
+      [0, 0, 0, "Do not use any type assertions.", "1"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilderContainer.test.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
@@ -7414,8 +7417,7 @@ exports[`better eslint`] = {
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/state.test.ts:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "2"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/state.ts:5381": [
       [0, 0, 0, "Do not use any type assertions.", "0"]
@@ -7848,8 +7850,7 @@ exports[`better eslint`] = {
       [0, 0, 0, "Unexpected any. Specify a different type.", "5"]
     ],
     "public/app/plugins/panel/canvas/utils.ts:5381": [
-      [0, 0, 0, "Unexpected any. Specify a different type.", "0"],
-      [0, 0, 0, "Unexpected any. Specify a different type.", "1"]
+      [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],
     "public/app/plugins/panel/dashlist/module.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
@@ -8957,6 +8958,9 @@ exports[`better eslint`] = {
       [0, 0, 0, "Do not use any type assertions.", "10"],
       [0, 0, 0, "Unexpected any. Specify a different type.", "11"]
     ],
+    "public/app/plugins/panel/xychart/TooltipView.tsx:5381": [
+      [0, 0, 0, "Do not use any type assertions.", "0"]
+    ],
     "public/app/plugins/panel/xychart/XYChartPanel2.tsx:5381": [
       [0, 0, 0, "Unexpected any. Specify a different type.", "0"]
     ],

.drone.star

@@ -7,7 +7,8 @@
 load('scripts/drone/events/pr.star', 'pr_pipelines')
 load('scripts/drone/events/main.star', 'main_pipelines')
 load('scripts/drone/pipelines/docs.star', 'docs_pipelines')
-load('scripts/drone/events/release.star', 'release_pipelines', 'publish_image_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'artifacts_page_pipeline')
+load('scripts/drone/events/release.star', 'release_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline', 'artifacts_page_pipeline')
+load('scripts/drone/pipelines/publish_images.star', 'publish_image_pipelines_public', 'publish_image_pipelines_security')
 load('scripts/drone/version.star', 'version_branch_pipelines')
 load('scripts/drone/events/cron.star', 'cronjobs')
 load('scripts/drone/vault.star', 'secrets')
@@ -15,7 +16,7 @@ load('scripts/drone/vault.star', 'secrets')
 def main(ctx):
     edition = 'oss'
     return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \
-        publish_image_pipelines('public') + publish_image_pipelines('security') + \
+        publish_image_pipelines_public() + publish_image_pipelines_security() + \
         publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \
         publish_npm_pipelines('public') + publish_packages_pipeline() + artifacts_page_pipeline() + \
         version_branch_pipelines() + cronjobs(edition=edition) + secrets()

.github/workflows/bump-version.yml

@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
     inputs:
       version:
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
-        default: '7.x.x'
   workflow_call:
     inputs:
       version_call:
-        description: Needs to match, exactly, the name of a version
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
         type: string
     secrets:

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

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

.github/workflows/codeql-analysis.yml

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

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

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

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

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

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

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

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

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

.github/workflows/prepare-release.yml

@@ -1,23 +0,0 @@
-name: Prepare release
-on:
-  workflow_dispatch:
-    inputs:
-      version_input:
-        description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
-        required: true
-jobs:
-  call-bump-version:
-    uses: grafana/grafana/.github/workflows/bump-version.yml@main
-    with:
-      version_call: ${{ github.event.inputs.version_input }}
-    secrets:
-      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-      metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
-  call-update-changelog:
-    uses: grafana/grafana/.github/workflows/update-changelog.yml@main
-    with:
-      version_call: ${{ github.event.inputs.version_input }}
-    secrets:
-      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
-      metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
-    needs: call-bump-version

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: publish_docs
 on:
   push:
     branches:
-    - main
+    - v9.2.x
     paths:
     - 'docs/sources/**'
     - 'packages/grafana-*/**'
@@ -30,7 +30,7 @@ jobs:
         key: yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
             yarn-
-    - run: yarn install --immutable    
+    - run: yarn install --immutable
     - name: publish-to-git
       uses: ./.github/actions/website-sync
       id: publish
@@ -40,7 +40,7 @@ jobs:
         host: github.com
         github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
         source_folder: docs/sources
-        target_folder: content/docs/grafana/next
+        target_folder: content/docs/grafana/latest
         allow_no_changes: 'true'
     - shell: bash
       run: |

.github/workflows/sbom-report.yml

@@ -0,0 +1,20 @@
+name: syft-sbom-ci
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  syft-sbom:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+        
+    - name: Anchore SBOM Action
+      uses: anchore/sbom-action@v0.12.0
+      with:
+         artifact-name: ${{ github.event.repository.name }}-spdx.json
+

.github/workflows/update-changelog.yml

@@ -4,11 +4,11 @@ on:
     inputs:
       version:
         required: true
-        description: Needs to match, exactly, the name of a milestone
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
   workflow_call:
     inputs:
       version_call:
-        description: Needs to match, exactly, the name of a milestone
+        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
         type: string
     secrets:
@@ -35,9 +35,9 @@ jobs:
           token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
           metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
       - name: Run update changelog (workflow invoked)
-        if: ${{ inputs.version_call != '' }}
+        if: ${{ inputs.version != '' }}
         uses: ./actions/update-changelog
         with:
-          version_call: ${{ inputs.version_call }}
+          version_call: ${{ inputs.version }}
           token: ${{ secrets.token }}
           metricsWriteAPIKey: ${{ secrets.metricsWriteAPIKey }}

.gitignore

@@ -61,6 +61,7 @@ public/css/*.min.css
 *.sublime-workspace
 *.swp
 .idea/
+.fleet/
 *.iml
 *.tmp
 .DS_Store
@@ -130,6 +131,7 @@ pkg/cmd/grafana-server/__debug_bin
 /packages/**/.rpt2_cache
 /packages/**/tsdoc-metadata.json
 /packages/**/package.tgz
+/packages/grafana-toolkit/sass
 ## CI places the packages in a different location
 /npm-artifacts/*.tgz
 

.pa11yci-pr.conf.js

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

.yarnrc.yml

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

CHANGELOG.md

@@ -1,3 +1,446 @@
+<!-- 9.2.5 START -->
+
+# 9.2.5 (2022-11-16)
+
+### Features and enhancements
+
+- **Alerting:** Log when alert rule cannot be screenshot to help debugging. [#58537](https://github.com/grafana/grafana/pull/58537), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Suggest previously entered custom labels. [#57783](https://github.com/grafana/grafana/pull/57783), [@VikaCep](https://github.com/VikaCep)
+- **Canvas:** Improve disabled inline editing UX. [#58610](https://github.com/grafana/grafana/pull/58610), [@nmarrs](https://github.com/nmarrs)
+- **Canvas:** Improve disabled inline editing UX. [#58609](https://github.com/grafana/grafana/issues/58609)
+- **Chore:** Upgrade go-sqlite3 to v1.14.16. [#58581](https://github.com/grafana/grafana/pull/58581), [@sakjur](https://github.com/sakjur)
+- **Plugins:** Ensure CallResource responses contain valid Content-Type header. [#58506](https://github.com/grafana/grafana/pull/58506), [@xnyo](https://github.com/xnyo)
+- **Prometheus:** Handle errors and warnings in buffered client. [#58657](https://github.com/grafana/grafana/pull/58657), [@itsmylife](https://github.com/itsmylife)
+- **Prometheus:** Upgrade HTTP client library to v1.13.1. [#58363](https://github.com/grafana/grafana/pull/58363), [@marefr](https://github.com/marefr)
+
+### Bug fixes
+
+- **Alerting:** Fix screenshots were not cached. [#58493](https://github.com/grafana/grafana/pull/58493), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Canvas:** Fix setting icon from field data. [#58499](https://github.com/grafana/grafana/pull/58499), [@nmarrs](https://github.com/nmarrs)
+- **Plugins:** Fix don't set Content-Type header if status is 204 for call resource. [#50780](https://github.com/grafana/grafana/pull/50780), [@sd2k](https://github.com/sd2k)
+
+### Plugin development fixes & changes
+
+- **Toolkit:** Fix compilation loop when watching plugins for changes. [#58167](https://github.com/grafana/grafana/pull/58167), [@jackw](https://github.com/jackw)
+- **Tooltips:** Make tooltips in FormField and FormLabel interactive and keyboard friendly. [#57706](https://github.com/grafana/grafana/pull/57706), [@asimpson](https://github.com/asimpson)
+
+<!-- 9.2.5 END -->
+<!-- 9.2.4 START -->
+
+# 9.2.4 (2022-11-07)
+
+### Features and enhancements
+
+- **Access Control:** Add an endpoint for setting several managed resource permissions. [#57893](https://github.com/grafana/grafana/pull/57893), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Accessibility:** Increase `Select` placeholder contrast to be WCAG AA compliant. [#58034](https://github.com/grafana/grafana/pull/58034), [@ashharrison90](https://github.com/ashharrison90)
+- **Alerting:** Append org ID to alert notification URLs. [#57123](https://github.com/grafana/grafana/pull/57123), [@neel1996](https://github.com/neel1996)
+- **Alerting:** Make the Grouped view the default one for Rules. [#58271](https://github.com/grafana/grafana/pull/58271), [@VikaCep](https://github.com/VikaCep)
+- **Build:** Remove unnecessary alpine package updates. [#58005](https://github.com/grafana/grafana/pull/58005), [@DanCech](https://github.com/DanCech)
+- **Chore:** Upgrade Go to 1.19.3. [#58052](https://github.com/grafana/grafana/pull/58052), [@sakjur](https://github.com/sakjur)
+- **Google Cloud Monitoring:** Set frame interval to draw null values. [#57768](https://github.com/grafana/grafana/pull/57768), [@andresmgot](https://github.com/andresmgot)
+- **Instrumentation:** Expose when the binary was built as a gauge. [#57951](https://github.com/grafana/grafana/pull/57951), [@bergquist](https://github.com/bergquist)
+- **Loki:** Preserve `X-ID-Token` header. [#57878](https://github.com/grafana/grafana/pull/57878), [@siiimooon](https://github.com/siiimooon)
+- **Search:** Reduce requests in folder view. [#55876](https://github.com/grafana/grafana/pull/55876), [@mvsousa](https://github.com/mvsousa)
+- **TimeSeries:** More thorough detection of negative values for auto-stacking direction. [#57863](https://github.com/grafana/grafana/pull/57863), [@leeoniya](https://github.com/leeoniya)
+
+### Bug fixes
+
+- **Alerting:** Attempt to preserve UID from migrated legacy channel. [#57639](https://github.com/grafana/grafana/pull/57639), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Fix response is not returned for invalid Duration in Provisioning API. [#58046](https://github.com/grafana/grafana/pull/58046), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Fix screenshot is not taken for stale series. [#57982](https://github.com/grafana/grafana/pull/57982), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Auth:** Fix admins not seeing pending invites. [#58217](https://github.com/grafana/grafana/pull/58217), [@joshhunt](https://github.com/joshhunt)
+- **MSSQL/Postgres:** Fix visual query editor filter disappearing. [#58248](https://github.com/grafana/grafana/pull/58248), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Tempo:** Fix dropdown issue on tag field focus. [#57616](https://github.com/grafana/grafana/pull/57616), [@xiyu95](https://github.com/xiyu95)
+- **Timeseries:** Fix null pointer when matching fill below to field. [#58030](https://github.com/grafana/grafana/pull/58030), [@mdvictor](https://github.com/mdvictor)
+
+### Plugin development fixes & changes
+
+- **Toolkit:** Fix Webpack less-loader config. [#57950](https://github.com/grafana/grafana/pull/57950), [@dessen-xu](https://github.com/dessen-xu)
+
+<!-- 9.2.4 END -->
+<!-- 9.2.3 START -->
+
+# 9.2.3 (2022-10-31)
+
+### Features and enhancements
+
+- **Docs:** Add information about DB version support to upgrade guide. [#57643](https://github.com/grafana/grafana/pull/57643), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Footer:** Update footer release notes link to Github changelog. [#57871](https://github.com/grafana/grafana/pull/57871), [@joshhunt](https://github.com/joshhunt)
+- **Prometheus:** Do not drop errors in streaming parser. [#57698](https://github.com/grafana/grafana/pull/57698), [@kylebrandt](https://github.com/kylebrandt)
+- **Prometheus:** Flavor/version configuration. [#57554](https://github.com/grafana/grafana/pull/57554), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Prometheus:** Provide label values match parameter API when supported prometheus instance is configured. [#57553](https://github.com/grafana/grafana/pull/57553), [@gtk-grafana](https://github.com/gtk-grafana)
+- **Security:** Upgrade x/text to version unaffected by CVE-2022-32149. [#57797](https://github.com/grafana/grafana/pull/57797), [@yong-jie-gong](https://github.com/yong-jie-gong)
+
+### Bug fixes
+
+- **Access control:** Fix a bug with argument order for data source managed permission updates. (Enterprise)
+- **Auth:** Fix GF_AUTH_JWT_URL_LOGIN env variable doesn't work. [#57689](https://github.com/grafana/grafana/pull/57689), [@Jguer](https://github.com/Jguer)
+- **Live:** Explicitly reply with http 200. [#57428](https://github.com/grafana/grafana/pull/57428), [@sh0rez](https://github.com/sh0rez)
+- **Prometheus:** Fix builder operation mode changing multiselect to single select behaviour. [#57780](https://github.com/grafana/grafana/pull/57780), [@itsmylife](https://github.com/itsmylife)
+- **Prometheus:** Fix builder operation mode changing multiselect to single select behaviour. [#57493](https://github.com/grafana/grafana/pull/57493), [@yinjialu](https://github.com/yinjialu)
+- **Security:** Fix vulnerabilities in webpack loader-utils. [#57533](https://github.com/grafana/grafana/pull/57533), [@jackw](https://github.com/jackw)
+
+<!-- 9.2.3 END -->
+<!-- 9.2.2 START -->
+
+# 9.2.2 (2022-10-25)
+
+### Features and enhancements
+
+- **Alerting:** Add support for wecom apiapp. [#55991](https://github.com/grafana/grafana/pull/55991), [@aimuz](https://github.com/aimuz)
+- **Canvas:** Improve resource picker initialization. [#57319](https://github.com/grafana/grafana/pull/57319), [@nmarrs](https://github.com/nmarrs)
+- **Canvas:** Improve text element readability. [#57371](https://github.com/grafana/grafana/pull/57371), [@adela-almasan](https://github.com/adela-almasan)
+- **CloudWatch:** Make sure adoption tracking is done on valid, migrated queries. [#56872](https://github.com/grafana/grafana/pull/56872), [@sunker](https://github.com/sunker)
+- **Dashboard:** Alerts user to incorrect tag format for JSON import. [#54657](https://github.com/grafana/grafana/pull/54657), [@iamelDuderino](https://github.com/iamelDuderino)
+- **MSSQL:** Support tables from all schemas. [#53099](https://github.com/grafana/grafana/pull/53099), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Opentsdb:** Allow template variables for filter keys. [#57226](https://github.com/grafana/grafana/pull/57226), [@bohandley](https://github.com/bohandley)
+- **Prometheus:** Provide label values match parameter API when supported prometheus instance is configured. [#56510](https://github.com/grafana/grafana/pull/56510), [@gtk-grafana](https://github.com/gtk-grafana)
+- **QueryEditor:** Revert components from grafana-ui. [#57436](https://github.com/grafana/grafana/pull/57436), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TeamSync:** Allow team sync when external organization mapping returns no organization role. (Enterprise)
+
+### Bug fixes
+
+- **Browse:** Fix General folder not showing in FolderPicker. [#57156](https://github.com/grafana/grafana/pull/57156), [@eledobleefe](https://github.com/eledobleefe)
+- **Elasticsearch:** Fix calculation of trimEdges in alert mode. [#56148](https://github.com/grafana/grafana/pull/56148), [@jorgelbg](https://github.com/jorgelbg)
+- **Elasticsearch:** Fix trimEdges delete logic in alert mode. [#56985](https://github.com/grafana/grafana/pull/56985), [@gabor](https://github.com/gabor)
+- **GoogleOAuth:** Unlock User Admin UI. [#57350](https://github.com/grafana/grafana/pull/57350), [@gamab](https://github.com/gamab)
+- **LogContext:** Fix wrong color of `show context` icon in light theme. [#57427](https://github.com/grafana/grafana/pull/57427), [@svennergr](https://github.com/svennergr)
+- **Loki:** Fix adding of adhoc filters to stream selector when query with empty stream selector. [#57280](https://github.com/grafana/grafana/pull/57280), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Fix double stringified log-lines when copied via Copy button. [#57243](https://github.com/grafana/grafana/pull/57243), [@svennergr](https://github.com/svennergr)
+- **Loki:** Fix explain section about $\_\_interval variable. [#57188](https://github.com/grafana/grafana/pull/57188), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Remove already selected options from next label filter options in builder. [#57187](https://github.com/grafana/grafana/pull/57187), [@ivanahuckova](https://github.com/ivanahuckova)
+- **NodeGraph:** Fix rendering issues when values of arc are over 1. [#57460](https://github.com/grafana/grafana/pull/57460), [@aocenas](https://github.com/aocenas)
+- **PublicDashboards:** Fix hidden queries execution. [#57194](https://github.com/grafana/grafana/pull/57194), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Fix hidden queries execution. [#57004](https://github.com/grafana/grafana/pull/57004), [@juanicabanas](https://github.com/juanicabanas)
+- **Tempo:** Fix Node Graph visualization type in dashboard. [#56931](https://github.com/grafana/grafana/pull/56931), [@CrypticSignal](https://github.com/CrypticSignal)
+- **TimeSeries:** Fix stacking when first value is negative zero. [#57257](https://github.com/grafana/grafana/pull/57257), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TimeseriesPanel:** Fix variables in data links. [#56729](https://github.com/grafana/grafana/pull/56729), [@mdvictor](https://github.com/mdvictor)
+- **User:** Fix externalUserId not being populated. [#57341](https://github.com/grafana/grafana/pull/57341), [@joshhunt](https://github.com/joshhunt)
+
+### Breaking changes
+
+We added some components a bit too early to @grafana/ui in 9.2 so we are moving them back to @grafana/experimental. If you used any of these components
+
+- AccessoryButton
+- EditorFieldGroup
+- EditorHeader
+- EditorField
+- EditorRow
+- EditorList
+- EditorRows
+- EditorSwitch
+- FlexItem
+- Stack
+- InlineSelect
+- InputGroup
+- Space
+
+Please use them from grafana/experimental from now on. Issue [#57436](https://github.com/grafana/grafana/issues/57436)
+
+<!-- 9.2.2 END -->
+<!-- 9.2.1 START -->
+
+# 9.2.1 (2022-10-18)
+
+### Features and enhancements
+
+- **Alerting:** Improve notification policies created during migration. [#52071](https://github.com/grafana/grafana/pull/52071), [@JacobsonMT](https://github.com/JacobsonMT)
+- **AzureAD:** Add option to force fetch the groups from the Graph API. [#56916](https://github.com/grafana/grafana/pull/56916), [@gamab](https://github.com/gamab)
+- **AzureAD:** Add option to force fetch the groups from the Graph API (#56916). [#56947](https://github.com/grafana/grafana/pull/56947), [@gamab](https://github.com/gamab)
+- **Docs:** Note end of release notes publication. [#57013](https://github.com/grafana/grafana/pull/57013), [@gguillotte-grafana](https://github.com/gguillotte-grafana)
+- **Inspect:** Handle JSON tab crash when the provided object is too big to stringify. [#55939](https://github.com/grafana/grafana/pull/55939), [@TsotosA](https://github.com/TsotosA)
+- **TablePanel:** Footer now updates values on column filtering. [#56354](https://github.com/grafana/grafana/pull/56354), [@mdvictor](https://github.com/mdvictor)
+
+### Bug fixes
+
+- **Alerting:** Fix email image embedding on Windows. [#56766](https://github.com/grafana/grafana/pull/56766), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Fix mathexp.NoData for ConditionsCmd. [#56816](https://github.com/grafana/grafana/pull/56816), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Legacy Alerting:** Fix duration calculation when testing a rule. [#56616](https://github.com/grafana/grafana/pull/56616), [@jorgelbg](https://github.com/jorgelbg)
+- **Loki:** Propagate additional headers from Grafana to Loki when querying data. [#56896](https://github.com/grafana/grafana/pull/56896), [@alexweav](https://github.com/alexweav)
+- **Search:** Sort alphabetically in the folder view, increase the limit of the folder search from 50 to 1000. [#57141](https://github.com/grafana/grafana/pull/57141), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
+- **TablePanel:** Fix last table column to be centered. [#56047](https://github.com/grafana/grafana/pull/56047), [@gitstart](https://github.com/gitstart)
+
+### Plugin development fixes & changes
+
+- **Grafana UI:** Export prop types for queryfield, modal and field components. [#57097](https://github.com/grafana/grafana/pull/57097), [@jackw](https://github.com/jackw)
+- **Toolkit:** Fix `Cannot use import statement outside...` error in tests. [#57071](https://github.com/grafana/grafana/pull/57071), [@jackw](https://github.com/jackw)
+
+<!-- 9.2.1 END -->
+<!-- 9.2.0 START -->
+
+# 9.2.0 (2022-10-11)
+
+### Features and enhancements
+
+- **Alerting:** Add Notification error feedback on contact points view. [#56225](https://github.com/grafana/grafana/pull/56225), [@soniaAguilarPeiron](https://github.com/soniaAguilarPeiron)
+- **Alerting:** Allow created by to be manually set when there's no creator for silences. [#55952](https://github.com/grafana/grafana/pull/55952), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Expose info about notification delivery errors in a new /receivers endpoint. [#55429](https://github.com/grafana/grafana/pull/55429), [@santihernandezc](https://github.com/santihernandezc)
+- **Alerting:** Update imported prometheus alertmanager version. [#56228](https://github.com/grafana/grafana/pull/56228), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Update imported prometheus alertmanager version. Backport (#56228). [#56430](https://github.com/grafana/grafana/pull/56430), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Alerting:** Write and Delete multiple alert instances. [#55350](https://github.com/grafana/grafana/pull/55350), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Core:** Implement aria attributes for query rows, improve a11y. [#55563](https://github.com/grafana/grafana/pull/55563), [@L-M-K-B](https://github.com/L-M-K-B)
+- **Custom Branding:** Remove custom branding service. (Enterprise)
+- **Custom branding:** Remove UI. (Enterprise)
+- **DevEnv:** Adds docker block for clickhouse. [#55702](https://github.com/grafana/grafana/pull/55702), [@owensmallwood](https://github.com/owensmallwood)
+- **Docker:** removes unneccesary use of edge repo. [#54567](https://github.com/grafana/grafana/pull/54567), [@xlson](https://github.com/xlson)
+- **Explore:** Revert split pane resize feature. [#56310](https://github.com/grafana/grafana/pull/56310), [@Elfo404](https://github.com/Elfo404)
+- **Frontend:** Make local storage items propagate to different tabs immediately. [#55810](https://github.com/grafana/grafana/pull/55810), [@oscarkilhed](https://github.com/oscarkilhed)
+- **PublicDashboards:** Allow disabling an existent public dashboard if it …. [#55778](https://github.com/grafana/grafana/pull/55778), [@evictorero](https://github.com/evictorero)
+- **QueryEditorRow:** Only pass error to query editor if panel is not in a loading state. [#56350](https://github.com/grafana/grafana/pull/56350), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Reports:** Refresh query variables on time range change. (Enterprise)
+- **XYChart:** Beta release. [#55973](https://github.com/grafana/grafana/pull/55973), [@mdvictor](https://github.com/mdvictor)
+- **[9.2.x] Alerting:** Start ticker only when scheduler starts (#56339). [#56418](https://github.com/grafana/grafana/pull/56418), [@yuri-tceretian](https://github.com/yuri-tceretian)
+
+### Bug fixes
+
+- **Alerting:** Fix pq: missing FROM-clause for table "a". [#56453](https://github.com/grafana/grafana/pull/56453), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **AzureMonitor:** Correctly update subscriptions value in ARG editor. [#55860](https://github.com/grafana/grafana/pull/55860), [@aangelisc](https://github.com/aangelisc)
+- **Chore:** Fix swagger validation failures. (Enterprise)
+- **Chore:** Regenerate swagger specification and fix validation failures. [#55750](https://github.com/grafana/grafana/pull/55750), [@joshhunt](https://github.com/joshhunt)
+- **Correlations:** Only return correlation for which both source and target datasources exist. [#55454](https://github.com/grafana/grafana/pull/55454), [@Elfo404](https://github.com/Elfo404)
+- **Explore:** Prevent panes from disappearing when resizing window in split view. [#55696](https://github.com/grafana/grafana/pull/55696), [@gelicia](https://github.com/gelicia)
+- **Links:** Fix opening links from different orgs on the same tab. [#55837](https://github.com/grafana/grafana/pull/55837), [@guicaulada](https://github.com/guicaulada)
+- **LogContext:** Fix scroll position in upper context group. [#56370](https://github.com/grafana/grafana/pull/56370), [@svennergr](https://github.com/svennergr)
+- **Logs:** Show copy button independently from context. [#55934](https://github.com/grafana/grafana/pull/55934), [@svennergr](https://github.com/svennergr)
+- **Loki/Prometheus:** Fix adding of ad hoc filters when jumping from dashboard to explore. [#55915](https://github.com/grafana/grafana/pull/55915), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Add support for range aggregations with by grouping. [#56184](https://github.com/grafana/grafana/pull/56184), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Fix label-value escaping in context query. [#56614](https://github.com/grafana/grafana/pull/56614), [@svennergr](https://github.com/svennergr)
+- **Loki:** Fix redundant escaping in adhoc filter with regex match. [#56447](https://github.com/grafana/grafana/pull/56447), [@ivanahuckova](https://github.com/ivanahuckova)
+- **PanelEdit:** Fixes resize pane border and spacing issues. [#56190](https://github.com/grafana/grafana/pull/56190), [@torkelo](https://github.com/torkelo)
+- **PublicDashboards:** Fix dashboard insights query when Public Dashboard feature is enabled. (Enterprise)
+- **PublicDashboards:** Fix dashboard insights query when Public Dashboard feature is enabled. (Enterprise)
+- **RBAC:** Redirect to /login when forceLogin is set. [#56469](https://github.com/grafana/grafana/pull/56469), [@sakjur](https://github.com/sakjur)
+- **SAML:** Fix RelayState generation function. (Enterprise)
+- **Security:** Fix CVE-2022-27664. [#55361](https://github.com/grafana/grafana/pull/55361), [@yong-jie-gong](https://github.com/yong-jie-gong)
+- **StateTimeline:** Fix tooltip showing erroneously in shared crosshair dashboards. [#55809](https://github.com/grafana/grafana/pull/55809), [@mdvictor](https://github.com/mdvictor)
+- **Tempo:** Fix unexpected trimming of leading zeroes in traceID. [#55167](https://github.com/grafana/grafana/pull/55167), [@hanjm](https://github.com/hanjm)
+- **Tracing:** Fix bug where errors are not reported to OpenTelemetry. [#55925](https://github.com/grafana/grafana/pull/55925), [@sakjur](https://github.com/sakjur)
+
+<!-- 9.2.0 END -->
+<!-- 9.2.0-beta1 START -->
+
+# 9.2.0-beta1 (2022-09-26)
+
+### Features and enhancements
+
+- **AccessControl:** Move GetCacheKey to SignedInUser. [#53591](https://github.com/grafana/grafana/pull/53591), [@mgyongyosi](https://github.com/mgyongyosi)
+- **AccessControl:** Move GetCacheKey to SignedInUser. (Enterprise)
+- **Admin:** Add support to configure default admin email. [#54363](https://github.com/grafana/grafana/pull/54363), [@mhuangwm](https://github.com/mhuangwm)
+- **Admin:** Create/Edit Team/ServiceAccount UI changes. [#53889](https://github.com/grafana/grafana/pull/53889), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Alert list panel:** Add view mode "Stat". [#53281](https://github.com/grafana/grafana/pull/53281), [@peterholmberg](https://github.com/peterholmberg)
+- **Alerting:** Add alert preview to cloud rules editor. [#54950](https://github.com/grafana/grafana/pull/54950), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Add new API endpoint GET /api/v1/ngalert. [#55134](https://github.com/grafana/grafana/pull/55134), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Add templates autocomplete. [#53655](https://github.com/grafana/grafana/pull/53655), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Adds support for editing group details for Grafana managed rules. [#53120](https://github.com/grafana/grafana/pull/53120), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Change default alert state to Error on execution error or timeout. [#55345](https://github.com/grafana/grafana/pull/55345), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Display alert's 'Created' time in local time instead of UTC. [#54414](https://github.com/grafana/grafana/pull/54414), [@mmusenbr](https://github.com/mmusenbr)
+- **Alerting:** Improve Mimir AM interoperability with Grafana. [#53396](https://github.com/grafana/grafana/pull/53396), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Improve validation of query and expressions on rule submit. [#53258](https://github.com/grafana/grafana/pull/53258), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Read group details before saving. [#53586](https://github.com/grafana/grafana/pull/53586), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Resolve stale state. [#49352](https://github.com/grafana/grafana/pull/49352), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Support for re-ordering alert rules in a group. [#53318](https://github.com/grafana/grafana/pull/53318), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** Update embedded Alertmanager v0.24. [#53555](https://github.com/grafana/grafana/pull/53555), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Update forking request handlers to use the same errors. [#52965](https://github.com/grafana/grafana/pull/52965), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Alerting:** Write and Delete multiple alert instances. [#52305](https://github.com/grafana/grafana/pull/52305), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Annotation:** Optionally allow storing longer annotation tags. [#54754](https://github.com/grafana/grafana/pull/54754), [@papagian](https://github.com/papagian)
+- **Auth:** Add SAML common resolutions to cookie issues. [#55395](https://github.com/grafana/grafana/pull/55395), [@Jguer](https://github.com/Jguer)
+- **Auth:** Add cli command users-manager for conflict resolution. [#52344](https://github.com/grafana/grafana/pull/52344), [@eleijonmarck](https://github.com/eleijonmarck)
+- **Auth:** Add documentation on group overage claims in AzureAD. [#55389](https://github.com/grafana/grafana/pull/55389), [@Jguer](https://github.com/Jguer)
+- **Auth:** Extend auth token errors with user ID. [#54633](https://github.com/grafana/grafana/pull/54633), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **Auth:** Reduce allocs in permission map. [#55410](https://github.com/grafana/grafana/pull/55410), [@Jguer](https://github.com/Jguer)
+- **Auth:** Restore legacy behavior and add deprecation notice for empty org role in oauth. [#55118](https://github.com/grafana/grafana/pull/55118), [@Jguer](https://github.com/Jguer)
+- **AzureMonitor:** Automate retrieval of supported Metrics namespaces. [#53203](https://github.com/grafana/grafana/pull/53203), [@aangelisc](https://github.com/aangelisc)
+- **Build:** Replace the file-loader loader with asset module in webpack config. [#53088](https://github.com/grafana/grafana/pull/53088), [@academo](https://github.com/academo)
+- **Chore:** Group auth docker blocks. [#54274](https://github.com/grafana/grafana/pull/54274), [@linoman](https://github.com/linoman)
+- **Chore:** Upgrade Go to 1.19.1. [#54902](https://github.com/grafana/grafana/pull/54902), [@sakjur](https://github.com/sakjur)
+- **Cleanup:** Add traces to cleanup jobs. [#55465](https://github.com/grafana/grafana/pull/55465), [@sakjur](https://github.com/sakjur)
+- **CloudMonitor:** Remove cloudMonitoringExperimentalUI feature flag. [#55054](https://github.com/grafana/grafana/pull/55054), [@asimpson](https://github.com/asimpson)
+- **CloudWatch:** Add AWS/States metrics. [#55427](https://github.com/grafana/grafana/pull/55427), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Add missing AWS/ApiGateway metrics. [#53839](https://github.com/grafana/grafana/pull/53839), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Add missing AWS/Events metrics. [#53831](https://github.com/grafana/grafana/pull/53831), [@jangaraj](https://github.com/jangaraj)
+- **CloudWatch:** Enable feature adoption tracking in the plugin. [#54299](https://github.com/grafana/grafana/pull/54299), [@sunker](https://github.com/sunker)
+- **CloudWatch:** Log group variable should get all log groups. [#54062](https://github.com/grafana/grafana/pull/54062), [@iwysiu](https://github.com/iwysiu)
+- **CloudWatch:** Refactoring - decouple logs and metrics in datasource file. [#55079](https://github.com/grafana/grafana/pull/55079), [@sunker](https://github.com/sunker)
+- **Correlations:** Add GetCorrelation(s) HTTP APIs. [#52517](https://github.com/grafana/grafana/pull/52517), [@Elfo404](https://github.com/Elfo404)
+- **Custom branding:** Add RBAC (early access). (Enterprise)
+- **Custom branding:** Add preview for the settings (early access). (Enterprise)
+- **Dashboard:** Support Variables in "Filter by Name" Transformation. [#51804](https://github.com/grafana/grafana/pull/51804), [@Kirchen99](https://github.com/Kirchen99)
+- **DashboardQuery:** Expand query options. [#53998](https://github.com/grafana/grafana/pull/53998), [@ryantxu](https://github.com/ryantxu)
+- **Docs:** Deprecating packages_api and removing it from our pipelines. [#54473](https://github.com/grafana/grafana/pull/54473), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Docs:** Update annotations API docs to include required field. [#52644](https://github.com/grafana/grafana/pull/52644), [@HarryTennent](https://github.com/HarryTennent)
+- **Echo:** Add support for Google Analytics 4. [#55446](https://github.com/grafana/grafana/pull/55446), [@joshhunt](https://github.com/joshhunt)
+- **Elasticsearch:** Respect time range in ad hoc filters. [#53874](https://github.com/grafana/grafana/pull/53874), [@gabor](https://github.com/gabor)
+- **Explore:** Add Mixed Datasource. [#53429](https://github.com/grafana/grafana/pull/53429), [@gelicia](https://github.com/gelicia)
+- **Explore:** Add resize to split view, with Min/Max button. [#54420](https://github.com/grafana/grafana/pull/54420), [@gelicia](https://github.com/gelicia)
+- **Footer:** Add release notes url to version label. [#52909](https://github.com/grafana/grafana/pull/52909), [@kianelbo](https://github.com/kianelbo)
+- **Geomap:** Add Africa, Australia, Oceania, South Asia, and East Asia as initial view options. [#55142](https://github.com/grafana/grafana/pull/55142), [@zuchka](https://github.com/zuchka)
+- **Geomap:** Add dynamic initial view options. [#54419](https://github.com/grafana/grafana/pull/54419), [@drew08t](https://github.com/drew08t)
+- **Grafana Backend:** Establish a database version support policy. [#54374](https://github.com/grafana/grafana/pull/54374), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Grafana UI:** Add implicit submit to TimeRangeForm for A11y. [#52647](https://github.com/grafana/grafana/pull/52647), [@matejkubinec](https://github.com/matejkubinec)
+- **Grafana/ui:** Adds all unicons to IconName and script to generate types. [#53820](https://github.com/grafana/grafana/pull/53820), [@academo](https://github.com/academo)
+- **GrafanaUI:** Add icon to links on Plugin configuration page. [#55581](https://github.com/grafana/grafana/pull/55581), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **GrafanaUI:** Deprecate logs components. [#55364](https://github.com/grafana/grafana/pull/55364), [@gabor](https://github.com/gabor)
+- **GraphPanel:** Panel Description box does not expand to fit markdown table. [#54238](https://github.com/grafana/grafana/pull/54238), [@gitstart](https://github.com/gitstart)
+- **Icons:** Move unicons icons to the repository and generate the iconsBundle.js with nodejs. [#53766](https://github.com/grafana/grafana/pull/53766), [@academo](https://github.com/academo)
+- **InfluxDB:** Remove browser ('direct' access) mode. [#53529](https://github.com/grafana/grafana/pull/53529), [@obetomuniz](https://github.com/obetomuniz)
+- **JWT:** Add support for assigning org roles. [#54277](https://github.com/grafana/grafana/pull/54277), [@nrwiersma](https://github.com/nrwiersma)
+- **JWT:** Allow conventional bearer token in Authorization header. [#54821](https://github.com/grafana/grafana/pull/54821), [@nrwiersma](https://github.com/nrwiersma)
+- **Live:** Migrate to centrifuge-js v3 (new API and client protocol). [#51977](https://github.com/grafana/grafana/pull/51977), [@FZambia](https://github.com/FZambia)
+- Load icons using webpack context instead of react-inlinesvg library. [#53675](https://github.com/grafana/grafana/pull/53675), [@academo](https://github.com/academo)
+- **Login:** Allow basic users to reset password when LDAP or Auth Proxy is enabled. [#52331](https://github.com/grafana/grafana/pull/52331), [@krzysdabro](https://github.com/krzysdabro)
+- **Login:** Remove single admin team restriction. [#54534](https://github.com/grafana/grafana/pull/54534), [@linoman](https://github.com/linoman)
+- **Logs:** Relocate "show context" button, add copy line log button. [#50977](https://github.com/grafana/grafana/pull/50977), [@Seyaji](https://github.com/Seyaji)
+- **Loki Query Variables:** Add support to select from existing labels. [#54625](https://github.com/grafana/grafana/pull/54625), [@matyax](https://github.com/matyax)
+- **Loki/Prometheus:** Make sections in log/metrics browser resizable. [#54704](https://github.com/grafana/grafana/pull/54704), [@gwdawson](https://github.com/gwdawson)
+- **Loki/Prometheus:** Remove beta tag from query builder. [#55150](https://github.com/grafana/grafana/pull/55150), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Add validation to derived fields url field setting. [#53599](https://github.com/grafana/grafana/pull/53599), [@matyax](https://github.com/matyax)
+- **Loki:** Create Variable Query Editor for Loki. [#54102](https://github.com/grafana/grafana/pull/54102), [@matyax](https://github.com/matyax)
+- **MSSQL:** Migrate to React. [#51765](https://github.com/grafana/grafana/pull/51765), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Metrics:** Instrument requests not matching any handler as `notfound`. [#53949](https://github.com/grafana/grafana/pull/53949), [@bergquist](https://github.com/bergquist)
+- **Navigation Bar:** Remove plugins link under Server Admin. [#54386](https://github.com/grafana/grafana/pull/54386), [@academo](https://github.com/academo)
+- **Navigation:** Don't round app plugin icon images. [#54543](https://github.com/grafana/grafana/pull/54543), [@joshhunt](https://github.com/joshhunt)
+- **OAuth:** Allow assigning Server Admin. [#54780](https://github.com/grafana/grafana/pull/54780), [@Jguer](https://github.com/Jguer)
+- **Panel edit:** Run queries when time range changes in table view. [#53111](https://github.com/grafana/grafana/pull/53111), [@axelavargas](https://github.com/axelavargas)
+- **Panels:** Add panel debug support helper. [#54678](https://github.com/grafana/grafana/pull/54678), [@ryantxu](https://github.com/ryantxu)
+- **Playlists:** Migrate to UIDs and load dashboards in the frontend. [#54125](https://github.com/grafana/grafana/pull/54125), [@ryantxu](https://github.com/ryantxu)
+- **Plugins:** Add feature toggles for long running queries. [#54349](https://github.com/grafana/grafana/pull/54349), [@kevinwcyu](https://github.com/kevinwcyu)
+- **Plugins:** Add secure JSON fields to plugin setting DTO. [#55313](https://github.com/grafana/grafana/pull/55313), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Handle app plugin proxy routes per request. [#51835](https://github.com/grafana/grafana/pull/51835), [@marefr](https://github.com/marefr)
+- **Plugins:** Use error plane for api/ds/query. [#54750](https://github.com/grafana/grafana/pull/54750), [@wbrowne](https://github.com/wbrowne)
+- **Preferences:** Support setting any dashboard as home, not just the starred ones. [#54258](https://github.com/grafana/grafana/pull/54258), [@ryantxu](https://github.com/ryantxu)
+- **Prometheus:** Add dashboard uid when tracing header in browsermode. [#53232](https://github.com/grafana/grafana/pull/53232), [@lpskdl](https://github.com/lpskdl)
+- **Prometheus:** Throw error on direct access. [#50162](https://github.com/grafana/grafana/pull/50162), [@aocenas](https://github.com/aocenas)
+- **Prometheus:** Upgrades http client to 1.30. [#53901](https://github.com/grafana/grafana/pull/53901), [@bergquist](https://github.com/bergquist)
+- **Prometheus:** Upgrades the prometheus http client to 1.13. [#47707](https://github.com/grafana/grafana/pull/47707), [@yesoreyeram](https://github.com/yesoreyeram)
+- **PublicDashboard:** Add RTK Query with loading and error state. Add MSW dependency for testing. [#55518](https://github.com/grafana/grafana/pull/55518), [@juanicabanas](https://github.com/juanicabanas)
+- **PublicDashboards:** Add RBAC to secured endpoints. [#54544](https://github.com/grafana/grafana/pull/54544), [@evictorero](https://github.com/evictorero)
+- **PublicDashboards:** Add link to public dashboards docs to sharing modal. [#55186](https://github.com/grafana/grafana/pull/55186), [@guicaulada](https://github.com/guicaulada)
+- **PublicDashboards:** Disable form when user does not has permissions. [#54853](https://github.com/grafana/grafana/pull/54853), [@evictorero](https://github.com/evictorero)
+- **PublicDashboards:** Dont support exemplars. [#54933](https://github.com/grafana/grafana/pull/54933), [@owensmallwood](https://github.com/owensmallwood)
+- **PublicDashboards:** Ignore time range input and changes on public dashboard. [#55412](https://github.com/grafana/grafana/pull/55412), [@guicaulada](https://github.com/guicaulada)
+- **PublicDashboards:** Log api layer errors and which datasources fail/succeed. [#55056](https://github.com/grafana/grafana/pull/55056), [@owensmallwood](https://github.com/owensmallwood)
+- **PublicDashboards:** Render tag when dashboard meta changes in state. [#55414](https://github.com/grafana/grafana/pull/55414), [@owensmallwood](https://github.com/owensmallwood)
+- **PublicDashboards:** Resolve interval for public dashboard data source. [#55489](https://github.com/grafana/grafana/pull/55489), [@guicaulada](https://github.com/guicaulada)
+- **PublicDashboards:** Sanitize metadata from public dashboard queries. [#55269](https://github.com/grafana/grafana/pull/55269), [@guicaulada](https://github.com/guicaulada)
+- **PublicDashboards:** UI improvements. [#55130](https://github.com/grafana/grafana/pull/55130), [@juanicabanas](https://github.com/juanicabanas)
+- **Query editor:** Allow query editors to create new query. [#55028](https://github.com/grafana/grafana/pull/55028), [@ivanahuckova](https://github.com/ivanahuckova)
+- **RBAC:** Add cache for oss rbac permissions. [#55098](https://github.com/grafana/grafana/pull/55098), [@kalleep](https://github.com/kalleep)
+- **RBAC:** Add endpoints for reading and updating role assignments. (Enterprise)
+- **RBAC:** Add permissions to install and configure plugins. [#51829](https://github.com/grafana/grafana/pull/51829), [@gamab](https://github.com/gamab)
+- **RBAC:** Display indicator if a permission is inherited. [#54080](https://github.com/grafana/grafana/pull/54080), [@kalleep](https://github.com/kalleep)
+- **RBAC:** Only display unique permissions in list. [#54074](https://github.com/grafana/grafana/pull/54074), [@kalleep](https://github.com/kalleep)
+- **RBAC:** Refactor delegation check to reduce db queries. (Enterprise)
+- **RBAC:** Validate scopes during role creation. (Enterprise)
+- **Report:** Keep report data on edit page refresh. (Enterprise)
+- **Reports:** Allow CSV only option. (Enterprise)
+- **Reports:** Render steps inside ReportPage. (Enterprise)
+- **SAML:** Account for all orgs in org_mapping. (Enterprise)
+- **SAML:** Add option to skip org role sync. [#55230](https://github.com/grafana/grafana/pull/55230), [@gamab](https://github.com/gamab)
+- **SAML:** Add option to skip org role sync. (Enterprise)
+- **SAML:** Allow wildcard mapping to add user to all existing orgs. [#55628](https://github.com/grafana/grafana/pull/55628), [@gamab](https://github.com/gamab)
+- **SAML:** Do not SAML SLO if user is not SAML authenticated. [#53418](https://github.com/grafana/grafana/pull/53418), [@Jguer](https://github.com/Jguer)
+- **SAML:** Improve SAML login flow. (Enterprise)
+- **SQL:** Migrate (MS/My/Postgres)SQL configuration pages from Angular to React. [#51891](https://github.com/grafana/grafana/pull/51891), [@oscarkilhed](https://github.com/oscarkilhed)
+- **Search:** Migrated impressions to use dashboardUID. [#53090](https://github.com/grafana/grafana/pull/53090), [@lpskdl](https://github.com/lpskdl)
+- **Secrets:** Add fallback to secrets kvstore plugin. [#54056](https://github.com/grafana/grafana/pull/54056), [@guicaulada](https://github.com/guicaulada)
+- **Secrets:** Convert secret migration to a background service. [#54676](https://github.com/grafana/grafana/pull/54676), [@guicaulada](https://github.com/guicaulada)
+- **Secrets:** Implement secrets manager plugin fallback store. [#54496](https://github.com/grafana/grafana/pull/54496), [@guicaulada](https://github.com/guicaulada)
+- **Secrets:** Improve error handling for secrets manager plugin. [#54811](https://github.com/grafana/grafana/pull/54811), [@guicaulada](https://github.com/guicaulada)
+- **SegmentInput:** Omit allowCustomValue and allowEmptyValue props. [#55352](https://github.com/grafana/grafana/pull/55352), [@timagixe](https://github.com/timagixe)
+- **Status History Panel:** Show X-Axis Value in Tooltip. [#54563](https://github.com/grafana/grafana/pull/54563), [@gitstart](https://github.com/gitstart)
+- **TeamSync:** Add description to group mapping. (Enterprise)
+- **TeamSync:** Prevent team syncing out of orgs mapped by auth method. (Enterprise)
+- **Teams:** Add TeamRolePicker to the Create and Edit Team pages. [#53775](https://github.com/grafana/grafana/pull/53775), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Tempo:** Set the default query type even if queryType was set to 'clear'. [#53887](https://github.com/grafana/grafana/pull/53887), [@CrypticSignal](https://github.com/CrypticSignal)
+- **Tempo:** Wrap the autocomplete value for a tag in double quotes. [#55610](https://github.com/grafana/grafana/pull/55610), [@CrypticSignal](https://github.com/CrypticSignal)
+- **TextPanel:** Support code formats. [#53850](https://github.com/grafana/grafana/pull/53850), [@ryantxu](https://github.com/ryantxu)
+- **TimeRangePicker:** Absolute timeranges with timezone. [#53763](https://github.com/grafana/grafana/pull/53763), [@mdvictor](https://github.com/mdvictor)
+- **TimeSeries:** Support for log scale and negative numbers. [#54812](https://github.com/grafana/grafana/pull/54812), [@leeoniya](https://github.com/leeoniya)
+- **TopNav:** Panel edit changes. [#54746](https://github.com/grafana/grafana/pull/54746), [@torkelo](https://github.com/torkelo)
+- **Tracing:** Add new [tracing.opentelemetry] custom_attributes config setting. [#54110](https://github.com/grafana/grafana/pull/54110), [@hairyhenderson](https://github.com/hairyhenderson)
+- **Transformations:** Add support for an inner join transformation. [#53865](https://github.com/grafana/grafana/pull/53865), [@AlexKaracaoglu](https://github.com/AlexKaracaoglu)
+- **Transformers:** Support inner vs outer join. [#53913](https://github.com/grafana/grafana/pull/53913), [@ryantxu](https://github.com/ryantxu)
+- **User management:** Use HMAC-SHA256 to generate time limit codes (password reset tokens). [#42334](https://github.com/grafana/grafana/pull/42334), [@andreasgerstmayr](https://github.com/andreasgerstmayr)
+- **UsersTable:** Display Disabled flag in Organizations' Users table. [#53656](https://github.com/grafana/grafana/pull/53656), [@mgyongyosi](https://github.com/mgyongyosi)
+- **Various Panels:** Add ability to toggle legend with keyboard shortcut. (Enterprise)
+
+### Bug fixes
+
+- **Alerting:** AlertingProxy to elevate permissions for request forwarded to data proxy when RBAC enabled. [#53620](https://github.com/grafana/grafana/pull/53620), [@yuri-tceretian](https://github.com/yuri-tceretian)
+- **Auth:** Allow admins to manually change external user's role if `oauth_skip_org_role_update_sync` or saml `skip_org_role_sync` is enabled. [#55182](https://github.com/grafana/grafana/pull/55182), [@Jguer](https://github.com/Jguer)
+- **AuthNZ:** Security fixes for CVE-2022-35957 and CVE-2022-36062. [#55503](https://github.com/grafana/grafana/pull/55503), [@IevaVasiljeva](https://github.com/IevaVasiljeva)
+- **ContextHandler:** Use standard library style middleware. [#54219](https://github.com/grafana/grafana/pull/54219), [@sakjur](https://github.com/sakjur)
+- **ElasticSearch:** Fix lucene formatted variables being wrongly escaped. [#54981](https://github.com/grafana/grafana/pull/54981), [@svennergr](https://github.com/svennergr)
+- **FIX:** RBAC prevents deleting empty snapshots. [#54385](https://github.com/grafana/grafana/pull/54385), [@gamab](https://github.com/gamab)
+- **Fix:** Adjusting plugin.json schema regex. [#54515](https://github.com/grafana/grafana/pull/54515), [@tolzhabayev](https://github.com/tolzhabayev)
+- **Fix:** Wrong swagger meta preventing spec generation. [#54181](https://github.com/grafana/grafana/pull/54181), [@leandro-deveikis](https://github.com/leandro-deveikis)
+- **Histogram:** Fix panel hide when clicking on legend. [#53651](https://github.com/grafana/grafana/pull/53651), [@mdvictor](https://github.com/mdvictor)
+- **Loki:** Hide loki sample queries from query inspector. [#55158](https://github.com/grafana/grafana/pull/55158), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Query Builder:** Fix spelling of "lose" in user visible message. [#53435](https://github.com/grafana/grafana/pull/53435), [@spazm](https://github.com/spazm)
+- **RBAC:** Fix resolver issue on wildcard resulting in wrong status code for endpoints. [#54208](https://github.com/grafana/grafana/pull/54208), [@kalleep](https://github.com/kalleep)
+- **Reports:** Fix starting value. (Enterprise)
+- **StatPanel:** Add padding between horizontal name and value. [#55299](https://github.com/grafana/grafana/pull/55299), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana)
+- **TablePanel:** Fix FooterRow styling for Safari and Firefox. [#55543](https://github.com/grafana/grafana/pull/55543), [@mdvictor](https://github.com/mdvictor)
+- **TablePanel:** Fix vertical scrollbar. [#53457](https://github.com/grafana/grafana/pull/53457), [@mdvictor](https://github.com/mdvictor)
+- **Tempo:** Fix typo in the tooltip for "Limit". [#53750](https://github.com/grafana/grafana/pull/53750), [@CrypticSignal](https://github.com/CrypticSignal)
+- **Transformations:** Fix clearing of transformation select fields. [#53916](https://github.com/grafana/grafana/pull/53916), [@AlexKaracaoglu](https://github.com/AlexKaracaoglu)
+- **Various Panels:** Fix Single right-aligned y-axis hiding gridlines. [#54206](https://github.com/grafana/grafana/pull/54206), [@gitstart](https://github.com/gitstart)
+
+### Breaking changes
+
+Dashboards: Remove the ability to open dashboard settings while panel edit is still open. Issue [#54746](https://github.com/grafana/grafana/issues/54746)
+
+In InfluxDB, browser access mode was deprecated in Grafana 8.0.0 and removed in 9.2.0. If you used this mode, please switch to server access mode on the datasource configuration page. Issue [#53529](https://github.com/grafana/grafana/issues/53529)
+
+In Prometheus, browser access mode was deprecated in Grafana 7.4.0 and removed in 9.2.0. If you used this mode, please switch to server access mode on the datasource configuration page. Issue [#50162](https://github.com/grafana/grafana/issues/50162)
+
+Password reset links sent before the upgrade will no longer work and have to be resent. Since the duration of those links are only two hours we decided to not support both token formats. Issue [#42334](https://github.com/grafana/grafana/issues/42334)
+
+### Deprecations
+
+Google Analytics 'Universal Analytics' is deprecated by Google in favor of Google Analytics 4. See [Google's deprecation notice](https://support.google.com/analytics/answer/10089681?hl=en) for more details. After July 2023, Grafana's Google Analytics 'Universal Analytics' integration will be removed, along with the `analytics.google_analytics_ua_id` server config property. Configure Google Analytics 4 using the `analytics.google_analytics_4_id` server config property.
+Issue [#55446](https://github.com/grafana/grafana/issues/55446)
+
+The following components and functions related to logs are deprecated in the `grafana-ui` package: `LogLabels`, `LogMessageAnsi`, `LogRows`, `getLogRowStyles`.
+Issue [#55364](https://github.com/grafana/grafana/issues/55364)
+
+### Plugin development fixes & changes
+
+- **GrafanaUI:** Add required behavior to Inline Field. [#54867](https://github.com/grafana/grafana/pull/54867), [@gefgu](https://github.com/gefgu)
+- **CustomScrollbar:** Add optional scroll indicators to `CustomScrollbar`. [#54705](https://github.com/grafana/grafana/pull/54705), [@ashharrison90](https://github.com/ashharrison90)
+- **Build:** Introduce ESM and Treeshaking to NPM package builds. [#51517](https://github.com/grafana/grafana/pull/51517), [@jackw](https://github.com/jackw)
+
+<!-- 9.1.7 START -->
+
+# 9.1.7 (2022-10-04)
+
+### Features and enhancements
+
+- **Chore:** Upgrade Go version to 1.19.1 (backport). [#55733](https://github.com/grafana/grafana/pull/55733), [@sakjur](https://github.com/sakjur)
+- **CloudWatch:** Add missing AWS/Prometheus metrics. [#54990](https://github.com/grafana/grafana/pull/54990), [@jangaraj](https://github.com/jangaraj)
+- **Explore:** Add feature tracking events. [#54514](https://github.com/grafana/grafana/pull/54514), [@L-M-K-B](https://github.com/L-M-K-B)
+- **Graphite:** Add error information to graphite queries tracing. [#55249](https://github.com/grafana/grafana/pull/55249), [@jesusvazquez](https://github.com/jesusvazquez)
+- **Prometheus:** Restore FromAlert header. [#55255](https://github.com/grafana/grafana/pull/55255), [@kylebrandt](https://github.com/kylebrandt)
+- **SAML:** Account for all orgs in org_mapping (#3855). (Enterprise)
+- **Search:** Add search index configuration options. [#55525](https://github.com/grafana/grafana/pull/55525), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
+- **Thresholds:** Add option for dashed line style. [#55875](https://github.com/grafana/grafana/pull/55875), [@leeoniya](https://github.com/leeoniya)
+
+### Bug fixes
+
+- **Alerting:** Fix default query's data source when no default datasource specified. [#55435](https://github.com/grafana/grafana/pull/55435), [@konrad147](https://github.com/konrad147)
+- **Alerting:** Fix mathexp.NoData cannot be reduced. [#55347](https://github.com/grafana/grafana/pull/55347), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Skip unsupported file types on provisioning. [#55573](https://github.com/grafana/grafana/pull/55573), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **AzureMonitor:** Ensure resourceURI template variable is migrated. [#56095](https://github.com/grafana/grafana/pull/56095), [@aangelisc](https://github.com/aangelisc)
+- **Dashboard:** Fix plugin dashboard save as button. [#55197](https://github.com/grafana/grafana/pull/55197), [@lpskdl](https://github.com/lpskdl)
+- **Docs:** Fix decimals: auto docs for panel edit. [#55477](https://github.com/grafana/grafana/pull/55477), [@joshhunt](https://github.com/joshhunt)
+- **Fix:** RBAC handle `error no resolver` found. [#55676](https://github.com/grafana/grafana/pull/55676), [@gamab](https://github.com/gamab)
+- **Fix:** RBAC handle `error no resolver` found. (Enterprise)
+- **LibraryPanelSearch:** Refactor and fix hyphen issue. [#55314](https://github.com/grafana/grafana/pull/55314), [@kaydelaney](https://github.com/kaydelaney)
+- **Live:** Fix live streaming with `live-service-web-worker` feature flag enabled. [#55528](https://github.com/grafana/grafana/pull/55528), [@ArturWierzbicki](https://github.com/ArturWierzbicki)
+- **QueryField:** Fix wrong cursor position on autocomplete. [#55576](https://github.com/grafana/grafana/pull/55576), [@svennergr](https://github.com/svennergr)
+
+<!-- 9.1.7 END -->
+<!-- 9.2.0-beta1 END -->
 <!-- 9.1.6 START -->
 
 # 9.1.6 (2022-09-20)

Dockerfile

@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.19.1-alpine3.15 as go-builder
+FROM golang:1.19.3-alpine3.15 as go-builder
 
 RUN apk add --no-cache gcc g++ make
 
@@ -57,8 +57,6 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 WORKDIR $GF_PATHS_HOME
 
 RUN apk add --no-cache ca-certificates bash tzdata musl-utils
-RUN apk add --no-cache openssl ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
-RUN apk upgrade ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk info -vv | sort
 
 COPY conf ./conf

Dockerfile.ubuntu

@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.19.1 AS go-builder
+FROM golang:1.19.3 AS go-builder
 
 WORKDIR /src/grafana
 

conf/defaults.ini

@@ -210,10 +210,10 @@ check_for_updates = true
 check_for_plugin_updates = true
 
 # Google Analytics universal tracking code, only enabled if you specify an id here
-google_analytics_ua_id = 
+google_analytics_ua_id =
 
 # Google Analytics 4 tracking code, only enabled if you specify an id here
-google_analytics_4_id = 
+google_analytics_4_id =
 
 # Google Tag Manager ID, only enabled if you specify an id here
 google_tag_manager_id =
@@ -541,6 +541,7 @@ allowed_domains =
 allowed_groups =
 role_attribute_strict = false
 allow_assign_grafana_admin = false
+force_use_graph_api = false
 
 #################################### Okta OAuth #######################
 [auth.okta]
@@ -625,6 +626,7 @@ key_file =
 role_attribute_path =
 role_attribute_strict = false
 auto_sign_up = false
+url_login = false
 allow_assign_grafana_admin = false
 
 #################################### Auth LDAP ###########################
@@ -632,6 +634,7 @@ allow_assign_grafana_admin = false
 enabled = false
 config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
+skip_org_role_sync = false
 
 # LDAP background sync (Enterprise only)
 # At 1 am every day

conf/provisioning/alerting/sample.yaml

@@ -56,6 +56,7 @@ apiVersion: 1
 #       # <string> state of the alert rule when the query execution 
 #       #          fails - possible values: "Error", "Alerting", "OK"
 #       #          default = Alerting
+#       executionErrorState: Alerting
 #       # <duration, required> how long the alert condition should be breached before Firing. Before this time has elapsed, the alert is considered to be Pending
 #       for: 60s
 #       # <map<string, string>> map of strings to attach arbitrary custom data

conf/sample.ini

@@ -623,6 +623,8 @@
 ;enabled = false
 ;config_file = /etc/grafana/ldap.toml
 ;allow_sign_up = true
+# prevent synchronizing ldap users organization roles
+;skip_org_role_sync = false
 
 # LDAP background sync (Enterprise only)
 # At 1 am every day

devenv/datasources.yaml

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

devenv/docker/blocks/loki/data/data.js

@@ -125,8 +125,8 @@ async function main() {
     await sleep(getNextSineWaveSleepDuration());
     const timestampMs = new Date().getTime();
     const item = getRandomLogItem(step + 1)
-    lokiSendLogLine(timestampMs, JSON.stringify(item), {place:'moon', source: 'data'});
-    lokiSendLogLine(timestampMs, logFmtLine(item), {place:'luna', source: 'data'});
+    lokiSendLogLine(timestampMs, JSON.stringify(item), {place:'moon', source: 'data', instance: 'server\\1', job: '"grafana/data"'});
+    lokiSendLogLine(timestampMs, logFmtLine(item), {place:'luna', source: 'data', instance: 'server\\2', job: '"grafana/data"'});
   }
 }
 

docs/sources/_index.md

@@ -55,15 +55,15 @@ title: Grafana documentation
         <h4>Getting started</h4>
         <p>Learn the basics of using Grafana.</p>
     </a>
-    <a href="{{< relref "basics/" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Grafana basics</h4>
+    <a href="{{< relref "fundamentals/" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>Grafana fundamentals</h4>
         <p>Learn basic observability.</p>
     </a>
     <a href="{{< relref "setup-grafana/configure-grafana/" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Configure Grafana</h4>
         <p>Review the configuration and setup options.</p>
     </a>
-    <a href="{{< relref "basics/timeseries/" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "fundamentals/timeseries/" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Intro to time series</h4>
         <p>Learn about time series data.</p>
     </a>
@@ -71,8 +71,8 @@ title: Grafana documentation
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "whatsnew/whats-new-in-v9-1/" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v9.1</h4>
+    <a href="{{< relref "whatsnew/whats-new-in-v9-2/" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v9.2</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 

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

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

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

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

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

@@ -111,4 +111,4 @@ In this task you configure Grafana Enterprise to validate the license with AWS i
 1. To restart Grafana and activate your license, update the service running Grafana to use the latest revision of the task definition that you created.
 1. After you update the service, navigate to your Grafana instance, sign in with Grafana Admin credentials, and navigate to the **Statistics and Licensing** page to validate that your license is active.
 
-For more information about validating that your license is active, refer to [Determine the number of active users for each licensed role](../../license-restrictions/#determine-the-number-of-active-users-for-each-licensed-role).
+For more information about validating that your license is active, refer to [Grafana Enterprise license restrictions]({{< relref "../../#grafana-enterprise-license-restrictions" >}}).

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

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

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

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

docs/sources/administration/provisioning/index.md

@@ -157,6 +157,7 @@ Since not all datasources have the same configuration settings we only have the
 | httpMethod                 | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                                                                                                                                                                                        |
 | customQueryParameters      | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                                                                                                                                                                                   |
 | manageAlerts               | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                                                                                                                                                                                       |
+| alertmanagerUid            | string  | Prometheus and Loki                                              | UID of Alert Manager that manages Alert for this data source.                                                                                                                                                                                                                                                       |
 | esVersion                  | string  | Elasticsearch                                                    | Elasticsearch version (E.g. `7.0.0`, `7.6.1`)                                                                                                                                                                                                                                                                       |
 | timeField                  | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                                                                                                                                                                                        |
 | interval                   | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                                                                                                                                                                                         |
@@ -189,6 +190,8 @@ Since not all datasources have the same configuration settings we only have the
 | maxIdleConns               | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum number of connections in the idle connection pool (Grafana v5.4+)                                                                                                                                                                                                                                           |
 | connMaxLifetime            | number  | MySQL, PostgreSQL and MSSQL                                      | Maximum amount of time in seconds a connection may be reused (Grafana v5.4+)                                                                                                                                                                                                                                        |
 | keepCookies                | array   | _HTTP\*_                                                         | Cookies that needs to be passed along while communicating with datasources                                                                                                                                                                                                                                          |
+| prometheusVersion          | string  | Prometheus                                                       | The version of the Prometheus datasource (e.g. `2.37.0`, `2.24.0`)                                                                                                                                                                                                                                                  |
+| prometheusType             | string  | Prometheus                                                       | The type of the Prometheus datasources (i.e. `Prometheus`, `Cortex`, `Thanos`, or `Mimir`)                                                                                                                                                                                                                          |
 
 #### Secure Json Data
 
@@ -319,7 +322,7 @@ Note: The JSON definition in the input field when using `Copy JSON to Clipboard`
 
 ### Reusable Dashboard URLs
 
-If the dashboard in the JSON file contains an [UID]({{< relref "../../dashboards/json-model/" >}}), Grafana forces insert/update on that UID. This allows you to migrate dashboards between Grafana instances and provisioning Grafana from configuration without breaking the URLs given because the new dashboard URL uses the UID as identifier.
+If the dashboard in the JSON file contains an [UID]({{< relref "../../dashboards/build-dashboards/view-dashboard-json-model" >}}), Grafana forces insert/update on that UID. This allows you to migrate dashboards between Grafana instances and provisioning Grafana from configuration without breaking the URLs given because the new dashboard URL uses the UID as identifier.
 When Grafana starts, it updates/inserts all dashboards available in the configured folders. If you modify the file, then the dashboard is also updated.
 By default, Grafana deletes dashboards in the database if the file is removed. You can disable this behavior using the `disableDeletion` setting.
 
@@ -852,7 +855,7 @@ policies:
     # <duration> How long to wait before sending a notification about new alerts that
     #            are added to a group of alerts for which an initial notification has
     #            already been sent. (Usually ~5m or more), default = 5m
-    group_internval: 5m
+    group_interval: 5m
     # <duration>  How long to wait before sending a notification again if it has already
     #             been sent successfully for an alert. (Usually ~3h or more), default = 4h
     repeat_interval: 4h

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

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

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

@@ -147,7 +147,7 @@ For details on managing teams, see [Team management]({{< relref "../team-managem
 
 While Grafana OSS includes a robust set of permissions and settings that you can use to manage user access to server and organization resources, you might find that you require additional capabilities.
 
-[Grafana Enterprise]({{< relref "../../enterprise/">}}) provides the following permissions-related features:
+[Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise">}}) provides the following permissions-related features:
 
 - Data source permissions
 - Role-based access control (RBAC)

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

@@ -78,7 +78,7 @@ Grafana Enterprise includes the ability for you to assign discrete fixed roles t
 Assign fixed roles when the basic roles do not meet your permission requirements. For example, you might want a user with the basic viewer role to also edit dashboards. Or, you might want anyone with the editor role to also add and manage users. Fixed roles provide users more granular access to create, view, and update the following Grafana resources:
 
 - [Alerting]({{< relref "../../../alerting/" >}})
-- [Annotations]({{< relref "../../../dashboards/annotations/" >}})
+- [Annotations]({{< relref "../../../dashboards/build-dashboards/annotate-visualizations" >}})
 - [API keys]({{< relref "../../api-keys/" >}})
 - [Dashboards and folders]({{< relref "../../../dashboards/" >}})
 - [Data sources]({{< relref "../../../datasources/" >}})
@@ -90,7 +90,7 @@ Assign fixed roles when the basic roles do not meet your permission requirements
 - [Provisioning]({{< relref "../../provisioning/" >}})
 - [Reports]({{< relref "../../../dashboards/create-reports/" >}})
 - [Roles]({{< relref "../../" >}})
-- [Settings]({{< relref "../../../enterprise/settings-updates/" >}})
+- [Settings]({{< relref "../../../setup-grafana/configure-grafana/settings-updates-at-runtime" >}})
 - [Service accounts]({{< relref "../../service-accounts/" >}})
 - [Teams]({{< relref "../../team-management/" >}})
 - [Users]({{< relref "../../user-management/" >}})

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -9,16 +9,16 @@ keywords:
   - alerting
   - alerts
   - groups
-title: View alert groupings
+title: View alert groups
 weight: 445
 ---
 
-# View alert groupings
+# View alert groups
 
-To view alert groupings:
+To view alert groups:
 
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-1. Click **Alert grouping** to open the page listing existing groups.
+1. Click **Alert groups** to open the page listing existing groups.
 1. From the **Alertmanager** drop-down, select an external Alertmanager as your data source. By default, the `Grafana` Alertmanager is selected.
 1. From **custom group by** drop-down, select a combination of labels to view a grouping other than the default. This is useful for debugging and verifying your grouping of notification policies.
 

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

@@ -25,7 +25,7 @@ Watch this video to learn more about creating alerts: {{< vimeo 720001934 >}}
 1. Click **New alert rule**. The new alerting rule page opens where the Grafana managed alerts option is selected by default.
 1. In Step 1, add queries and expressions to evaluate, and then select the alert condition.
    - For queries, select a data source from the drop-down.
-   - Add one or more [queries]({{< relref "../../panels/query-a-data-source/add-a-query/" >}}) or [expressions]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/" >}}).
+   - Add one or more [queries]({{< relref "../../panels-visualizations/query-transform-data/#add-a-query/" >}}) or [expressions]({{< relref "../../panels-visualizations/query-transform-data/expression-queries/" >}}).
    - For each expression, select either **Classic condition** to create a single alert rule, or choose from **Math**, **Reduce**, **Resample** options to generate separate alert for each series. For details on these options, see [Single and multi dimensional rule](#single-and-multi-dimensional-rule).
    - Click **Run queries** to verify that the query is successful.
    - Next, select the query or expression for your alert condition.
@@ -67,7 +67,7 @@ To generate a separate alert for each series, create a multi-dimensional rule. U
 
 #### Rule with classic condition
 
-For more information, see [expressions documentation]({{< relref "../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/" >}}).
+For more information, see [expressions documentation]({{< relref "../../panels-visualizations/query-transform-data/expression-queries/" >}}).
 
 ### No data and error handling
 

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

@@ -27,7 +27,7 @@ Grafana allows you to create alerting rules for an external Grafana Mimir or Lok
 
   - **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 [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.
+  - **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.
 
 Watch this video to learn more about how to create a Mimir managed alert rule: {{< vimeo 720001865 >}}
 

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

@@ -31,7 +31,6 @@ The following table lists the contact point types supported by Grafana.
 | [Pagerduty](https://www.pagerduty.com/)          | `pagerduty`               | Supported            | Supported                                                                                                |
 | [Prometheus Alertmanager](https://prometheus.io) | `prometheus-alertmanager` | Supported            | N/A                                                                                                      |
 | [Pushover](https://pushover.net/)                | `pushover`                | Supported            | Supported                                                                                                |
-| [Sensu](https://sensu.io/)                       | `sensu`                   | Supported            | N/A                                                                                                      |
 | [Sensu Go](https://docs.sensu.io/sensu-go/)      | `sensugo`                 | Supported            | N/A                                                                                                      |
 | [Slack](https://slack.com/)                      | `slack`                   | Supported            | Supported                                                                                                |
 | [Telegram](https://telegram.org/)                | `telegram`                | Supported            | N/A                                                                                                      |

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

@@ -18,7 +18,7 @@ Grafana supports several alert rule types, the following sections will explain t
 
 Grafana-managed rules are the most flexible alert rule type. They allow you to create alerts that can act on data from any of your existing data sources.
 
-In additional to supporting any datasource you can also add additional [expressions]({{< relref "../../../panels/query-a-data-source/use-expressions-to-manipulate-data/" >}}) to transform your data and express alert conditions.
+In additional to supporting any datasource you can also add additional [expressions]({{< relref "../../../panels-visualizations/query-transform-data/expression-queries/" >}}) to transform your data and express alert conditions.
 
 ## Mimir, Loki and Cortex rules
 

docs/sources/alerting/fundamentals/alertmanager.md

@@ -9,34 +9,34 @@ weight: 116
 
 # Alertmanager
 
-The Alertmanager helps both group and manage alert rules, adding a layer of orchestration on top of the alerting engines. To learn more, see [Prometheus Alertmanager documentation](https://prometheus.io/docs/alerting/latest/alertmanager/).
+Alertmanager enables you to quickly and efficiently manage and respond to alerts. It receives alerts, handles silencing, inhibition, grouping, and routing by sending notifications out via your channel of choice, for example, email or Slack.
 
-Grafana includes built-in support for Prometheus Alertmanager. By default, notifications for Grafana managed alerts are handled by the embedded Alertmanager that is part of core Grafana. You can configure the Alertmanager's contact points, notification policies, silences, and templates from the alerting UI by selecting the `Grafana` option from the Alertmanager drop-down.
+In Grafana, you can use the Cloud Alertmanager, Grafana Alertmanager, or an external Alertmanager. You can also run multiple alertmanagers; your decision depends on your set up and where your alerts are being generated.
 
-> **Note:** Before v8.2, the configuration of the embedded Alertmanager was shared across organizations. If you are on an older Grafana version, we recommend that you use Grafana alerts only if you have one organization. Otherwise, your contact points are visible to all organizations.
+**Cloud Alertmanager**
 
-Grafana Alerting added support for external Alertmanager configuration. When you add an [Alertmanager data source]({{< relref "../../datasources/alertmanager/" >}}), the Alertmanager drop-down shows a list of available external Alertmanager data sources. Select a data source to create and manage alerting for standalone Grafana Mimir or Loki data sources.
+Cloud Alertmanager runs in Grafana Cloud and it can receive alerts from Grafana, Mimir, and Loki.
 
-{{< figure max-width="40%" src="/static/img/docs/alerting/unified/contact-points-select-am-8-0.gif" max-width="250px" caption="Select Alertmanager" >}}
+**Grafana Alertmanager**
 
-You can configure one or several external Alertmanagers to receive alerts from Grafana. Once configured, both the embedded Alertmanager **and** any configured external Alertmanagers will receive _all_ alerts.
+Grafana Alertmanager is an internal Alertmanager that is pre-configured and available for selection by default if you run Grafana on-premise or open-source.
 
-You can do the setup in the "Admin" tab within the Grafana v8 Alerts UI.
+The Grafana Alertmanager can receive alerts from Grafana, but it cannot receive alerts from outside Grafana, for example, from Mimir or Loki.
 
-### Add a new external Alertmanager
+**External Alertmanager**
 
-1. In the Grafana menu, click the Alerting (bell) icon to open the Alerting page listing existing alerts.
-2. Click **Admin** and then scroll down to the External Alertmanager section.
-3. Click **Add Alertmanager** and a modal opens.
-4. Add the URL and the port for the external Alertmanager. You do not need to specify the path suffix, for example, `/api/v(1|2)/alerts`. Grafana automatically adds this.
+If you want to use a single alertmanager to receive all your Grafana, Loki, Mimir, and Prometheus alerts, you can set up Grafana to use an external Alertmanager. This external Alertmanager can be configured and administered from within Grafana itself.
 
-The external URL is listed in the table with a pending status. Once Grafana verifies that the Alertmanager is discovered, the status changes to active. No requests are made to the external Alertmanager at this point; the verification signals that alerts are ready to be sent.
+Here are two examples of when you may want to configure your own external alertmanager and send your alerts there instead of the Grafana Alertmanager:
 
-### Edit an external Alertmanager
+1. You may already have alertmanagers on-premise in your own Cloud infrastructure that you have set up and still want to use, because you have other alert generators, such as Prometheus.
 
-1. Click the pen symbol to the right of the Alertmanager row in the table.
-2. When the edit modal opens, you can view all the URLs that were added.
+2. You want to use both Prometheus on-premise and hosted Grafana to send alerts to the same alertmanager that runs in your Cloud infrastructure.
 
-The edited URL will be pending until Grafana verifies it again.
+Alertmanagers are visible from the drop-down menu on the Alerting Contact Points, Notification Policies, and Silences pages.
 
-{{< figure max-width="40%" src="/static/img/docs/alerting/unified/ext-alertmanager-active.png" max-width="650px" caption="External Alertmanagers" >}}
+**Useful links**
+
+[Prometheus Alertmanager documentation](https://prometheus.io/docs/alerting/latest/alertmanager/)
+
+[Add an external Alertmanager](https://grafana.com/docs/grafana/latest/alerting/set-up/configure-alertmanager/)

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/fundamentals/annotation-label/template-functions/" >}}) to create notification content dynamically.
 
 ## Annotations
 

docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md

@@ -30,15 +30,18 @@ A label matchers consists of 3 distinct parts, the **label**, the **value** and
 | `=~`     | Select labels that regex-match the value.          |
 | `!~`     | Select labels that do not regex-match the value.   |
 
-## Example of a label matcher
+If you are using multiple label matchers, they are combined using the AND logical operator. This means that all matchers must match in order to link a rule to a policy.
 
-Imagine we've defined the following set of labels for our alert.
+## Example scenario
+
+If you define the following set of labels for your alert:
 
 `{ foo=bar, baz=qux, id=12 }`
 
-In this situation,
+then:
 
-- A label matcher defined as `foo=bar` will match this alert rule.
-- A label matcher defined as `foo!=bar` will _not_ match this alert rule.
-- A label matcher defined as `id=~[0-9]+` will match this alert rule.
-- A label matcher defined as `baz!~[0-9]+` will match this alert rule.
+- A label matcher defined as `foo=bar` matches this alert rule.
+- A label matcher defined as `foo!=bar` does _not_ match this alert rule.
+- A label matcher defined as `id=~[0-9]+` matches this alert rule.
+- A label matcher defined as `baz!~[0-9]+` matches this alert rule.
+- Two label matchers defined as `foo=bar` and `id=~[0-9]+` match this alert rule.

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

@@ -53,7 +53,7 @@ If Grafana has been set up to use an external image store, `upload_external_imag
     # will be persisted to disk for up to temp_data_lifetime.
     upload_external_image_storage = false
 
-Restart Grafana for the changes to take affect.
+Restart Grafana for the changes to take effect.
 
 ## Supported notifiers
 
@@ -86,8 +86,8 @@ Include images from URL refers to using the external image store.
 Grafana provides the following metrics to observe the performance and failure rate of images in notifications.
 For example, if a screenshot could not be taken within the expected time (10 seconds) then the counter `grafana_screenshot_failures_total` is updated.
 
-- `grafana_screenshot_cache_hits_total`
-- `grafana_screenshot_cache_misses_total`
+- `grafana_alerting_image_cache_hits_total`
+- `grafana_alerting_image_cache_misses_total`
 - `grafana_screenshot_duration_seconds`
 - `grafana_screenshot_failures_total`
 - `grafana_screenshot_successes_total`
@@ -99,3 +99,14 @@ For example, if a screenshot could not be taken within the expected time (10 sec
 - 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.
 - When alerts generated by different alert rules are sent in a single notification, there may be screenshots for each alert rule. This happens if an alert group contains multiple alerting rules. The order the images are attached is random. If you need to guarantee the ordering of images, make sure that your alert groups contain a single alerting rule.
 - Some contact points only handle a single image. In this case, the first image associated with an alert will be attached. Because the ordering is random, this may not always be an image for the same alert rule. If you need to guarantee you receive a screenshot for a particular rule, make sure that your alert groups contain a single alerting rule.
+
+## Troubleshooting
+
+If Grafana has been set up to send images in notifications, however notifications are still being received without images, then check the troubleshooting instructions below.
+
+1. Check that Grafana has been set up as per the instructions
+2. Check that the notifier supports images in notifications as per the table of supported notifiers
+3. Enable debug logging in Grafana and look for logs with the logger `ngalert.image`
+4. If the alert is not associated with a dashboard there will be logs for `Cannot take screenshot for alert rule as it is not associated with a dashboard`
+5. If the alert is associated with a dashboard, but no panel in the dashboard, there will be logs for `Cannot take screenshot for alert rule as it is not associated with a panel`
+6. If images cannot be taken because of mis-configuration or an issue with image rendering there will be logs for `Failed to take an image` including the Dashboard UID, Panel ID, and the error message

docs/sources/alerting/notifications/_index.md

@@ -58,7 +58,7 @@ You can configure grouping to be `group_by: [alertname]` (take note that the `en
 1. To add a top level specific policy, go to the **Specific routing** section and click **New specific policy**.
 1. In **Matching labels** section, add one or more rules for matching alert labels. For more information, see ["Labels and label matchers"]({{< relref "../fundamentals/annotation-label/labels-and-label-matchers/" >}}).
 1. In **Contact point**, add the [contact point]({{< relref "../contact-points/" >}}) to send notification to if alert matches only this specific policy and not any of the nested policies.
-1. Optionally, enable **Continue matching subsequent sibling nodes** to continue matching nested policies even after the alert matched the parent policy. When this option is enabled, you can get more than one notification. Use it to send notification to a catch-all contact point as well as to one of more specific contact points handled by nested policies.
+1. Optionally, enable **Continue matching subsequent sibling nodes** to continue matching sibling policies even after the alert matched the current policy. When this option is enabled, you can get more than one notification for one alert.
 1. Optionally, enable **Override grouping** to specify the same grouping as the root policy. If this option is not enabled, the root policy grouping is used.
 1. Optionally, enable **Override general timings** to override the timing options configured in the group notification policy.
 1. Click **Save policy** to save your changes.

docs/sources/alerting/set-up/configure-alertmanager/index.md

@@ -8,29 +8,29 @@ keywords:
   - alerting
   - set up
   - configure
-  - Alertmanager
-title: Configure Alertmanager
+  - external Alertmanager
+title: Add an external Alertmanager
 weight: 100
 ---
 
-# Configure Alertmanager
+# Add an external Alertmanager
 
-Configure Alertmanager from Grafana Alerting to group and manage alert rules, adding a layer of orchestration on top of your external alerting engine.
+Set up Grafana to use an external Alertmanager as a single Alertmanager to receive all of your alerts. This external Alertmanager can then be configured and administered from within Grafana itself.
 
-## Add a new external Alertmanager
+Once you have added the Alertmanager, you can use the Grafana Alerting UI to manage silences, contact points, and notification policies. A drop-down option in these pages allows you to switch between alertmanagers.
 
-1. In the Grafana menu, click the Alerting (bell) icon to open the Alerting page listing existing alerts.
-2. Click **Admin** and then scroll down to the External Alertmanager section.
-3. Click **Add Alertmanager** and a modal opens.
-4. Add the URL and the port for the external Alertmanager. You do not need to specify the path suffix, for example, `/api/v(1|2)/alerts`. Grafana automatically adds this.
+**Note:**
+Starting with Grafana 9.2, the URL configuration of external alertmanagers from the Admin tab on the Alerting page is deprecated. It will be removed in a future release.
 
-The external URL is listed in the table with a pending status. Once Grafana verifies that the Alertmanager is discovered, the status changes to active. No requests are made to the external Alertmanager at this point; the verification signals that alerts are ready to be sent.
+External alertmanagers should now be configured as data sources using Grafana Configuration from the main Grafana navigation menu. This enables you to manage the contact points and notification policies of external alertmanagers from within Grafana and also encrypts HTTP basic authentication credentials that were previously visible when configuring external alertmanagers by URL.
 
-### Edit an external Alertmanager
+To add an external Alertmanager, complete the following steps.
 
-1. Click the pen symbol to the right of the Alertmanager row in the table.
-2. When the edit modal opens, you can view all the URLs that were added.
+1. Click Configuration and then Data sources.
+2. Search for Alertmanager.
+3. Choose your Implementation and fill out the fields on the page, as required.
 
-The edited URL will be pending until Grafana verifies it again.
+**Note:**
+Prometheus, Grafana Mimir, and Cortex implementations of Alertmanager are supported. For Prometheus, contact points and notification policies are read-only in the Grafana Alerting UI.
 
-{{< figure max-width="40%" src="/static/img/docs/alerting/unified/ext-alertmanager-active.png" max-width="650px" caption="External Alertmanagers" >}}
+4. Click Save & test.

docs/sources/alerting/set-up/provision-alerting-resources/_index.md

@@ -0,0 +1,40 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/provision-alerting-resources
+  - /docs/grafana/latest/alerting/provision-alerting-resources
+description: Provision alerting resources
+keywords:
+  - grafana
+  - alerting
+  - set up
+  - configure
+  - provisioning
+title: Provision Grafana Alerting resources
+weight: 200
+---
+
+# Provision Grafana Alerting resources
+
+Alerting infrastructure is often complex, with many pieces of the pipeline that often live in different places. Scaling this across multiple teams and organizations is an especially challenging task. Grafana Alerting provisioning makes this process easier by enabling you to create, manage, and maintain your alerting data in a way that best suits your organization.
+
+There are three options to choose from:
+
+1. Use file provisioning to provision your Grafana Alerting resources, such as alert rules and contact points, through files on disk.
+
+1. Provision your alerting resources using the Grafana HTTP API.
+
+   For more information on the Grafana Alerting provisioning API, refer to [Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/).
+
+1. Provision your alerting resources using Terraform.
+
+**Note:**
+
+Currently, provisioning for Grafana Alerting supports alert rules, contact points, mute timings, and templates. Provisioned alerting resources can only be edited in the source that created them and not from within Grafana or any other source. For example, if you provision your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
+
+**Useful Links:**
+
+[Grafana provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/)
+
+[Grafana Cloud provisioning](https://grafana.com/docs/grafana-cloud/infrastructure-as-code/terraform/)
+
+[Grafana Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning)

docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md

@@ -1,44 +1,18 @@
 ---
 aliases:
-  - /docs/grafana/latest/alerting/provision-alerting-resources
-  - /docs/grafana/latest/alerting/provision-alerting-resources
-description: Provision alerting resources
+  - /docs/grafana/latest/alerting/provision-alerting-resources/file-provisioning
+  - /docs/grafana/latest/alerting/provision-alerting-resources/file-provisioning
+description: Create and manage resources using file provisioning
 keywords:
   - grafana
   - alerting
-  - set up
-  - configure
+  - alerting resources
+  - file provisioning
   - provisioning
-title: Provision Grafana Alerting resources
-weight: 200
+title: Create and manage alerting resources using file provisioning
+weight: 100
 ---
 
-# Provision Grafana Alerting resources
-
-Alerting infrastructure is often complex, with many pieces of the pipeline that often live in different places. Scaling this across multiple teams and organizations is an especially challenging task. Grafana Alerting provisioning makes this process easier by enabling you to create, manage, and maintain your alerting data in a way that best suits your organization.
-
-There are three options to choose from:
-
-1. Use file provisioning to provision your Grafana Alerting resources, such as alert rules and contact points, through files on disk.
-
-1. Provision your alerting resources using the Grafana HTTP API.
-
-   For more information on the Grafana Alerting provisioning API, refer to [Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/).
-
-1. Provision your alerting resources using Terraform.
-
-**Note:**
-
-Currently, provisioning for Grafana Alerting supports alert rules, contact points, mute timings, and templates. Provisioned alerting resources can only be edited in the source that created them and not from within Grafana or any other source. For example, if you provision your alerting resources using files from disk, you cannot edit the data in Terraform or from within Grafana.
-
-**Useful Links:**
-
-[Grafana provisioning](https://grafana.com/docs/grafana/latest/administration/provisioning/)
-
-[Grafana Cloud provisioning](https://grafana.com/docs/grafana-cloud/infrastructure-as-code/terraform/)
-
-[Grafana Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning)
-
 ## Create and manage alerting resources using file provisioning
 
 Provision your alerting resources using files from disk. When you start Grafana, the data from these files is created in your Grafana system. Grafana adds any new resources you created, updates any that you changed, and deletes old ones.
@@ -57,11 +31,11 @@ Create or delete alert rules in your Grafana instance(s).
 
 1. Create an alert rule in Grafana.
 1. Use the [Alerting provisioning API](https://grafana.com/docs/grafana/latest/developers/http_api/admin/#reload-provisioning-configurations) to extract the alert rule.
-1. Copy the contents into a YAML or JSON configuration file.
+1. Copy the contents into a YAML or JSON configuration file in the default provisioning directory or in your configured directory.
 
    Example configuration files can be found below.
 
-1. Add the file(s) to your GitOps workflow, so that they deploy alongside your Grafana instance(s).
+1. Ensure that your files are in the right directory on the node running the Grafana server, so that they deploy alongside your Grafana instance(s).
 1. Delete the alert rule in Grafana.
 
    **Note:**

docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md

@@ -0,0 +1,316 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/provision-alerting-resources/terraform-provisioning
+description: Create and manage alerting resources using Terraform
+keywords:
+  - grafana
+  - alerting
+  - alerting resources
+  - provisioning
+  - Terraform
+title: Create and manage alerting resources using Terraform
+weight: 200
+---
+
+# Create and manage alerting resources using Terraform
+
+Use Terraform’s Grafana Provider to manage your alerting resources and provision them into your Grafana system. Terraform provider support for Grafana Alerting makes it easy to create, manage, and maintain your entire Grafana Alerting stack as code.
+
+For more information on managing your alerting resources using Terraform, refer to the [Grafana Provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs) documentation.
+
+Complete the following tasks to create and manage your alerting resources using Terraform.
+
+1. Create an API key for provisioning.
+1. Configure the Terraform provider.
+1. Provision your alerting resources.
+
+## Before you begin
+
+- Ensure you have the grafana/grafana [Terraform provider](https://registry.terraform.io/providers/grafana/grafana/1.28.0) 1.27.0 or higher.
+
+- Ensure you are using Grafana 9.1 or higher.
+
+## Create an API key for provisioning
+
+You can [create a normal Grafana API key](https://grafana.com/docs/grafana/latest/administration/api-keys/) to authenticate Terraform with Grafana. Most existing tooling using API keys should automatically work with the new Grafana Alerting support.
+
+There are also dedicated RBAC roles for alerting provisioning. This lets you easily authenticate as a [service account](https://grafana.com/docs/grafana/latest/administration/service-accounts/) with the minimum permissions needed to provision your Alerting infrastructure.
+
+To create an API key for provisioning, complete the following steps.
+
+1. Create a new service account for your CI pipeline.
+1. Assign the role “Access the alert rules Provisioning API.”
+1. Create a new service account token.
+1. Name and save the token for use in Terraform.
+
+Alternatively, you can use Terraform authentication: [basic auth](https://registry.terraform.io/providers/grafana/grafana/latest/docs#authentication).
+
+## Configure the Terraform provider
+
+Grafana Alerting support is included as part of the [Grafana Terraform provider](https://registry.terraform.io/providers/grafana/grafana/latest/docs).
+
+The following is an example you can use to configure the Terraform provider.
+
+```terraform
+terraform {
+    required_providers {
+        grafana = {
+            source = "grafana/grafana"
+            version = ">= 1.28.2"
+        }
+    }
+}
+
+provider "grafana" {
+    url = <YOUR_GRAFANA_URL>
+    auth = <YOUR_GRAFANA_API_KEY>
+}
+```
+
+## Provision contact points and templates
+
+Contact points connect an alerting stack to the outside world. They tell Grafana how to connect to your external systems and where to deliver notifications. There are over fifteen different integrations to choose from.
+
+To provision contact points and templates, complete the following steps.
+
+1. Copy this code block into a .tf file on your local machine.
+
+This example uses a contact point that sends alert notifications to Slack.
+
+```terraform
+resource "grafana_contact_point" "my_slack_contact_point" {
+    name = "Send to My Slack Channel"
+
+    slack {
+        url = <YOUR_SLACK_WEBHOOK_URL>
+        text = <<EOT
+{{ len .Alerts.Firing }} alerts are firing!
+
+Alert summaries:
+{{ range .Alerts.Firing }}
+{{ template "Alert Instance Template" . }}
+{{ end }}
+EOT
+    }
+}
+```
+
+1. Enter text for your notification in the text field.
+
+The `text` field supports [Go-style templating](https://pkg.go.dev/text/template). This enables you to manage your Grafana Alerting message templates directly in Terraform.
+
+1. Run the command ‘terraform apply’.
+
+1. Go to the Grafana UI and check the details of your contact point.
+
+**Note:**
+
+You cannot edit resources provisioned from Terraform from the UI. This ensures that your alerting stack always stays in sync with your code.
+
+1. Click **Test** to verify that the contact point works correctly.
+
+**Note:**
+
+You can re-use the same templates across many contact points. In the example above, a shared template ie embedded using the statement `{{ template “Alert Instance Template” . }}`
+
+This fragment can then be managed separately in Terraform:
+
+```terraform
+resource "grafana_message_template" "my_alert_template" {
+    name = "Alert Instance Template"
+
+    template = <<EOT
+{{ define "Alert Instance Template" }}
+Firing: {{ .Labels.alertname }}
+Silence: {{ .SilenceURL }}
+{{ end }}
+EOT
+}
+```
+
+## Provision notification policies and routing
+
+Notification policies tell Grafana how to route alert instances, as opposed to where. They connect firing alerts to your previously defined contact points using a system of labels and matchers.
+
+To provision notification policies and routing, complete the following steps.
+
+1. Copy this code block into a .tf file on your local machine.
+
+In this example, the alerts are grouped by `alertname`, which means that any notifications coming from alerts which share the same name, are grouped into the same Slack message.
+
+resource "grafana_notification_policy" "my_policy" {
+group_by = ["alertname"]
+contact_point = grafana_contact_point.my_slack_contact_point.name
+
+    group_wait = "45s"
+    group_interval = "6m"
+    repeat_interval = "3h"
+
+    policy {
+        matcher {
+            label = "a"
+            match = "="
+            value = "b"
+        }
+        group_by = ["..."]
+        contact_point = grafana_contact_point.a_different_contact_point.name
+        mute_timings = [grafana_mute_timing.my_mute_timing.name]
+
+        policy {
+            matcher {
+                label = "sublabel"
+                match = "="
+                value = "subvalue"
+            }
+            contact_point = grafana_contact_point.a_third_contact_point.name
+            group_by = ["..."]
+        }
+    }
+
+}
+
+1. In the mute_timings field, link a mute timing to your notification policy.
+
+1. Run the command ‘terraform apply’.
+
+1. Go to the Grafana UI and check the details of your notification policy.
+
+**Note:**
+
+You cannot edit resources provisioned from Terraform from the UI. This ensures that your alerting stack always stays in sync with your code.
+
+1. Click **Test** to verify that the notification point is working correctly.
+
+## Provision mute timings
+
+Mute timings provide the ability to mute alert notifications for defined time periods.
+
+To provision mute timings, complete the following steps.
+
+1. Copy this code block into a .tf file on your local machine.
+
+In this example, alert notifications are muted on weekends.
+
+resource "grafana_mute_timing" "my_mute_timing" {
+name = "My Mute Timing"
+
+    intervals {
+        times {
+          start = "04:56"
+          end = "14:17"
+        }
+        weekdays = ["saturday", "sunday", "tuesday:thursday"]
+        months = ["january:march", "12"]
+        years = ["2025:2027"]
+    }
+
+}
+
+1. Run the command ‘terraform apply’.
+1. Go to the Grafana UI and check the details of your mute timing.
+
+**Note:**
+
+You cannot edit resources provisioned from Terraform from the UI. This ensures that your alerting stack always stays in sync with your code.
+
+1. Click **Test** to verify that the mute timing is working correctly.
+
+## Provision alert rules
+
+[Alert rules](https://grafana.com/docs/grafana/latest/alerting/alerting-rules/) enable you to alert against any Grafana data source. This can be a data source that you already have configured, or you can [define your data sources in Terraform](https://registry.terraform.io/providers/grafana/grafana/latest/docs/resources/data_source) alongside your alert rules.
+
+To provision alert rules, complete the following steps.
+
+1. Create a data source to query and a folder to store your rules in.
+
+In this example, the [TestData](https://grafana.com/docs/grafana/latest/datasources/testdata/) data source is used.
+
+```terraform
+resource "grafana_data_source" "testdata_datasource" {
+    name = "TestData"
+    type = "testdata"
+}
+
+resource "grafana_folder" "rule_folder" {
+    title = "My Rule Folder"
+}
+```
+
+1. Define an alert rule.
+
+For more information on alert rules, refer to [how to create Grafana-managed alerts](https://grafana.com/blog/2022/08/01/grafana-alerting-video-how-to-create-alerts-in-grafana-9/).
+
+1. Group your alert rules.
+
+In this example, the `grafana_rule_group` resource group is used.
+
+```terraform
+resource "grafana_rule_group" "my_rule_group" {
+    name = "My Alert Rules"
+    folder_uid = grafana_folder.rule_folder.uid
+    interval_seconds = 60
+    org_id = 1
+
+    rule {
+        name = "My Random Walk Alert"
+        condition = "C"
+        for = "0s"
+
+        // Query the datasource.
+        data {
+            ref_id = "A"
+            relative_time_range {
+                from = 600
+                to = 0
+            }
+            datasource_uid = grafana_data_source.testdata_datasource.uid
+            // `model` is a JSON blob that sends datasource-specific data.
+            // It's different for every datasource. The alert's query is defined here.
+            model = jsonencode({
+                intervalMs = 1000
+                maxDataPoints = 43200
+                refId = "A"
+            })
+        }
+
+        // The query was configured to obtain data from the last 60 seconds. Let's alert on the average value of that series using a Reduce stage.
+        data {
+            datasource_uid = "-100"
+            // You can also create a rule in the UI, then GET that rule to obtain the JSON.
+            // This can be helpful when using more complex reduce expressions.
+            model = <<EOT
+{"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":["A"]},"reducer":{"params":[],"type":"last"},"type":"avg"}],"datasource":{"name":"Expression","type":"__expr__","uid":"__expr__"},"expression":"A","hide":false,"intervalMs":1000,"maxDataPoints":43200,"reducer":"last","refId":"B","type":"reduce"}
+EOT
+            ref_id = "B"
+            relative_time_range {
+                from = 0
+                to = 0
+            }
+        }
+
+        // Now, let's use a math expression as our threshold.
+        // We want to alert when the value of stage "B" above exceeds 70.
+        data {
+            datasource_uid = "-100"
+            ref_id = "C"
+            relative_time_range {
+                from = 0
+                to = 0
+            }
+            model = jsonencode({
+                expression = "$B > 70"
+                type = "math"
+                refId = "C"
+            })
+        }
+    }
+}
+```
+
+1. Go to the Grafana UI and check your alert rule.
+
+You can see whether or not the alert rule is firing. You can also see a visualization of each of the alert rule’s query stages
+
+When the alert fires, Grafana routes a notification through the policy you defined.
+
+For example, if you chose Slack as a contact point, Grafana’s embedded [Alertmanager](https://github.com/prometheus/alertmanager) automatically posts a message to Slack.

docs/sources/alerting/set-up/provision-alerting-resources/view-provisioned-resources/index.md

@@ -0,0 +1,28 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/provision-alerting-resources/view-provisioned-resources
+description: View provisioned resources in Grafana
+keywords:
+  - grafana
+  - alerting
+  - alerting resources
+  - provisioning
+title: View provisioned resources in Grafana
+weight: 300
+---
+
+# View provisioned alerting resources in Grafana
+
+Verify that your alerting resources were created in Grafana.
+
+To view your provisioned resources in Grafana, complete the following steps.
+
+1. Open your Grafana instance.
+1. Navigate to Alerting.
+1. Click an alerting resource folder, for example, Alert rules.
+
+Provisioned resources are labeled **Provisioned**, so that it is clear that they were not created manually.
+
+**Note:**
+
+You cannot edit provisioned resources from Grafana. You can only change the resource properties by changing the provisioning file and restarting Grafana or carrying out a hot reload. This prevents changes being made to the resource that would be overwritten if a file is provisioned again or a hot reload is carried out.

docs/sources/alerting/silences/_index.md

@@ -16,8 +16,6 @@ weight: 450
 
 Use silences to stop notifications from one or more alerting rules. Silences do not prevent alert rules from being evaluated. Nor do they not stop alerting instances from being shown in the user interface. Silences only stop notifications from getting created. A silence lasts for only a specified window of time.
 
-Silences do not prevent alert rules from being evaluated. They also do not stop alert instances from being shown in the user interface. Silences only prevent notifications from being created.
-
 You can configure Grafana managed silences as well as silences for an [external Alertmanager data source]({{< relref "../../datasources/alertmanager/" >}}). For more information, see [Alertmanager]({{< relref "../fundamentals/alertmanager/" >}}).
 
 See also:

docs/sources/alerting/silences/create-silence.md

@@ -19,7 +19,7 @@ Silences stop notifications from getting created and last for only a specified w
 To add a silence:
 
 1. In the Grafana menu, click the **Alerting** (bell) icon to open the Alerting page listing existing alerts.
-2. On the Alerting page, click **Silences** to open the page listing existing contact points.
+2. On the Alerting page, click **Silences** to open the page listing existing silences.
 3. From Alertmanager drop-down, select an external Alertmanager to create and manage silences for the external data source. Otherwise, keep the default option of Grafana.
 4. Click **New Silence** to open the Create silence page.
 5. In **Silence start and end**, select the start and end date to indicate when the silence should go into effect and expire.

docs/sources/basics/exemplars/_index.md

@@ -1,30 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/basics/exemplars/
-description: Exemplars
-keywords:
-  - grafana
-  - concepts
-  - exemplars
-  - prometheus
-title: Exemplars
-weight: 400
----
-
-# Introduction to exemplars
-
-An exemplar is a specific trace representative of measurement taken in a given time interval. While metrics excel at giving you an aggregated view of your system, traces give you a fine grained view of a single request; exemplars are a way to link the two.
-
-Suppose your company website is experiencing a surge in traffic volumes. While more than eighty percent of the users are able to access the website in under two seconds, some users are experiencing a higher than normal response time resulting in bad user experience.
-
-To identify the factors that are contributing to the latency, you must compare a trace for a fast response against a trace for a slow response. Given the vast amount of data in a typical production environment, it will be extremely laborious and time-consuming effort.
-
-Use exemplars to help isolate problems within your data distribution by pinpointing query traces exhibiting high latency within a time interval. Once you localize the latency problem to a few exemplar traces, you can combine it with additional system based information or location properties to perform a root cause analysis faster, leading to quick resolutions to performance issues.
-
-Support for exemplars is available for the Prometheus data source only. Once you enable the functionality, exemplars data is available by default. For more information on exemplar configuration and how to enable exemplars, refer to [configuring exemplars in Prometheus data source]({{< relref "../../datasources/prometheus/#configuring-exemplars" >}}).
-
-Grafana shows exemplars alongside a metric in the Explore view and in dashboards. Each exemplar displays as a highlighted star. You can hover your cursor over an exemplar to view the unique traceID, which is a combination of a key value pair. To investigate further, click the blue button next to the `traceID` property.
-
-{{< figure src="/static/img/docs/v74/exemplars.png" class="docs-image--no-shadow" max-width= "750px" caption="Screenshot showing the detail window of an Exemplar" >}}
-
-Refer to [View exemplar data]({{< relref "view-exemplars/" >}}) for instructions on how to drill down and view exemplar trace details from metrics and logs. To know more about exemplars, refer to the blogpost [Intro to exemplars, which enable Grafana Tempo’s distributed tracing at massive scale](https://grafana.com/blog/2021/03/31/intro-to-exemplars-which-enable-grafana-tempos-distributed-tracing-at-massive-scale/).

docs/sources/best-practices/_index.md

@@ -1,16 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/best-practices/
-description: Best practices for working with Grafana
-title: Best practices
-weight: 20
----
-
-# Best practices
-
-This section provides information about best practices for intermediate Grafana administrators and users. Click on each of the links before for more information.
-
-- [Best practices for creating dashboards]({{< relref "best-practices-for-creating-dashboards/" >}})
-- [Best practices for managing dashboards]({{< relref "best-practices-for-managing-dashboards/" >}})
-- [Common observability strategies]({{< relref "common-observability-strategies/" >}})
-- [Dashboard management maturity model]({{< relref "dashboard-management-maturity-levels/" >}})

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

@@ -1,56 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/best-practices/best-practices-for-creating-dashboards/
-description: Best practices for creating dashboards in Grafana
-title: Best practices for creating dashboards
-weight: 100
----
-
-# Best practices for creating dashboards
-
-This page outlines some best practices to follow when creating Grafana dashboards.
-
-## Before you begin
-
-Here are some principles to consider before you create a dashboard.
-
-### A dashboard should tell a story or answer a question
-
-What story are you trying to tell with your dashboard? Try to create a logical progression of data, such as large to small or general to specific. What is the goal for this dashboard? (Hint: If the dashboard doesn't have a goal, then ask yourself if you really need the dashboard.)
-
-Keep your graphs simple and focused on answering the question that you are asking. For example, if your question is "which servers are in trouble?", then maybe you don't need to show all the server data. Just show data for the ones in trouble.
-
-### Dashboards should reduce cognitive load, not add to it
-
-_Cognitive load_ is basically how hard you need to think about something in order to figure it out. Make your dashboard easy to interpret. Other users and future you (when you're trying to figure out what broke at 2AM) will appreciate it.
-
-Ask yourself:
-
-- Can I tell what exactly each graph represents? Is it obvious, or do I have to think about it?
-- If I show this to someone else, how long will it take them to figure it out? Will they get lost?
-
-### Have a monitoring strategy
-
-It's easy to make new dashboards. It's harder to optimize dashboard creation and adhere to a plan, but it's worth it. This strategy should govern both your overall dashboard scheme and enforce consistency in individual dashboard design.
-
-Refer to [Common observability strategies]({{< relref "common-observability-strategies/" >}}) and [Dashboard management maturity levels]({{< relref "dashboard-management-maturity-levels/" >}}) for more information.
-
-### Write it down
-
-Once you have a strategy or design guidelines, write them down to help maintain consistency over time. Check out this [Wikimedia runbook example](https://wikitech.wikimedia.org/wiki/Performance/Runbook/Grafana_best_practices).
-
-## Best practices to follow
-
-- When creating a new dashboard, make sure it has a meaningful name.
-  - If you are creating a dashboard to play or experiment, then put the word `TEST` or `TMP` in the name.
-  - Consider including your name or initials in the dashboard name or as a tag so that people know who owns the dashboard.
-  - Remove temporary experiment dashboards when you are done with them.
-- If you create many related dashboards, think about how to cross-reference them for easy navigation. Refer to [Best practices for managing dashboards]({{< relref "best-practices-for-managing-dashboards/" >}}) for more information.
-- Grafana retrieves data from a data source. A basic understanding of [data sources]({{< relref "../datasources/" >}}) in general and your specific is important.
-- Avoid unnecessary dashboard refreshing to reduce the load on the network or backend. For example, if your data changes every hour, then you don't need to set the dashboard refresh rate to 30 seconds.
-- 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.
-- Reuse your dashboards and enforce consistency by using [templates and variables]({{< relref "../dashboards/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

@@ -1,39 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/best-practices/best-practices-for-managing-dashboards/
-description: Best practices for managing dashboards in Grafana
-title: Best practices for managing dashboards
-weight: 200
----
-
-# Best practices for managing dashboards
-
-This page outlines some best practices to follow when managing Grafana dashboards.
-
-## Before you begin
-
-Here are some principles to consider before you start managing dashboards.
-
-### Strategic observability
-
-There are several [common observability strategies]({{< relref "common-observability-strategies/" >}}). You should research them and decide whether one of them works for you or if you want to come up with your own. Either way, have a plan, write it down, and stick to it.
-
-Adapt your strategy to changing needs as necessary.
-
-### Maturity level
-
-What is your dashboard maturity level? Analyze your current dashboard setup and compare it to the [Dashboard management maturity model]({{< relref "dashboard-management-maturity-levels/" >}}). Understanding where you are can help you decide how to get to where you want to be.
-
-## Best practices to follow
-
-- Avoid dashboard sprawl, meaning the uncontrolled growth of dashboards. Dashboard sprawl negatively affects time to find the right dashboard. Duplicating dashboards and changing “one thing” (worse: keeping original tags) is the easiest kind of sprawl.
-  - Periodically review the dashboards and remove unnecessary ones.
-  - 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" >}}).
-- 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/" >}}).
-  - 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/common-observability-strategies.md

@@ -1,62 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/best-practices/common-observability-strategies/
-  - /docs/grafana/latest/getting-started/strategies/
-description: Common observability strategies
-keywords:
-  - grafana
-  - intro
-  - guide
-  - concepts
-  - methods
-title: Common observability strategies
-weight: 300
----
-
-# Common observability strategies
-
-When you have a lot to monitor, like a server farm, you need a strategy to decide what is important enough to monitor. This page describes several common methods for choosing what to monitor.
-
-A logical strategy allows you to make uniform dashboards and scale your observability platform more easily.
-
-## Guidelines for usage
-
-- The USE method tells you how happy your machines are, the RED method tells you how happy your users are.
-- USE reports on causes of issues.
-- RED reports on user experience and is more likely to report symptoms of problems.
-- The best practice of alerting is to alert on symptoms rather than causes, so alerting should be done on RED dashboards.
-
-## USE method
-
-USE stands for:
-
-- **Utilization -** Percent time the resource is busy, such as node CPU usage
-- **Saturation -** Amount of work a resource has to do, often queue length or node load
-- **Errors -** Count of error events
-
-This method is best for hardware resources in infrastructure, such as CPU, memory, and network devices. For more information, refer to [The USE Method](http://www.brendangregg.com/usemethod.html).
-
-## RED method
-
-RED stands for:
-
-- **Rate -** Requests per second
-- **Errors -** Number of requests that are failing
-- **Duration -** Amount of time these requests take, distribution of latency measurements
-
-This method is most applicable to services, especially a microservices environment. For each of your services, instrument the code to expose these metrics for each component. RED dashboards are good for alerting and SLAs. A well-designed RED dashboard is a proxy for user experience.
-
-For more information, refer to Tom Wilkie's blog post [The RED method: How to instrument your services](https://grafana.com/blog/2018/08/02/the-red-method-how-to-instrument-your-services).
-
-## The Four Golden Signals
-
-According to the [Google SRE handbook](https://landing.google.com/sre/sre-book/chapters/monitoring-distributed-systems/#xref_monitoring_golden-signals), if you can only measure four metrics of your user-facing system, focus on these four.
-
-This method is similar to the RED method, but it includes saturation.
-
-- **Latency -** Time taken to serve a request
-- **Traffic -** How much demand is placed on your system
-- **Errors -** Rate of requests that are failing
-- **Saturation -** How "full" your system is
-
-[Here's an example from Grafana Play](https://play.grafana.org/d/000000109/the-four-golden-signals?orgId=1).

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

@@ -1,73 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/best-practices/dashboard-management-maturity-levels/
-description: Explanation of dashboard management maturity model
-title: Dashboard management maturity model
-weight: 400
----
-
-# Dashboard management maturity model
-
-_Dashboard management maturity_ refers to how well-designed and efficient your dashboard ecosystem is. We recommend periodically reviewing your dashboard setup to gauge where you are and how you can improve.
-
-Broadly speaking, dashboard maturity can be defined as low, medium, or high.
-
-Much of the content for this topic was taken from the KubeCon 2019 talk [Fool-Proof Kubernetes Dashboards for Sleep-Deprived Oncalls](https://www.youtube.com/watch?v=YE2aQFiMGfY).
-
-## Low - default state
-
-At this stage, you have no coherent dashboard management strategy. Almost everyone starts here.
-
-How can you tell you are here?
-
-- Everyone can modify your dashboards.
-- Lots of copied dashboards, little to no dashboard reuse.
-- One-off dashboards that hang around forever.
-- No version control (dashboard JSON in version control).
-- Lots of browsing for dashboards, searching for the right dashboard. This means lots of wasted time trying to find the dashboard you need.
-- Not having any alerts to direct you to the right dashboard.
-
-## Medium - methodical dashboards
-
-At this stage, you are starting to manage your dashboard use with methodical dashboards. You might have laid out a strategy, but there are some things you could improve.
-
-How can you tell you are here?
-
-- Prevent sprawl by using template variables. For example, you don't need a separate dashboard for each node, you can use query variables. Even better, you can make the data source a template variable too, so you can reuse the same dashboard across different clusters and monitoring backends.
-
-  Refer to the list of [Variable examples]({{< relref "../dashboards/variables/#examples-of-templates-and-variables" >}}) if you want some ideas.
-
-- Methodical dashboards according to an [observability strategy]({{< relref "common-observability-strategies/" >}}).
-- Hierarchical dashboards with drill-downs to the next level.
-
-  {{< figure class="float-right"  max-width="100%" src="/static/img/docs/best-practices/drill-down-example.png" caption="Example of using drill-down" >}}
-
-- Dashboard design reflects service hierarchies. The example shown below uses the RED method (request and error rate on the left, latency duration on the right) with one row per service. The row order reflects the data flow.
-
-  {{< figure class="float-right"  max-width="100%" src="/static/img/docs/best-practices/service-hierarchy-example.png" caption="Example of a service hierarchy" >}}
-
-- Compare like to like: split service dashboards when the magnitude differs. Make sure aggregated metrics don't drown out important information.
-- Expressive charts with meaningful use of color and normalizing axes where you can.
-  - Example of meaningful color: Blue means it's good, red means it's bad. [Thresholds]({{< relref "../panels/configure-thresholds/" >}}) can help with that.
-  - Example of normalizing axes: When comparing CPU usage, measure by percentage rather than raw number, because machines can have a different number of cores. Normalizing CPU usage by the number of cores reduces cognitive load because the viewer can trust that at 100% all cores are being used, without having to know the number of CPUs.
-- 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/" >}}).
-- Version-controlled dashboard JSON.
-
-## High - optimized use
-
-At this stage, you have optimized your dashboard management use with a consistent and thoughtful strategy. It requires maintenance, but the results are worth it.
-
-- Actively reducing sprawl.
-  - Regularly review existing dashboards to make sure they are still relevant.
-  - Only approved dashboards added to master dashboard list.
-  - Tracking dashboard use. If you're an Enterprise user, you can take advantage of [Usage insights]({{< relref "../dashboards/assess-dashboard-usage/" >}}).
-- Consistency by design.
-- Use scripting libraries to generate dashboards, ensure consistency in pattern and style.
-  - grafonnet (Jsonnet)
-  - grafanalib (Python)
-- No editing in the browser. Dashboard viewers change views with variables.
-- Browsing for dashboards is the exception, not the rule.
-- Perform experimentation and testing in a separate Grafana instance dedicated to that purpose, not your production instance. When a dashboard in the test environment is proven useful, then add that dashboard to your main Grafana instance.

docs/sources/dashboards/_index.md

@@ -3,26 +3,26 @@ aliases:
   - /docs/grafana/latest/dashboards/
   - /docs/grafana/latest/features/dashboard/dashboards/
 title: Dashboards
-weight: 80
+weight: 70
 ---
 
-# About Grafana dashboards
+# Dashboards
 
-A dashboard is a set of one or more [panels]({{< relref "../panels/" >}}) organized and arranged into one or more rows. Grafana ships with a variety of panels making it easy to construct the right queries, and customize the visualization so that you can create the perfect dashboard for your need. Each panel can interact with data from any configured Grafana [data source]({{< relref "../administration/data-source-management/" >}}).
+A dashboard is a set of one or more [panels]({{< relref "../panels-visualizations/" >}}) organized and arranged into one or more rows. Grafana ships with a variety of panels making it easy to construct the right queries, and customize the visualization so that you can create the perfect dashboard for your need. Each panel can interact with data from any configured Grafana [data source]({{< relref "../administration/data-source-management/" >}}).
 
 Dashboard snapshots are static. Queries and expressions cannot be re-executed from snapshots. As a result, if you update any variables in your query or expression, it will not change your dashboard data.
 
 Before you begin, ensure that you have configured a data source. See also:
 
 - [Use dashboards]({{< relref "use-dashboards/" >}})
+- [Build dashboards]({{< relref "./build-dashboards" >}})
 - [Create dashboard folders]({{< relref "./manage-dashboards/#create-a-dashboard-folder" >}})
-- [Add and organize panels]({{< relref "add-organize-panels/" >}})
 - [Manage dashboards]({{< relref "./manage-dashboards" >}})
 - [Public dashboards]({{< relref "dashboard-public/" >}})
-- [Annotations]({{< relref "annotations/" >}})
+- [Annotations]({{< relref "./build-dashboards/annotate-visualizations" >}})
 - [Playlist]({{< relref "./create-manage-playlists/" >}})
 - [Reporting]({{< relref "./create-reports" >}})
 - [Time range controls]({{< relref "./manage-dashboards/#common-time-range-controls" >}})
-- [Dashboard version history]({{< relref "dashboard-history/" >}})
-- [Dashboard export and import]({{< relref "./manage-dashboards/#export-and-import-dashboards" >}})
-- [Dashboard JSON model]({{< relref "json-model/" >}})
+- [Version history]({{< relref "./build-dashboards/manage-version-history" >}})
+- [Export and import]({{< relref "./manage-dashboards/#export-and-import-dashboards" >}})
+- [JSON model]({{< relref "./build-dashboards/view-dashboard-json-model/" >}})

docs/sources/dashboards/build-dashboards/_index.md

@@ -0,0 +1,24 @@
+---
+aliases:
+  - /docs/grafana/next/dashboards/build-dashboards/
+title: Build dashboards
+menuTitle: Build dashboards
+weight: 2
+keywords:
+  - grafana
+  - dashboard
+  - dashboard folders
+  - create
+  - build
+  - design
+---
+
+# Build dashboards
+
+This section includes the following topics:
+
+{{< section >}}
+
+## Dynamic dashboards
+
+You can create more interactive and dynamic dashboards by adding and using [variables]({{< relref "../variables" >}}). Instead of hard-coding things like server, application, and sensor names in your metric queries, you can use variables in their place. Read more about variables [here]({{< relref "../variables" >}}).

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

@@ -9,9 +9,10 @@ aliases:
   - /docs/grafana/latest/panels/add-panels-dynamically/about-repeating-panels-rows/
   - /docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-rows/
   - /docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-panels/
+  - /docs/grafana/next/dashboards/build-dashboards/add-organize-panels/
 title: Add and organize panels
 menuTitle: Add and organize panels
-weight: 2
+weight: 200
 keywords:
   - panel
   - dashboard
@@ -36,13 +37,13 @@ This section describes the areas of the Grafana panel editor.
    - **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 "../manage-dashboards/#configure-dashboard-time-range-controls" >}}).
+   - **Time range controls:** For more information, refer to [Time range controls]({{< relref "../../manage-dashboards/#configure-dashboard-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/" >}}).
+- **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.
 
@@ -76,10 +77,10 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
 **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/" >}}).
+- 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.
+- 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**:
 
@@ -88,7 +89,7 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 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.
+For more information about data sources, refer to [Data sources]({{< relref "../../../datasources/" >}}) for specific guidelines.
 
 1. In the Visualization list, select a visualization type.
 
@@ -96,17 +97,17 @@ Dashboards and panels allow you to show your data in visual form. Each panel nee
 
    ![](/static/img/docs/panel-editor/select-visualization-8-0.png)
 
-   For more information about individual visualizations, refer to [Visualizations options]({{< relref "../../visualizations/" >}}).
+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.
 
-   - [Configure value mappings]({{< relref "../../panels/configure-value-mappings" >}})
-   - [Visualization-specific options]({{< relref "../../visualizations/" >}})
-   - [Override field values]({{< relref "../../panels/configure-overrides/" >}})
-   - [Configure thresholds]({{< relref "../../panels/configure-thresholds/" >}})
-   - [Configure standard options]({{< relref "../../panels/configure-standard-options/" >}})
+   - [Configure value mappings]({{< relref "../../../panels/configure-value-mappings" >}})
+   - [Visualization-specific options]({{< relref "../../../visualizations/" >}})
+   - [Override field values]({{< relref "../../../panels/configure-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.
 

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

@@ -2,16 +2,18 @@
 aliases:
   - /docs/grafana/latest/dashboards/annotations/
   - /docs/grafana/latest/reference/annotations/
+  - /docs/grafana/next/dashboards/build-dashboards/annotate-visualizations/
 keywords:
   - grafana
   - annotations
   - documentation
   - guide
-title: Annotations
-weight: 9
+title: Annotate visualizations
+menuTitle: Annotate visualizations
+weight: 600
 ---
 
-# Annotations
+# Annotate visualizations
 
 Annotations provide a way to mark points on the graph with rich events. When you hover over an annotation
 you can get event description and event tags. The text field can include links to other systems with more detail.
@@ -20,7 +22,7 @@ you can get event description and event tags. The text field can include links t
 
 ## Native annotations
 
-Grafana comes with a native annotation store and the ability to add annotation events directly from the graph panel or via the [HTTP API]({{< relref "../developers/http_api/annotations/" >}}).
+Grafana comes with a native annotation store and the ability to add annotation events directly from the graph panel or via the [HTTP API]({{< relref "../../../developers/http_api/annotations/" >}}).
 
 ### Add annotation
 
@@ -94,4 +96,4 @@ to show.
 
 ### Annotation query details
 
-The annotation query options are different for each data source. For information about annotations in a specific data source, refer to the specific [data source]({{< relref "../datasources/" >}}) topic.
+The annotation query options are different for each data source. For information about annotations in a specific data source, refer to the specific [data source]({{< relref "../../../datasources/" >}}) topic.

docs/sources/dashboards/build-dashboards/best-practices/index.md

@@ -0,0 +1,215 @@
+---
+aliases:
+  - /docs/grafana/latest/best-practices/
+  - /docs/grafana/latest/best-practices/common-observability-strategies/
+  - /docs/grafana/latest/getting-started/strategies/
+  - /docs/grafana/latest/best-practices/dashboard-management-maturity-levels/
+  - /docs/grafana/latest/best-practices/best-practices-for-creating-dashboards/
+  - /docs/grafana/latest/best-practices/best-practices-for-managing-dashboards/
+  - /docs/grafana/latest/dashboards/build-dashboards/best-practices/
+description: Best practices for working with Grafana
+title: Grafana dashboard best practices
+menuTitle: Best practices
+weight: 100
+---
+
+# Grafana dashboard best practices
+
+This section provides information about best practices for intermediate Grafana administrators and users about how to build and maintain Grafana dashboards.
+
+For more information about the different kinds of dashboards you can create, refer to [Grafana dashboards: A complete guide to all the different types you can build](https://grafana.com/blog/2022/06/06/grafana-dashboards-a-complete-guide-to-all-the-different-types-you-can-build/?pg=webinar-getting-started-with-grafana-dashboard-design-amer&plcmt=related-content-1).
+
+## Common observability strategies
+
+When you have a lot to monitor, like a server farm, you need a strategy to decide what is important enough to monitor. This page describes several common methods for choosing what to monitor.
+
+A logical strategy allows you to make uniform dashboards and scale your observability platform more easily.
+
+### Guidelines for usage
+
+- The USE method tells you how happy your machines are, the RED method tells you how happy your users are.
+- USE reports on causes of issues.
+- RED reports on user experience and is more likely to report symptoms of problems.
+- The best practice of alerting is to alert on symptoms rather than causes, so alerting should be done on RED dashboards.
+
+### USE method
+
+USE stands for:
+
+- **Utilization -** Percent time the resource is busy, such as node CPU usage
+- **Saturation -** Amount of work a resource has to do, often queue length or node load
+- **Errors -** Count of error events
+
+This method is best for hardware resources in infrastructure, such as CPU, memory, and network devices. For more information, refer to [The USE Method](http://www.brendangregg.com/usemethod.html).
+
+### RED method
+
+RED stands for:
+
+- **Rate -** Requests per second
+- **Errors -** Number of requests that are failing
+- **Duration -** Amount of time these requests take, distribution of latency measurements
+
+This method is most applicable to services, especially a microservices environment. For each of your services, instrument the code to expose these metrics for each component. RED dashboards are good for alerting and SLAs. A well-designed RED dashboard is a proxy for user experience.
+
+For more information, refer to Tom Wilkie's blog post [The RED method: How to instrument your services](https://grafana.com/blog/2018/08/02/the-red-method-how-to-instrument-your-services).
+
+### The Four Golden Signals
+
+According to the [Google SRE handbook](https://landing.google.com/sre/sre-book/chapters/monitoring-distributed-systems/#xref_monitoring_golden-signals), if you can only measure four metrics of your user-facing system, focus on these four.
+
+This method is similar to the RED method, but it includes saturation.
+
+- **Latency -** Time taken to serve a request
+- **Traffic -** How much demand is placed on your system
+- **Errors -** Rate of requests that are failing
+- **Saturation -** How "full" your system is
+
+[Here's an example from Grafana Play](https://play.grafana.org/d/000000109/the-four-golden-signals?orgId=1).
+
+## Dashboard management maturity model
+
+_Dashboard management maturity_ refers to how well-designed and efficient your dashboard ecosystem is. We recommend periodically reviewing your dashboard setup to gauge where you are and how you can improve.
+
+Broadly speaking, dashboard maturity can be defined as low, medium, or high.
+
+Much of the content for this topic was taken from the KubeCon 2019 talk [Fool-Proof Kubernetes Dashboards for Sleep-Deprived Oncalls](https://www.youtube.com/watch?v=YE2aQFiMGfY).
+
+### Low - default state
+
+At this stage, you have no coherent dashboard management strategy. Almost everyone starts here.
+
+How can you tell you are here?
+
+- Everyone can modify your dashboards.
+- Lots of copied dashboards, little to no dashboard reuse.
+- One-off dashboards that hang around forever.
+- No version control (dashboard JSON in version control).
+- Lots of browsing for dashboards, searching for the right dashboard. This means lots of wasted time trying to find the dashboard you need.
+- Not having any alerts to direct you to the right dashboard.
+
+### Medium - methodical dashboards
+
+At this stage, you are starting to manage your dashboard use with methodical dashboards. You might have laid out a strategy, but there are some things you could improve.
+
+How can you tell you are here?
+
+- Prevent sprawl by using template variables. For example, you don't need a separate dashboard for each node, you can use query variables. Even better, you can make the data source a template variable too, so you can reuse the same dashboard across different clusters and monitoring backends.
+
+  Refer to the list of [Variable examples]({{< relref "../../variables/#examples-of-templates-and-variables" >}}) if you want some ideas.
+
+- Methodical dashboards according to an [observability strategy]({{< relref "#common-observability-strategies" >}}).
+- Hierarchical dashboards with drill-downs to the next level.
+
+  {{< figure class="float-right"  max-width="100%" src="/static/img/docs/best-practices/drill-down-example.png" caption="Example of using drill-down" >}}
+
+- Dashboard design reflects service hierarchies. The example shown below uses the RED method (request and error rate on the left, latency duration on the right) with one row per service. The row order reflects the data flow.
+
+  {{< figure class="float-right"  max-width="100%" src="/static/img/docs/best-practices/service-hierarchy-example.png" caption="Example of a service hierarchy" >}}
+
+- Compare like to like: split service dashboards when the magnitude differs. Make sure aggregated metrics don't drown out important information.
+- Expressive charts with meaningful use of color and normalizing axes where you can.
+  - Example of meaningful color: Blue means it's good, red means it's bad. [Thresholds]({{< relref "../../../panels-visualizations/configure-thresholds/" >}}) can help with that.
+  - Example of normalizing axes: When comparing CPU usage, measure by percentage rather than raw number, because machines can have a different number of cores. Normalizing CPU usage by the number of cores reduces cognitive load because the viewer can trust that at 100% all cores are being used, without having to know the number of CPUs.
+- 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 "../manage-dashboard-links" >}}).
+- Version-controlled dashboard JSON.
+
+### High - optimized use
+
+At this stage, you have optimized your dashboard management use with a consistent and thoughtful strategy. It requires maintenance, but the results are worth it.
+
+- Actively reducing sprawl.
+  - Regularly review existing dashboards to make sure they are still relevant.
+  - Only approved dashboards added to master dashboard list.
+  - Tracking dashboard use. If you're an Enterprise user, you can take advantage of [Usage insights]({{< relref "../../assess-dashboard-usage/" >}}).
+- Consistency by design.
+- Use scripting libraries to generate dashboards, ensure consistency in pattern and style.
+  - grafonnet (Jsonnet)
+  - grafanalib (Python)
+- No editing in the browser. Dashboard viewers change views with variables.
+- Browsing for dashboards is the exception, not the rule.
+- Perform experimentation and testing in a separate Grafana instance dedicated to that purpose, not your production instance. When a dashboard in the test environment is proven useful, then add that dashboard to your main Grafana instance.
+
+## Best practices for creating dashboards
+
+This page outlines some best practices to follow when creating Grafana dashboards.
+
+### Before you begin
+
+Here are some principles to consider before you create a dashboard.
+
+#### A dashboard should tell a story or answer a question
+
+What story are you trying to tell with your dashboard? Try to create a logical progression of data, such as large to small or general to specific. What is the goal for this dashboard? (Hint: If the dashboard doesn't have a goal, then ask yourself if you really need the dashboard.)
+
+Keep your graphs simple and focused on answering the question that you are asking. For example, if your question is "which servers are in trouble?", then maybe you don't need to show all the server data. Just show data for the ones in trouble.
+
+#### Dashboards should reduce cognitive load, not add to it
+
+_Cognitive load_ is basically how hard you need to think about something in order to figure it out. Make your dashboard easy to interpret. Other users and future you (when you're trying to figure out what broke at 2AM) will appreciate it.
+
+Ask yourself:
+
+- Can I tell what exactly each graph represents? Is it obvious, or do I have to think about it?
+- If I show this to someone else, how long will it take them to figure it out? Will they get lost?
+
+#### Have a monitoring strategy
+
+It's easy to make new dashboards. It's harder to optimize dashboard creation and adhere to a plan, but it's worth it. This strategy should govern both your overall dashboard scheme and enforce consistency in individual dashboard design.
+
+Refer to [Common observability strategies]({{< relref "#common-observability-strategies" >}}) and [Dashboard management maturity levels]({{< relref "#dashboard-management-maturity-model" >}}) for more information.
+
+#### Write it down
+
+Once you have a strategy or design guidelines, write them down to help maintain consistency over time. Check out this [Wikimedia runbook example](https://wikitech.wikimedia.org/wiki/Performance/Runbook/Grafana_best_practices).
+
+### Best practices to follow
+
+- When creating a new dashboard, make sure it has a meaningful name.
+  - If you are creating a dashboard to play or experiment, then put the word `TEST` or `TMP` in the name.
+  - Consider including your name or initials in the dashboard name or as a tag so that people know who owns the dashboard.
+  - Remove temporary experiment dashboards when you are done with them.
+- If you create many related dashboards, think about how to cross-reference them for easy navigation. Refer to [Best practices for managing dashboards]({{< relref "#best-practices-for-managing-dashboards" >}}) for more information.
+- Grafana retrieves data from a data source. A basic understanding of [data sources]({{< relref "../../../datasources/" >}}) in general and your specific is important.
+- Avoid unnecessary dashboard refreshing to reduce the load on the network or backend. For example, if your data changes every hour, then you don't need to set the dashboard refresh rate to 30 seconds.
+- 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 "../../../panels-visualizations/visualizations/text/" >}}) 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.
+- 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.
+
+## Best practices for managing dashboards
+
+This page outlines some best practices to follow when managing Grafana dashboards.
+
+### Before you begin
+
+Here are some principles to consider before you start managing dashboards.
+
+#### Strategic observability
+
+There are several [common observability strategies]({{< relref "#common-observability-strategies" >}}). You should research them and decide whether one of them works for you or if you want to come up with your own. Either way, have a plan, write it down, and stick to it.
+
+Adapt your strategy to changing needs as necessary.
+
+#### Maturity level
+
+What is your dashboard maturity level? Analyze your current dashboard setup and compare it to the [Dashboard management maturity model]({{< relref "#dashboard-management-maturity-model" >}}). Understanding where you are can help you decide how to get to where you want to be.
+
+### Best practices to follow
+
+- Avoid dashboard sprawl, meaning the uncontrolled growth of dashboards. Dashboard sprawl negatively affects time to find the right dashboard. Duplicating dashboards and changing “one thing” (worse: keeping original tags) is the easiest kind of sprawl.
+  - Periodically review the dashboards and remove unnecessary ones.
+  - 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-visualizations/configure-data-links/#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 "../manage-dashboard-links/" >}}).
+  - Add a [Dashboard list panel]({{< relref "../../../panels-visualizations/visualizations/dashboard-list/" >}}). You can then customize what you see by doing tag or folder searches.
+  - Add a [Text panel]({{< relref "../../../panels-visualizations/visualizations/text/" >}}) and use markdown to customize the display.

docs/sources/dashboards/build-dashboards/create-dashboard-url-variables/index.md

@@ -0,0 +1,73 @@
+---
+title: Dashboard URL variables
+keywords:
+  - grafana
+  - url variables
+  - documentation
+  - variables
+  - dashboards
+aliases:
+  - /docs/grafana/latest/dashboards/build-dashboards/create-dashboard-url-variables/
+  - /docs/grafana/latest/variables/url-variables/
+  - /docs/grafana/latest/variables/variable-types/url-variables/
+weight: 250
+---
+
+# Dashboard URL variables
+
+Grafana can apply variable values passed as query parameters in dashboard URLs.
+For more information, refer to [Manage dashboard links]({{< relref "../manage-dashboard-links/" >}}) and [Templates and variables]({{< relref "../../variables/" >}}).
+
+## Passing variables as query parameters
+
+Grafana interprets query string parameters prefixed with `var-` as variables in the given dashboard.
+
+For example, in this URL:
+
+```
+https://${your-domain}/path/to/your/dashboard?var-example=value
+```
+
+The query parameter `var-example=value` represents the dashboard variable `example` with a value of `value`.
+
+### Passing multiple values for a variable
+
+To pass multiple values, repeat the variable parameter once for each value:
+
+```
+https://${your-domain}/path/to/your/dashboard?var-example=value1&var-example=value2
+```
+
+Grafana interprets `var-example=value1&var-example=value2` as the dashboard variable `example` with two values: `value1` and `value2`.
+
+### Example
+
+See [https://play.grafana.org/d/000000074/alerting?var-app=backend&var-server=backend_01&var-server=backend_03&var-interval=1]h - this passes the variable `server` with multiple values, and the variables `app` and `interval` with a single value each.
+
+## Adding variables to dashboard links
+
+Grafana can add variables to dashboard links when you generate them from a dashboard's settings. For more information and steps to add variables, refer to [Manage dashboard links]({{< relref "../manage-dashboard-links/" >}}).
+
+## Passing ad hoc filters
+
+Ad hoc filters apply key/value filters to all metric queries that use a specified data source. For more information, refer to [Add ad hoc filters]({{< relref "../../variables/add-template-variables/#add-ad-hoc-filters" >}}).
+
+To pass an ad hoc filter as a query parameter, use the variable syntax to pass the ad hoc filter variable, and also provide the key, the operator as the value, and the value as a pipe-separated list.
+
+For example, in this URL:
+
+```
+https://${your-domain}/path/to/your/dashboard?var-adhoc=example_key|=|example_value
+```
+
+The query parameter `var-adhoc=key|=|value` applies the ad hoc filter configured as the `adhoc` dashboard variable using the `example_key` key, the `=` operator, and the `example_value` value.
+
+> **Note:** When sharing URLs with ad hoc filters, remember to encode the URL. In the above example, replace the pipes (`|`) with `%7C` and the equality operator (`=`) with `%3D`.
+
+### Example
+
+See [https://play.grafana.org/d/000000002/influxdb-templated?orgId=1&var-datacenter=America&var-host=All&var-summarize=1m&var-adhoc=datacenter%7C%3D%7CAmerica] - this passes the ad hoc filter variable `adhoc` with the filter value `datacenter = America`.
+
+## Controlling time range using the URL
+
+To set a dashboard's time range, use the `from`, `to`, `time`, and `time.window` query parameters. Because these are not variables, they do not require the `var-` prefix. For more information, see the [Linking overview]({{< relref "../" >}}).

docs/sources/dashboards/build-dashboards/create-dashboard/index.md

@@ -0,0 +1,92 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/build-dashboards/create-dashboard/
+  - /docs/grafana/latest/dashboards/build-dashboards/add-organize-panels/
+title: Create a dashboard
+menuTitle: Create a dashboard
+weight: 1
+keywords:
+  - panel
+  - dashboard
+  - create
+---
+
+## Create a dashboard
+
+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**:
+
+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 "../../../panels-visualizations/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.
+
+   - [Configure value mappings]({{< relref "../../../panels-visualizations/configure-value-mappings" >}})
+   - [Visualization-specific options]({{< relref "../../../panels-visualizations/visualizations/" >}})
+   - [Override field values]({{< relref "../../../panels-visualizations/configure-overrides/" >}})
+   - [Configure thresholds]({{< relref "../../../panels-visualizations/configure-thresholds/" >}})
+   - [Configure standard options]({{< relref "../../../panels-visualizations/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.
+
+## Configure repeating rows
+
+You can configure Grafana to dynamically add panels or rows to a dashboard based on the value of a variable. Variables dynamically change your queries across all rows in a dashboard. For more information about repeating panels, refer to [Configure repeating panels](../../panels/configure-panel-options/#configure-repeating-panels).
+
+To see an example of repeating rows, refer to [Dashboard with repeating rows](https://play.grafana.org/d/000000153/repeat-rows). The example shows that you can also repeat rows if you have variables set with `Multi-value` or `Include all values` selected.
+
+**Before you begin:**
+
+- Ensure that the query includes a multi-value variable.
+
+**To configure repeating rows:**
+
+1. On the dashboard home page, click **Add panel**.
+
+1. On the **Add a panel** dialog box, click **Add a new row**.
+
+1. Hover over the row title and click the cog icon.
+
+1. On the **Row Options** dialog box, add a title and select the variable for which you want to add repeating rows.
+
+> **Note:** To provide context to dashboard users, add the variable to the row title.
+
+## Move a panel
+
+You can place a panel on a dashboard in any location.
+
+1. Open the dashboard.
+
+1. Click the panel title and drag the panel to the new location.
+
+## Resize a panel
+
+You can size a dashboard panel to suits your needs.
+
+1. Open the dashboard.
+
+1. To adjust the size of the panel, click and drag the lower-right corner of the panel.

docs/sources/dashboards/build-dashboards/manage-dashboard-links/index.md

@@ -6,6 +6,7 @@ aliases:
   - /docs/grafana/latest/linking/dashboard-links/
   - /docs/grafana/latest/dashboards/manage-dashboard-links/
   - /docs/grafana/latest/panels/working-with-panels/add-link-to-panel/
+  - /docs/grafana/latest/dashboards/build-dashboards/manage-dashboard-links/
 description: How to link Grafana dashboards.
 keywords:
   - link
@@ -17,7 +18,7 @@ keywords:
   - navigate
 title: Manage dashboard links
 menuTitle: Manage dashboard links
-weight: 400
+weight: 500
 ---
 
 # Manage dashboard links
@@ -35,11 +36,11 @@ The next step is to figure out which link type is right for your workflow. Even
 - 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" >}}).
+- If you want to drill down into a specific series, or even a single measurement, use [data links]({{< relref "../../../panels-visualizations/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:
+To control the time range of a panel or dashboard, you can provide query parameters in the 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
@@ -47,7 +48,7 @@ You can control the time range of a panel or dashboard by providing following qu
 
 ## 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 "../../../panels-visualizations/configure-data-links/#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).
 
@@ -69,7 +70,7 @@ Add links to other dashboards at the top of your current dashboard.
    - **With tags** – Enter tags to limit the linked dashboards to only the ones with the tags you enter. Otherwise, Grafana includes links to all other dashboards.
    - **As dropdown** – If you are linking to lots of dashboards, then you probably want to select this option and add an optional title to the dropdown. Otherwise, Grafana displays the dashboard links side by side across the top of your dashboard.
    - **Time range** – Select this option to include the dashboard time range in the link. When the user clicks the link, the linked dashboard opens with the indicated time range already set. **Example:** https://play.grafana.org/d/000000010/annotations?orgId=1&from=now-3h&to=now
-   - **Variable values** – Select this option to include template variables currently used as query parameters in the link. When the user clicks the link, any matching templates in the linked dashboard are set to the values from the link. Here is the variable format: `https://${you-domain}/path/to/your/dashboard?var-${template-variable1}=value1&var-${template-variable2}=value2` **Example:** https://play.grafana.org/d/000000074/alerting?var-app=backend&var-server=backend_01&var-server=backend_03&var-interval=1h
+   - **Variable values** – Select this option to include template variables currently used as query parameters in the link. When the user clicks the link, any matching templates in the linked dashboard are set to the values from the link. For more information, see [Dashboard URL variables]({{< relref "../create-dashboard-url-variables/" >}}).
    - **Open in new tab** – Select this option if you want the dashboard link to open in a new tab or window.
 1. Click **Add**.
 

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

@@ -8,12 +8,13 @@ aliases:
   - /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
+  - /docs/grafana/latest/dashboards/build-dashboards/manage-library-panels/
+title: Manage library panels
 menuTitle: Manage library panels
-weight: 3
+weight: 300
 ---
 
-# Manage Grafana library panels
+# Manage 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.
 

docs/sources/dashboards/build-dashboards/manage-version-history/index.md

@@ -2,17 +2,19 @@
 aliases:
   - /docs/grafana/latest/dashboards/dashboard-history/
   - /docs/grafana/latest/reference/dashboard_history/
+  - /docs/grafana/latest/dashboards/build-dashboards/manage-version-history/
 keywords:
   - grafana
   - dashboard
   - documentation
   - version
   - history
-title: Dashboard version history
-weight: 14
+title: Manage dashboard version history
+menutitle: Manage version history
+weight: 400
 ---
 
-# Dashboard version history
+# Manage dashboard version history
 
 Whenever you save a version of your dashboard, a copy of that version is saved so that previous versions of your dashboard are never lost. A list of these versions is available by entering the dashboard settings and then selecting "Versions" in the left side menu.
 

docs/sources/dashboards/build-dashboards/modify-dashboard-settings/index.md

@@ -0,0 +1,95 @@
+---
+aliases:
+  - /docs/grafana/latest/dashboards/build-dashboards/modify-dashboard-settings/
+title: Modify dashboard settings
+menuTitle: Dashboard settings
+weight: 8
+keywords:
+  - time settings
+  - variables
+  - links
+  - dashboard
+  - settings
+---
+
+# Modify dashboard settings
+
+The dashboard settings page enables you to:
+
+- Edit general dashboard properties, including time settings
+- Add annotation queries
+- Add dashboard variables
+- Add links
+- View the dashboard JSON model
+
+To access the dashboard setting page:
+
+1. Open a dashboard in edit mode.
+1. Click **Dashboard settings** (gear icon) located at the top of the page.
+
+## Modify dashboard time settings
+
+Adjust dashboard time settings when you want to change the dashboard timezone, the local browser time, and specify auto-refresh time intervals.
+
+1. On the **Dashboard settings** page, click **General**.
+1. Navigate to the **Time Options** section.
+1. Specify time settings according to the following descriptions.
+
+   - **Timezone:** Specify the local time zone of the service or system that you are monitoring. This can be helpful when monitoring a system or service that operates across several time zones.
+     - **Default:** Grafana uses the default selected time zone for the user profile, team, or organization. If no time zone is specified for the user profile, a team the user is a member of, or the organization, then Grafana uses the local browser time.
+     - **Local browser time:** The time zone configured for the viewing user browser is used. This is usually the same time zone as set on the computer.
+     - Standard [ISO 8601 time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), including UTC.
+   - **Auto-refresh:** Customize the options displayed for relative time and the auto-refresh options Entries are comma separated and accept any valid time unit.
+   - **Now delay:** Override the `now` time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
+   - **Hide time picker:** Select this option if you do not want Grafana to display the time picker.
+
+## Add an annotation query
+
+An annotation query is a query that queries for events. These events can be visualized in graphs across the dashboard as vertical lines along with a small
+icon you can hover over to see the event information.
+
+1. On the **Dashboard settings** page, click **Annotations**.
+1. Click **Add annotation query**.
+1. Enter a name and select a data source.
+1. Complete the rest of the form to build a query and annotation.
+
+The query editor UI changes based on the data source you select. Refer to the [Data source]({{< relref "../../../datasources/" >}}) documentation for details on how to construct a query.
+
+## Add a variable
+
+Variables enable you to create more interactive and dynamic dashboards. Instead of hard-coding things like server, application,
+and sensor names in your metric queries, you can use variables in their place. Variables are displayed as dropdown lists at the top of
+the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
+
+For more information about variables, refer to [Variables]({{< relref "../../variables/" >}}).
+
+1. On the **Dashboard settings** page, click **Variable** in the left side section menu and then the **Add variable** button.
+1. In the **General** section, the the name of the variable. This is the name that you will later use in queries.
+1. Select a variable **Type**.
+
+   > **Note:** The variable type you select impacts which fields you populate on the page.
+
+1. Define the variable and click **Update**.
+
+## Add a link
+
+Dashboard links enable you to place links to other dashboards and web sites directly below the dashboard header. Links provide for easy navigation to other, related dashboards and content.
+
+1. On the **Dashboard settings** page, click **Links** in the left side section menu and then the **Add link** button.
+1. Enter title and and in the **Type** field, select **Dashboard** or **Link**.
+1. To add a dashboard link:
+   a. Add an optional tag. Tags are useful creating a dynamic dropdown of dashboards that all have a specific tag.
+   b. Select any of the dashboard link **Options**.
+   c. Click **Apply**.
+1. To add a link:
+   a. Add a URL and tooltip text that appears when the user hovers over the link.
+   b. Select an icon that appears next to the link.
+   c. Select any of the dashboard link **Options**.
+
+## View dashboard JSON model
+
+A dashboard in Grafana is represented by a JSON object, which stores metadata of its dashboard. Dashboard metadata includes dashboard properties, metadata from panels, template variables, panel queries, and so on.
+
+To view a dashboard JSON model, on the **Dashboard settings** page, click **JSON**.
+
+For more information about the JSON fields, refer to [JSON fields]({{< relref "../view-dashboard-json-model/#json-fields" >}}).

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

@@ -2,6 +2,7 @@
 aliases:
   - /docs/grafana/latest/dashboards/json-model/
   - /docs/grafana/latest/reference/dashboard/
+  - /docs/grafana/latest/dashboards/build-dashboards/view-dashboard-json-model/
 keywords:
   - grafana
   - dashboard
@@ -9,7 +10,7 @@ keywords:
   - json
   - model
 title: JSON model
-weight: 1200
+weight: 700
 ---
 
 # Dashboard JSON model

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

@@ -28,6 +28,8 @@ Reporting enables you to automatically generate PDFs from any of your dashboards
 
 Any changes you make to a dashboard used in a report are reflected the next time the report is sent. For example, if you change the time range in the dashboard, then the time range in the report also changes.
 
+For information about recent improvements to the reporting UI, refer to [Grafana reporting: How we improved the UX in Grafana](https://grafana.com/blog/2022/06/29/grafana-reporting-how-we-improved-the-ux-in-grafana/).
+
 ## Requirements
 
 - SMTP must be configured for reports to be sent. Refer to [SMTP]({{< relref "../../setup-grafana/configure-grafana/#smtp" >}}) in [Configuration]({{< relref "../../setup-grafana/configure-grafana/" >}}) for more information.
@@ -74,7 +76,7 @@ Only organization administrators can create reports by default. You can customiz
 
 ### Choose template variables
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 7.5 and later behind the `reportVariables` feature flag, Grafana Enterprise version 8.0 and later without a feature flag, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.5 and later behind the `reportVariables` feature flag, Grafana Enterprise version 8.0 and later without a feature flag, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 You can configure report-specific template variables for the dashboard on the report page. The variables that you select will override the variables from the dashboard, and they are used when rendering a PDF file of the report. For detailed information about using template variables, refer to the [Templates and variables]({{< relref "../variables/" >}}) section.
 
@@ -82,9 +84,9 @@ You can configure report-specific template variables for the dashboard on the re
 
 ### Render a report with panels or rows set to repeat by a variable
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 8.0 and later, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 8.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
-You can include dynamic dashboards with panels or rows, set to repeat by a variable, into reports. For detailed information about setting up repeating panels or rows in dashboards, refer to [Repeat panels or rows]({{< relref "../../panels/configure-panel-options/#configure-repeating-rows-or-panels" >}}).
+You can include dynamic dashboards with panels or rows, set to repeat by a variable, into reports. For detailed information about setting up repeating panels or rows in dashboards, refer to [Repeat panels or rows]({{< relref "../../panels-visualizations/configure-panel-options/#configure-repeating-rows-or-panels" >}}).
 
 #### Caveats
 
@@ -97,7 +99,7 @@ You can include dynamic dashboards with panels or rows, set to repeat by a varia
 
 ### Report time range
 
-> **Note:** You can set custom report time ranges in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) 7.2+ and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** You can set custom report time ranges in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) 7.2+ and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 By default, reports use the saved time range of the dashboard. You can change the time range of the report by:
 
@@ -121,7 +123,7 @@ If the time zone is set differently between your Grafana server and its remote i
 
 ### CSV export
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) 8+ with the [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) v3.0+, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) 8+ with the [Grafana image renderer plugin](/grafana/plugins/grafana-image-renderer) v3.0+, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 You can attach a CSV file to the report email for each table panel on the selected dashboard, along with the PDF report. By default, CSVs larger than 10Mb are not sent which keeps email servers from rejecting the email. You can increase or decrease this limit in the [reporting configuration]({{< relref "#rendering-configuration" >}}).
 
@@ -133,7 +135,7 @@ A background job runs every 10 minutes and removes temporary CSV files. You can
 
 ### Scheduling
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 8.0 and later, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 8.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 > The scheduler was significantly changed in Grafana Enterprise version 8.1.
 
 Scheduled reports can be sent once, or repeated on an hourly, daily, weekly, or monthly basis, or sent at custom intervals. You can also disable scheduling by selecting **Never**, for example to send the report via the API.
@@ -156,7 +158,7 @@ When you schedule a report with a monthly frequency, and set the start date betw
 
 #### Send a test email
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 1. In the report, click **Send test email**.
 1. In the **Email** field, enter the email address or addresses that you want to test, separated by a semicolon.
@@ -169,19 +171,19 @@ The last saved version of the report will be sent to selected emails. You can us
 
 ### Pause a report
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 8.0 and later, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 8.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 You can pause sending reports from the report list view by clicking the pause icon. The report will not be sent according to its schedule until it is resumed by clicking the resume button on the report row.
 
 ### Add multiple dashboards to a report
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 9.0 and later, and [Grafana Cloud Pro and Advanced]({{< relref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 9.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 You can add more than one dashboard to a report. Additional dashboards will be rendered as new pages in the same PDF file, or additional images if you chose to embed images in your report email. You cannot add the same dashboard to a report multiple times.
 
 ### Embed a dashboard as an image into a report
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 9.0 and later, and [Grafana Cloud Pro and Advanced]({{< relref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 9.0 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 You can send a report email with an image of the dashboard embedded in the email instead of attached as a PDF. In this case, the email recipients can see the dashboard at a glance instead of having to open the PDF.
 
@@ -236,7 +238,7 @@ font_italic = DejaVuSansCondensed-Oblique.ttf
 
 ## Report settings
 
-> **Note:** Available in [Grafana Enterprise]({{< relref "../../enterprise/" >}}) version 7.2 and later, and [Grafana Cloud Pro and Advanced]({{< ref "/grafana-cloud" >}}).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.2 and later, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/).
 
 You can configure organization-wide report settings in the **Settings** tab on the **Reporting** page. Settings are applied to all the reports for current organization.
 

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

@@ -2,6 +2,7 @@
 aliases:
   - /docs/grafana/latest/dashboards/dashboard-manage/
   - /docs/grafana/latest/features/dashboard/dashboards/
+  - /docs/grafana/latest/dashboards/dashboard-public/
 title: Public dashboards
 weight: 8
 ---
@@ -59,5 +60,7 @@ publicDashboards = true
 - Exemplars will be omitted from the panel.
 - Annotations will not be displayed in public dashboards.
 - Grafana Live and real-time event streams are not supported.
+- Library panels are currently not supported, but are planned to be in the future.
+- Datasources using Reverse Proxy functionality are not supported.
 
 We are excited to share this enhancement with you and we’d love your feedback! Please check out the [Github](https://github.com/grafana/grafana/discussions/49253) discussion and join the conversation.

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

@@ -14,7 +14,7 @@ aliases:
 title: Manage dashboards
 menuTitle: Manage dashboards
 weight: 8
-eywords:
+keywords:
   - grafana
   - dashboard
   - dashboard folders
@@ -29,7 +29,7 @@ eywords:
 
 # Manage dashboards
 
-A dashboard is a set of one or more [panels]({{< relref "../../panels/" >}}) that visually presents your data in one or more rows.
+A dashboard is a set of one or more [panels]({{< relref "../../panels-visualizations/" >}}) that visually presents your data in one or more rows.
 
 For more information about creating dashboards, refer to [Add and organize panels](../add-organize-panels).
 
@@ -129,155 +129,6 @@ Find dashboards for common server applications at [Grafana.com/dashboards](https
 
 {{< figure src="/static/img/docs/v50/gcom_dashboard_list.png" max-width="700px" >}}
 
-## Configure dashboard time range controls
-
-Grafana provides several ways to manage the time ranges of the data being visualized, for dashboard, panels and also for alerting.
-
-This section describes supported time units and relative ranges, the common time controls, dashboard-wide time settings, and panel-specific time settings.
-
-### Time units and relative ranges
-
-Grafana supports the following time units: `s (seconds)`, `m (minutes)`, `h (hours)`, `d (days)`, `w (weeks)`, `M (months)`, `Q (quarters)` and `y (years)`.
-
-The minus operator enables you to step back in time, relative to now. If you want to display the full period of the unit (day, week, month, etc...), append `/<time unit>` to the end. To view fiscal periods, use `fQ (fiscal quarter)` and `fy (fiscal year)` time units.
-
-The plus operator enables you to step forward in time, relative to now. For example, you can use this feature to look at predicted data in the future.
-
-The following table provides example relative ranges:
-
-| Example relative range | From:       | To:         |
-| ---------------------- | ----------- | ----------- |
-| Last 5 minutes         | `now-5m`    | `now`       |
-| The day so far         | `now/d`     | `now`       |
-| This week              | `now/w`     | `now/w`     |
-| This week so far       | `now/w`     | `now`       |
-| This month             | `now/M`     | `now/M`     |
-| This month so far      | `now/M`     | `now`       |
-| Previous Month         | `now-1M/M`  | `now-1M/M`  |
-| This year so far       | `now/Y`     | `now`       |
-| This Year              | `now/Y`     | `now/Y`     |
-| Previous fiscal year   | `now-1y/fy` | `now-1y/fy` |
-
-#### Note about Grafana Alerting
-
-For Grafana Alerting, we do not support the following syntaxes at this time.
-
-- now+n for future timestamps.
-- now-1n/n for "start of n until end of n" because this is an absolute timestamp.
-
-### Common time range controls
-
-The dashboard and panel time controls have a common UI.
-
-<img class="no-shadow" src="/static/img/docs/time-range-controls/common-time-controls-7-0.png" max-width="700px">
-
-The following sections define common time range controls.
-
-#### Current time range
-
-The current time range, also called the _time picker_, shows the time range currently displayed in the dashboard or panel you are viewing.
-
-Hover your cursor over the field to see the exact time stamps in the range and their source (such as the local browser).
-
-<img class="no-shadow" src="/static/img/docs/time-range-controls/time-picker-7-0.png" max-width="300px">
-
-Click the current time range to change it. You can change the current time using a _relative time range_, such as the last 15 minutes, or an _absolute time range_, such as `2020-05-14 00:00:00 to 2020-05-15 23:59:59`.
-
-<img class="no-shadow" src="/static/img/docs/time-range-controls/change-current-time-range-7-0.png" max-width="900px">
-
-#### Relative time range
-
-Select the relative time range from the **Relative time ranges** list. You can filter the list using the input field at the top. Some examples of time ranges include:
-
-- Last 30 minutes
-- Last 12 hours
-- Last 7 days
-- Last 2 years
-- Yesterday
-- Day before yesterday
-- This day last week
-- Today so far
-- This week so far
-- This month so far
-
-#### Absolute time range
-
-You can set an absolute time range in the following ways:
-
-- Type values into the **From** and **To** fields. You can type exact time values or relative values, such as `now-24h`, and then click **Apply time range**.
-- Click in the **From** or **To** field. Grafana displays a calendar. Click the day or days you want to use as the current time range and then click **Apply time range**.
-
-This section also displays recently used absolute ranges.
-
-#### Zoom out (Cmd+Z or Ctrl+Z)
-
-Click the **Zoom out** icon to view a larger time range in the dashboard or panel visualization.
-
-#### Zoom in (only applicable to graph visualizations)
-
-Click and drag to select the time range in the visualization that you want to view.
-
-#### Refresh dashboard
-
-Click the **Refresh dashboard** icon to immediately run every query on the dashboard and refresh the visualizations. Grafana cancels any pending requests when you trigger a refresh.
-
-By default, Grafana does not automatically refresh the dashboard. Queries run on their own schedule according to the panel settings. However, if you want to regularly refresh the dashboard, then click the down arrow next to the **Refresh dashboard** icon and then select a refresh interval.
-
-### Dashboard time settings
-
-Time settings are saved on a per-dashboard basis.
-
-You can change the **Timezone** and **fiscal year** settings from the time range controls by clicking the **Change time settings** button.
-
-For more advanced time settings, click the **Dashboard settings** (gear) icon at the top of the page. Then navigate to the **Time Options** section of the **General** tab.
-
-- **Timezone:** Specify the local time zone of the service or system that you are monitoring. This can be helpful when monitoring a system or service that operates across several time zones.
-  - **Default:** The default selected time zone for the user profile, team, or organization is used. If no time zone is specified for the user profile, a team the user is a member of, or the organization, then Grafana uses local browser time.
-  - **Local browser time:** The time zone configured for the viewing user browser is used. This is usually the same time zone as set on the computer.
-  - Standard [ISO 8601 time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), including UTC.
-- **Auto-refresh:** Customize the options displayed for relative time and the auto-refresh options. Entries are comma separated and accept any valid time unit.
-- **Now delay:** Override the `now` time by entering a time delay. Use this option to accommodate known delays in data aggregation to avoid null values.
-- **Hide time picker:** Select this option if you do not want Grafana to display the time picker.
-
-### Panel time overrides and timeshift
-
-In [Query options]({{< relref "../../panels/query-options/" >}}), you can override the relative time range for individual panels, which causes them to be different than what is selected in the dashboard time picker located in the upper right. This enables you to show metrics from different time periods or days at the same time.
-
-> **Note:** Panel time overrides have no effect when the time range for the dashboard is absolute.
-
-### Control the time range using a URL
-
-You can control the time range of a dashboard by providing the following query parameters in the dashboard URL:
-
-- `from`: Defines the lower limit of the time range, specified in `ms`, `epoch`, or [relative time]({{< relref "#relative-time-range" >}})
-- `to`: Defines the upper limit of the time range, specified in `ms`, `epoch`, or [relative time]({{< relref "#relative-time-range" >}})
-- `time` and `time.window`: Defines a time range from `time-time.window/2` to `time+time.window/2`. Both parameters should be specified in `ms`. For example `?time=1500000000000&time.window=10000` results in 10s time range from 1499999995000 to 1500000005000
-
-## Organize a dashboard
-
-You can place any panel in any location you want and controls its size. The changes you make impact other users of the dashboard.
-
-**Before you begin:**
-
-- Ensure that you sign in to Grafana with Editor permissions
-
-**To organize a dashboard**:
-
-1. Hover your cursor over the panel, and click-and-drag the panel to its new location.
-
-1. To resize a panel, click the zoom in (+) and zoom out (-) icons.
-
-![](/static/img/docs/animated_gifs/drag_drop.gif)
-
-### Tips and shortcuts
-
-- Click the graph title and in the dropdown menu quickly duplicate the panel.
-- Click the colored icon in the legend to change a series color or the y-axis.
-- Click series name in the legend to hide series.
-- Ctrl/Shift/Meta + click legend name to hide other series.
-- Hover your cursor over a panel and press `e` to open the panel editor.
-- Hover your cursor over a panel and press `v` to open the panel in full screen view.
-
 ## Troubleshoot dashboards
 
 This section provides information to help you solve common dashboard problems.

docs/sources/dashboards/share-dashboards-panels/index.md

@@ -16,7 +16,7 @@ aliases:
   - docs/grafana/latest/dashboards/share-dashboards-panels/
   - /docs/grafana/latest/share-dashboards-panels/
 title: Share dashboards and panels
-menuTitle: Share dashboards and panels
+menuTitle: Sharing
 weight: 85
 keywords:
   - grafana

docs/sources/dashboards/use-dashboards.md

@@ -1,148 +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
-
-This topic provides an overview of dashboard features and shortcuts, and describes how to use dashboard search.
-
-## Dashboard feature overview
-
-The dashboard user interface provides a number of features that you can use to customize the presentation of your data.
-
-The following image and descriptions highlights all dashboards features.
-
-{{< figure src="/static/img/docs/v91/dashboard-features/dashboard-features.png" width="700px" >}}
-
-- **Grafana home** (1): Click the Grafana home icon to be redirected to the home page configured in the Grafana instance.
-- **Dashboard title** (2): When you click the dashboard title you can search for dashboard contained in the current folder.
-- **Share dashboard** (3): Use this option to share the current dashboard by link or snapshot. You can also export the dashboard definition from the share modal.
-- **Add panel** (4): Use this option to add a panel, dashboard row, or library panel to the current dashboard.
-- **Dashboard settings** (5): Use this option to change dashboard name, folder, and tags and manage variables and annotation queries.
-- **Time picker dropdown** (6): Click to select relative time range options and set custom absolute time ranges.
-- **Zoom out time range** (7): Click to zoom out the time range. For more information about how to use time range controls, refer to [Common time range controls](../time-range-controls/#common-time-range-controls).
-- **Refresh dashboard** (8): Click to immediately trigger queries and refresh dashboard data.
-- **Refresh dashboard time interval** (9): Click to select a dashboard auto refresh time interval.
-- **View mode** (10): Click to display the dashboard on a large screen such as a TV or a kiosk. View mode hides irrelevant information such as navigation menus. For more information about view mode, refer to [How to Create Kiosks to Display Dashboards on a TV](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/).
-- **Dashboard panel** (11): The primary building block of a dashboard is the panel. To add a new panel, dashboard row, or library panel, click **Add panel**.
-  - Library panels can be shared among many dashboards.
-  - To move a panel, drag the panel header to another location.
-  - To resize a panel, click and drag the lower right corner of the panel.
-- **Graph legend** (12): Change series colors, y-axis and series visibility directly from the legend.
-- **Search** (13): Click **Search** to search for dashboards by name or panel title.
-- **Dashboard row** (14): A dashboard row is a logical divider within a dashboard that groups panels together.
-  - Rows can be collapsed or expanded allowing you to hide parts of the dashboard.
-  - Panels inside a collapsed row do not issue queries.
-  - Use the [repeating rows]({{< relref "../panels/configure-panel-options/#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
-
-You can search for dashboards by dashboard name and by panel title. When you search for dashboards, the system returns all dashboards available within the Grafana instance, even if you do not have permission to view the contents of the dashboard.
-
-### Search dashboards using dashboard name
-
-Begin typing any part of the dashboard name in the search bar. The search returns 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.
-
-> \*\*Note: You can use your keyboard arrow keys to navigate the results and press `Enter` to open the selected dashboard.
-
-The following image shows the search results when you search using dashboard name.
-
-{{< figure src="/static/img/docs/v91/dashboard-features/search-by-dashboard-name.png" width="700px" >}}
-
-### Search dashboards using panel title
-
-You can search for a dashboard by the title of a panel that appears in a dashboard.
-If a panel's title matches your search query, the dashboard appears in the search results.
-
-This feature is available by default in Grafana Cloud and in Grafana OSS v9.1 and higher, you access this feature by enabling the `panelTitleSearch` feature toggle.
-For more information about enabling panel title search, refer to [Enable the panelTitleSearch feature toggle.](#enable-panelTitleSearch-feature-toggle)
-
-The following image shows the search results when you search using panel title.
-
-{{< figure src="/static/img/docs/v91/dashboard-features/search-by-panel-title.png" width="700px" >}}
-
-#### Enable the panelTitleSearch feature toggle
-
-Complete the following steps to enable the `panelTitleSearch` feature toggle.
-
-**Before you begin:**
-
-- If you are running Grafana Enterprise with RBAC, enable [service accounts]({{< relref "../administration/service-accounts/" >}}).
-
-**To enable the panelTitleSearch feature toggle:**
-
-1. Open the Grafana [configuration file]({{< relref "../setup-grafana/configure-grafana/#configuration-file-location" >}}).
-
-1. Locate the [feature_toggles]({{< relref "../setup-grafana/configure-grafana/#feature_toggles" >}}) section.
-
-1. Add the following parameter to the `feature_toggles` section:
-
-   ```
-   [feature_toggles]
-   # enable features, separated by spaces
-   enable = dashboardPreviews
-   ```
-
-1. Save your changes and restart the Grafana server.
-
-### Filter dashboard search results by tag(s)
-
-Tags are a great way to organize your dashboards, especially as the number of dashboards grow. You can add and manage tags in dashboard `Settings`.
-
-When you select multiple tags, Grafana shows dashboards that include all selected tags.
-
-To filter dashboard search result by a tag, complete one of the following steps:
-
-- To filter dashboard search results by tag, click a tag that appears in the right column of the search results.
-
-  You can continue filtering by clicking additional tags.
-
-- To see a list of all available tags, click the **Filter by tags** dropdown menu and select a tag.
-
-  All tags will be shown, and when you select a tag, the dashboard search will be instantly filtered.
-
-> **Note:** When using only a keyboard, press the `tab` key and navigate to the **Filter by tag** drop-down menu, press the down arrow key `▼` to activate the menu and locate a tag, and press `Enter` to select the tag.

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

@@ -0,0 +1,179 @@
+---
+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/
+  - /docs/grafana/latest/dashboards/use-dashboards/
+title: Use dashboards
+menuTitle: Use dashboards
+weight: 1
+keywords:
+  - dashboard
+  - search
+  - shortcuts
+---
+
+# Use dashboards
+
+This topic provides an overview of dashboard features and shortcuts, and describes how to use dashboard search.
+
+## Dashboard feature overview
+
+The dashboard user interface provides a number of features that you can use to customize the presentation of your data.
+
+The following image and descriptions highlights all dashboards features.
+
+{{< figure src="/static/img/docs/v91/dashboard-features/dashboard-features.png" width="700px" >}}
+
+- **Grafana home** (1): Click the Grafana home icon to be redirected to the home page configured in the Grafana instance.
+- **Dashboard title** (2): When you click the dashboard title you can search for dashboard contained in the current folder.
+- **Share dashboard** (3): Use this option to share the current dashboard by link or snapshot. You can also export the dashboard definition from the share modal.
+- **Add panel** (4): Use this option to add a panel, dashboard row, or library panel to the current dashboard.
+- **Dashboard settings** (5): Use this option to change dashboard name, folder, and tags and manage variables and annotation queries. For more information about dashboard settings, refer to [Modify dashboard settings]({{< relref "../build-dashboards/modify-dashboard-settings/" >}})
+- **Time picker dropdown** (6): Click to select relative time range options and set custom absolute time ranges.
+  - You can change the **Timezone** and **fiscal year** settings from the time range controls by clicking the **Change time settings** button.
+  - Time settings are saved on a per-dashboard basis.
+- **Zoom out time range** (7): Click to zoom out the time range. For more information about how to use time range controls, refer to [Common time range controls](../time-range-controls/#common-time-range-controls).
+- **Refresh dashboard** (8): Click to immediately trigger queries and refresh dashboard data.
+- **Refresh dashboard time interval** (9): Click to select a dashboard auto refresh time interval.
+- **View mode** (10): Click to display the dashboard on a large screen such as a TV or a kiosk. View mode hides irrelevant information such as navigation menus. For more information about view mode, refer to [How to Create Kiosks to Display Dashboards on a TV](https://grafana.com/blog/2019/05/02/grafana-tutorial-how-to-create-kiosks-to-display-dashboards-on-a-tv/).
+- **Dashboard panel** (11): The primary building block of a dashboard is the panel. To add a new panel, dashboard row, or library panel, click **Add panel**.
+  - Library panels can be shared among many dashboards.
+  - To move a panel, drag the panel header to another location.
+  - To resize a panel, click and drag the lower right corner of the panel.
+- **Graph legend** (12): Change series colors, y-axis and series visibility directly from the legend.
+- **Search** (13): Click **Search** to search for dashboards by name or panel title.
+- **Dashboard row** (14): A dashboard row is a logical divider within a dashboard that groups panels together.
+  - Rows can be collapsed or expanded allowing you to hide parts of the dashboard.
+  - Panels inside a collapsed row do not issue queries.
+  - Use [repeating rows]({{< relref "../build-dashboards/create-dashboard/#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
+
+## Set dashboard time range
+
+Grafana provides several ways to manage the time ranges of the data being visualized, for dashboard, panels and also for alerting.
+
+This section describes supported time units and relative ranges, the common time controls, dashboard-wide time settings, and panel-specific time settings.
+
+### Time units and relative ranges
+
+Grafana supports the following time units: `s (seconds)`, `m (minutes)`, `h (hours)`, `d (days)`, `w (weeks)`, `M (months)`, `Q (quarters)` and `y (years)`.
+
+The minus operator enables you to step back in time, relative to now. If you want to display the full period of the unit (day, week, month, etc...), append `/<time unit>` to the end. To view fiscal periods, use `fQ (fiscal quarter)` and `fy (fiscal year)` time units.
+
+The plus operator enables you to step forward in time, relative to now. For example, you can use this feature to look at predicted data in the future.
+
+The following table provides example relative ranges:
+
+| Example relative range | From:       | To:         |
+| ---------------------- | ----------- | ----------- |
+| Last 5 minutes         | `now-5m`    | `now`       |
+| The day so far         | `now/d`     | `now`       |
+| This week              | `now/w`     | `now/w`     |
+| This week so far       | `now/w`     | `now`       |
+| This month             | `now/M`     | `now/M`     |
+| This month so far      | `now/M`     | `now`       |
+| Previous Month         | `now-1M/M`  | `now-1M/M`  |
+| This year so far       | `now/Y`     | `now`       |
+| This Year              | `now/Y`     | `now/Y`     |
+| Previous fiscal year   | `now-1y/fy` | `now-1y/fy` |
+
+#### Note about Grafana Alerting
+
+For Grafana Alerting, we do not support the following syntaxes at this time.
+
+- now+n for future timestamps.
+- now-1n/n for "start of n until end of n" because this is an absolute timestamp.
+
+### Common time range controls
+
+The dashboard and panel time controls have a common UI.
+
+<img class="no-shadow" src="/static/img/docs/time-range-controls/common-time-controls-7-0.png" max-width="700px">
+
+The following sections define common time range controls.
+
+#### Current time range
+
+The current time range, also called the _time picker_, shows the time range currently displayed in the dashboard or panel you are viewing.
+
+Hover your cursor over the field to see the exact time stamps in the range and their source (such as the local browser).
+
+<img class="no-shadow" src="/static/img/docs/time-range-controls/time-picker-7-0.png" max-width="300px">
+
+Click the current time range to change it. You can change the current time using a _relative time range_, such as the last 15 minutes, or an _absolute time range_, such as `2020-05-14 00:00:00 to 2020-05-15 23:59:59`.
+
+<img class="no-shadow" src="/static/img/docs/time-range-controls/change-current-time-range-7-0.png" max-width="900px">
+
+#### Relative time range
+
+Select the relative time range from the **Relative time ranges** list. You can filter the list using the input field at the top. Some examples of time ranges include:
+
+- Last 30 minutes
+- Last 12 hours
+- Last 7 days
+- Last 2 years
+- Yesterday
+- Day before yesterday
+- This day last week
+- Today so far
+- This week so far
+- This month so far
+
+#### Absolute time range
+
+You can set an absolute time range in the following ways:
+
+- Type values into the **From** and **To** fields. You can type exact time values or relative values, such as `now-24h`, and then click **Apply time range**.
+- Click in the **From** or **To** field. Grafana displays a calendar. Click the day or days you want to use as the current time range and then click **Apply time range**.
+
+This section also displays recently used absolute ranges.
+
+#### Zoom out (Cmd+Z or Ctrl+Z)
+
+Click the **Zoom out** icon to view a larger time range in the dashboard or panel visualization.
+
+#### Zoom in (only applicable to graph visualizations)
+
+Click and drag to select the time range in the visualization that you want to view.
+
+#### Refresh dashboard
+
+Click the **Refresh dashboard** icon to immediately run every query on the dashboard and refresh the visualizations. Grafana cancels any pending requests when you trigger a refresh.
+
+By default, Grafana does not automatically refresh the dashboard. Queries run on their own schedule according to the panel settings. However, if you want to regularly refresh the dashboard, then click the down arrow next to the **Refresh dashboard** icon and then select a refresh interval.
+
+### Control the time range using a URL
+
+You can control the time range of a dashboard by providing the following query parameters in the dashboard URL:
+
+- `from`: Defines the lower limit of the time range, specified in `ms`, `epoch`, or [relative time]({{< relref "#relative-time-range" >}})
+- `to`: Defines the upper limit of the time range, specified in `ms`, `epoch`, or [relative time]({{< relref "#relative-time-range" >}})
+- `time` and `time.window`: Defines a time range from `time-time.window/2` to `time+time.window/2`. Both parameters should be specified in `ms`. For example `?time=1500000000000&time.window=10000` results in 10s time range from 1499999995000 to 1500000005000

docs/sources/dashboards/variables/_index.md

@@ -2,6 +2,7 @@
 aliases:
   - /docs/grafana/latest/variables/
   - /docs/grafana/latest/variables/variable-examples/
+  - docs/grafana/latest/dashboards/variables/
 title: Variables
 weight: 130
 ---

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

@@ -25,6 +25,7 @@ aliases:
   - /docs/grafana/latest/variables/formatting-multi-value-variables/
   - /docs/grafana/latest/reference/templating/
   - /docs/grafana/latest/variables/manage-variable/
+  - /docs/grafana/latest/dashboards/variables/add-template-variables/
 title: Add and manage variables
 menuTitle: Manage variables
 weight: 100
@@ -113,6 +114,8 @@ For example, if you have server names or region names that never change, then yo
 
 _Text box_ variables display a free text input field with an optional default value. This is the most flexible variable, because you can enter any value. Use this type of variable if you have metrics with high cardinality or if you want to update multiple panels in a dashboard at the same time.
 
+For more information about cardinality, refer to [What are cardinality spikes and why do they matter?](https://grafana.com/blog/2022/02/15/what-are-cardinality-spikes-and-why-do-they-matter/)
+
 1. [Enter general options](#enter-general-options).
 1. (Optional) In the **Default value** field, select the default value for the variable. If you do not enter anything in this field, then Grafana displays an empty text box for users to type text into.
 1. In **Preview of values**, Grafana displays a list of the current variable values. Review them to ensure they match what you expect.

docs/sources/dashboards/variables/inspect-variable/index.md

@@ -2,6 +2,7 @@
 aliases:
   - /docs/grafana/latest/reference/templating/
   - /docs/grafana/latest/variables/inspect-variable/
+  - /docs/grafana/latest/dashboards/variables/inspect-variable/
 keywords:
   - grafana
   - templating

docs/sources/dashboards/variables/variable-syntax/index.md

@@ -3,6 +3,7 @@ aliases:
   - /docs/grafana/latest/variables/advanced-variable-format-options/
   - /docs/grafana/latest/reference/templating/
   - /docs/grafana/latest/variables/syntax/
+  - /docs/grafana/latest/dashboards/variables/variable-syntax/
 keywords:
   - grafana
   - templating

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

@@ -165,7 +165,7 @@ Link an X-Ray data source in the "X-Ray trace link" section of the configuration
 
 The data source select will contain only existing data source instances of type X-Ray so in order to use this feature you need to have existing X-Ray data source already configured, see [X-Ray docs](https://grafana.com/grafana/plugins/grafana-x-ray-datasource/) for details.
 
-The X-Ray link will then appear in the log details section which is accessible by clicking on the log row either in Explore or in dashboard [Logs panel]({{< relref "../../visualizations/logs-panel/" >}}). To log the `@xrayTraceId` in your logs see the [AWS X-Ray documentation](https://docs.amazonaws.cn/en_us/xray/latest/devguide/xray-services.html). To provide the field to Grafana your log queries also have to contain the `@xrayTraceId` field, for example using query `fields @message, @xrayTraceId`.
+The X-Ray link will then appear in the log details section which is accessible by clicking on the log row either in Explore or in dashboard [Logs panel]({{< relref "../../panels-visualizations/visualizations/logs/" >}}). To log the `@xrayTraceId` in your logs see the [AWS X-Ray documentation](https://docs.amazonaws.cn/en_us/xray/latest/devguide/xray-services.html). To provide the field to Grafana your log queries also have to contain the `@xrayTraceId` field, for example using query `fields @message, @xrayTraceId`.
 
 ![Trace link in log details](/static/img/docs/cloudwatch/xray-link-log-details-8-2.png 'Trace link in log details')
 

docs/sources/datasources/elasticsearch.md

@@ -180,7 +180,7 @@ Example dashboard:
 
 ## Annotations
 
-[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view. Grafana can query any Elasticsearch index
 for annotation events.
 
@@ -194,7 +194,7 @@ for annotation events.
 
 ## Querying Logs
 
-Querying and displaying log data from Elasticsearch is available in [Explore]({{< relref "../explore/" >}}), and in the [logs panel]({{< relref "../visualizations/logs-panel/" >}}) in dashboards.
+Querying and displaying log data from Elasticsearch is available in [Explore]({{< relref "../explore/" >}}), and in the [logs panel]({{< relref "../panels-visualizations/visualizations/logs/" >}}) in dashboards.
 Select the Elasticsearch data source, and then optionally enter a lucene query to display your logs.
 
 When switching from a Prometheus or Loki data source in Explore, your query is translated to an Elasticsearch log query with a correct Lucene filter.

docs/sources/datasources/google-cloud-monitoring/_index.md

@@ -280,7 +280,7 @@ Refer to the [variable syntax documentation]({{< relref "../../dashboards/variab
 
 {{< figure src="/static/img/docs/google-cloud-monitoring/annotations-8-0.png" max-width= "400px" class="docs-image--right" >}}
 
-[Annotations]({{< relref "../../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view. Annotation rendering is expensive so it is important to limit the number of rows returned. There is no support for showing Google Cloud Monitoring annotations and events yet but it works well with [custom metrics](https://cloud.google.com/monitoring/custom-metrics/) in Google Cloud Monitoring.
 
 With the query editor for annotations, you can select a metric and filters. The `Title` and `Text` fields support templating and can use data returned from the query. For example, the Title field could have the following text:

docs/sources/datasources/graphite.md

@@ -216,7 +216,7 @@ For more information, refer to [Advanced variable format options]({{< relref "..
 
 ## Annotations
 
-[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation
+[Annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation
 queries via the Dashboard menu / Annotations view.
 
 Graphite supports two ways to query annotations. A regular metric query, for this you use the `Graphite query` textbox. A Graphite events query, use the `Graphite event tags` textbox,

docs/sources/datasources/influxdb/_index.md

@@ -131,7 +131,7 @@ You can switch to raw query mode by clicking hamburger icon and then `Switch edi
 
 ## Querying logs
 
-Querying and displaying log data from InfluxDB is available in [Explore]({{< relref "../../explore/" >}}), and in the [logs panel]({{< relref "../../visualizations/logs-panel/" >}}) in dashboards.
+Querying and displaying log data from InfluxDB is available in [Explore]({{< relref "../../explore/" >}}), and in the [logs panel]({{< relref "../../panels-visualizations/visualizations/logs/" >}}) in dashboards.
 Select the InfluxDB data source, and then enter a query to display your logs.
 
 ### Log queries
@@ -146,7 +146,7 @@ To add a filter, click the plus icon to the right of the `Measurements/Fields` b
 
 ## Annotations
 
-[Annotations]({{< relref "../../dashboards/annotations/" >}}) allows you to overlay rich event information on top of graphs. Add annotation queries using the Annotations view in the Dashboard menu.
+[Annotations]({{< relref "../../dashboards/build-dashboards/annotate-visualizations" >}}) allows you to overlay rich event information on top of graphs. Add annotation queries using the Annotations view in the Dashboard menu.
 
 An example query:
 

docs/sources/datasources/influxdb/influxdb-flux.md

@@ -76,4 +76,4 @@ from(bucket: "grafana")
   |> yield(name: "mean")
 ```
 
-You can view the interpolated version of a query with the query inspector. For more information, refer to [Navigate the Query Inspector]({{< relref "../../panels/working-with-panels/navigate-inspector-panel/" >}}).
+You can view the interpolated version of a query with the query inspector. For more information, refer to [Panel Inspector]({{< relref "../../panels-visualizations/panel-inspector/" >}}).

docs/sources/datasources/loki.md

@@ -147,7 +147,7 @@ There are two types of LogQL queries:
 
 ### Log queries
 
-Loki log queries return the contents of the log lines. Querying and displaying log data from Loki is available via [Explore]({{< relref "../explore/" >}}), and with the [logs panel]({{< relref "../visualizations/logs-panel/" >}}) in dashboards. Select the Loki data source, and then enter a LogQL query to display your logs.F or more information about log queries and LogQL, refer to the [Loki log queries documentation](https://grafana.com/docs/loki/latest/logql/log_queries/)
+Loki log queries return the contents of the log lines. Querying and displaying log data from Loki is available via [Explore]({{< relref "../explore/" >}}), and with the [logs panel]({{< relref "../panels-visualizations/visualizations/logs/" >}}) in dashboards. Select the Loki data source, and then enter a LogQL query to display your logs.F or more information about log queries and LogQL, refer to the [Loki log queries documentation](https://grafana.com/docs/loki/latest/logql/log_queries/).
 
 #### Log context
 
@@ -232,7 +232,7 @@ You can use some global built-in variables in query variables; `$__interval`, `$
 
 ## Annotations
 
-You can use any non-metric Loki query as a source for [annotations]({{< relref "../dashboards/annotations/" >}}). Log content will be used as annotation text and your log stream labels as tags, so there is no need for additional mapping.
+You can use any non-metric Loki query as a source for [annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}). Log content will be used as annotation text and your log stream labels as tags, so there is no need for additional mapping.
 
 ## Configure the data source with provisioning
 

docs/sources/datasources/mssql.md

@@ -75,18 +75,51 @@ Make sure the user does not get any unwanted privileges from the public role.
 If you're using an older version of Microsoft SQL Server like 2008 and 2008R2 you may need to disable encryption to be able to connect.
 If possible, we recommend you to use the latest service pack available for optimal compatibility.
 
-## Query Editor
+## Query builder
 
-{{< figure src="/static/img/docs/v51/mssql_query_editor.png" class="docs-image--no-shadow" >}}
+{{< figure src="/static/img/docs/v92/mssql_query_builder.png" class="docs-image--no-shadow" >}}
 
-You will find the MSSQL query editor in the metrics tab in Graph, Singlestat or Table panel's edit mode. You enter edit mode by clicking the
-panel title, then edit. The editor allows you to define a SQL query to select data to be visualized.
+The MS SQL query builder is available when editing a panel using a MS SQL data source. The built query can be run by pressing the `Run query` button in the top right corner of the editor.
 
-1. Select _Format as_ `Time series` (for use in Graph or Singlestat panel's among others) or `Table` (for use in Table panel among others).
-1. This is the actual editor where you write your SQL queries.
-1. Show help section for MSSQL below the query editor.
-1. Show actual executed SQL query. Will be available first after a successful query has been executed.
-1. Add an additional query where an additional query editor will be displayed.
+### Format
+
+The response from MS SQL can be formatted as either a table or as a time series. To use the time series format one of the columns must be named `time`.
+
+### Dataset and Table selection
+
+In the dataset dropdown, choose the MS SQL database to query. The dropdown is be populated with the databases that the user has access to.
+When the dataset is selected, the table dropdown is populated with the tables that are available.
+
+### Columns and Aggregation functions (SELECT)
+
+Using the dropdown, select a column to include in the data. You can also specify an optional aggregation function.
+
+Add further value columns by clicking the plus button and another column dropdown appears.
+
+### Filter data (WHERE)
+
+To add a filter, flip the switch at the top of the editor.
+Using the first dropdown, select if all the filters need to match (AND) or if only one of the filters needs to match (OR).
+
+To add more columns to filter on use the plus button.
+
+### Group By
+
+To group the results by column, flip the group switch at the top of the editor. You can then choose which column to group the results by. The group by clause can be removed by pressing the X button.
+
+### Preview
+
+By flipping the preview switch at the top of the editor, you can get a preview of the SQL query generated by the query builder.
+
+## Code editor
+
+{{< figure src="/static/img/docs/v92/sql_code_editor.png" class="docs-image--no-shadow" >}}
+
+To make advanced queries, switch to the code editor by clicking `code` in the top right corner of the editor. The code editor support autocompletion of tables, columns, SQL keywords, standard sql functions, Grafana template variables and Grafana macros. Columns cannot be completed before a table has been specified.
+
+You can expand the code editor by pressing the `chevron` pointing downwards in the lower right corner of the code editor.
+
+`CTRL/CMD + Return` works as a keyboard shortcut to run the query.
 
 <div class="clearfix"></div>
 
@@ -182,7 +215,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 options definitions]({{< relref "../panels-visualizations/configure-standard-options/#display-name" >}}).
 
 **Example with `metric` column:**
 
@@ -226,7 +259,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 options definitions]({{< relref "../panels-visualizations/configure-standard-options/#display-name" >}}) display name value of `${__field.labels.hostname}`.
 
 Data frame result:
 
@@ -345,7 +378,7 @@ Read more about variable formatting options in the [Variables]({{< relref "../da
 
 ## Annotations
 
-[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Columns:**
 

docs/sources/datasources/mysql.md

@@ -73,60 +73,51 @@ Example:
 
 You can use wildcards (`*`) in place of database or table if you want to grant access to more databases and tables.
 
-## Query Editor
+## Query builder
 
-> Only available in Grafana v5.4+.
+{{< figure src="/static/img/docs/v92/mysql_query_builder.png" class="docs-image--no-shadow" >}}
 
-{{< figure src="/static/img/docs/v54/mysql_query_still.png" class="docs-image--no-shadow" animated-gif="/static/img/docs/v54/mysql_query.gif" >}}
+The MySQL query builder is available when editing a panel using a MySQL data source. The built query can be run by pressing the `Run query` button in the top right corner of the editor.
 
-You find the MySQL query editor in the metrics tab in a panel's edit mode. You enter edit mode by clicking the
-panel title, then edit.
+### Format
 
-The query editor has a link named `Generated SQL` that shows up after a query has been executed, while in panel edit mode. Click on it and it will expand and show the raw interpolated SQL string that was executed.
+The response from MySQL can be formatted as either a table or as a time series. To use the time series format one of the columns must be named `time`.
 
-### Select table, time column and metric column (FROM)
+### Dataset and Table selection
 
-When you enter edit mode for the first time or add a new query Grafana will try to prefill the query builder with the first table that has a timestamp column and a numeric column.
-
-In the FROM field, Grafana will suggest tables that are in the configured database. To select a table or view in another database that your database user has access to you can manually enter a fully qualified name (database.table) like `otherDb.metrics`.
-
-The Time column field refers to the name of the column holding your time values. Selecting a value for the Metric column field is optional. If a value is selected, the Metric column field will be used as the series name.
-
-The metric column suggestions will only contain columns with a text datatype (text, tinytext, mediumtext, longtext, varchar, char).
-If you want to use a column with a different datatype as metric column you may enter the column name with a cast: `CAST(numericColumn as CHAR)`.
-You may also enter arbitrary SQL expressions in the metric column field that evaluate to a text datatype like
-`CONCAT(column1, " ", CAST(numericColumn as CHAR))`.
+In the dataset dropdown, choose the MySQL database to query. The dropdown is be populated with the databases that the user has access to.
+When the dataset is selected, the table dropdown is populated with the tables that are available.
 
 ### Columns and Aggregation functions (SELECT)
 
-In the `SELECT` row you can specify what columns and functions you want to use.
-In the column field you may write arbitrary expressions instead of a column name like `column1 * column2 / column3`.
+Using the dropdown, select a column to include in the data. You can also specify an optional aggregation function.
 
-If you use aggregate functions you need to group your resultset. The editor will automatically add a `GROUP BY time` if you add an aggregate function.
-
-You may add further value columns by clicking the plus button and selecting `Column` from the menu. Multiple value columns will be plotted as separate series in the graph panel.
+Add further value columns by clicking the plus button and another column dropdown appears.
 
 ### Filter data (WHERE)
 
-To add a filter click the plus icon to the right of the `WHERE` condition. You can remove filters by clicking on
-the filter and selecting `Remove`. A filter for the current selected timerange is automatically added to new queries.
+To add a filter, flip the switch at the top of the editor.
+Using the first dropdown, select if all the filters need to match (AND) or if only one of the filters needs to match (OR).
+
+To add more columns to filter on use the plus button.
 
 ### Group By
 
-To group by time or any other columns click the plus icon at the end of the GROUP BY row. The suggestion dropdown will only show text columns of your currently selected table but you may manually enter any column.
-You can remove the group by clicking on the item and then selecting `Remove`.
+To group the results by column, flip the group switch at the top of the editor. You can then choose which column to group the results by. The group by clause can be removed by pressing the X button.
 
-If you add any grouping, all selected columns need to have an aggregate function applied. The query builder will automatically add aggregate functions to all columns without aggregate functions when you add groupings.
+### Preview
 
-#### Gap Filling
+By flipping the preview switch at the top of the editor, you can get a preview of the SQL query generated by the query builder.
 
-Grafana can fill in missing values when you group by time. The time function accepts two arguments. The first argument is the time window that you would like to group by, and the second argument is the value you want Grafana to fill missing items with.
+## Code editor
 
-### Text Editor Mode (RAW)
+{{< figure src="/static/img/docs/v92/sql_code_editor.png" class="docs-image--no-shadow" >}}
 
-You can switch to the raw query editor mode by clicking the hamburger icon and selecting `Switch editor mode` or by clicking `Edit SQL` below the query.
+To make advanced queries, switch to the code editor by clicking `code` in the top right corner of the editor. The code editor support autocompletion of tables, columns, SQL keywords, standard sql functions, Grafana template variables and Grafana macros. Columns cannot be completed before a table has been specified.
 
-> If you use the raw query editor, be sure your query at minimum has `ORDER BY time` and a filter on the returned time range.
+You can expand the code editor by pressing the `chevron` pointing downwards in the lower right corner of the code editor.
+
+`CTRL/CMD + Return` works as a keyboard shortcut to run the query.
 
 ## Macros
 
@@ -191,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 options definitions]({{< relref "../panels-visualizations/configure-standard-options/#display-name" >}}).
 
 **Example with `metric` column:**
 
@@ -233,7 +224,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 options definitions]({{< relref "../panels-visualizations/configure-standard-options/#display-name" >}}) display value of `${__field.labels.hostname}`.
 
 Data frame result:
 
@@ -382,7 +373,7 @@ Read more about variable formatting options in the [Variables]({{< relref "../da
 
 ## Annotations
 
-[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Example query using time column with epoch values:**
 

docs/sources/datasources/postgres.md

@@ -19,22 +19,22 @@ Grafana ships with a built-in PostgreSQL data source plugin that allows you to q
 
 To access PostgreSQL settings, hover your mouse over the **Configuration** (gear) icon, then click **Data Sources**, and then click the PostgreSQL data source.
 
-| Name                      | Description                                                                                                                                                                                                                             |
-| ------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `Name`                    | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                   |
-| `Default`                 | Default data source means that it will be pre-selected for new panels.                                                                                                                                                                  |
-| `Host`                    | The IP address/hostname and optional port of your PostgreSQL instance. _Do not_ include the database name. The connection string for connecting to Postgres will not be correct and it may cause errors.                                |
-| `Database`                | Name of your PostgreSQL database.                                                                                                                                                                                                       |
-| `User`                    | Database user's login/username                                                                                                                                                                                                          |
-| `Password`                | Database user's password                                                                                                                                                                                                                |
-| `SSL Mode`                | Determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. When SSL Mode is disabled, SSL Method and Auth Details would not be visible.                                                |
-| `SSL Auth Details Method` | Determines whether the SSL Auth details will be configured as a file path or file content. Grafana v7.5+                                                                                                                                |
-| `SSL Auth Details Value`  | File path or file content of SSL root certificate, client certificate and client key                                                                                                                                                    |
-| `Max open`                | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+).                                                                                                                                            |
-| `Max idle`                | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+).                                                                                                                                             |
-| `Max lifetime`            | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours (Grafana v5.4+).                                                                                                                              |
-| `Version`                 | Determines which functions are available in the query builder (only available in Grafana 5.3+).                                                                                                                                         |
-| `TimescaleDB`             | A time-series database built as a PostgreSQL extension. When enabled, Grafana uses `time_bucket` in the `$__timeGroup` macro to display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+). |
+| Name                      | Description                                                                                                                                                                                                                                                                                                                                                                                                             |
+| ------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `Name`                    | The data source name. This is how you refer to the data source in panels and queries.                                                                                                                                                                                                                                                                                                                                   |
+| `Default`                 | Default data source means that it will be pre-selected for new panels.                                                                                                                                                                                                                                                                                                                                                  |
+| `Host`                    | The IP address/hostname and optional port of your PostgreSQL instance. _Do not_ include the database name. The connection string for connecting to Postgres will not be correct and it may cause errors.                                                                                                                                                                                                                |
+| `Database`                | Name of your PostgreSQL database.                                                                                                                                                                                                                                                                                                                                                                                       |
+| `User`                    | Database user's login/username                                                                                                                                                                                                                                                                                                                                                                                          |
+| `Password`                | Database user's password                                                                                                                                                                                                                                                                                                                                                                                                |
+| `SSL Mode`                | Determines whether or with what priority a secure SSL TCP/IP connection will be negotiated with the server. When SSL Mode is disabled, SSL Method and Auth Details would not be visible.                                                                                                                                                                                                                                |
+| `SSL Auth Details Method` | Determines whether the SSL Auth details will be configured as a file path or file content. Grafana v7.5+                                                                                                                                                                                                                                                                                                                |
+| `SSL Auth Details Value`  | File path or file content of SSL root certificate, client certificate and client key                                                                                                                                                                                                                                                                                                                                    |
+| `Max open`                | The maximum number of open connections to the database, default `unlimited` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                            |
+| `Max idle`                | The maximum number of connections in the idle connection pool, default `2` (Grafana v5.4+).                                                                                                                                                                                                                                                                                                                             |
+| `Max lifetime`            | The maximum amount of time in seconds a connection may be reused, default `14400`/4 hours (Grafana v5.4+).                                                                                                                                                                                                                                                                                                              |
+| `Version`                 | Determines which functions are available in the query builder (only available in Grafana 5.3+).                                                                                                                                                                                                                                                                                                                         |
+| `TimescaleDB`             | A time-series database built as a PostgreSQL extension. When enabled, Grafana uses `time_bucket` in the `$__timeGroup` macro to display TimescaleDB specific aggregate functions in the query builder (only available in Grafana 5.3+). For more information, see [TimescaleDB documentation](https://docs.timescale.com/timescaledb/latest/tutorials/grafana/grafana-timescalecloud/#connect-timescaledb-and-grafana). |
 
 ### Min time interval
 
@@ -71,69 +71,51 @@ Example:
 
 Make sure the user does not get any unwanted privileges from the public role.
 
-## Query editor
+## Query builder
 
-{{< figure src="/static/img/docs/v53/postgres_query_still.png" class="docs-image--no-shadow" animated-gif="/static/img/docs/v53/postgres_query.gif" >}}
+{{< figure src="/static/img/docs/v92/postgresql_query_builder.png" class="docs-image--no-shadow" >}}
 
-You find the PostgreSQL query editor in the metrics tab in Graph or Singlestat panel's edit mode. You enter edit mode by clicking the
-panel title, then edit.
+The PostgreSQL query builder is available when editing a panel using a PostgreSQL data source. The built query can be run by pressing the `Run query` button in the top right corner of the editor.
 
-The query editor has a link named `Generated SQL` that shows up after a query has been executed, while in panel edit mode. Click on it and it will expand and show the raw interpolated SQL string that was executed.
+### Format
 
-### Select table, time column and metric column (FROM)
+The response from PostgreSQL can be formatted as either a table or as a time series. To use the time series format one of the columns must be named `time`.
 
-When you enter edit mode for the first time or add a new query Grafana will try to prefill the query builder with the first table that has a timestamp column and a numeric column.
+### Dataset and Table selection
 
-In the FROM field, Grafana will suggest tables that are in the `search_path` of the database user. To select a table or view not in your `search_path`
-you can manually enter a fully qualified name (schema.table) like `public.metrics`.
+In the dataset dropdown, choose the PostgreSQL database to query. The dropdown is be populated with the databases that the user has access to.
+When the dataset is selected, the table dropdown is populated with the tables that are available.
 
-The Time column field refers to the name of the column holding your time values. Selecting a value for the Metric column field is optional. If a value is selected, the Metric column field will be used as the series name.
+### Columns and Aggregation functions (SELECT)
 
-The metric column suggestions will only contain columns with a text datatype (char,varchar,text).
-If you want to use a column with a different datatype as metric column you may enter the column name with a cast: `ip::text`.
-You may also enter arbitrary SQL expressions in the metric column field that evaluate to a text datatype like
-`hostname || ' ' || container_name`.
+Using the dropdown, select a column to include in the data. You can also specify an optional aggregation function.
 
-### Columns, window, and aggregation functions (SELECT)
-
-In the `SELECT` row you can specify what columns and functions you want to use.
-In the column field you may write arbitrary expressions instead of a column name like `column1 * column2 / column3`.
-
-The available functions in the query editor depend on the PostgreSQL version you selected when configuring the data source.
-If you use aggregate functions you need to group your resultset. The editor will automatically add a `GROUP BY time` if you add an aggregate function.
-
-The editor tries to simplify and unify this part of the query. For example:<br>
-![](/static/img/docs/v53/postgres_select_editor.png)<br>
-
-The above will generate the following PostgreSQL `SELECT` clause:
-
-```sql
-avg(tx_bytes) OVER (ORDER BY "time" ROWS 5 PRECEDING) AS "tx_bytes"
-```
-
-You may add further value columns by clicking the plus button and selecting `Column` from the menu. Multiple value columns will be plotted as separate series in the graph panel.
+Add further value columns by clicking the plus button and another column dropdown appears.
 
 ### Filter data (WHERE)
 
-To add a filter click the plus icon to the right of the `WHERE` condition. You can remove filters by clicking on
-the filter and selecting `Remove`. A filter for the current selected timerange is automatically added to new queries.
+To add a filter, flip the switch at the top of the editor.
+Using the first dropdown, select if all the filters need to match (AND) or if only one of the filters needs to match (OR).
 
-### Group by
+To add more columns to filter on use the plus button.
 
-To group by time or any other columns click the plus icon at the end of the GROUP BY row. The suggestion dropdown will only show text columns of your currently selected table but you may manually enter any column.
-You can remove the group by clicking on the item and then selecting `Remove`.
+### Group By
 
-If you add any grouping, all selected columns need to have an aggregate function applied. The query builder will automatically add aggregate functions to all columns without aggregate functions when you add groupings.
+To group the results by column, flip the group switch at the top of the editor. You can then choose which column to group the results by. The group by clause can be removed by pressing the X button.
 
-#### Gap filling
+### Preview
 
-Grafana can fill in missing values when you group by time. The time function accepts two arguments. The first argument is the time window that you would like to group by, and the second argument is the value you want Grafana to fill missing items with.
+By flipping the preview switch at the top of the editor, you can get a preview of the SQL query generated by the query builder.
 
-### Text editor mode (RAW)
+## Code editor
 
-You can switch to the raw query editor mode by clicking the hamburger icon and selecting `Switch editor mode` or by clicking `Edit SQL` below the query.
+{{< figure src="/static/img/docs/v92/sql_code_editor.png" class="docs-image--no-shadow" >}}
 
-> If you use the raw query editor, be sure your query at minimum has `ORDER BY time` and a filter on the returned time range.
+To make advanced queries, switch to the code editor by clicking `code` in the top right corner of the editor. The code editor support autocompletion of tables, columns, SQL keywords, standard sql functions, Grafana template variables and Grafana macros. Columns cannot be completed before a table has been specified.
+
+You can expand the code editor by pressing the `chevron` pointing downwards in the lower right corner of the code editor.
+
+`CTRL/CMD + Return` works as a keyboard shortcut to run the query.
 
 ## Macros
 
@@ -196,7 +178,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 options definitions]({{< relref "../panels-visualizations/configure-standard-options/#display-name" >}}).
 
 **Example with `metric` column:**
 
@@ -238,7 +220,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 options definitions]({{< relref "../panels-visualizations/configure-standard-options/#display-name" >}}) display value of `${__field.labels.hostname}`.
 
 Data frame result:
 
@@ -380,7 +362,7 @@ Read more about variable formatting options in the [Variables]({{< relref "../da
 
 ## Annotations
 
-[Annotations]({{< relref "../dashboards/annotations/" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
+[Annotations]({{< relref "../dashboards/build-dashboards/annotate-visualizations" >}}) allow you to overlay rich event information on top of graphs. You add annotation queries via the Dashboard menu / Annotations view.
 
 **Example query using time column with epoch values:**