Merge branch 'main' of github.com:grafana/grafana into v9.0.x

2022-05-24 12:43:30 +03:00
parent 19a5bdc7e1 b0300d56ac
commit f89df6e171
1966 changed files with 74199 additions and 24536 deletions
@@ -8,36 +8,18 @@ exports[`no enzyme tests`] = {
    "packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx:4199795290": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx:3311646309": [
-      [0, 31, 13, "RegExp match", "2409514259"]
-    ],
-    "packages/grafana-ui/src/components/FormField/FormField.test.tsx:3429087660": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "packages/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx:3129955645": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/components/Gauge/Gauge.test.tsx:2525939157": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "packages/grafana-ui/src/components/Graph/Graph.test.tsx:1664091255": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
    "packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx:1865444105": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/components/Logs/LogLabels.test.tsx:1029448019": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
-    "packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx:1630730648": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx:2719724375": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "packages/grafana-ui/src/components/Logs/LogRows.test.tsx:3121815234": [
-      [0, 17, 13, "RegExp match", "2409514259"]
-    ],
    "packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:375894800": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -80,21 +62,12 @@ exports[`no enzyme tests`] = {
    "packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.test.js:3242042907": [
      [14, 26, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TracePageHeader/TracePageSearchBar.test.js:2807329716": [
+    "packages/jaeger-ui-components/src/TracePageHeader/TracePageSearchBar.test.js:1062402339": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.test.js:1734982398": [
      [14, 26, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.test.js:3807792910": [
-      [14, 19, 13, "RegExp match", "2409514259"]
-    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.test.js:1478502145": [
-      [14, 17, 13, "RegExp match", "2409514259"]
-    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js:3826510429": [
-      [14, 26, 13, "RegExp match", "2409514259"]
-    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.js:2408389970": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -104,22 +77,16 @@ exports[`no enzyme tests`] = {
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.test.js:2429764318": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.test.js:1966455998": [
-      [14, 17, 13, "RegExp match", "2409514259"]
-    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js:3813002651": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.js:3006381933": [
-      [14, 19, 13, "RegExp match", "2409514259"]
-    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js:3097530078": [
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js:2816619357": [
      [16, 19, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js:2623922632": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.js:1117377794": [
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.js:174536706": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.test.js:743308415": [
@@ -137,15 +104,12 @@ exports[`no enzyme tests`] = {
    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.js:1423129438": [
      [15, 17, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.js:2326471104": [
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.js:551014442": [
      [13, 26, 13, "RegExp match", "2409514259"]
    ],
    "packages/jaeger-ui-components/src/TraceTimelineViewer/index.test.js:381298544": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
-    "packages/jaeger-ui-components/src/common/CopyIcon.test.js:187212136": [
-      [15, 19, 13, "RegExp match", "2409514259"]
-    ],
    "packages/jaeger-ui-components/src/common/NewWindowIcon.test.js:1750458349": [
      [14, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -182,12 +146,6 @@ exports[`no enzyme tests`] = {
    "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:1463123173": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx:1969004590": [
-      [0, 17, 13, "RegExp match", "2409514259"]
-    ],
-    "public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx:948029434": [
-      [0, 17, 13, "RegExp match", "2409514259"]
-    ],
    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:2357087833": [
      [0, 35, 13, "RegExp match", "2409514259"]
    ],
@@ -215,15 +173,9 @@ exports[`no enzyme tests`] = {
    "public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.test.tsx:4164297658": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/features/explore/LiveLogs.test.tsx:156663779": [
+    "public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx:523695501": [
      [0, 17, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx:3933225580": [
-      [0, 17, 13, "RegExp match", "2409514259"]
-    ],
-    "public/app/features/explore/SecondaryActions.test.tsx:1177396128": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "public/app/features/folders/FolderSettingsPage.test.tsx:1109052730": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -236,12 +188,6 @@ exports[`no enzyme tests`] = {
    "public/app/features/org/OrgProfile.test.tsx:623809345": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/features/teams/CreateTeam.test.tsx:1750035593": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
-    "public/app/features/teams/TeamGroupSync.test.tsx:2526985933": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "public/app/features/teams/TeamList.test.tsx:854193970": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -257,9 +203,6 @@ exports[`no enzyme tests`] = {
    "public/app/features/teams/TeamSettings.test.tsx:2043271249": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
-    "public/app/features/users/UsersActionBar.test.tsx:3740177621": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
    "public/app/features/users/UsersListPage.test.tsx:3908145117": [
      [0, 19, 13, "RegExp match", "2409514259"]
    ],
@@ -15,7 +15,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -80,7 +80,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -168,7 +168,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -188,6 +188,19 @@ steps:
  - grabpl
  image: grafana/build-container:1.5.4
  name: yarn-install
+- failure: ignore
+  image: grafana/drone-downstream
+  name: trigger-enterprise-downstream
+  settings:
+    params:
+    - SOURCE_BUILD_NUMBER=${DRONE_COMMIT}
+    - SOURCE_COMMIT=${DRONE_COMMIT}
+    - OSS_PULL_REQUEST=${DRONE_PULL_REQUEST}
+    repositories:
+    - grafana/grafana-enterprise@${DRONE_SOURCE_BRANCH}
+    server: https://drone.grafana.net
+    token:
+      from_secret: drone_token
 - commands:
  - ./bin/grabpl build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER}
    --variants linux-amd64,linux-amd64-musl,darwin-amd64,windows-amd64,armv6
@@ -421,7 +434,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -491,7 +504,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -581,7 +594,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -670,7 +683,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -731,7 +744,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -815,7 +828,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -868,6 +881,7 @@ steps:
    params:
    - SOURCE_BUILD_NUMBER=${DRONE_COMMIT}
    - SOURCE_COMMIT=${DRONE_COMMIT}
+    - OSS_PULL_REQUEST=${DRONE_PULL_REQUEST}
    repositories:
    - grafana/grafana-enterprise@main
    server: https://drone.grafana.net
@@ -1247,7 +1261,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -1320,7 +1334,7 @@ steps:
  name: identify-runner
 - commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
    -OutFile grabpl.exe
  image: grafana/ci-wix:0.1.1
  name: windows-init
@@ -1408,7 +1422,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -1493,7 +1507,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -1799,7 +1813,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -1923,7 +1937,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2000,7 +2014,7 @@ steps:
  name: identify-runner
 - commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
    -OutFile grabpl.exe
  image: grafana/ci-wix:0.1.1
  name: windows-init
@@ -2059,7 +2073,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2416,7 +2430,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2595,7 +2609,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2719,7 +2733,7 @@ steps:
  name: identify-runner
 - commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
    -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@@ -2794,7 +2808,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2872,7 +2886,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -2933,7 +2947,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3012,7 +3026,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3074,7 +3088,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3112,7 +3126,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3150,7 +3164,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3206,7 +3220,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3254,7 +3268,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3303,7 +3317,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3579,7 +3593,7 @@ steps:
  name: identify-runner
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3697,7 +3711,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -3768,7 +3782,7 @@ steps:
  name: identify-runner
 - commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
    -OutFile grabpl.exe
  image: grafana/ci-wix:0.1.1
  name: windows-init
@@ -3816,7 +3830,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -4171,7 +4185,7 @@ services: []
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -4341,7 +4355,7 @@ services:
 steps:
 - commands:
  - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/grabpl
  - chmod +x bin/grabpl
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@@ -4456,7 +4470,7 @@ steps:
  name: identify-runner
 - commands:
  - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.41/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.48/windows/grabpl.exe
    -OutFile grabpl.exe
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@@ -4653,6 +4667,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 650895e4350d8423d0a77aa728ed07696ee301ad440b9982e336a05bb364cdf8
+hmac: 39c6fd27fc223b7bc99242101d28f508cdbbf01b561330bb52979f1d032af5d5

 ...
@@ -169,5 +169,15 @@ lerna.json @grafana/frontend-ops
 /grafana-mixin/ @grafana/hosted-grafana-team

 # Grafana authentication and authorization
-/pkg/services/accesscontrol @grafana/grafana-enterprise-operations-team
-/pkg/services/serviceaccounts @grafana/grafana-enterprise-operations-team
+/pkg/services/accesscontrol @grafana/grafana-authnz-team
+/pkg/services/auth @grafana/grafana-authnz-team
+/pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
+/pkg/services/datasources/permissions @grafana/grafana-authnz-team
+/pkg/services/datasources/permissions/accesscontrol.go @grafana/grafana-authnz-team
+/pkg/services/guardian @grafana/grafana-authnz-team
+/pkg/services/ldap @grafana/grafana-authnz-team
+/pkg/services/login @grafana/grafana-authnz-team
+/pkg/services/multildap @grafana/grafana-authnz-team
+/pkg/services/oauthtoken @grafana/grafana-authnz-team
+/pkg/services/teamguardian @grafana/grafana-authnz-team
+/pkg/services/serviceaccounts @grafana/grafana-authnz-team
@@ -0,0 +1,43 @@
+name: UX design issue
+description: Create an issue for delivering wireframes, mockups or other design solutions.
+title: "UX: "
+labels: ["type/ux"]
+body:
+  - type: textarea
+    id: background
+    attributes:
+      label: "Background / Why we're doing this"
+      description: Describe the problem and background of the issue. This could include research insights that inform the design changes, unmet user needs, or other usability issues.
+      placeholder: Add UI improvements to make Grafana Alerting alert creation easier based on usability test results.
+    validations:
+      required: true
+  - type: dropdown
+    attributes:
+      label: Is there existing research for this?
+      description: Please link research results or insights in the Background section if you have any. If no research was conducted, you might want to consider usability testing your design later.
+      options: [
+        "Yes, I have linked it", 
+        "No research yet"
+      ]
+    validations:
+      required: true
+  - type: textarea
+    id: problems-or-tasks
+    attributes:
+      label: Problems or tasks
+      description: Describe problems the new design should solve or tasks the user needs to complete.
+      placeholder: 
+      value: |
+        - A problem we're trying to solve
+        - A task the user needs to accomplish
+        - …
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Deliverables
+      description: Add a checklist of deliverables here. You can later add links to each deliverable.
+      value: |
+          - Figma mockup
+          - Miro board
+          - …
@@ -7,12 +7,43 @@
    "failure": "Milestone not set"
  },
  {
-    "type": "check-backport",
+    "type": "check-label",
    "title": "Backport Check",
-    "backportEnabled": "Backport enabled",
-    "backportSkipped": "Backport skipped",
-    "failure": "Backport decision needed",
-    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported",
-    "skipLabels": [ "backport", "no-backport"]
+    "labels": {
+      "exists": "Backport enabled",
+      "notExists": "Backport decision needed",
+      "matches": [
+        "backport v*"
+      ]
+    },
+    "skip": {
+      "message": "Backport skipped",
+      "matches": [
+        "backport",
+        "no-backport"
+      ]
+    },
+    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported"
+  },
+  {
+    "type": "check-changelog",
+    "title": "Changelog Check",
+    "labels": {
+      "exists": "Changelog enabled",
+      "notExists": "Changelog decision needed",
+      "matches": [
+        "add to changelog"
+      ]
+    },
+    "breakingChangeLabels": [
+      "breaking change"
+    ],
+    "skip": {
+      "message": "Changelog skipped",
+      "matches": [
+        "no-changelog"
+      ]
+    },
+    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#include-in-changelog-and-release-notes"
  }
 ]
@@ -20,6 +20,7 @@
    "history", // we should bump this together with react-router-dom
    "@mdx-js/react", // storybook peer-depends on it's 1.x version, we should upgrade this when we upgrade storybook
    "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
+    "node-fetch", // we should bump this once we move to esm modules
    "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
    "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
    "react-router-dom", // we should bump this together with history
@@ -28,7 +29,6 @@
    "systemjs",
    "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
    "ts-loader", // we should remove ts-loader and use babel-loader instead
-    "typescript", // >4.5.x doesn't seem to work on windows with pnp currently. probably similar to https://github.com/yarnpkg/berry/issues/3722
    "ora" // we should bump this once we move to esm modules
  ],
  "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
@@ -74,7 +74,7 @@ jobs:
          repository: "grafana/grafana-github-actions"
          path: ./actions
          ref: main
-      - uses: actions/setup-node@v2.5.1
+      - uses: actions/setup-node@v3.2.0
        with:
          node-version: '16'
      - name: Install Actions
@@ -95,12 +95,12 @@ jobs:
      - uses: actions/checkout@v3

      - name: Get built packages from pr
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
        with:
          name: buildPr

      - name: Get built packages from base
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
        with:
          name: buildBase
      
@@ -0,0 +1,26 @@
+name: Enterprise PR check
+on:
+  pull_request:
+    branches:
+      - main
+      - 'v[0-9]+.[0-9]+.x'
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Repository Dispatch
+        uses: ./actions/repository-dispatch
+        with:
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          repository: grafana/grafana-enterprise
+          event_type: oss-pull-request
+          client_payload:
+            '{"source_branch": "${{ github.head_ref }}", "target_branch": "${{ github.base_ref }}", "pr_number": "${{ github.event.number }}"}'
@@ -5,9 +5,10 @@ on:
      - opened
      - reopened
      - synchronize
-      - ready_for_review      
+      - ready_for_review
      - labeled
      - unlabeled
+      - edited
  issues:
    types:
      - milestoned
@@ -17,7 +17,7 @@ jobs:
    - uses: actions/checkout@v3
    - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
    - name: generate-packages-docs
-      uses: actions/setup-node@v2.5.1
+      uses: actions/setup-node@v3.2.0
      id: generate-docs
      with:
        node-version: '16'
@@ -7,7 +7,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v5
        with:
          repo-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
          # Number of days of inactivity before a stale Issue or Pull Request is closed.
@@ -21,3 +21,7 @@ vendor
 # Auto-generated localisation files
 public/locales/_build/
 public/locales/**/*.js
+
+# Auto-generated theme files
+theme.light.generated.json
+theme.dark.generated.json
@@ -1,6 +1,6 @@
 {
  "name": "prettier",
-  "version": "2.5.1-sdk",
+  "version": "2.6.0-sdk",
  "main": "./index.js",
  "type": "commonjs"
 }
@@ -61,18 +61,26 @@ const moduleWrapper = tsserver => {
          //
          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
          //
-          // Update Oct 8 2021: VSCode changed their format in 1.61.
+          // Update 2021-10-08: VSCode changed their format in 1.61.
          // Before | ^zip:/c:/foo/bar.zip/package.json
          // After  | ^/zip//c:/foo/bar.zip/package.json
          //
+          // Update 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
          case `vscode <1.61`: {
            str = `^zip:${str}`;
          } break;

-          case `vscode`: {
+          case `vscode <1.66`: {
            str = `^/zip/${str}`;
          } break;

+          case `vscode`: {
+            str = `^/zip${str}`;
+          } break;
+
          // To make "go to definition" work,
          // We have to resolve the actual file system path from virtual path
          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
@@ -160,8 +168,12 @@ const moduleWrapper = tsserver => {
        typeof parsedMessage.arguments.hostInfo === `string`
      ) {
        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
-          hostInfo += ` <1.61`;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.61`;
+          } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.66`;
+          }
        }
      }

@@ -61,18 +61,26 @@ const moduleWrapper = tsserver => {
          //
          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
          //
-          // Update Oct 8 2021: VSCode changed their format in 1.61.
+          // Update 2021-10-08: VSCode changed their format in 1.61.
          // Before | ^zip:/c:/foo/bar.zip/package.json
          // After  | ^/zip//c:/foo/bar.zip/package.json
          //
+          // Update 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
          case `vscode <1.61`: {
            str = `^zip:${str}`;
          } break;

-          case `vscode`: {
+          case `vscode <1.66`: {
            str = `^/zip/${str}`;
          } break;

+          case `vscode`: {
+            str = `^/zip${str}`;
+          } break;
+
          // To make "go to definition" work,
          // We have to resolve the actual file system path from virtual path
          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
@@ -160,8 +168,12 @@ const moduleWrapper = tsserver => {
        typeof parsedMessage.arguments.hostInfo === `string`
      ) {
        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK && process.env.VSCODE_IPC_HOOK.match(/Code\/1\.([1-5][0-9]|60)\./)) {
-          hostInfo += ` <1.61`;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.61`;
+          } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.66`;
+          }
        }
      }

@@ -1,6 +1,6 @@
 {
  "name": "typescript",
-  "version": "4.4.4-sdk",
+  "version": "4.6.4-sdk",
  "main": "./lib/typescript.js",
  "type": "commonjs"
 }
@@ -34,7 +34,7 @@ packageExtensions:
  doctrine@3.0.0:
    dependencies:
      assert: 2.0.0
-  moveable@0.28.0:
+  moveable@0.29.8:
    dependencies:
      "@daybrush/utils": 1.6.0
      framework-utils: ^1.1.0
@@ -49,7 +49,7 @@ packageExtensions:
  react-compat-css-styled@1.0.8:
    dependencies:
      react-simple-compat: 1.2.1
-  react-compat-moveable@0.16.0:
+  react-compat-moveable@0.17.8:
    dependencies:
      "@egjs/agent": ^2.2.1
      "@egjs/children-differ": ^1.0.1
@@ -78,4 +78,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
    spec: "https://mskelton.dev/yarn-outdated/v2"

-yarnPath: .yarn/releases/yarn-3.2.0.cjs
+yarnPath: .yarn/releases/yarn-3.2.1.cjs
@@ -1,3 +1,30 @@
+<!-- 8.5.3 START -->
+
+# 8.5.3
+
+### Bug fixes
+
+- **Security:** fixes CVE-2022-29170. [#49240](https://github.com/grafana/grafana/pull/49240), [@xlson](https://github.com/xlson)
+
+<!-- 8.5.3 END -->
+<!-- 8.5.2 START -->
+
+# 8.5.2 (2022-05-03)
+
+### Features and enhancements
+
+- **Alerting:** Add safeguard for migrations that might cause dataloss. [#48526](https://github.com/grafana/grafana/pull/48526), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **AzureMonitor:** Add support for not equals and startsWith operators when creating Azure Metrics dimension filters. [#48077](https://github.com/grafana/grafana/pull/48077), [@aangelisc](https://github.com/aangelisc)
+- **Elasticsearch:** Add deprecation notice for < 7.10 versions. [#48506](https://github.com/grafana/grafana/pull/48506), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Traces:** Filter by service/span name and operation in Tempo and Jaeger. [#48209](https://github.com/grafana/grafana/pull/48209), [@joey-grafana](https://github.com/joey-grafana)
+
+### Bug fixes
+
+- **AzureAd Oauth:** Fix strictMode to reject users without an assigned role. [#48474](https://github.com/grafana/grafana/pull/48474), [@kyschouv](https://github.com/kyschouv)
+- **CloudWatch:** Fix variable query tag migration. [#48587](https://github.com/grafana/grafana/pull/48587), [@iwysiu](https://github.com/iwysiu)
+- **Plugins:** Ensure catching all appropriate 4xx api/ds/query scenarios. [#47565](https://github.com/grafana/grafana/pull/47565), [@wbrowne](https://github.com/wbrowne)
+
+<!-- 8.5.2 END -->
 <!-- 8.5.1 START -->

 # 8.5.1 (2022-04-27)
@@ -80,7 +80,6 @@ The current team members are:
 - Emil Tullstedt ([Grafana Labs](https://grafana.com/))
 - Erik Sundell ([Grafana Labs](https://grafana.com/))
 - Fredrik Enestad ([Embark Studios](https://www.embark-studios.com/))
- Hugo Häggmark ([Grafana Labs](https://grafana.com/))
 - Ivana Huckova ([Grafana Labs](https://grafana.com/))
 - Jeroen Op 't Eynde ([Grafana Labs](https://grafana.com/))
 - Jessica Müller ([Grafana Labs](https://grafana.com/))
@@ -0,0 +1,5 @@
+# Hall of fame
+
+List of previous team members that have had a big impact on the company or the product and contributed during a long period of time.
+
+- Hugo Häggmark ([School of applied technology](https://salt.study))
@@ -35,7 +35,7 @@ node_modules: package.json yarn.lock ## Install node modules.
 ##@ Swagger
 SPEC_TARGET = public/api-spec.json
 MERGED_SPEC_TARGET := public/api-merged.json
-NGALERT_SPEC_TARGET = pkg/services/ngalert/api/tooling/post.json
+NGALERT_SPEC_TARGET = pkg/services/ngalert/api/tooling/api.json

 $(SPEC_TARGET): $(API_DEFINITION_FILES) ## Generate API spec
 	docker run --rm -it \
@@ -53,10 +53,10 @@ $(SPEC_TARGET): $(API_DEFINITION_FILES) ## Generate API spec
 swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET)

 $(NGALERT_SPEC_TARGET):
-	+$(MAKE) -C pkg/services/ngalert/api/tooling post.json
+	+$(MAKE) -C pkg/services/ngalert/api/tooling api.json

 $(MERGED_SPEC_TARGET): $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) ## Merge generated and ngalert API specs
-	go run pkg/api/docs/merge/merge_specs.go -o=public/api-merged.json $(<) pkg/services/ngalert/api/tooling/post.json
+	go run pkg/api/docs/merge/merge_specs.go -o=public/api-merged.json $(<) pkg/services/ngalert/api/tooling/api.json

 ensure_go-swagger_mac:
 	@hash swagger &>/dev/null || (brew tap go-swagger/go-swagger && brew install go-swagger)
@@ -643,6 +643,12 @@ managed_identity_enabled = false
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 managed_identity_client_id =

+#################################### Role-based Access Control ###########
+[rbac]
+enabled = true
+# If enabled, cache permissions in a in memory cache (Enterprise only)
+permission_cache = true
+
 #################################### SMTP / Emailing #####################
 [smtp]
 enabled = false
@@ -835,6 +841,22 @@ max_attempts = 3
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 min_interval = 10s

+[unified_alerting.screenshots]
+# Enable screenshots in notifications. This option requires a remote HTTP image rendering service. Please
+# see [rendering] for further configuration options.
+enabled =
+
+# The maximum number of screenshots that can be taken at the same time. This option is different from
+# concurrent_render_request_limit as max_concurrent_screenshots sets the number of concurrent screenshots
+# that can be taken at the same time for all firing alerts where as concurrent_render_request_limit sets
+# the total number of concurrent screenshots across all Grafana services.
+max_concurrent_screenshots = 5
+
+# Uploads screenshots to the local Grafana server or remote storage such as Azure, S3 and GCS. Please
+# see [external_image_storage] for further configuration options. If this option is false then
+# screenshots will be persisted to disk for up to temp_data_lifetime.
+upload_external_image_storage = false
+
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -916,7 +938,7 @@ enabled = true
 #################################### Query History #############################
 [query_history]
 # Enable the Query history
-enabled = false
+enabled = true

 #################################### Internal Grafana Metrics ############
 # Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
@@ -976,6 +998,15 @@ disable_shared_zipkin_spans = false
 [tracing.opentelemetry.jaeger]
 # jaeger destination (ex http://localhost:14268/api/traces)
 address =
+# Propagation specifies the text map propagation format: w3c, jaeger
+propagation =
+
+# This is a configuration for OTLP exporter with GRPC protocol
+[tracing.opentelemetry.otlp]
+# otlp destination (ex localhost:4317)
+address =
+# Propagation specifies the text map propagation format: w3c, jaeger
+propagation =

 #################################### External Image Storage ##############
 [external_image_storage]
@@ -1143,6 +1174,9 @@ promQueryBuilder = true
 # The new loki visual query builder
 lokiQueryBuilder = true

+# InfluxDB backend migration
+influxdbBackendMigration = true
+
 # Experimental Explore to Dashboard workflow
 explore2Dashboard = true

@@ -1150,7 +1184,10 @@ explore2Dashboard = true
 commandPalette = true

 # Use dynamic labels in CloudWatch datasource
-cloudWatchDynamicLabels = false
+cloudWatchDynamicLabels = true
+
+# New expandable navigation
+newNavigation = true

 # feature1 = true
 # feature2 = false
@@ -1,76 +1,68 @@
+# ---
 # # config file version
-# apiVersion: 1
+# apiVersion: 2

-# # list of default built-in role assignments that should be removed
-# removeDefaultAssignments:
-#   # <string>, must be one of the Organization roles (`Viewer`, `Editor`, `Admin`) or `Grafana Admin`
-#   - builtInRole: "Grafana Admin"
-#     # <string>, must be one of the existing fixed roles
-#     fixedRole: "fixed:permissions:admin"
-
-# # list of default built-in role assignments that should be added back
-# addDefaultAssignments:
-#   # <string>, must be one of the Organization roles (`Viewer`, `Editor`, `Admin`) or `Grafana Admin`
-#   - builtInRole: "Admin"
-#     # <string>, must be one of the existing fixed roles
-#     fixedRole: "fixed:reporting:admin:read"
-    
-# # list of roles that should be deleted
-# deleteRoles:
-#   # <string> name of the role you want to create. Required if no uid is set
-#   - name: "custom:reports:editor"
-#     # <string> uid of the role. Required if no name
-#     uid: "customreportseditor1"
-#     # <int> org id. will default to Grafana's default if not specified
-#     orgId: 1
-#     # <bool> force deletion revoking all grants of the role
-#     force: true
-#   - name: "custom:global:reports:reader"
-#     uid: "customglobalreportsreader1"
-#     # <bool> overwrite org id and removes a global role
-#     global: true
-#     force: true
-
-# # list of roles to insert/update depending on what is available in the database
+# # <list> list of roles to insert/update/delete
 # roles:
-#   # <string, required> name of the role you want to create. Required
-#   - name: "custom:users:editor"
+#   # <string, required> name of the role you want to create or update. Required.
+#   - name: 'custom:users:writer'
 #     # <string> uid of the role. Has to be unique for all orgs.
-#     uid: customuserseditor1
+#     uid: customuserswriter1
 #     # <string> description of the role, informative purpose only.
-#     description: "Role for our custom user editors"
-#     # <int> version of the role, Grafana will update the role when increased
+#     description: 'Create, read, write users'
+#     # <int> version of the role, Grafana will update the role when increased.
 #     version: 2
-#     # <int> org id. will default to Grafana's default if not specified
-#     orgId: 1    
-#     # <list> list of the permissions granted by this role
+#     # <int> org id. Defaults to Grafana's default if not specified.
+#     orgId: 1
+#     # <list> list of the permissions granted by this role.
 #     permissions:
-#       # <string, required> action allowed
-#       - action: "users:read"
-#         #<string> scope it applies to
-#         scope: "users:*"
-#       - action: "users:write"
-#         scope: "users:*"
-#       - action: "users:create"
-#         scope: "users:*"
-#     # <list> list of builtIn roles the role should be assigned to
-#     builtInRoles:
-#       # <string, required> name of the builtin role you want to assign the role to
-#       - name: "Editor"
-#         # <int> org id. will default to the role org id
-#         orgId: 1        
-#   - name: "custom:global:users:reader"
-#     uid: "customglobalusersreader1"
-#     description: "Global Role for custom user readers"
-#     version: 1
-#     # <bool> overwrite org id and creates a global role
+#       # <string, required> action allowed.
+#       - action: 'users:read'
+#         #<string> scope it applies to.
+#         scope: 'users:*'
+#       - action: 'users:write'
+#         scope: 'users:*'
+#       - action: 'users:create'
+#   - name: 'custom:global:users:reader'
+#     # <bool> overwrite org id and creates a global role.
 #     global: true
-#     permissions:
-#       - action: "users:read"
-#         scope: "users:*"
-#     builtInRoles:
-#       - name: "Viewer"
-#         orgId: 1        
-#       - name: "Editor"
-#         # <bool> overwrite org id and assign role globally
+#     # <string> state of the role. Defaults to 'present'. If 'absent', role will be deleted.
+#     state: 'absent'
+#     # <bool> force deletion revoking all grants of the role.
+#     force: true
+#   - uid: 'basic_editor'
+#     version: 2
+#     global: true
+#     # <list> list of roles to copy permissions from.
+#     from:
+#       - uid: 'basic_editor'
 #         global: true
+#       - name: 'fixed:users:writer'
+#         global: true
+#     # <list> list of the permissions to add/remove on top of the copied ones.
+#     permissions:
+#       - action: 'users:read'
+#         scope: 'users:*'
+#       - action: 'users:write'
+#         scope: 'users:*'
+#         # <string> state of the permission. Defaults to 'present'. If 'absent', the permission will be removed.
+#         state: absent
+
+# # <list> list role assignments to teams to create or remove.
+# teams:
+#   # <string, required> name of the team you want to assign roles to. Required.
+#   - name: 'Users writers'
+#     # <int> org id. Will default to Grafana's default if not specified.
+#     orgId: 1
+#     # <list> list of roles to assign to the team
+#     roles:
+#       # <string> uid of the role you want to assign to the team.
+#       - uid: 'customuserswriter1'
+#         # <int> org id. Will default to Grafana's default if not specified.
+#         orgId: 1
+#       # <string> name of the role you want to assign to the team.
+#       - name: 'fixed:users:writer'
+#         # <bool> overwrite org id to specify the role is global.
+#         global: true
+#         # <string> state of the assignment. Defaults to 'present'. If 'absent', the assignment will be revoked.
+#         state: absent
@@ -623,6 +623,11 @@
 # Should be set for user-assigned identity and should be empty for system-assigned identity
 ;managed_identity_client_id =

+#################################### Role-based Access Control ###########
+[rbac]
+;enabled = true
+# If enabled, cache permissions in a in memory cache (Enterprise only)
+;permission_cache = true
 #################################### SMTP / Emailing ##########################
 [smtp]
 ;enabled = false
@@ -898,7 +903,7 @@
 #################################### Query History #############################
 [query_history]
 # Enable the Query history
-;enabled = false
+;enabled = true

 #################################### Internal Grafana Metrics ##########################
 # Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
@@ -958,6 +963,15 @@
 [tracing.opentelemetry.jaeger]
 # jaeger destination (ex http://localhost:14268/api/traces)
 ; address = http://localhost:14268/api/traces
+# Propagation specifies the text map propagation format: w3c, jaeger
+; propagation = jaeger
+
+# This is a configuration for OTLP exporter with GRPC protocol
+[tracing.opentelemetry.otlp]
+# otlp destination (ex localhost:4317)
+; address = localhost:4317
+# Propagation specifies the text map propagation format: w3c, jaeger
+; propagation = w3c

 #################################### External image storage ##########################
 [external_image_storage]
@@ -2,6 +2,8 @@

 Grafana uses a _bus_ to pass messages between different parts of the application. All communication over the bus happens synchronously.

+> **Deprecated:** The bus has officially been deprecated, however, we're still using the command/query objects paradigms.
+
 There are three types of messages: _events_, _commands_, and _queries_.

 ## Events
@@ -99,6 +99,8 @@ To add a migration:
 - In the `AddMigrations` function, find the `addXxxMigration` function for the service you want to create a migration for.
 - At the end of the `addXxxMigration` function, register your migration:

+> **NOTE:** Putting migrations behind feature flags is no longer recommended as it may cause the migration skip integration testing.
+
 [Example](https://github.com/grafana/grafana/blob/00d0640b6e778ddaca021670fe851fe00982acf2/pkg/services/sqlstore/migrations/migrations.go#L55-L70)

 ### Implement `DatabaseMigrator`
@@ -0,0 +1,194 @@
+# Localisation
+
+Grafana uses the [LinguiJS](https://github.com/lingui/js-lingui) framework for managing translating phrases in the Grafana frontend.
+
+## tl;dr
+
+- Use `<Trans id="search-results.panel-link">Go to {panel.title}</Trans>` in code to add a translatable phrase
+- Translations are stored in .po files in `public/locales/{locale}/messages.po`
+- If a particular phrase is not available in the a language then it will fall back to English
+
+## How to add a new translation phrase
+
+1. Use one of `@lingui/macro`'s React components with the `id`, ensuring it conforms to the guidelines below, with the default english translation. e.g.
+
+```jsx
+import { Trans } from @lingui/macro
+
+const SearchTitle = ({term}) => (
+  <Trans id="search-page.results-title">
+    Results for {term}
+  </Trans>
+);
+```
+
+Prefer using the JSX components (compared to the plain javascript functions, see below) where possible for phrases. Many props can (and probably should) be changed to accept the `React.ReactNode` instead of `string` for phrases put into the DOM.
+
+Note that Lingui must be able to statically analyse the code to extract the phrase, so the `id` can not be dynamic. e.g. the following will not work:
+
+```jsx
+const ErrorMessage = ({ id, message }) => <Trans id={`errors.${id}`}>There was an error: {message}</Trans>;
+```
+
+2. Upon reload, the default English phrase will appear on the page.
+
+3. Before submitting your PR, run the `yarn i18n:extract` command to extract the messages you added into the `messages.po` file and make them available for translation.
+
+## How translations work in Grafana
+
+Grafana uses the [LinguiJS](https://github.com/lingui/js-lingui) framework for managing translating phrases in the Grafana frontend. It:
+
+- Marks up phrases within our code for extraction
+- Extracts phrases into messages catalogues for translating in external systems
+- "Compiles" the catalogues to a format that can be used in the website
+- Manages the user's locale and putting the translated phrases in the UI
+
+### Phrase ID naming convention
+
+We set explicit IDs for phrases to make it easier to identify phrases out of context, and to track where they're used. IDs follow a naming scheme that includes _where_ the phrase is used. The exception is the rare case of single reoccuring words like "Cancel", but default to using a feature/phrase specific phrase.
+
+Message IDs are made of _up to_ three segments in the format `feature.area.phrase`. For example:
+
+- `dashboard.header.refresh-label`
+- `explore.toolbar.share-tooltip`
+
+For components used all over the site, use just two segments:
+
+- `footer.update`
+- `navigation.home`
+
+### Top-level provider
+
+In [AppWrapper.tsx](/public/app/AppWrapper.tsx) the app is wrapped with `I18nProvider` from `public/app/core/localisation.tsx` where the Lingui instance is created with the user's preferred locale. This sets the appropriate context and allows any component from `@lingui/macro` to use the translations for the user's preferred locale.
+
+### Message format
+
+Lingui uses the [ICU MessageFormat](https://unicode-org.github.io/icu/userguide/format_parse/messages/) for the phrases in the .po catalogues. ICU has special syntax especially for describing plurals across multiple languages. For more details see the [Lingui docs](https://lingui.js.org/ref/message-format.html).
+
+### Plain JS usage
+
+See [Lingui Docs](https://lingui.js.org/ref/macro.html#t) for more details.
+
+Sometimes you may need to translate a string cannot be represented in JSX, such as `placeholder` props. Use the `t` macro for this.
+
+```jsx
+import { t } from "@lingui/macro"
+
+const placeholder = t({
+   id: 'form.username-placeholder',
+   message: `Username`
+});
+
+return <input type="value" placeholder={placeholder}>
+```
+
+While the `t` macro can technically be used outside of React functions (e.g, in actions/reducers), aim to keep all UI phrases within the React UI functions.
+
+## Examples
+
+See the [Lingui docs](https://lingui.js.org/ref/macro.html#usage) for more details.
+
+### Basic usage
+
+For fixed phrases:
+
+```jsx
+import { Trans } from '@lingui/macro';
+
+<Trans id="page.greeting">Hello user!</Trans>;
+```
+
+You can include variables, just like regular JSX. Prefer using "simple" variables to make the extracted phrase easier to read for translators
+
+```jsx
+import { Trans } from '@lingui/macro';
+
+// Bad - translators will see: Hello {0}
+<Trans id="page.greeting">Hello {user.name}!</Trans>;
+
+// Good - translators will see: Hello {userName}
+const userName = user.name;
+<Trans id="page.greeting">Hello {userName}!</Trans>;
+```
+
+Variables must be strings (or, must support calling `.toString()`, which we almost never want).
+
+```jsx
+import { Trans } from '@lingui/macro';
+
+// This will not work
+const userName = <strong>user.name</strong>;
+<Trans id="page.greeting">Hello {userName}!</Trans>;
+
+// Instead, put the JSX inside the phrase directly
+const userName = user.name;
+<Trans id="page.greeting">
+  Hello <strong>{userName}</strong>!
+</Trans>;
+```
+
+### React components and HTML tags
+
+Both HTML tags and React components can be included in a phase. The Lingui macro will replace them with placeholder tags for the translators
+
+```js
+import { Trans } from "@lingui/macro"
+
+const randomVariable = "variable"
+
+<Trans id="page.explainer">
+  Click <button>here</button> to <a href="https://grafana.com">learn more.</a>
+</Trans>
+
+// ↓ is transformed by macros into ↓
+<Trans
+  id="page.explainer"
+  defaults="Click <0>here</0> to <1>learn more</1>"
+  components={[
+    <button />,
+    <Text />
+  ]}
+/>
+
+// ↓ is in the messages.po file like ↓
+msgid "page.explainer"
+msgstr "Click <0>here</0> to <1>learn more</1>"
+```
+
+### Plurals
+
+See the [Lingui docs](https://lingui.js.org/ref/macro.html#id1) for more details.
+
+Plurals require special handling to make sure they can be translating according to the rules of each locale (which may be more complex that you think!). Use the `<Plural />` component and specify the plural forms for the default language (English). The message will be extracted into a form where translators can extend it with rules for other locales.
+
+```js
+import { Plural } from "@lingui/macro"
+
+<Plural
+  id="sharing.shared-with"
+  value={sharedCount}
+  none="Not shared with anyone"
+  one="Shared with one person"
+  other="Shared with # people"
+/>
+
+// ↓ is transformed by macros into ↓
+
+<Trans
+  id="example.plurals"
+  values={{ sharedCount }}
+  defaults="{sharedCount, plural, none {Not shared with anyone}, one {Shared with one person}, other {Shared with # people}"
+/>
+
+// sharedCount = 0 -> Not shared with anyone
+// sharedCount = 1 -> Shared with one person
+// sharedCount = 3 -> Shared with # people
+```
+
+### Date and time
+
+[Lingui has functions](https://lingui.js.org/ref/core.html#I18n.date) to format dates and times according to the convention to the user's preferred locale, based on the browser [Intl.DateTimeFormat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat) API. However, as displaying dates and times is fundamental to Grafana, guidelines have not been established for this yet.
+
+## Documentation
+
+[Grafana's documentation](https://grafana.com/docs/grafana/latest/) is not yet open for translation and should be authored in English only.
@@ -43,11 +43,31 @@ This makes it easier to track what changes go into a certain release. Without th

 At Grafana we generate the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) and [release notes](https://grafana.com/docs/grafana/latest/release-notes/) based on merged pull requests. Including changes in the changelog/release notes is very important to provide a somewhat complete picture of what changes a Grafana release actually includes.

-Exactly what changes should be added to the changelog is hard to answer but some general guidance would be any change that you think would be interesting for the community as a whole. Use your best judgement and/or ask other maintainers for advice.
-
 There's a GitHub action available in the repository named [Update changelog](https://github.com/grafana/grafana/blob/main/.github/workflows/update-changelog.yml) that can manually be triggered to re-generate the changelog and release notes for any release.

-To include a pull request in the changelog/release notes the general rule of thumb is that a milestone should be assigned and labeled with `add to changelog`.
+Exactly what changes should be added to the changelog is hard to answer but here's some general guidance:
+
+- Include any bug fix in general.
+- Include any change that you think would be interesting for the community as a whole.
+- Skip larger features divided in multiple pull requests since they might go into the release blog post/What's New article.
+- Use your best judgement and/or ask other maintainers for advice.
+- Including a change in error rather than skipping one that should have been there is better.
+- Always keep [Format the pull request title](#format-the-pull-request-title) in mind.
+
+An active decision to include change in changelog/release notes needs to be taken for every pull request. There's a pull request check named **Changelog Check** that will enforce this. By adding/removing labels on the pull request or updating the pull request title/description the check will be re-evaluated.
+
+#### Skip changelog
+
+If you don't want to include your change in changelog/release notes you need to add a label named **no-changelog** to the pull request.
+
+#### Include in changelog/release notes
+
+To include a pull request in the changelog/release notes you need to add a label named `add to changelog` to the pull request. Then additional validation rules is checked:
+
+- Title need to be formatted according to [Format the pull request title](#format-the-pull-request-title)
+- Description needs to include a breaking change notice if change is labeled to be a breaking change, see Breaking changes below for more information.
+
+Not complying with above rules can make the **Changelog Check** fail with validation errors.

 The changelog/release notes are divided into sections and here's a description of how you make a pull request show up in a certain section.

@@ -7,6 +7,15 @@ deleteDatasources:
  - name: gdev-influxdb2-influxql
  - name: gdev-loki-0.3
  - name: gdev-loki-0.4
+  - name: gdev-elasticsearch-v2-metrics
+  - name: gdev-elasticsearch-v2-logs
+  - name: gdev-elasticsearch-v5-metrics
+  - name: gdev-elasticsearch-v5-logs
+  - name: gdev-elasticsearch-v56-metrics
+  - name: gdev-elasticsearch-v56-logs
+  - name: gdev-elasticsearch-v6-metrics
+  - name: gdev-elasticsearch-v6-logs
+  - name: gdev-elasticsearch-v6-filebeat

 datasources:
  - name: gdev-graphite
@@ -105,17 +114,7 @@ datasources:
      tsdbResolution: 1
      tsdbVersion: 3

-  - name: gdev-elasticsearch-v2-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://localhost:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 2
-
-  - name: gdev-elasticsearch-v2-logs
+  - name: gdev-elasticsearch
    type: elasticsearch
    access: proxy
    database: "[logs-]YYYY.MM.DD"
@@ -123,77 +122,9 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
-      esVersion: 2
-
-  - name: gdev-elasticsearch-v5-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://localhost:10200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 5
-
-  - name: gdev-elasticsearch-v5-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://localhost:10200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 5
-
-  - name: gdev-elasticsearch-v56-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://localhost:13200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 56
-
-  - name: gdev-elasticsearch-v56-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://localhost:13200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 56
-
-  - name: gdev-elasticsearch-v6-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://localhost:11200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 60
-
-  - name: gdev-elasticsearch-v6-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://localhost:11200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 60
-
-  - name: gdev-elasticsearch-v6-filebeat
-    type: elasticsearch
-    access: proxy
-    database: "[filebeat-]YYYY.MM.DD"
-    url: http://localhost:11200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 60
+      logLevelField: level
+      logMessageField: line
+      esVersion: 8.0.0

  - name: gdev-elasticsearch-v7-metrics
    type: elasticsearch
@@ -1,736 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": false,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "limit": 100,
-        "name": "Annotations & Alerts",
-        "showIn": 0,
-        "type": "dashboard"
-      },
-      {
-        "datasource": "Elastic 5 Logs",
-        "enable": false,
-        "iconColor": "rgba(255, 96, 96, 1)",
-        "limit": 100,
-        "name": "test",
-        "query": "",
-        "showIn": 0,
-        "textField": "description",
-        "type": "alert"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1591027568655,
-  "links": [
-    {
-      "asDropdown": true,
-      "icon": "external link",
-      "tags": ["gdev", "elasticsearch", "datasource-test"],
-      "title": "Dashboards",
-      "type": "dashboards"
-    }
-  ],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v2-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 1,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "3",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "1",
-                "size": "5"
-              },
-              "type": "terms"
-            },
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            }
-          ],
-          "query": "*",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Top 5 servers",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v2-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "5m",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "percents": [25, 50, 75, 95, 99]
-              },
-              "type": "percentiles"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Percentiles & Metric filter",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v2-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {
-                "std_deviation_bounds_lower": true,
-                "std_deviation_bounds_upper": true
-              },
-              "settings": {},
-              "type": "extended_stats"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Standard dev",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "columns": [
-        {
-          "text": "@hostname",
-          "value": "@hostname"
-        },
-        {
-          "text": "Average",
-          "value": "Average"
-        },
-        {
-          "text": "Max",
-          "value": "Max"
-        },
-        {
-          "text": "Sum",
-          "value": "Sum"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v2-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 13
-      },
-      "id": 6,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        },
-        {
-          "align": "auto",
-          "colorMode": null,
-          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "2",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "_term",
-                "size": "0"
-              },
-              "type": "terms"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            },
-            {
-              "field": "@value",
-              "id": "3",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            },
-            {
-              "field": "@value",
-              "id": "4",
-              "meta": {},
-              "settings": {},
-              "type": "sum"
-            }
-          ],
-          "refId": "B",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Metrics",
-      "transform": "table",
-      "type": "table-old"
-    },
-    {
-      "columns": [
-        {
-          "text": "@timestamp",
-          "value": "@timestamp"
-        },
-        {
-          "text": "@message",
-          "value": "@message"
-        },
-        {
-          "text": "tags",
-          "value": "tags"
-        },
-        {
-          "text": "description",
-          "value": "description"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v2-logs",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 20
-      },
-      "id": 5,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "select field",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "size": 500
-              },
-              "type": "raw_document"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Log query",
-      "transform": "json",
-      "type": "table-old"
-    },
-    {
-      "circleMaxSize": 30,
-      "circleMinSize": 2,
-      "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-      "datasource": "gdev-elasticsearch-v2-metrics",
-      "decimals": 0,
-      "esGeoPoint": "@location",
-      "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 12,
-        "w": 24,
-        "x": 0,
-        "y": 27
-      },
-      "hideEmpty": false,
-      "hideZero": false,
-      "id": 8,
-      "initialZoom": 1,
-      "links": [],
-      "locationData": "geohash",
-      "mapCenter": "(0°, 0°)",
-      "mapCenterLatitude": 0,
-      "mapCenterLongitude": 0,
-      "maxDataPoints": 1,
-      "mouseWheelZoom": false,
-      "showLegend": true,
-      "stickyLabels": false,
-      "tableQueryOptions": {
-        "geohashField": "geohash",
-        "latitudeField": "latitude",
-        "longitudeField": "longitude",
-        "metricField": "metric",
-        "queryType": "geohash"
-      },
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "fake": true,
-              "field": "@location",
-              "id": "3",
-              "settings": {
-                "precision": 2
-              },
-              "type": "geohash_grid"
-            }
-          ],
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": "0,10",
-      "title": "World map panel",
-      "type": "grafana-worldmap-panel",
-      "unitPlural": "",
-      "unitSingle": "",
-      "valueName": "total"
-    }
-  ],
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["elasticsearch", "gdev", "datasource-test"],
-  "templating": {
-    "list": [
-      {
-        "datasource": "gdev-elasticsearch-v2-metrics",
-        "filters": [],
-        "hide": 0,
-        "label": "",
-        "name": "Filters",
-        "skipUrlSync": false,
-        "type": "adhoc"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {
-    "collapse": false,
-    "enable": true,
-    "notice": false,
-    "now": true,
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "status": "Stable",
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
-    "type": "timepicker"
-  },
-  "timezone": "browser",
-  "title": "Datasource tests - Elasticsearch v2",
-  "uid": "RlqLq2fiz",
-  "version": 1
-}
@@ -1,737 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": false,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "limit": 100,
-        "name": "Annotations & Alerts",
-        "showIn": 0,
-        "type": "dashboard"
-      },
-      {
-        "datasource": "Elastic 5 Logs",
-        "enable": false,
-        "iconColor": "rgba(255, 96, 96, 1)",
-        "limit": 100,
-        "name": "test",
-        "query": "",
-        "showIn": 0,
-        "textField": "description",
-        "type": "alert"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1591027589702,
-  "links": [
-    {
-      "asDropdown": true,
-      "icon": "external link",
-      "tags": ["gdev", "elasticsearch", "datasource-test"],
-      "title": "Dashboards",
-      "type": "dashboards"
-    }
-  ],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v5-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 1,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "3",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "1",
-                "size": "5"
-              },
-              "type": "terms"
-            },
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            }
-          ],
-          "query": "*",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Top 5 servers",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v5-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "5m",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "percents": [25, 50, 75, 95, 99]
-              },
-              "type": "percentiles"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Percentiles & Metric filter",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v5-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {
-                "std_deviation_bounds_lower": true,
-                "std_deviation_bounds_upper": true
-              },
-              "settings": {},
-              "type": "extended_stats"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Standard dev",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "columns": [
-        {
-          "text": "@hostname",
-          "value": "@hostname"
-        },
-        {
-          "text": "Average",
-          "value": "Average"
-        },
-        {
-          "text": "Max",
-          "value": "Max"
-        },
-        {
-          "text": "Sum",
-          "value": "Sum"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v5-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 13
-      },
-      "id": 6,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        },
-        {
-          "align": "auto",
-          "colorMode": null,
-          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "2",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "_term",
-                "size": "0"
-              },
-              "type": "terms"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            },
-            {
-              "field": "@value",
-              "id": "3",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            },
-            {
-              "field": "@value",
-              "id": "4",
-              "meta": {},
-              "settings": {},
-              "type": "sum"
-            }
-          ],
-          "refId": "B",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Metrics",
-      "transform": "table",
-      "type": "table-old"
-    },
-    {
-      "columns": [
-        {
-          "text": "@timestamp",
-          "value": "@timestamp"
-        },
-        {
-          "text": "@message",
-          "value": "@message"
-        },
-        {
-          "text": "tags",
-          "value": "tags"
-        },
-        {
-          "text": "description",
-          "value": "description"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v5-logs",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 20
-      },
-      "id": 5,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "select field",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "size": 500
-              },
-              "type": "raw_document"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Log query",
-      "transform": "json",
-      "type": "table-old"
-    },
-    {
-      "circleMaxSize": 30,
-      "circleMinSize": 2,
-      "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-      "datasource": "gdev-elasticsearch-v5-metrics",
-      "decimals": 0,
-      "esGeoPoint": "@location",
-      "esLocationName": "",
-      "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 12,
-        "w": 24,
-        "x": 0,
-        "y": 27
-      },
-      "hideEmpty": false,
-      "hideZero": false,
-      "id": 8,
-      "initialZoom": 1,
-      "links": [],
-      "locationData": "geohash",
-      "mapCenter": "(0°, 0°)",
-      "mapCenterLatitude": 0,
-      "mapCenterLongitude": 0,
-      "maxDataPoints": 1,
-      "mouseWheelZoom": false,
-      "showLegend": true,
-      "stickyLabels": false,
-      "tableQueryOptions": {
-        "geohashField": "geohash",
-        "latitudeField": "latitude",
-        "longitudeField": "longitude",
-        "metricField": "metric",
-        "queryType": "geohash"
-      },
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "fake": true,
-              "field": "@location",
-              "id": "3",
-              "settings": {
-                "precision": 2
-              },
-              "type": "geohash_grid"
-            }
-          ],
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": "0,10",
-      "title": "World map panel",
-      "type": "grafana-worldmap-panel",
-      "unitPlural": "",
-      "unitSingle": "",
-      "valueName": "total"
-    }
-  ],
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["elasticsearch", "gdev", "datasource-test"],
-  "templating": {
-    "list": [
-      {
-        "datasource": "gdev-elasticsearch-v5-metrics",
-        "filters": [],
-        "hide": 0,
-        "label": "",
-        "name": "Filters",
-        "skipUrlSync": false,
-        "type": "adhoc"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {
-    "collapse": false,
-    "enable": true,
-    "notice": false,
-    "now": true,
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "status": "Stable",
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
-    "type": "timepicker"
-  },
-  "timezone": "browser",
-  "title": "Datasource tests - Elasticsearch v5",
-  "uid": "8HjT32Bmz",
-  "version": 1
-}
@@ -1,737 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": false,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "limit": 100,
-        "name": "Annotations & Alerts",
-        "showIn": 0,
-        "type": "dashboard"
-      },
-      {
-        "datasource": "Elastic 5 Logs",
-        "enable": false,
-        "iconColor": "rgba(255, 96, 96, 1)",
-        "limit": 100,
-        "name": "test",
-        "query": "",
-        "showIn": 0,
-        "textField": "description",
-        "type": "alert"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1591027589702,
-  "links": [
-    {
-      "asDropdown": true,
-      "icon": "external link",
-      "tags": ["gdev", "elasticsearch", "datasource-test"],
-      "title": "Dashboards",
-      "type": "dashboards"
-    }
-  ],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v5-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 1,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "3",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "1",
-                "size": "5"
-              },
-              "type": "terms"
-            },
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            }
-          ],
-          "query": "*",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Top 5 servers",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v56-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "5m",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "percents": [25, 50, 75, 95, 99]
-              },
-              "type": "percentiles"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Percentiles & Metric filter",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v56-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {
-                "std_deviation_bounds_lower": true,
-                "std_deviation_bounds_upper": true
-              },
-              "settings": {},
-              "type": "extended_stats"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Standard dev",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "columns": [
-        {
-          "text": "@hostname",
-          "value": "@hostname"
-        },
-        {
-          "text": "Average",
-          "value": "Average"
-        },
-        {
-          "text": "Max",
-          "value": "Max"
-        },
-        {
-          "text": "Sum",
-          "value": "Sum"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v56-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 13
-      },
-      "id": 6,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        },
-        {
-          "align": "auto",
-          "colorMode": null,
-          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "2",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "_term",
-                "size": "0"
-              },
-              "type": "terms"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            },
-            {
-              "field": "@value",
-              "id": "3",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            },
-            {
-              "field": "@value",
-              "id": "4",
-              "meta": {},
-              "settings": {},
-              "type": "sum"
-            }
-          ],
-          "refId": "B",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Metrics",
-      "transform": "table",
-      "type": "table-old"
-    },
-    {
-      "columns": [
-        {
-          "text": "@timestamp",
-          "value": "@timestamp"
-        },
-        {
-          "text": "@message",
-          "value": "@message"
-        },
-        {
-          "text": "tags",
-          "value": "tags"
-        },
-        {
-          "text": "description",
-          "value": "description"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v56-logs",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 20
-      },
-      "id": 5,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "select field",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "size": 500
-              },
-              "type": "raw_document"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Log query",
-      "transform": "json",
-      "type": "table-old"
-    },
-    {
-      "circleMaxSize": 30,
-      "circleMinSize": 2,
-      "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-      "datasource": "gdev-elasticsearch-v56-metrics",
-      "decimals": 0,
-      "esGeoPoint": "@location",
-      "esLocationName": "",
-      "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 12,
-        "w": 24,
-        "x": 0,
-        "y": 27
-      },
-      "hideEmpty": false,
-      "hideZero": false,
-      "id": 8,
-      "initialZoom": 1,
-      "links": [],
-      "locationData": "geohash",
-      "mapCenter": "(0°, 0°)",
-      "mapCenterLatitude": 0,
-      "mapCenterLongitude": 0,
-      "maxDataPoints": 1,
-      "mouseWheelZoom": false,
-      "showLegend": true,
-      "stickyLabels": false,
-      "tableQueryOptions": {
-        "geohashField": "geohash",
-        "latitudeField": "latitude",
-        "longitudeField": "longitude",
-        "metricField": "metric",
-        "queryType": "geohash"
-      },
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "fake": true,
-              "field": "@location",
-              "id": "3",
-              "settings": {
-                "precision": 2
-              },
-              "type": "geohash_grid"
-            }
-          ],
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": "0,10",
-      "title": "World map panel",
-      "type": "grafana-worldmap-panel",
-      "unitPlural": "",
-      "unitSingle": "",
-      "valueName": "total"
-    }
-  ],
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["elasticsearch", "gdev", "datasource-test"],
-  "templating": {
-    "list": [
-      {
-        "datasource": "gdev-elasticsearch-v56-metrics",
-        "filters": [],
-        "hide": 0,
-        "label": "",
-        "name": "Filters",
-        "skipUrlSync": false,
-        "type": "adhoc"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {
-    "collapse": false,
-    "enable": true,
-    "notice": false,
-    "now": true,
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "status": "Stable",
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
-    "type": "timepicker"
-  },
-  "timezone": "browser",
-  "title": "Datasource tests - Elasticsearch v56",
-  "uid": "8HjT32BmO",
-  "version": 1
-}
@@ -1,737 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": false,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "limit": 100,
-        "name": "Annotations & Alerts",
-        "showIn": 0,
-        "type": "dashboard"
-      },
-      {
-        "datasource": "gdev-elasticsearch-v6-logs",
-        "enable": false,
-        "iconColor": "rgba(255, 96, 96, 1)",
-        "limit": 100,
-        "name": "test",
-        "query": "",
-        "showIn": 0,
-        "textField": "description",
-        "type": "alert"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1591027529668,
-  "links": [
-    {
-      "asDropdown": true,
-      "icon": "external link",
-      "tags": ["gdev", "elasticsearch", "datasource-test"],
-      "title": "Dashboards",
-      "type": "dashboards"
-    }
-  ],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v6-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 1,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": true,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "3",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "1",
-                "size": "5"
-              },
-              "type": "terms"
-            },
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            }
-          ],
-          "query": "*",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Top 5 servers",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v6-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 0,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "5m",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "percents": [25, 50, 75, 95, 99]
-              },
-              "type": "percentiles"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Percentiles & Metric filter",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {
-        "Count": "#6ED0E0"
-      },
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v6-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "grid": {},
-      "gridPos": {
-        "h": 6,
-        "w": 12,
-        "x": 12,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "Count",
-          "lines": false,
-          "yaxis": 2,
-          "zindex": -1
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "{{metric}}",
-          "bucketAggs": [
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {
-                "std_deviation_bounds_lower": true,
-                "std_deviation_bounds_upper": true
-              },
-              "settings": {},
-              "type": "extended_stats"
-            }
-          ],
-          "query": "@metric:cpu",
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Standard dev",
-      "tooltip": {
-        "msResolution": true,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "columns": [
-        {
-          "text": "@hostname",
-          "value": "@hostname"
-        },
-        {
-          "text": "Average",
-          "value": "Average"
-        },
-        {
-          "text": "Max",
-          "value": "Max"
-        },
-        {
-          "text": "Sum",
-          "value": "Sum"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v6-metrics",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 13
-      },
-      "id": 6,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        },
-        {
-          "align": "auto",
-          "colorMode": null,
-          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "decimals": 2,
-          "pattern": "/.*/",
-          "thresholds": [],
-          "type": "number",
-          "unit": "short"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "field": "@hostname",
-              "id": "2",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "asc",
-                "orderBy": "_term",
-                "size": "0"
-              },
-              "type": "terms"
-            }
-          ],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            },
-            {
-              "field": "@value",
-              "id": "3",
-              "meta": {},
-              "settings": {},
-              "type": "max"
-            },
-            {
-              "field": "@value",
-              "id": "4",
-              "meta": {},
-              "settings": {},
-              "type": "sum"
-            }
-          ],
-          "refId": "B",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Metrics",
-      "transform": "table",
-      "type": "table-old"
-    },
-    {
-      "columns": [
-        {
-          "text": "@timestamp",
-          "value": "@timestamp"
-        },
-        {
-          "text": "@message",
-          "value": "@message"
-        },
-        {
-          "text": "tags",
-          "value": "tags"
-        },
-        {
-          "text": "description",
-          "value": "description"
-        }
-      ],
-      "datasource": "gdev-elasticsearch-v6-logs",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fontSize": "100%",
-      "gridPos": {
-        "h": 7,
-        "w": 24,
-        "x": 0,
-        "y": 20
-      },
-      "id": 5,
-      "links": [],
-      "pageSize": null,
-      "scroll": true,
-      "showHeader": true,
-      "sort": {
-        "col": 0,
-        "desc": true
-      },
-      "styles": [
-        {
-          "align": "auto",
-          "dateFormat": "YYYY-MM-DD HH:mm:ss",
-          "pattern": "@timestamp",
-          "type": "date"
-        }
-      ],
-      "targets": [
-        {
-          "bucketAggs": [],
-          "dsType": "elasticsearch",
-          "metrics": [
-            {
-              "field": "select field",
-              "id": "1",
-              "meta": {},
-              "settings": {
-                "size": 500
-              },
-              "type": "raw_document"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "title": "ES Log query",
-      "transform": "json",
-      "type": "table-old"
-    },
-    {
-      "circleMaxSize": 30,
-      "circleMinSize": 2,
-      "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
-      "datasource": "gdev-elasticsearch-v6-metrics",
-      "decimals": 0,
-      "esGeoPoint": "@location",
-      "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 12,
-        "w": 24,
-        "x": 0,
-        "y": 27
-      },
-      "hideEmpty": false,
-      "hideZero": false,
-      "id": 8,
-      "initialZoom": "1",
-      "links": [],
-      "locationData": "geohash",
-      "mapCenter": "(0°, 0°)",
-      "mapCenterLatitude": 0,
-      "mapCenterLongitude": 0,
-      "maxDataPoints": 1,
-      "mouseWheelZoom": false,
-      "showLegend": true,
-      "stickyLabels": false,
-      "tableQueryOptions": {
-        "geohashField": "geohash",
-        "latitudeField": "latitude",
-        "longitudeField": "longitude",
-        "metricField": "metric",
-        "queryType": "geohash"
-      },
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "fake": true,
-              "field": "@location",
-              "id": "3",
-              "settings": {
-                "precision": 2
-              },
-              "type": "geohash_grid"
-            }
-          ],
-          "metrics": [
-            {
-              "field": "@value",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "avg"
-            }
-          ],
-          "refId": "A",
-          "target": "",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": "0,10",
-      "title": "World map panel",
-      "type": "grafana-worldmap-panel",
-      "unitPlural": "",
-      "unitSingle": "",
-      "valueName": "total"
-    }
-  ],
-  "refresh": false,
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["elasticsearch", "gdev", "datasource-test"],
-  "templating": {
-    "list": [
-      {
-        "datasource": "gdev-elasticsearch-v6-metrics",
-        "filters": [],
-        "hide": 0,
-        "label": "",
-        "name": "Filters",
-        "skipUrlSync": false,
-        "type": "adhoc"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "collapse": false,
-    "enable": true,
-    "notice": false,
-    "now": true,
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "status": "Stable",
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"],
-    "type": "timepicker"
-  },
-  "timezone": "browser",
-  "title": "Datasource tests - Elasticsearch v6",
-  "uid": "NF8Pq2Biz",
-  "version": 1
-}
@@ -1,241 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": "-- Grafana --",
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "gnetId": null,
-  "graphTooltip": 0,
-  "iteration": 1591027621672,
-  "links": [
-    {
-      "asDropdown": true,
-      "icon": "external link",
-      "tags": ["gdev", "elasticsearch", "datasource-test"],
-      "title": "Dashboards",
-      "type": "dashboards"
-    }
-  ],
-  "panels": [
-    {
-      "aliasColors": {
-        "error": "red"
-      },
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-elasticsearch-v6-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 5,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "fake": true,
-              "field": "fields.level",
-              "id": "3",
-              "settings": {
-                "min_doc_count": 1,
-                "order": "desc",
-                "orderBy": "_term",
-                "size": "10"
-              },
-              "type": "terms"
-            },
-            {
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "5m",
-                "min_doc_count": 1,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "metrics": [
-            {
-              "field": "select field",
-              "id": "1",
-              "type": "count"
-            }
-          ],
-          "query": "fields.app:grafana",
-          "refId": "A",
-          "timeField": "@timestamp"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Panel Title",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "gdev-elasticsearch-v6-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 22,
-        "w": 24,
-        "x": 0,
-        "y": 5
-      },
-      "id": 2,
-      "links": [],
-      "options": {
-        "showLabels": false,
-        "showTime": true,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
-      },
-      "targets": [
-        {
-          "bucketAggs": [
-            {
-              "$$hashKey": "object:394",
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
-          "metrics": [
-            {
-              "$$hashKey": "object:359",
-              "field": "select field",
-              "id": "1",
-              "meta": {},
-              "settings": {},
-              "type": "logs"
-            }
-          ],
-          "query": "fields.app:grafana",
-          "refId": "A",
-          "timeField": "@timestamp"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Panel Title",
-      "type": "logs"
-    }
-  ],
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["gdev", "elasticsearch", "datasource-test"],
-  "templating": {
-    "list": [
-      {
-        "datasource": "gdev-elasticsearch-v6-filebeat",
-        "filters": [],
-        "hide": 0,
-        "label": "",
-        "name": "Filters",
-        "skipUrlSync": false,
-        "type": "adhoc"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-  },
-  "timezone": "",
-  "title": "Datasource tests - Elasticsearch v6 Filebeat",
-  "uid": "06tPt4gZz",
-  "version": 1
-}
@@ -3,7 +3,10 @@
    "list": [
      {
        "builtIn": 1,
-        "datasource": "-- Grafana --",
+        "datasource": {
+          "type": "datasource",
+          "uid": "grafana"
+        },
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
@@ -19,6 +22,7 @@
    ]
  },
  "editable": true,
+  "fiscalYearStartMonth": 0,
  "graphTooltip": 0,
  "links": [
    {
@@ -32,6 +36,7 @@
      "type": "dashboards"
    }
  ],
+  "liveNow": false,
  "panels": [
    {
      "datasource": {
@@ -1042,6 +1047,10 @@
      "type": "timeseries"
    },
    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -1143,6 +1152,10 @@
      "type": "timeseries"
    },
    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
      "fieldConfig": {
        "defaults": {
          "color": {
@@ -1222,6 +1235,95 @@
      ],
      "title": "Always show points between gaps",
      "type": "timeseries"
+    },
+    {
+      "datasource": {
+        "type": "testdata",
+        "uid": "PD8C576611E62080A"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineStyle": {
+              "fill": "solid"
+            },
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 7,
+        "x": 7,
+        "y": 22
+      },
+      "id": 16,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "testdata",
+            "uid": "PD8C576611E62080A"
+          },
+          "refId": "A",
+          "scenarioId": "csv_metric_values",
+          "stringInput": ",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,,,,,,60,,,,,,,,,,,,,,,,,,61,,,,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,,,,,,60,,,,,,59,,,,,,60,,,,,,,59,,,,,,,,,,,,,,,,,,,,,,,,58,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,57,,,,,,56,,,,,,57,,,,,,,,,,,,56,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,54,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,53,,,,,54,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,,,,,,,,,,,,,55,,,,,,56,,,,,,,,,,,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,,,,,,,57,,,,,,,58,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,57,,,,,,,,,,,,,,,,,,,58,,,,,,59,,,,,,58,,,,,,,,,,,,,,,,,,,,,,,,57,,,,,,58,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,60,,,,,,,,,,,,61,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,62,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,61,,,,,,,,,,,,,,,,,,60,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,60,,,,,,59,,,,,,60,,,,,,,,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,,,,,,60,,,,,,,,,,,,,59,,,,,,60,,,,,,,,,,,,59,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,58,,,,,,59,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,58,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,57,,,,,,58,,,,,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,56,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,55,,,,,,56,,,,,,55,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,54,,,,,,53,,,,,,,,,,,,,,,,,,,52,,,,,,,,,,,51,,,,,,,,,,,,,,,,,,,,,,,,,52,,,,,,,54,,,,,,55,,,,,,56,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,57,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,58,,,,,,,,,,,,,,,,,,59,,,,,,,,,,,,,,,,,,60,,,,,,,,,,,,61,,,,,,,,,,,,,,,,,,,,,,,,60,,,,,,61,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,62,,,,,,61,,,,,,62,,,,,,61,,,,,,62,,,,,,,,,,,,,,,,,,,63,,,,,,,,,,,,,,,,,,,,,,,,64,,,,,,63,,,,,,64,,,,,,63,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,62,,,,,,,,,,,,,,,,,,,61,,,,,,,,,,,,62,,,,,,,,,,,,,,,,,,,,,,,,,63,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,64,,,,,,,,,,,,63,,,,,,,,,,,,,62,,,,,,,,,,,,,,,,,,,,"
+        }
+      ],
+      "title": "Always show points between gaps",
+      "type": "timeseries"
    }
  ],
  "schemaVersion": 33,
@@ -1242,5 +1344,6 @@
  "timezone": "",
  "title": "Panel Tests - Graph NG - Gaps and Connected",
  "uid": "8mmCAF1Mz",
-  "version": 2
+  "version": 1,
+  "weekStart": ""
 }
@@ -0,0 +1 @@
+elastic_version=8.2.0
@@ -0,0 +1,3 @@
+FROM node:16-alpine
+
+COPY data.js /home/node/data.js
@@ -0,0 +1,137 @@
+const http = require('http');
+
+if (process.argv.length !== 3) {
+  throw new Error('invalid command line: use node sendLogs.js ELASTIC_BASE_URL');
+}
+
+const ELASTIC_BASE_URL = process.argv[2];
+
+// helper function, do a http request
+async function jsonRequest(data, method, url, expectedStatusCode) {
+  return new Promise((resolve, reject) => {
+    const req = http.request(
+      {
+        protocol: url.protocol,
+        host: url.hostname,
+        port: url.port,
+        path: `${url.pathname}${url.search}`,
+        method,
+        headers: { 'content-type': 'application/json' },
+      },
+      (res) => {
+        if (res.statusCode !== expectedStatusCode) {
+          reject(new Error(`Invalid response: ${res.statusCode}`));
+        } else {
+          resolve();
+        }
+      }
+    );
+
+    req.on('error', (err) => reject(err));
+
+    req.write(JSON.stringify(data));
+    req.end();
+  });
+}
+
+// helper function, choose a random element from an array
+function chooseRandomElement(items) {
+  const index = Math.trunc(Math.random() * items.length);
+  return items[index];
+}
+
+// helper function, sleep for a duration
+async function sleep(duration) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, duration);
+  });
+}
+
+async function elasticSendLogItem(timestamp, item) {
+  // we need the YYYY.MM.DD format
+  const timestampText = timestamp.toISOString().slice(0, 10).replace(/-/g, '.');
+  const url = new URL(ELASTIC_BASE_URL);
+  url.pathname = `/logs-${timestampText}/_doc`;
+  await jsonRequest(item, 'POST', url, 201);
+  console.log(`posted to ${url.toString()}`);
+}
+
+async function elasticSetupIndexTemplate() {
+  const data = {
+    index_patterns: ['logs-*'],
+    template: {
+      mappings: {
+        properties: {
+          '@timestamp': {
+            type: 'date',
+          },
+          counter: {
+            type: 'integer',
+          },
+          float: {
+            type: 'float',
+          },
+          level: {
+            type: 'keyword',
+          },
+          label: {
+            type: 'keyword',
+          },
+          location: {
+            type: 'geo_point',
+          },
+        },
+      },
+    },
+  };
+  const url = new URL(ELASTIC_BASE_URL);
+  url.pathname = '/_index_template/gdev';
+  await jsonRequest(data, 'PUT', url, 200);
+}
+
+function makeRandomPoint() {
+  const angle = Math.random() * 2 * Math.PI;
+  const x = 45 * Math.sin(angle);
+  const y = 45 * Math.cos(angle);
+  return y + ', ' + x;
+}
+
+function getRandomLogItem(counter, timestamp) {
+  const randomText = `${Math.trunc(Math.random() * 1000 * 1000 * 1000)}`;
+  const maybeAnsiText = Math.random() < 0.5 ? 'with ANSI \u001b[31mpart of the text\u001b[0m' : '';
+  return {
+    '@timestamp': timestamp.toISOString(),
+    line: `log text ${maybeAnsiText} [${randomText}]`,
+    counter: counter.toString(),
+    float: 100 * Math.random().toString(),
+    label: chooseRandomElement(['val1', 'val2', 'val3']),
+    level: chooseRandomElement(['info', 'info', 'error']),
+    // location: chooseRandomElement(LOCATIONS),
+    location: makeRandomPoint(),
+  };
+}
+
+async function main() {
+  await elasticSetupIndexTemplate();
+  const SLEEP_ANGLE_STEP = Math.PI / 200;
+  let sleepAngle = 0;
+  function getNextSineWaveSleepDuration() {
+    sleepAngle += SLEEP_ANGLE_STEP;
+    return Math.trunc(1000 * Math.abs(Math.sin(sleepAngle)));
+  }
+
+  for (let step = 0; step < 300; step++) {
+    await sleep(getNextSineWaveSleepDuration());
+    const timestamp = new Date();
+    const item = getRandomLogItem(step + 1, timestamp);
+    elasticSendLogItem(timestamp, item);
+  }
+}
+
+// when running in docker, we catch the needed stop-signal, to shutdown fast
+process.on('SIGTERM', () => {
+  console.log('shutdown requested');
+  process.exit(0);
+});
+
+main();
@@ -1,22 +1,24 @@
 # You need to run 'sysctl -w vm.max_map_count=262144' on the host machine

-  elasticsearch-latest:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-beta1
+  elasticsearch:
+    image: docker.elastic.co/elasticsearch/elasticsearch:${elastic_version}
    command: elasticsearch
    environment:
      - "discovery.type=single-node"
      - "xpack.license.self_generated.type=basic"
      - "xpack.security.enabled=false"
    ports:
-      - "14200:9200"
-      - "14300:9300"
+      - "9200:9200"

-  # TODO: uncomment when https://github.com/grafana/fake-data-gen/pull/20 is merged
-  # fake-elastic-latest-data:
-  #   image: grafana/fake-data-gen
-  #   links:
-  #     - elasticsearch-latest
-  #   environment:
-  #     FD_SERVER: elasticsearch-latest
-  #     FD_DATASOURCE: elasticsearch8
-  #     FD_PORT: 9200
+  data:
+    build: docker/blocks/elastic/data
+    command: node /home/node/data.js http://elasticsearch:9200
+    depends_on:
+      - elasticsearch
+    # elastic starts slowly, the first couple start of data.js
+    # might fail, so we auto-restart it on failure.
+    deploy:
+      restart_policy:
+        condition: on-failure
+        delay: 5s
+        max_attempts: 20 # should be enough
@@ -1,15 +0,0 @@
-  elasticsearch2:
-    image: elasticsearch:2.4.1
-    command: elasticsearch -Des.network.host=0.0.0.0
-    ports:
-      - "9200:9200"
-      - "9300:9300"
-    volumes:
-      - ./docker/blocks/elastic2/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
-
-  fake-elastic-data:
-    image: grafana/fake-data-gen
-    environment:
-      FD_SERVER: elasticsearch2
-      FD_DATASOURCE: elasticsearch
-      FD_PORT: 9200
@@ -1,2 +0,0 @@
-script.inline: on
-script.indexed: on
@@ -1,15 +0,0 @@
-  elasticsearch5:
-    image: elasticsearch:5.0.2
-    command: elasticsearch
-    ports:
-      - '10200:9200'
-      - '10300:9300'
-
-  fake-elastic5-data:
-    image: grafana/fake-data-gen
-    links:
-      - elasticsearch5
-    environment:
-      FD_SERVER: elasticsearch5
-      FD_DATASOURCE: elasticsearch
-      FD_PORT: 9200
@@ -1,15 +0,0 @@
-  elasticsearch56:
-    image: elasticsearch:5.6.16
-    command: elasticsearch
-    ports:
-      - '13200:9200'
-      - '13300:9300'
-
-  fake-elastic56-data:
-    image: grafana/fake-data-gen
-    links:
-      - elasticsearch56
-    environment:
-      FD_SERVER: elasticsearch56
-      FD_DATASOURCE: elasticsearch
-      FD_PORT: 9200
@@ -1,25 +0,0 @@
-# You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
-
-  elasticsearch6:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.1
-    command: elasticsearch
-    ports:
-      - "11200:9200"
-      - "11300:9300"
-
-  fake-elastic6-data:
-    image: grafana/fake-data-gen
-    links:
-      - elasticsearch6 
-    environment:
-      FD_SERVER: elasticsearch6
-      FD_DATASOURCE: elasticsearch6
-      FD_PORT: 9200
-
-  filebeat6:
-    image: docker.elastic.co/beats/filebeat-oss:6.7.1
-    command: filebeat -e -strict.perms=false
-    volumes:
-      - ./docker/blocks/elastic6/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
-      - /var/log:/var/log:ro
-      - ../data/log:/var/log/grafana:ro
@@ -1,2 +0,0 @@
-script.inline: on
-script.indexed: on
@@ -1,8 +1,8 @@
 +++
-title = "Grafana documentation"
+aliases = ["/docs/grafana/latest/", "/docs/grafana/latest/guides/reference/admin/", "/docs/grafana/v1.1/", "/docs/grafana/v3.1/"]
 description = "Guides, Installation and Feature Documentation"
 keywords = ["grafana", "installation", "documentation"]
-aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
+title = "Grafana documentation"
 +++

 # Grafana documentation
@@ -1,6 +1,7 @@
 +++
-title = "Administration"
+aliases = ["/docs/grafana/latest/administration/"]
 description = "Administration"
+title = "Administration"
 weight = 40
 +++

@@ -12,4 +13,5 @@ This section includes information for Grafana administrators, team administrator
 - [Configuration]({{< relref "configuration" >}})
 - [Configure Docker image]({{< relref "configure-docker" >}})
 - [Security]({{< relref "security" >}})
+- [Database encryption]({{< relref "database-encryption" >}})
 - [Service accounts]({{< relref "service-accounts" >}})
@@ -1,17 +1,19 @@
 ---
-title: 'API keys in Grafana'
-menuTitle: 'API keys'
-description: 'This section contains information about API keys in Grafana'
-weight: 300
+aliases:
+  - /docs/grafana/latest/administration/api-keys/
+description: This section contains information about API keys in Grafana
 keywords:
  - API keys
  - Service accounts
+menuTitle: API keys
+title: API keys in Grafana
+weight: 300
 ---

 # API keys in Grafana

 API Keys can be used to interact with Grafana HTTP APIs.

-We recommend using service accounts instead of API keys if you are on Grafana 8.5+, for more information refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts.md#">}}).
+We recommend using service accounts instead of API keys if you are on Grafana 8.5+, for more information refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts.md#" >}}).

 {{< section >}}
@@ -1,7 +1,9 @@
 ---
-title: About API keys in Grafana
+aliases:
+  - /docs/grafana/latest/administration/api-keys/about-api-keys/
+description: Learn about using API keys in Grafana
 menuTitle: About API keys
-description: 'Learn about using API keys in Grafana'
+title: About API keys in Grafana
 weight: 30
 ---

@@ -9,4 +11,4 @@ weight: 30

 An API key is a randomly generated string that external systems use to interact with Grafana HTTP APIs.

-When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources. For more information about creating API keys, refer to [Create an API key]({{< relref "./create-api-key.md#">}}).
+When you create an API key, you specify a **Role** that determines the permissions associated with the API key. Role permissions control that actions the API key can perform on Grafana resources. For more information about creating API keys, refer to [Create an API key]({{< relref "./create-api-key.md#" >}}).
@@ -1,24 +1,26 @@
 ---
-title: Create an API key in Grafana
-menuTitle: Create an API key
-description: 'How to create an API key in Grafana'
-weight: 50
+aliases:
+  - /docs/grafana/latest/administration/api-keys/create-api-key/
+description: How to create an API key in Grafana
 keywords:
  - API keys
  - Service accounts
+menuTitle: Create an API key
+title: Create an API key in Grafana
+weight: 50
 ---

 # Create an API key in Grafana

 Create an API key when you want to manage your computed workload with a user.

-For more information about API keys, refer to [About API keys in Grafana]({{< relref "./about-api-keys.md">}}).
+For more information about API keys, refer to [About API keys in Grafana]({{< relref "./about-api-keys.md" >}}).

-This topic shows you how to create an API key using the Grafana UI. You can also create an API key using the Grafana HTTP API. For more information about creating API keys via the API, refer to [Create API key via API]({{< relref "../../http_api/create-api-tokens-for-org.md#how-to-create-a-new-organization-and-an-api-token">}}).
+This topic shows you how to create an API key using the Grafana UI. You can also create an API key using the Grafana HTTP API. For more information about creating API keys via the API, refer to [Create API key via API]({{< relref "../../developers/http_api/create-api-tokens-for-org.md#how-to-create-a-new-organization-and-an-api-token" >}}).

 ## Before you begin:

- Ensure you have permission to create and edit API keys. For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}).
+- Ensure you have permission to create and edit API keys. For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).

 **To create an API key:**

@@ -1,7 +1,8 @@
 +++
-title = "Grafana CLI"
+aliases = ["/docs/grafana/latest/administration/cli/"]
 description = "Guide to using grafana-cli"
 keywords = ["grafana", "cli", "grafana-cli", "command line interface"]
+title = "Grafana CLI"
 weight = 400
 +++

@@ -213,7 +214,7 @@ grafana-cli --homepath "/usr/share/grafana" admin reset-admin-password <new pass

 If you have not lost the admin password, we recommend that you change the user password either in the User Preferences or in the Server Admin > User tab.

-If you need to set the password in a script, then you can use the [Grafana User API]({{< relref "../http_api/user.md#change-password" >}}).
+If you need to set the password in a script, then you can use the [Grafana User API]({{< relref "../developers/http_api/user.md#change-password" >}}).

 ### Migrate data and encrypt passwords

@@ -1,8 +1,8 @@
 +++
-title = "Configuration"
+aliases = ["/docs/grafana/latest/administration/configuration/", "/docs/grafana/latest/installation/configuration/"]
 description = "Configuration documentation"
 keywords = ["grafana", "configuration", "documentation"]
-aliases = ["/docs/grafana/latest/installation/configuration/"]
+title = "Configuration"
 weight = 150
 +++

@@ -1181,7 +1181,7 @@ Sets a global limit on number of alert rules that can be created. Default is -1

 ## [unified_alerting]

-For more information about the Grafana alerts, refer to [Unified Alerting]({{< relref "../alerting/unified-alerting/_index.md" >}}).
+For more information about the Grafana alerts, refer to [About Grafana alerting]({{< relref "../alerting/_index.md" >}}).

 ### enabled

@@ -1381,7 +1381,7 @@ Configures Query history in Explore.

 ### enabled

-Enable or disable the Query history. Default is `disabled`.
+Enable or disable the Query history. Default is `enabled`.

 ## [metrics]

@@ -1700,7 +1700,7 @@ Enter a comma-separated list of plugin identifiers to hide in the plugin catalog

 The `max_connections` option specifies the maximum number of connections to the Grafana Live WebSocket endpoint per Grafana server instance. Default is `100`.

-Refer to [Grafana Live configuration documentation]({{< relref "../live/configure-grafana-live.md" >}}) if you specify a number higher than default since this can require some operating system and infrastructure tuning.
+Refer to [Grafana Live configuration documentation]({{< relref "../live/set-up-grafana-live.md" >}}) if you specify a number higher than default since this can require some operating system and infrastructure tuning.

 0 disables Grafana Live, -1 means unlimited connections.

@@ -1729,7 +1729,7 @@ allowed_origins = "https://*.example.com"

 The high availability (HA) engine name for Grafana Live. By default, it's not set. The only possible value is "redis".

-For more information, refer to [Configure Grafana Live HA setup]({{< relref "../live/live-ha-setup.md" >}}).
+For more information, refer to the [Configure Grafana Live HA setup]({{< relref "../live/set-up-grafana-live/#configure-grafana-live-ha-setup" >}}).

 ### ha_engine_address

@@ -1921,3 +1921,31 @@ default_baselayer_config = `{
 ### enable_custom_baselayers

 Set this to `true` to disable loading other custom base maps and hide them in the Grafana UI. Default is `false`.
+
+## [dashboard_previews]
+
+### [crawler]
+
+> **Note:** This feature is available in Grafana v9.0 and later versions.
+
+#### thread_count
+
+Number of dashboards rendered in parallel. Default is 6
+
+#### rendering_timeout
+
+Timeout passed down to the Image Renderer plugin. It is used in two separate places within a single rendering request - during the initial navigation to the dashboard, and when waiting for all the panels to load. Default is 20s.
+
+#### max_crawl_duration
+
+Maximum duration of a single crawl. Default is 1h.
+
+#### scheduler_interval
+
+Minimum interval between two subsequent scheduler runs. Default is 12h.
+
+Refer to the [dashboards previews]({{< relref "../dashboards/previews.md" >}}) documentation for detailed instructions.
+
+## [rbac]
+
+Refer to [Role-based access control]({{< relref "../enterprise/access-control/about-rbac.md" >}}) for more information.
@@ -1,8 +1,8 @@
 +++
-title = "Configure Grafana Docker image"
+aliases = ["/docs/grafana/latest/administration/configure-docker/", "/docs/grafana/latest/installation/configure-docker/"]
 description = "Guide for configuring the Grafana Docker image"
 keywords = ["grafana", "configuration", "documentation", "docker"]
-aliases = ["/docs/grafana/latest/installation/configure-docker/"]
+title = "Configure Grafana Docker image"
 weight = 200
 +++

@@ -1,8 +1,8 @@
 +++
-title = "Database encryption"
+aliases = ["/docs/grafana/latest/administration/database-encryption/"]
 description = "Grafana database encryption"
 keywords = ["grafana", "database", "encryption", "envelope encryption", "documentation"]
-aliases = [""]
+title = "Database encryption"
 weight = 450
 +++

@@ -12,21 +12,91 @@ Grafana’s database contains secrets, which are used to query data sources, sen

 Grafana encrypts these secrets before they are written to the database, by using a symmetric-key encryption algorithm called Advanced Encryption Standard (AES), and using a [secret key]({{< relref "../administration/configuration/#secret_key" >}}) that you can change when you configure a new Grafana instance.

-You can choose to use [envelope encryption](#envelope-encryption), which adds a layer of indirection to the encryption process.
+Since Grafana v9.0, it uses [envelope encryption](#envelope-encryption) by default, which adds a layer of indirection to the
+encryption process that represents an [**implicit breaking change**](#implicit-breaking-change) for older versions of Grafana.
+
+For further details about how to operate a Grafana instance with envelope encryption, see the [Operational work](#operational work) section below.

 > **Note:** In Grafana Enterprise, you can also choose to [encrypt secrets in AES-GCM mode]({{< relref "../enterprise/enterprise-encryption/#changing-your-encryption-mode-to-aes-gcm" >}}) instead of AES-CFB.

 # Envelope encryption

-In Grafana, you can choose to use envelope encryption. Instead of
-encrypting all secrets with a single key, Grafana uses a set of keys
-called data encryption keys (DEKs) to encrypt them. These data
-encryption keys are themselves encrypted with a single key encryption
-key (KEK).
+> **Note:** Since Grafana v9.0, you can turn it off by adding the term `disableEnvelopeEncryption` to the list of
+> feature toggles in your [Grafana configuration]({{< relref "../administration/configuration/#feature_toggles" >}}).

-To turn on envelope encryption, add the term `envelopeEncryption` to the list of feature toggles in your [Grafana configuration]({{< relref "../administration/configuration/#feature_toggles" >}}).
+Instead of encrypting all secrets with a single key, Grafana uses a set of keys called data encryption keys (DEKs) to
+encrypt them. These data encryption keys are themselves encrypted with a single key encryption key (KEK), configured
+through the `secret_key` attribute in your
+[Grafana configuration]({{< relref "../administration/configuration/#secret_key" >}}) or with a
+[KMS integration](#kms-integration).

-> **Note:** Avoid turning off envelope encryption once you have turned it on, and back up your database before turning it on for the first time. If you turn envelope encryption on, create new secrets or update your existing secrets (for example, by creating a new data source or alert notification channel), and then turn envelope encryption off, then those data sources, alert notification channels, and other resources using envelope encryption will stop working and you will experience errors. This is because the secrets encrypted with envelope encryption cannot be decrypted or used by Grafana when envelope encryption is turned off.
+## Implicit breaking change
+
+As stated above, envelope encryption represents an implicit breaking change because it changes the way secrets stored
+in the Grafana database are encrypted. That means Grafana administrators will be able to transition to Grafana v9.0
+with no action required from the database encryption perspective, but will need to be extremely careful if they need
+to roll back to a previous version (e.g. Grafana v8.5) after being updated, because secrets created or modified after upgrade
+the update to Grafana v9.0 won't be decryptable in previous versions.
+
+Fortunately though, envelope encryption was added in Grafana v8.3 behind a feature toggle. So, in case of emergency,
+Grafana administrators will be able to downgrade up to Grafana v8.3 and enable envelope encryption as a workaround.
+
+> **Note:** In Grafana releases between v8.3 and v8.5, you can turn envelope encryption on by adding the term
+> `envelopeEncryption` to the list of feature toggles in your
+> [Grafana configuration]({{< relref "../administration/configuration/#feature_toggles" >}}).
+
+# Operational work
+
+From the database encryption perspective, there are several operations that Grafana administrator may want to perform:
+
+- [**Re-encrypt secrets**](#re-encrypt-secrets): re-encrypt secrets with envelope encryption and a fresh data key.
+- [**Roll back secrets**](#roll-back-secrets): decrypt secrets encrypted with envelope encryption and re-encrypt them with legacy encryption.
+- [**Re-encrypt data keys**](#re-encrypt-data-keys): re-encrypt data keys with a fresh key encryption key and a [KMS integration](#kms-integration).
+- [**Rotate data keys**](#rotate-data-keys): disable active data keys and stop using them for encryption in favor of a fresh one.
+
+Find more details about each of those below.
+
+## Re-encrypt secrets
+
+Secrets re-encryption can be performed when a Grafana administrator wants to either:
+
+- Move forward already existing secrets' encryption from legacy to envelope encryption.
+- Re-encrypt secrets after a [data keys rotation](#rotate-data-keys).
+
+> **Note:** This operation is available through Grafana CLI by running `grafana-cli admin secrets-migration re-encrypt`
+> command. It's safe to run more than once. Recommended to run under maintenance mode.
+
+## Roll back secrets
+
+Used to roll back secrets encrypted with envelope encryption to legacy encryption. It can be used to downgrade to
+a Grafana version earlier than Grafana v9.0 after an unsuccessful upgrade.
+
+> **Note:** This operation is available through Grafana CLI by running `grafana-cli admin secrets-migration rollback`
+> command. It's safe to run more than once. Recommended to run under maintenance mode.
+
+## Re-encrypt data keys
+
+Used to re-encrypt data keys encrypted with a specific key encryption key (KEK). It can be used to either re-encrypt
+existing data keys with a new key encryption key version (see [KMS integration](#kms-integration) rotation) or to
+re-encrypt them with a completely different key encryption key.
+
+> **Note:** This operation is available through Grafana CLI by running `grafana-cli admin secrets-migration re-encrypt-data-keys`
+> command. It's safe to run more than once. Recommended to run under maintenance mode.
+
+## Rotate data keys
+
+Data keys rotation can be performed to disable the active data key and therefore stop using them for encryption operations.
+For high-availability setups, you may need to wait until the data keys cache's TTL (time-to-live) expires to ensure that all
+rotated data keys are no longer being used for encryption operations.
+
+New data keys for encryption operations are generated on-demand.
+
+> **Note:** It does not imply secrets re-encryption. Therefore, rotated data keys will continue being used to decrypt
+> those secrets still encrypted with it. Look at [secrets re-encryption](#re-encrypt-secrets) to completely stop using
+> rotated data keys for both encryption and decryption.
+
+> **Note:** This operation is available through Grafana [Admin API]({{< relref "../developers/configuration/admin/#rotate-data-encryption-keys" >}}).
+> It's safe to run more than once.

 # KMS integration

@@ -1,7 +1,8 @@
 +++
-title = "Jaeger instrumentation"
+aliases = ["/docs/grafana/latest/administration/jaeger-instrumentation/"]
 description = "Jaeger traces emitted and propagation by Grafana"
 keywords = ["grafana", "jaeger", "tracing"]
+title = "Jaeger instrumentation"
 weight = 900
 +++

@@ -1,16 +1,16 @@
 ---
-title: 'Manage organizations'
-menuTitle: 'Manage organizations'
-description: 'Describes how to use organizations to isolate dashboard to users and teams.'
-weight: 300
 aliases:
-  [
-    '/docs/grafana/latest/manage-users/server-admin/',
-    '/docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/',
-  ]
+  - /docs/grafana/latest/administration/manage-organizations/
+  - /docs/grafana/latest/manage-users/server-admin/
+  - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/
+description: Describes how to use organizations to isolate dashboard to users and
+  teams.
 keywords:
  - organizations
  - dashboards
+menuTitle: Manage organizations
+title: Manage organizations
+weight: 300
 ---

 # Manage organizations
@@ -1,9 +1,9 @@
 +++
-title = "Manage user preferences"
-weight = 400
+aliases = ["/docs/grafana/latest/administration/change-your-password/", "/docs/grafana/latest/administration/manage-user-preferences/"]
 description = "Learn how to update your user preferences and switch organizations"
 keywords = ["password", "change", "organization", "change"]
-aliases = ["/docs/grafana/latest/administration/change-your-password/", "/docs/grafana/latest/administration/manage-user-preferences/"]
+title = "Manage user preferences"
+weight = 400
 +++

 # Manage user preferences
@@ -16,7 +16,7 @@ You can also view important information about your account, such as the organiza

 You can change your Grafana password at any time.

-> **Note**: If your Grafana instance uses an <!--[external authentication provider]({{< relref "../../auth/_index.md">}})--> external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.
+> **Note**: If your Grafana instance uses an <!--[external authentication provider]({{< relref "../../auth/_index.md" >}})--> external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.

 **To change your password**:

@@ -41,7 +41,7 @@ Your profile includes your name, user name, and email address, which you can upd

 ## Edit your preferences

-You can choose the way you would like data to appear in Grafana, including the UI theme, home dashboard, timezone, and first day of the week. You can set these preferences for your own account, for a team, for an organization, or Grafana-wide using configuration settings. Your user preferences take precedence over team, organization, and Grafana default preferences. For more information, see [Grafana preferences]({{< relref "../../administration/preferences/_index.md">}}).
+You can choose the way you would like data to appear in Grafana, including the UI theme, home dashboard, timezone, and first day of the week. You can set these preferences for your own account, for a team, for an organization, or Grafana-wide using configuration settings. Your user preferences take precedence over team, organization, and Grafana default preferences. For more information, see [Grafana preferences]({{< relref "../../administration/preferences/_index.md" >}}).

 - **UI theme** determines whether Grafana appears in light mode or dark mode. By default, UI theme is set to dark mode.
 - **Home dashboard** refers to the dashboard you see when you sign in to Grafana. By default, this is set to the Home dashboard.
@@ -1,6 +1,6 @@
 +++
-title = "Manage users and permissions"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/"]
+title = "Manage users and permissions"
 weight = 200
 +++

@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/", "/docs/grafana/latest/manage-users/", "/docs/grafana/latest/permissions/", "/docs/grafana/latest/permissions/organization_roles/", "/docs/grafana/latest/permissions/overview/"]
 title = "About users and permissions"
-aliases = ["/docs/grafana/latest/manage-users/", "/docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/", "/docs/grafana/latest/permissions/overview/", "/docs/grafana/latest/permissions/", "/docs/grafana/latest/permissions/organization_roles/"]
 weight = 100
 +++

@@ -20,6 +20,8 @@ You can assign a user one of three types of permissions:

 A Grafana server administrator manages server-wide settings and access to resources such as organizations, users, and licenses. Grafana includes a default server administrator that you can use to manage all of Grafana, or you can divide that responsibility among other server administrators that you create.

+> **Note:** The server administrator role does not mean that the user is also a Grafana [organization administrator]({{< ref "#organization-roles" >}}).
+
 A server administrator can perform the following tasks:

 - Manage users and permissions
@@ -50,7 +52,7 @@ Permissions assigned to a user within an organization control the extent to whic

 ### Organization roles

-Organization role-based permissions are global, which means that each permission level applies to all Grafana resources within an given organization. For example, an editor can see and update _all_ dashboards in an organization, unless those dashboards have been specifically restricted using [dashboard permissions]({{< relref "manage-dashboard-permissions/_index.md">}}).
+Organization role-based permissions are global, which means that each permission level applies to all Grafana resources within an given organization. For example, an editor can see and update _all_ dashboards in an organization, unless those dashboards have been specifically restricted using [dashboard permissions]({{< relref "manage-dashboard-permissions/_index.md" >}}).

 Grafana uses the following roles to control user access:

@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/", "/docs/grafana/latest/permissions/dashboard_folder_permissions/"]
 title = "Manage dashboard permissions"
-aliases = ["/docs/grafana/latest/permissions/dashboard_folder_permissions/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/"]
 weight = 500
 +++

@@ -8,7 +8,7 @@ weight = 500

 Dashboard and dasboard folder permissions enable you to grant a viewer the ability to edit and save dashboard changes, or limit an editor's permission to modify a dashboard.

-For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions">}}).
+For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions" >}}).

 ## Grant dashboard folder permissions

@@ -17,7 +17,7 @@ When you grant user permissions for folders, that setting applies to all dashboa
 ### Before you begin

 - Ensure you have organization administrator privileges
- Identify the dashboard folder permissions you want to modify and the users or teams to which you want to grant access. For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions">}}).
+- Identify the dashboard folder permissions you want to modify and the users or teams to which you want to grant access. For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions" >}}).

 **To grant dashboard folder permissions**:

@@ -64,6 +64,8 @@ By default, the viewer organization role does not allow viewers to create dashbo

 This modification is useful for public Grafana installations where you want anonymous users to be able to edit panels and queries but not save or create new dashboards.

+> **Note**: If you use Grafana Enterprise and customize users' permissions using RBAC, the RBAC permissions override the functionality enabled by the `viewers_can_edit` flag.
+
 ### Before you begin

 - Ensure that you have access to the Grafana server
@@ -72,7 +74,7 @@ This modification is useful for public Grafana installations where you want anon

 1. Open the Grafana configuration file.

-   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration">}}).
+   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration" >}}).

 1. Locate the `viewers_can_edit` parameter.
 1. Set the `viewers_can_edit` value to `true`.
@@ -80,7 +82,7 @@ This modification is useful for public Grafana installations where you want anon

 ## Edit dashboard permissions

-Edit dashboard permissions when you are want to enhance or restrict a user's access to a dashboard. For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions">}}).
+Edit dashboard permissions when you are want to enhance or restrict a user's access to a dashboard. For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions" >}}).

 ### Before you begin

@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/", "/docs/grafana/latest/manage-users/org-admin/"]
 title = "Manage users in an organization"
-aliases = ["/docs/grafana/latest/manage-users/org-admin/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/"]
 weight = 400
 +++

@@ -8,6 +8,6 @@ weight = 400

 Organization administrators can invite users to join their organization. Organization users have access to organization resources based on their role, which is **Admin**, **Editor**, or **Viewer**. Permissions associated with each role determine the tasks a user can perform in the system.

-For more information about organization user permissions, refer to [Organization users and permissions]({{< relref "../about-users-and-permissions/#organization-users-and-permissions">}}).
+For more information about organization user permissions, refer to [Organization users and permissions]({{< relref "../about-users-and-permissions/#organization-users-and-permissions" >}}).

 {{< section >}}
@@ -1,12 +1,12 @@
 +++
-title = "Change a user's organization permissions"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/"]
+title = "Change a user's organization permissions"
 weight = 30
 +++

 # Change a user's organization permissions

-Update user permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+Update user permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles" >}}).

 ## Before you begin

@@ -24,4 +24,4 @@ Update user permissions when you want to enhance or restrict a user's access to
 1. Select the role that you want to assign.
 1. Click **Update**.

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also [change a user's organization permissions]({{< relref "../../manage-users-and-permissions/manage-server-users/change-user-org-permissions.md" >}}) in the Server Admin section.
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also [change a user's organization permissions]({{< relref "../../manage-users-and-permissions/manage-server-users/change-user-org-permissions.md" >}}) in the Server Admin section.
@@ -1,6 +1,6 @@
 +++
-title = "Invite a user to join an organization"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/"]
+title = "Invite a user to join an organization"
 weight = 10
 +++

@@ -11,13 +11,13 @@ When you invite users to join an organization, you assign the **Admin**, **Edito
 - If you know that the user already has access Grafana and you know their user name, then you issue an invitation by entering their user name.
 - If the user is new to Grafana, then use their email address to issue an invitation. The system automatically creates the user account on first sign in.

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also manually [add a user to an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md" >}}).
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also manually [add a user to an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md" >}}).

 ## Before you begin

 - Ensure you have organization administrator privileges.
 - If the user already has access to Grafana, obtain their user name.
- Determine the permissions you want to assign to the user. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+- Determine the permissions you want to assign to the user. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles" >}}).

 **To invite or add an existing user account to your organization**:

@@ -1,6 +1,6 @@
 +++
-title = "Manage a pending invitation"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/"]
+title = "Manage a pending invitation"
 weight = 20
 +++

@@ -1,6 +1,6 @@
 +++
-title = "Remove a user from an organization"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/"]
+title = "Remove a user from an organization"
 weight = 40
 +++

@@ -24,4 +24,4 @@ This action does not remove the user account from the Grafana server.

 1. Click the red **X** to remove the user from the organization.

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md#remove-a-user-from-an-organization" >}}) on the Users page of the Server Admin section.
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md#remove-a-user-from-an-organization" >}}) on the Users page of the Server Admin section.
@@ -1,6 +1,6 @@
 +++
-title = "View a list of organization users"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/"]
+title = "View a list of organization users"
 weight = 50
 +++

@@ -19,4 +19,4 @@ You can see a list of users with accounts in your Grafana organization. If neces

 ![Org Admin user list](/static/img/docs/manage-users/org-user-list-7-3.png)

-> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also [view a global list of users]({{< relref "../../manage-users-and-permissions/manage-server-users/view-list-users.md" >}}) in the Server Admin section of Grafana.
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../../manage-users-and-permissions/manage-server-users/view-list-users.md" >}}) in the Server Admin section of Grafana.
@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/", "/docs/grafana/latest/manage-users/server-admin/", "/docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/"]
 title = "Manage users globally"
-aliases = ["/docs/grafana/latest/manage-users/server-admin/", "/docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/"]
 weight = 300
 +++

@@ -8,10 +8,10 @@ weight = 300

 A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system.

-If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions in Grafana, you can manage all users for a Grafana instance in the Server Admin section:
+If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions in Grafana, you can manage all users for a Grafana instance in the Server Admin section:

 {{< section >}}

-If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, refer to [Manage users in a organization]({{< relref "../../manage-users-and-permissions/manage-org-users/_index.md" >}}).
+If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, refer to [Manage users in a organization]({{< relref "../../manage-users-and-permissions/manage-org-users/_index.md" >}}).

-For more information about users and permissions, refer to [About users and permissions]({{< relref "../about-users-and-permissions">}}).
+For more information about users and permissions, refer to [About users and permissions]({{< relref "../about-users-and-permissions" >}}).
@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/"]
 title = "Add or remove a user from an organization"
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/"]
 weight = 30
 +++

@@ -12,8 +12,8 @@ You are required to specify an Admin role for each organization. The first user

 ## Before you begin

- [Create an organization]({{< relref "../../manage-organizations/_index.md">}})
- [Add a user]({{< relref "./add-user.md">}}) to Grafana
+- [Create an organization]({{< relref "../../manage-organizations/_index.md" >}})
+- [Add a user]({{< relref "./add-user.md" >}}) to Grafana
 - Ensure you have Grafana server administrator privileges

 **To add a user to an organization**:
@@ -24,13 +24,13 @@ You are required to specify an Admin role for each organization. The first user
 1. In the **Organizations** section, click **Add user to organization**.
 1. Select an organization and a role.

-   For more information about user permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+   For more information about user permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles" >}}).

 1. Click **Add to organization**.

 The next time the user signs in, they will be able to navigate to their new organization using the Switch Organizations option in the user profile menu.

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still [invite a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still [invite a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).

 # Remove a user from an organization

@@ -48,4 +48,4 @@ Remove a user from an organization when they no longer require access to the das
 1. In the **Organization** section, click **Remove from organization** next to the organization from which you want to remove the user.
 1. Click **Confirm removal**.

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/remove-user-from-org.md" >}}) in the Users section of organization configuration.
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/remove-user-from-org.md" >}}) in the Users section of organization configuration.
@@ -1,6 +1,6 @@
 +++
-title = "Add a user"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/"]
+title = "Add a user"
 weight = 10
 +++

@@ -8,7 +8,7 @@ weight = 10

 Add users when you want to manually provide individuals with access to Grafana.

-When you create a user using this method, you must create their password. The user does not receive a notification by email. To invite a user to Grafana and allow them to create their own password, [invite a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org.md">}}).
+When you create a user using this method, you must create their password. The user does not receive a notification by email. To invite a user to Grafana and allow them to create their own password, [invite a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org.md" >}}).

 When you configure advanced authentication using Oauth, SAML, LDAP, or the Auth proxy, users are created automatically.

@@ -23,6 +23,6 @@ When you configure advanced authentication using Oauth, SAML, LDAP, or the Auth
 1. Click **New user**.
 1. Complete the fields and click **Create user**.

-When you create a user, the system assigns the user viewer permissions in a default organization, which you can change. You can now [add a user to a second organization]({{< relref "./add-remove-user-to-org.md">}}).
+When you create a user, the system assigns the user viewer permissions in a default organization, which you can change. You can now [add a user to a second organization]({{< relref "./add-remove-user-to-org.md" >}}).

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still add users by [inviting a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still add users by [inviting a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).
@@ -1,18 +1,18 @@
 +++
-title = "Assign or remove Grafana server administrator privileges"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/"]
+title = "Assign or remove Grafana server administrator privileges"
 weight = 20
 +++

 # Assign or remove Grafana server administrator privileges

-Grafana server administrators are responsible for creating users, organizations, and managing permissions. For more information about the server administration role, refer to [Grafana server administrators]({{< relref "../about-users-and-permissions/#grafana-server-administrators">}}).
+Grafana server administrators are responsible for creating users, organizations, and managing permissions. For more information about the server administration role, refer to [Grafana server administrators]({{< relref "../about-users-and-permissions/#grafana-server-administrators" >}}).

 > **Note:** Server administrators are "super-admins" with full permissions to create, read, update, and delete all resources and users in all organizations, as well as update global settings such as licenses. Only grant this permission to trusted users.

 ## Before you begin

- [Add a user]({{< relref "./add-user.md">}})
+- [Add a user]({{< relref "./add-user.md" >}})
 - Ensure you have Grafana server administrator privileges

 **To assign or remove Grafana administrator privileges**:
@@ -1,16 +1,16 @@
 +++
-title = "Change a user's organization permissions"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/"]
+title = "Change a user's organization permissions"
 weight = 50
 +++

 # Change a user's organization permissions

-Update organization permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+Update organization permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles" >}}).

 ## Before you begin

- [Add a user to an organization]({{< relref "./add-remove-user-to-org.md">}})
+- [Add a user to an organization]({{< relref "./add-remove-user-to-org.md" >}})
 - Ensure you have Grafana server administrator privileges

 **To change a user's organization permissions**:
@@ -1,6 +1,6 @@
 +++
-title = "Force a user to logout from Grafana"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/"]
+title = "Force a user to logout from Grafana"
 weight = 90
 +++

@@ -1,6 +1,6 @@
 +++
-title = "Grant editors administrator permissions"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/"]
+title = "Grant editors administrator permissions"
 weight = 60
 +++

@@ -15,6 +15,8 @@ When `editors_can_admin` is enabled:
 - Users with the Editor role in an organization are Administrators for new dashboards and folders they create, meaning they can edit dashboard permissions. To learn more about dashboard permissions, refer to [Manage dashboard permissions]({{< relref "../manage-dashboard-permissions/_index.md" >}}).
 - Users with the Editor role in an organization can create teams, and they are Administrators of the teams they create. To learn more about team permissions, refer to [Manage teams]({{< relref "../manage-teams/_index.md" >}})

+> **Note**: If you use Grafana Enterprise and customize users' permissions using RBAC, the RBAC permissions override the functionality enabled by the `editors_can_admin` flag.
+
 ## Before you begin

 - Ensure that you have access to the Grafana server
@@ -23,7 +25,7 @@ When `editors_can_admin` is enabled:

 1. Log in to the Grafana server and open the Grafana configuration file.

-   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration">}}).
+   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration" >}}).

 1. Locate the `editors_can_admin` parameter.
 1. Set the `editors_can_admin` value to `true`.
@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/"]
 title = "View and edit a user account"
-aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/"]
 weight = 110
 +++

@@ -1,6 +1,6 @@
 +++
-title = "View a list of users"
 aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/"]
+title = "View a list of users"
 weight = 100
 +++

@@ -19,4 +19,4 @@ You can see a list of users with accounts on your Grafana server. This action mi

 ![Server Admin user list](/static/img/docs/manage-users/server-user-list-7-3.png)

-> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still [view of list of users in a given organization]({{< relref "../../manage-users-and-permissions/manage-org-users/view-list-org-users.md" >}}).
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../../manage-users-and-permissions/manage-org-users/view-list-org-users.md" >}}).
@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/", "/docs/grafana/latest/manage-users/add-or-remove-user-from-team/", "/docs/grafana/latest/manage-users/create-or-remove-team/", "/docs/grafana/latest/manage-users/manage-teams/"]
 title = "Manage teams"
-aliases = ["/docs/grafana/latest/manage-users/add-or-remove-user-from-team/","/docs/grafana/latest/manage-users/create-or-remove-team/", "/docs/grafana/latest/manage-users/manage-teams/", "/docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/"]
 weight = 600
 +++

@@ -10,7 +10,7 @@ A team is a group of users within an organization that have common dashboard and

 A user can be a Member or an Administrator for a given team. Members of a team inherit permissions from the team, but they cannot edit the team itself. Team Administrators can add members to a team and update its settings, such as the team name, team member's team roles, UI preferences, and home dashboard.

-For more information about teams, refer to [Teams and permissions]({{< relref "../about-users-and-permissions/#teams-and-permissions">}}).
+For more information about teams, refer to [Teams and permissions]({{< relref "../about-users-and-permissions/#teams-and-permissions" >}}).

 ## Create a team

@@ -1,6 +1,6 @@
 +++
+aliases = ["/docs/grafana/latest/administration/preferences/"]
 title = "Preferences"
-aliases =["/docs/grafana/latest/administration/preferences/"]
 weight = 50
 +++

@@ -1,6 +1,7 @@
 +++
-title = "Change name and email"
+aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-name/"]
 keywords = ["grafana", "configuration", "documentation", "home"]
+title = "Change name and email"
 weight = 100
 +++

@@ -1,7 +1,8 @@
 +++
-title = "Change UI theme"
+aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-theme/"]
 description = "How to set the Grafana UI theme"
 keywords = ["grafana", "configuration", "documentation", "home"]
+title = "Change UI theme"
 weight = 200
 +++

@@ -1,7 +1,8 @@
 +++
-title = "Change default timezone"
+aliases = ["/docs/grafana/latest/administration/preferences/change-grafana-timezone/"]
 description = "How to change your Grafana timezone"
 keywords = ["grafana", "configuration", "documentation", "home"]
+title = "Change default timezone"
 weight = 400
 +++

@@ -1,8 +1,8 @@
 +++
-title = "Change home dashboard"
+aliases = ["/docs/grafana/latest/administration/change-home-dashboard/", "/docs/grafana/latest/administration/preferences/change-home-dashboard/"]
 description = "How to replace the default home dashboard"
 keywords = ["grafana", "configuration", "documentation", "home"]
-aliases = ["/docs/grafana/latest/administration/change-home-dashboard/"]
+title = "Change home dashboard"
 weight = 300
 +++

@@ -32,7 +32,7 @@ Users with the Grafana Server Admin flag on their account or access to the confi
 ### Use a JSON file as the home dashboard

 1. Save your JSON file somewhere that Grafana can access it. For example, in the Grafana `data` folder of Grafana.
-1. Update your configuration file to set the path to the JSON file. Refer to [default_home_dashboard_path]({{< relref "../configuration.md#default_home_dashboard_path">}}) for more information about modifying the Grafana configuration files.
+1. Update your configuration file to set the path to the JSON file. Refer to [default_home_dashboard_path]({{< relref "../configuration.md#default_home_dashboard_path" >}}) for more information about modifying the Grafana configuration files.

 ```ini
 [dashboards]
@@ -1,8 +1,8 @@
 +++
-title = "Provisioning"
+aliases = ["/docs/grafana/latest/administration/provisioning/", "/docs/grafana/latest/installation/provisioning/"]
 description = ""
 keywords = ["grafana", "provisioning"]
-aliases = ["/docs/grafana/latest/installation/provisioning"]
+title = "Provisioning"
 weight = 800
 +++

@@ -601,4 +601,4 @@ The following sections detail the supported settings and secure settings for eac

 Grafana Enterprise supports provisioning for the following resources:

- [Access control provisioning]({{< relref "../enterprise/access-control/_index.md" >}})
+- [Role-based access control provisioning]({{< relref "../enterprise/access-control/rbac-provisioning.md" >}})
@@ -1,8 +1,8 @@
 +++
-title = "Security"
+aliases = ["/docs/grafana/latest/administration/security/", "/docs/grafana/latest/installation/security/"]
 description = "Security Docs"
 keywords = ["grafana", "security", "documentation"]
-aliases = ["/docs/grafana/latest/installation/security/"]
+title = "Security"
 weight = 500
 +++

@@ -1,11 +1,13 @@
 ---
-title: 'Service accounts in Grafana'
-menuTitle: 'Service accounts'
-description: 'This page contains information about service accounts in Grafana'
-weight: 300
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/
+description: This page contains information about service accounts in Grafana
 keywords:
  - API keys
  - Service accounts
+menuTitle: Service accounts
+title: Service accounts in Grafana
+weight: 300
 ---

 # Service accounts in Grafana
@@ -1,7 +1,9 @@
 ---
-title: About service accounts
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/about-service-accounts/
+description: This page contains detailed information about service accounts in Grafana
 menuTitle: About service accounts
-description: 'This page contains detailed information about service accounts in Grafana'
+title: About service accounts
 weight: 30
 ---

@@ -9,7 +11,7 @@ weight: 30

 A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. Create service accounts and tokens to authenticate applications like Terraform with the Grafana API.

-> **Note:** Service accounts are available in Grafana 8.5+ as a beta feature To enable service accounts, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#">}}) section. Service accounts will eventually replace [API keys]({{< relref "../api-keys/_index.md" >}}) as the primary way to authenticate applications that interact with Grafana.
+> **Note:** Service accounts are available in Grafana 8.5+ as a beta feature. To enable service accounts, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#" >}}) section. Service accounts will eventually replace [API keys]({{< relref "../api-keys/_index.md" >}}) as the primary way to authenticate applications that interact with Grafana.

 A common use case for creating a service account is to perform operations on automated or triggered tasks. You can use service accounts to:

@@ -44,4 +46,4 @@ The added benefits of service accounts to API keys include:
 - Service accounts resemble Grafana users and can be enabled/disabled, granted specific permissions, and remain active until they are deleted or disabled. API keys are only valid until their expiry date.
 - Service accounts can be associated with multiple tokens.
 - Unlike API keys, service account tokens are not associated with a specific user, which means that applications can be authenticated even if a Grafana user is deleted.
- You can grant granular permissions to service accounts by leveraging [fine-grained access control]({{< relref "../../enterprise/access-control">}}). For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}).
+- You can grant granular permissions to service accounts by leveraging [fine-grained access control]({{< relref "../../enterprise/access-control" >}}). For more information about permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).
@@ -1,20 +1,22 @@
 ---
-title: 'Add a token to a service account in Grafana'
-menuTitle: 'Add a token to a service account'
-description: 'This topic shows you how to add a token to a service account'
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/add-service-account-token/
+description: This topic shows you how to add a token to a service account
+menuTitle: Add a token to a service account
+title: Add a token to a service account in Grafana
 weight: 60
 ---

 # Add a token to a service account in Grafana

-A service account token is a generated random string that acts as an alternative to a password when authenticating with Grafana’s HTTP API. For more information about service accounts, refer to [About service accounts in Grafana]({{< relref "./about-service-accounts.md">}}).
+A service account token is a generated random string that acts as an alternative to a password when authenticating with Grafana’s HTTP API. For more information about service accounts, refer to [About service accounts in Grafana]({{< relref "./about-service-accounts.md" >}}).

-You can create a service account token using the Grafana UI or via the API. For more information about creating a service account token via the API, refer to [Create service account tokens using the HTTP API]({{< relref "../../http_api/serviceaccount.md#create-service-account-tokens">}}).
+You can create a service account token using the Grafana UI or via the API. For more information about creating a service account token via the API, refer to [Create service account tokens using the HTTP API]({{< relref "../../developers/http_api/serviceaccount.md#create-service-account-tokens" >}}).

 ## Before you begin

- Ensure you have added the `serviceAccounts` feature toggle to Grafana. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#">}}).
- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}).
+- Ensure you have added the `serviceAccounts` feature toggle to Grafana. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#" >}}).
+- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).

 ## To add a token to a service account

@@ -1,22 +1,24 @@
 ---
-title: Create a service account in Grafana
-menuTitle: Create a service account
-description: 'How to create a service account in Grafana'
-weight: 50
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/create-service-account/
+description: How to create a service account in Grafana
 keywords:
  - Service accounts
+menuTitle: Create a service account
+title: Create a service account in Grafana
+weight: 50
 ---

 # Create a service account in Grafana

-A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. For more information about how you can use service accounts, refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts.md#">}}).
+A service account can be used to run automated workloads in Grafana, like dashboard provisioning, configuration, or report generation. For more information about how you can use service accounts, refer to [About service accounts]({{< relref "../service-accounts/about-service-accounts.md#" >}}).

-For more information about creating service accounts via the API, refer to [Create a service account in the HTTP API]({{< relref "../../http_api/serviceaccount.md#create-service-account">}}).
+For more information about creating service accounts via the API, refer to [Create a service account in the HTTP API]({{< relref "../../developers/http_api/serviceaccount.md#create-service-account" >}}).

 ## Before you begin

- Ensure you have added the feature toggle for service accounts `serviceAccounts`. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#">}}).
- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#">}}).
+- Ensure you have added the feature toggle for service accounts `serviceAccounts`. For more information about adding the feature toggle, refer to [Enable service accounts]({{< relref "./enable-service-accounts.md#" >}}).
+- Ensure you have permission to create and edit service accounts. By default, the organization administrator role is required to create and edit service accounts. For more information about user permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#" >}}).

 ## To create a service account

@@ -1,11 +1,14 @@
 ---
-title: 'Enable service accounts in Grafana'
-menuTitle: 'Enable service accounts'
-description: 'This topic shows you how to to enable the service accounts feature in Grafana'
-weight: 40
+aliases:
+  - /docs/grafana/latest/administration/service-accounts/enable-service-accounts/
+description: This topic shows you how to to enable the service accounts feature in
+  Grafana
 keywords:
  - Feature toggle
  - Service accounts
+menuTitle: Enable service accounts
+title: Enable service accounts in Grafana
+weight: 40
 ---

 # Enable service accounts in Grafana
@@ -1,7 +1,7 @@
 +++
-title = "Set up Grafana for high availability"
+aliases = ["/docs/grafana/latest/administration/set-up-for-high-availability/", "/docs/grafana/latest/tutorials/ha_setup/"]
 keywords = ["grafana", "tutorials", "HA", "high availability"]
-aliases = ["/docs/grafana/latest/tutorials/ha_setup/"]
+title = "Set up Grafana for high availability"
 weight = 1200
 +++

@@ -22,17 +22,17 @@ Grafana will now persist all long term data in the database. How to configure th

 ## Alerting high availability

-Grafana alerting provides a new [highly-available model]({{< relref "../alerting/unified-alerting/high-availability/_index.md" >}}). It also preserves the semantics of legacy dashboard alerting by executing all alerts on every server and by sending notifications only once per alert. Load distribution between servers is not supported at this time.
+Grafana alerting provides a new [highly-available model]({{< relref "../alerting/high-availability/_index.md" >}}). It also preserves the semantics of legacy dashboard alerting by executing all alerts on every server and by sending notifications only once per alert. Load distribution between servers is not supported at this time.

-For instructions on setting up alerting high availability, see [enable alerting high availability]({{< relref "../alerting/unified-alerting/high-availability/enable-alerting-ha.md" >}}).
+For instructions on setting up alerting high availability, see [enable alerting high availability](https://grafana.com/docs/grafana/next/alerting/old-alerting/notifications/).

 **Legacy dashboard alerts**

-Legacy Grafana alerting supports a limited form of high availability. In this model, [alert notifications]({{< relref "../alerting/old-alerting/notifications.md" >}}) are deduplicated when running multiple servers. This means all alerts are executed on every server, but alert notifications are only sent once per alert. Grafana does not support load distribution between servers.
+Legacy Grafana alerting supports a limited form of high availability. In this model, [alert notifications](https://grafana.com/docs/grafana/next/alerting/old-alerting/notifications/) are deduplicated when running multiple servers. This means all alerts are executed on every server, but alert notifications are only sent once per alert. Grafana does not support load distribution between servers.

 ## Grafana Live

-Grafana Live works with limitations in highly available setup. For details, refer to the [Grafana Live documentation]({{< relref "../live/live-ha-setup.md" >}}).
+Grafana Live works with limitations in highly available setup. For details, refer to the [Configure Grafana Live HA setup]({{< relref "../live/set-up-grafana-live/#configure-grafana-live-ha-setup" >}}).

 ## User sessions

@@ -1,4 +1,5 @@
 +++
+aliases = ["/docs/grafana/latest/administration/view-server/"]
 title = "View server"
 weight = 100
 +++
@@ -1,8 +1,8 @@
 +++
-title = "Internal Grafana metrics"
+aliases = ["/docs/grafana/latest/admin/metrics/", "/docs/grafana/latest/administration/view-server/internal-metrics/"]
 description = "Internal metrics exposed by Grafana"
 keywords = ["grafana", "metrics", "internal metrics"]
-aliases = ["/docs/grafana/latest/admin/metrics/"]
+title = "Internal Grafana metrics"
 weight = 200
 +++

@@ -1,8 +1,8 @@
 +++
-title = "View server settings"
+aliases = ["/docs/grafana/latest/admin/view-server-settings/", "/docs/grafana/latest/administration/view-server/view-server-settings/"]
 description = "How to view server settings in the Grafana UI"
 keywords = ["grafana", "configuration", "server", "settings"]
-aliases = ["/docs/grafana/latest/admin/view-server-settings/"]
+title = "View server settings"
 weight = 300
 +++

@@ -1,7 +1,7 @@
 +++
-title = "View server stats"
+aliases = ["/docs/grafana/latest/admin/view-server-stats/", "/docs/grafana/latest/administration/view-server/view-server-stats/"]
 keywords = ["grafana", "server", "statistics"]
-aliases = ["/docs/grafana/latest/admin/view-server-stats/"]
+title = "View server stats"
 weight = 400
 +++

@@ -1,35 +1,35 @@
 +++
-title = "Alerts"
-weight = 110
+aliases = ["/docs/grafana/latest/alerting/", "/docs/grafana/latest/alerting/unified-alerting/difference-old-new/"]
+title = "Alerting"
+weight = 114
 +++

-# Grafana alerts
+# Grafana alerting

-Alerts allow you to learn about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services.
-
-Grafana 8.0 introduced new and improved alerting that centralizes alerting information in a single, searchable view. It allows you to:
+Grafana alerts allow you to learn about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services. It centralizes alerting information in a single, searchable view that allows you to:

 - Create and manage Grafana alerts
 - Create and manage Grafana Mimir and Loki managed alerts
 - View alerting information from Prometheus and Alertmanager compatible data sources

-Grafana alerting is enabled by default for new OSS installations. For older installations, it is still an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature.
+For new installations or existing installs without alerting configured, Grafana alerting is enabled by default.

-| Release                  | Cloud         | Enterprise    | OSS                              |
-| ------------------------ | ------------- | ------------- | -------------------------------- |
-| Grafana 8.2              | On by default | Opt-in        | Opt-in                           |
-| Grafana 8.3              | On by default | Opt-in        | On by default for new installs\* |
-| Grafana 9.0 (unreleased) | On by default | On by default | On by default                    |
+| Release     | Cloud         | Enterprise    | OSS           |
+| ----------- | ------------- | ------------- | ------------- |
+| Grafana 9.0 | On by default | On by default | On by default |

-> **Note:** New installs include existing installs which do not have any alerts configured.
+- For existing OSS installations with legacy dashboard alerting, you can [opt-in]({{< relref "./opt-in.md" >}}) to Grafana alerting.
+- For Grafana Cloud instances using legacy cloud alerting, contact customer support to migrate to Grafana alerting.

-Grafana alerting has four key components:
+Before you begin, we recommend that you familiarize yourself with some of the [fundamental concepts]({{< relref "./fundamentals/_index.md" >}}) of Grafana alerting. Refer to [Role-based access control]({{< relref "../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to learn more about controlling access to alerts using role-based permissions.

- Alerting rule - Evaluation criteria that determine whether an alert will fire. It consists of one or more queries and expressions, a condition, the frequency of evaluation, and optionally, the duration over which the condition is met.
- Contact point - Channel for sending notifications when the conditions of an alerting rule are met.
- Notification policy - Set of matching and grouping criteria used to determine where and how frequently to send notifications.
- Silences - Date and matching criteria used to silence notifications.
-
-To learn more, see [What's New with Grafana alerting]({{< relref "../alerting/unified-alerting/difference-old-new.md" >}}).
-
-For information on how to create and manage Grafana alerts and notifications, refer to [Overview of Grafana alerts]({{< relref "../alerting/unified-alerting/_index.md" >}}) and [Create and manage Grafana alerting rules]({{< relref "./unified-alerting/alerting-rules/_index.md" >}}).
+- [Enable Grafana alerting in OSS]({{< relref "./opt-in.md" >}})
+- [Migrating legacy alerts]({{< relref "./migrating-legacy-alerts.md" >}})
+- [Create Grafana managed alerting rules]({{< relref "alerting-rules/create-grafana-managed-rule.md" >}})
+- [Create Grafana Mimir or Loki managed alerting rules]({{< relref "alerting-rules/create-mimir-loki-managed-rule.md" >}})
+- [View existing alerting rules and manage their current state]({{< relref "alerting-rules/rule-list.md" >}})
+- [View the state and health of alerting rules]({{< relref "./fundamentals/state-and-health.md" >}})
+- [View alert groupings]({{< relref "./alert-groups/_index.md" >}})
+- [Add or edit an alert contact point]({{< relref "./contact-points/_index.md" >}})
+- [Add or edit notification policies]({{< relref "./notifications/_index.md" >}})
+- [Add or edit silences]({{< relref "./silences/_index.md" >}})
@@ -0,0 +1,16 @@
+++
+title = "Alert groups"
+description = "Alert groups"
+keywords = ["grafana", "alerting", "alerts", "groups"]
+weight = 445
+aliases = ["/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
+++
+
+# Alert groups
+
+Alert groups show grouped alerts from an Alertmanager instance. By default, the alerts are grouped by the label keys for the root policy in [notification policies]({{< relref "../notifications/_index.md" >}}). Grouping common alerts into a single alert group prevents duplicate alerts from being fired.
+
+For more information, see:
+
+- [View alert groupings]({{< relref "./view-alert-grouping.md" >}})
+- [Filter alerts by group]({{< relref "./filter-alerts.md" >}})
@@ -0,0 +1,21 @@
+++
+title = "Filter alerts"
+description = "Alert groups"
+keywords = ["grafana", "alerting", "alerts", "groups"]
+weight = 445
+aliases = ["/docs/grafana/latest/alerting/unified-alerting/alert-groups/"]
+++
+
+# Filter alerts by group
+
+You can use the following filters to view alerts that match specific criteria.
+
+## Search by label
+
+To use this filter option:
+
+In **Search**, enter an existing label to view alerts matching the label. For example, `environment=production,region=~US|EU,severity!=warning`.
+
+## Filter alerts by state
+
+In **States**, select from Active, Suppressed, or Unprocessed states to view alerts matching your selected state. All other alerts are hidden.
--- a/Show More
+++ b/Show More