diff --git a/.betterer.results b/.betterer.results
index 3d25ebbffdc..03734dce277 100644
--- a/.betterer.results
+++ b/.betterer.results
@@ -44,6 +44,12 @@ exports[`no enzyme tests`] = {
     "packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.test.js:1734982398": [
       [14, 26, 13, "RegExp match", "2409514259"]
     ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.test.js:2025513694": [
+      [14, 19, 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/index.test.js:700147304": [
       [16, 19, 13, "RegExp match", "2409514259"]
     ],
@@ -80,7 +86,7 @@ exports[`no enzyme tests`] = {
     "public/app/features/alerting/TestRuleResult.test.tsx:2358420489": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],
-    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:3716733755": [
+    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:2357087833": [
       [0, 35, 13, "RegExp match", "2409514259"]
     ],
     "public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx:2723773538": [
@@ -134,7 +140,7 @@ exports[`better eslint`] = {
       [12, 17, 10, "Do not use any type assertions.", "1579919174"],
       [12, 24, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "e2e/dashboards-suite/dashboard-templating.spec.ts:1854610528": [
+    "e2e/dashboards-suite/dashboard-templating.spec.ts:3846708644": [
       [12, 17, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "e2e/dashboards-suite/textbox-variables.spec.ts:2500589821": [
@@ -316,7 +322,7 @@ exports[`better eslint`] = {
       [91, 13, 28, "Do not use any type assertions.", "2187961375"],
       [93, 13, 24, "Do not use any type assertions.", "1019297299"]
     ],
-    "packages/grafana-data/src/datetime/rangeutil.ts:2234129242": [
+    "packages/grafana-data/src/datetime/rangeutil.ts:2182917545": [
       [88, 18, 3, "Unexpected any. Specify a different type.", "193409811"],
       [89, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
       [92, 33, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -625,6 +631,9 @@ exports[`better eslint`] = {
       [315, 14, 3, "Unexpected any. Specify a different type.", "193409811"],
       [315, 22, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
+    "packages/grafana-data/src/transformations/transformers/joinDataFrames.ts:1554585514": [
+      [340, 13, 3, "Unexpected any. Specify a different type.", "193409811"]
+    ],
     "packages/grafana-data/src/transformations/transformers/labelsToFields.test.ts:1352052528": [
       [393, 13, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -678,9 +687,9 @@ exports[`better eslint`] = {
     "packages/grafana-data/src/types/app.ts:2148970488": [
       [75, 48, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-data/src/types/config.ts:21897200": [
-      [185, 11, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [199, 16, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "packages/grafana-data/src/types/config.ts:1574035243": [
+      [171, 11, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [184, 16, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "packages/grafana-data/src/types/dashboard.ts:1867834569": [
       [12, 39, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -813,10 +822,10 @@ exports[`better eslint`] = {
       [192, 52, 3, "Unexpected any. Specify a different type.", "193409811"],
       [192, 72, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-data/src/types/plugin.ts:2556367579": [
-      [174, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [191, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [197, 16, 7, "Do not use any type assertions.", "3399135973"]
+    "packages/grafana-data/src/types/plugin.ts:695757440": [
+      [173, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [190, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [196, 16, 7, "Do not use any type assertions.", "3399135973"]
     ],
     "packages/grafana-data/src/types/query.ts:4277928644": [
       [100, 14, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -1205,19 +1214,19 @@ exports[`better eslint`] = {
       [31, 49, 3, "Unexpected any. Specify a different type.", "193409811"],
       [31, 73, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-runtime/src/config.ts:2639113063": [
+    "packages/grafana-runtime/src/config.ts:2061755826": [
       [66, 11, 3, "Unexpected any. Specify a different type.", "193409811"],
       [75, 29, 17, "Do not use any type assertions.", "4278379396"],
-      [107, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [192, 18, 13, "Do not use any type assertions.", "538937261"],
-      [192, 28, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [98, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [183, 18, 13, "Do not use any type assertions.", "538937261"],
+      [183, 28, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "packages/grafana-runtime/src/services/AngularLoader.ts:3455177907": [
       [45, 14, 3, "Unexpected any. Specify a different type.", "193409811"],
       [61, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
       [61, 30, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-runtime/src/services/EchoSrv.ts:347668574": [
+    "packages/grafana-runtime/src/services/EchoSrv.ts:2163840677": [
       [51, 51, 3, "Unexpected any. Specify a different type.", "193409811"],
       [51, 60, 3, "Unexpected any. Specify a different type.", "193409811"],
       [63, 53, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -1709,7 +1718,7 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/Graph/GraphContextMenu.tsx:3875310700": [
       [22, 53, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-ui/src/components/Graph/utils.ts:3619837376": [
+    "packages/grafana-ui/src/components/Graph/utils.ts:3717868215": [
       [104, 56, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "packages/grafana-ui/src/components/GraphNG/GraphNG.tsx:94669281": [
@@ -1740,7 +1749,7 @@ exports[`better eslint`] = {
       [2, 101, 3, "Unexpected any. Specify a different type.", "193409811"],
       [15, 28, 17, "Do not use any type assertions.", "2923536692"]
     ],
-    "packages/grafana-ui/src/components/GraphNG/utils.ts:460323924": [
+    "packages/grafana-ui/src/components/GraphNG/utils.ts:3480871323": [
       [23, 18, 35, "Do not use any type assertions.", "180126096"],
       [23, 48, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -2083,7 +2092,7 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/Switch/Switch.story.tsx:3337756944": [
       [11, 15, 258, "Do not use any type assertions.", "1871090638"]
     ],
-    "packages/grafana-ui/src/components/Table/BarGaugeCell.tsx:1481110243": [
+    "packages/grafana-ui/src/components/Table/BarGaugeCell.tsx:2469721145": [
       [46, 13, 17, "Do not use any type assertions.", "3640560184"]
     ],
     "packages/grafana-ui/src/components/Table/CellActions.tsx:3266589396": [
@@ -2091,8 +2100,8 @@ exports[`better eslint`] = {
       [22, 10, 16, "Do not use any type assertions.", "737436615"],
       [23, 22, 25, "Do not use any type assertions.", "1478996352"]
     ],
-    "packages/grafana-ui/src/components/Table/DefaultCell.tsx:3618905143": [
-      [16, 34, 40, "Do not use any type assertions.", "91092480"]
+    "packages/grafana-ui/src/components/Table/DefaultCell.tsx:1844923424": [
+      [14, 34, 40, "Do not use any type assertions.", "91092480"]
     ],
     "packages/grafana-ui/src/components/Table/Filter.tsx:1102571026": [
       [13, 10, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -2112,8 +2121,8 @@ exports[`better eslint`] = {
       [53, 38, 13, "Do not use any type assertions.", "947160887"],
       [53, 48, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-ui/src/components/Table/JSONViewCell.tsx:2181157412": [
-      [12, 34, 40, "Do not use any type assertions.", "91092480"]
+    "packages/grafana-ui/src/components/Table/JSONViewCell.tsx:4022130242": [
+      [11, 34, 40, "Do not use any type assertions.", "91092480"]
     ],
     "packages/grafana-ui/src/components/Table/Table.story.tsx:4272567078": [
       [23, 15, 364, "Do not use any type assertions.", "4121186137"]
@@ -2210,11 +2219,9 @@ exports[`better eslint`] = {
       [56, 22, 24, "Do not use any type assertions.", "4121028738"],
       [56, 43, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-ui/src/components/TimeSeries/utils.ts:1896295166": [
-      [34, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [136, 19, 146, "Do not use any type assertions.", "3723122882"],
-      [308, 12, 73, "Do not use any type assertions.", "587500217"],
-      [311, 17, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "packages/grafana-ui/src/components/TimeSeries/utils.ts:3806893813": [
+      [33, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [135, 19, 146, "Do not use any type assertions.", "3723122882"]
     ],
     "packages/grafana-ui/src/components/ToolbarButton/ToolbarButton.story.tsx:1133352709": [
       [10, 15, 780, "Do not use any type assertions.", "3533394757"]
@@ -2293,7 +2300,7 @@ exports[`better eslint`] = {
       [59, 12, 198, "Do not use any type assertions.", "2203342350"],
       [65, 26, 341, "Do not use any type assertions.", "3792878509"]
     ],
-    "packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts:3245297597": [
+    "packages/grafana-ui/src/components/uPlot/config/UPlotAxisBuilder.ts:895023121": [
       [23, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
       [170, 39, 3, "Unexpected any. Specify a different type.", "193409811"],
       [174, 5, 13, "Do not use any type assertions.", "268797995"],
@@ -2322,13 +2329,13 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/components/uPlot/types.ts:1918909040": [
       [16, 26, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-ui/src/components/uPlot/utils.ts:1283022966": [
+    "packages/grafana-ui/src/components/uPlot/utils.ts:20167453": [
       [70, 13, 20, "Do not use any type assertions.", "1571376654"],
       [131, 20, 34, "Do not use any type assertions.", "1148863494"],
       [134, 11, 35, "Do not use any type assertions.", "2376372234"],
       [136, 11, 45, "Do not use any type assertions.", "1627514634"],
       [164, 13, 41, "Do not use any type assertions.", "1747339107"],
-      [264, 14, 32, "Do not use any type assertions.", "319021204"]
+      [261, 14, 32, "Do not use any type assertions.", "319021204"]
     ],
     "packages/grafana-ui/src/options/builder/axis.tsx:1832382450": [
       [91, 14, 30, "Do not use any type assertions.", "3478399522"],
@@ -2479,6 +2486,9 @@ exports[`better eslint`] = {
     "packages/grafana-ui/src/utils/colors.ts:349987544": [
       [110, 25, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
+    "packages/grafana-ui/src/utils/dataLinks.ts:2916992126": [
+      [16, 12, 71, "Do not use any type assertions.", "1504235577"]
+    ],
     "packages/grafana-ui/src/utils/debug.ts:2900904491": [
       [6, 56, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -2506,9 +2516,9 @@ exports[`better eslint`] = {
       [38, 72, 3, "Unexpected any. Specify a different type.", "193409811"],
       [38, 85, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/grafana-ui/src/utils/table.ts:2798596296": [
-      [7, 52, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [8, 29, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "packages/grafana-ui/src/utils/table.ts:3564715667": [
+      [8, 52, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [9, 22, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "packages/grafana-ui/src/utils/useAsyncDependency.ts:4089662838": [
       [3, 60, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -2549,7 +2559,7 @@ exports[`better eslint`] = {
     "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.tsx:1954428690": [
       [97, 35, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx:3587041872": [
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.tsx:1594863792": [
       [77, 35, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx:3379895243": [
@@ -3176,7 +3186,7 @@ exports[`better eslint`] = {
       [73, 37, 3, "Unexpected any. Specify a different type.", "193409811"],
       [89, 39, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/core/components/ColorScale/ColorScale.tsx:12349772": [
+    "public/app/core/components/ColorScale/ColorScale.tsx:661627953": [
       [38, 24, 43, "Do not use any type assertions.", "1727107527"],
       [38, 25, 19, "Do not use any type assertions.", "1979047218"],
       [38, 41, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -3226,9 +3236,9 @@ exports[`better eslint`] = {
       [120, 15, 41, "Do not use any type assertions.", "1904113237"],
       [137, 15, 41, "Do not use any type assertions.", "1904113237"]
     ],
-    "public/app/core/components/NavBar/NavBarMenu.tsx:2778426907": [
-      [245, 54, 26, "Do not use any type assertions.", "1541386804"],
-      [463, 23, 21, "Do not use any type assertions.", "1121249950"]
+    "public/app/core/components/NavBar/NavBarMenu.tsx:2095049018": [
+      [241, 54, 26, "Do not use any type assertions.", "1541386804"],
+      [445, 23, 21, "Do not use any type assertions.", "1121249950"]
     ],
     "public/app/core/components/OptionsUI/DashboardPicker.tsx:3166151962": [
       [11, 85, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -3398,14 +3408,14 @@ exports[`better eslint`] = {
       [8, 12, 3, "Unexpected any. Specify a different type.", "193409811"],
       [11, 53, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/core/components/TagFilter/TagFilter.tsx:2477083789": [
+    "public/app/core/components/TagFilter/TagFilter.tsx:3569632478": [
       [35, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [109, 32, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [132, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [133, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [144, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [147, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [156, 44, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [103, 32, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [121, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [122, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [133, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [136, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [145, 44, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/core/components/TagFilter/TagOption.tsx:108355790": [
       [10, 50, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -3440,43 +3450,6 @@ exports[`better eslint`] = {
     "public/app/core/history/richHistoryLocalStorageUtils.ts:708464706": [
       [59, 99, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/core/logsModel.test.ts:342304192": [
-      [34, 32, 132, "Do not use any type assertions.", "3240026221"],
-      [41, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [46, 32, 250, "Do not use any type assertions.", "1056401323"],
-      [59, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [77, 32, 255, "Do not use any type assertions.", "3910157567"],
-      [90, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [108, 32, 255, "Do not use any type assertions.", "3910157567"],
-      [121, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [131, 32, 146, "Do not use any type assertions.", "4042945873"],
-      [141, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [159, 32, 245, "Do not use any type assertions.", "1219087628"],
-      [172, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [181, 32, 399, "Do not use any type assertions.", "951740236"],
-      [202, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [214, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [223, 32, 17, "Do not use any type assertions.", "3976469210"],
-      [1085, 32, 96, "Do not use any type assertions.", "2446954905"],
-      [1088, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [1096, 32, 96, "Do not use any type assertions.", "2446954905"],
-      [1099, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [1146, 14, 152, "Do not use any type assertions.", "1058688753"],
-      [1146, 14, 117, "Do not use any type assertions.", "2244099206"]
-    ],
-    "public/app/core/logsModel.ts:1903332011": [
-      [113, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [114, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [461, 21, 196, "Do not use any type assertions.", "842163811"],
-      [462, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [462, 35, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [466, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [610, 27, 17, "Do not use any type assertions.", "1830153619"],
-      [611, 30, 17, "Do not use any type assertions.", "1830153619"],
-      [664, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [664, 36, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [685, 26, 68, "Do not use any type assertions.", "1746242431"]
-    ],
     "public/app/core/mod_defs.d.ts:305963360": [
       [1, 12, 3, "Unexpected any. Specify a different type.", "193409811"],
       [6, 12, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -3538,7 +3511,7 @@ exports[`better eslint`] = {
       [11, 6, 169, "Do not use any type assertions.", "2248693214"],
       [17, 11, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/core/navigation/types.ts:2395305220": [
+    "public/app/core/navigation/types.ts:2017971154": [
       [10, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
       [14, 35, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -3617,24 +3590,24 @@ exports[`better eslint`] = {
       [0, 34, 3, "Unexpected any. Specify a different type.", "193409811"],
       [0, 39, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/core/services/backend_srv.ts:360059123": [
-      [83, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [153, 63, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [231, 40, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [285, 38, 20, "Do not use any type assertions.", "443888156"],
-      [285, 55, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [356, 103, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [392, 49, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [396, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [396, 43, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [400, 35, 3, "Unexpected any. Specify a different type.", "193409811"],
+    "public/app/core/services/backend_srv.ts:3750224237": [
+      [79, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [149, 63, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [227, 40, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [281, 38, 20, "Do not use any type assertions.", "443888156"],
+      [281, 55, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [352, 103, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [388, 49, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [392, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [392, 43, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [396, 35, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [400, 33, 3, "Unexpected any. Specify a different type.", "193409811"],
       [404, 33, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [408, 33, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [408, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
       [412, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [416, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [427, 16, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [423, 16, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/core/services/context_srv.ts:698805616": [
+    "public/app/core/services/context_srv.ts:1157446284": [
       [59, 10, 3, "Unexpected any. Specify a different type.", "193409811"],
       [60, 11, 3, "Unexpected any. Specify a different type.", "193409811"],
       [62, 14, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -4176,17 +4149,29 @@ exports[`better eslint`] = {
     "public/app/features/alerting/unified/AmRoutes.tsx:746213791": [
       [54, 20, 124, "Do not use any type assertions.", "1859971542"]
     ],
-    "public/app/features/alerting/unified/PanelAlertTabContent.test.tsx:2750168837": [
+    "public/app/features/alerting/unified/PanelAlertTabContent.test.tsx:2885585711": [
       [148, 18, 168, "Do not use any type assertions.", "3635996173"],
+      [161, 14, 241, "Do not use any type assertions.", "583862789"],
+      [161, 14, 227, "Do not use any type assertions.", "578877230"],
+      [174, 5, 3, "Unexpected any. Specify a different type.", "193409811"],
       [186, 56, 87, "Do not use any type assertions.", "3591252716"],
       [188, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
       [188, 28, 3, "Unexpected any. Specify a different type.", "193409811"],
       [189, 53, 90, "Do not use any type assertions.", "3360422103"],
       [190, 6, 3, "Unexpected any. Specify a different type.", "193409811"],
       [191, 6, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [257, 5, 46, "Do not use any type assertions.", "3849301614"],
-      [257, 5, 25, "Do not use any type assertions.", "2832141036"],
-      [257, 27, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [198, 43, 93, "Do not use any type assertions.", "491507647"],
+      [198, 43, 79, "Do not use any type assertions.", "2198135124"],
+      [202, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [224, 43, 122, "Do not use any type assertions.", "1400972852"],
+      [224, 43, 108, "Do not use any type assertions.", "2513195871"],
+      [229, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [251, 5, 46, "Do not use any type assertions.", "3849301614"],
+      [251, 5, 25, "Do not use any type assertions.", "2832141036"],
+      [251, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [253, 43, 70, "Do not use any type assertions.", "4292164046"],
+      [253, 43, 56, "Do not use any type assertions.", "2628506213"],
+      [256, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/alerting/unified/Receivers.test.tsx:3742116867": [
       [143, 34, 29, "Do not use any type assertions.", "2249960884"]
@@ -4201,11 +4186,14 @@ exports[`better eslint`] = {
       [127, 14, 16, "Do not use any type assertions.", "1747412709"],
       [128, 18, 24, "Do not use any type assertions.", "3254438164"]
     ],
-    "public/app/features/alerting/unified/RuleEditor.test.tsx:2974108144": [
-      [233, 42, 149, "Do not use any type assertions.", "2017267554"],
-      [454, 42, 32, "Do not use any type assertions.", "2259972478"],
-      [507, 65, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [642, 42, 20, "Do not use any type assertions.", "1750699644"]
+    "public/app/features/alerting/unified/RuleEditor.test.tsx:3247797279": [
+      [231, 42, 149, "Do not use any type assertions.", "2017267554"],
+      [418, 23, 50, "Do not use any type assertions.", "772738025"],
+      [418, 23, 36, "Do not use any type assertions.", "4069427080"],
+      [420, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [452, 42, 32, "Do not use any type assertions.", "2259972478"],
+      [505, 65, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [640, 42, 20, "Do not use any type assertions.", "1750699644"]
     ],
     "public/app/features/alerting/unified/RuleList.test.tsx:629893124": [
       [125, 21, 16, "Do not use any type assertions.", "2939667099"],
@@ -4383,8 +4371,8 @@ exports[`better eslint`] = {
       [43, 13, 12, "Do not use any type assertions.", "96869412"],
       [64, 7, 25, "Do not use any type assertions.", "4119455957"]
     ],
-    "public/app/features/alerting/unified/hooks/useIsRuleEditable.test.tsx:2319947585": [
-      [163, 64, 29, "Do not use any type assertions.", "2249960884"]
+    "public/app/features/alerting/unified/hooks/useIsRuleEditable.test.tsx:4024141754": [
+      [150, 64, 29, "Do not use any type assertions.", "2249960884"]
     ],
     "public/app/features/alerting/unified/mocks.ts:2719319751": [
       [48, 14, 7, "Do not use any type assertions.", "3399135973"],
@@ -4408,9 +4396,11 @@ exports[`better eslint`] = {
       [234, 6, 172, "Do not use any type assertions.", "1154786841"],
       [242, 6, 177, "Do not use any type assertions.", "3855113404"]
     ],
-    "public/app/features/alerting/unified/state/actions.ts:175963059": [
-      [74, 23, 24, "Do not use any type assertions.", "3178482079"],
-      [254, 70, 24, "Do not use any type assertions.", "3178482079"]
+    "public/app/features/alerting/unified/state/actions.ts:2828725785": [
+      [73, 23, 24, "Do not use any type assertions.", "3178482079"],
+      [253, 70, 24, "Do not use any type assertions.", "3178482079"],
+      [570, 60, 22, "Do not use any type assertions.", "3527197253"],
+      [570, 79, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/alerting/unified/types/receiver-form.ts:4067603235": [
       [10, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -4420,8 +4410,8 @@ exports[`better eslint`] = {
       [28, 4, 25, "Do not use any type assertions.", "2565039386"],
       [106, 22, 82, "Do not use any type assertions.", "713417051"]
     ],
-    "public/app/features/alerting/unified/utils/datasource.ts:3850518020": [
-      [137, 5, 69, "Do not use any type assertions.", "2540015575"]
+    "public/app/features/alerting/unified/utils/datasource.ts:2520335938": [
+      [136, 5, 69, "Do not use any type assertions.", "2540015575"]
     ],
     "public/app/features/alerting/unified/utils/misc.test.ts:962758579": [
       [19, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -4479,8 +4469,9 @@ exports[`better eslint`] = {
     "public/app/features/annotations/components/AnnotationResultMapper.tsx:1382385589": [
       [131, 41, 15, "Do not use any type assertions.", "3610795007"]
     ],
-    "public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx:1738271764": [
-      [28, 10, 11, "Do not use any type assertions.", "750480870"]
+    "public/app/features/annotations/components/StandardAnnotationQueryEditor.tsx:46885179": [
+      [28, 10, 11, "Do not use any type assertions.", "750480870"],
+      [78, 17, 16, "Do not use any type assertions.", "388222280"]
     ],
     "public/app/features/annotations/events_processing.ts:311785085": [
       [2, 46, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -4560,14 +4551,16 @@ exports[`better eslint`] = {
     "public/app/features/canvas/runtime/root.tsx:2845174121": [
       [24, 19, 36, "Do not use any type assertions.", "1413431594"]
     ],
-    "public/app/features/canvas/runtime/scene.tsx:4221384430": [
+    "public/app/features/canvas/runtime/scene.tsx:2928385813": [
       [155, 61, 25, "Do not use any type assertions.", "588553285"],
       [160, 42, 25, "Do not use any type assertions.", "588553285"]
     ],
     "public/app/features/comments/CommentView.tsx:3338885322": [
       [31, 20, 32, "Do not use any type assertions.", "3501587761"]
     ],
-    "public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx:3529318871": [
+    "public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.test.tsx:1976108855": [
+      [9, 15, 20, "Do not use any type assertions.", "2923490522"],
+      [10, 11, 16, "Do not use any type assertions.", "388222280"],
       [11, 14, 16, "Do not use any type assertions.", "2607709806"],
       [11, 27, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -4580,7 +4573,7 @@ exports[`better eslint`] = {
       [90, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
       [126, 18, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts:3288513450": [
+    "public/app/features/dashboard/components/DashExportModal/DashboardExporter.test.ts:2274633003": [
       [22, 6, 59, "Do not use any type assertions.", "3685154675"],
       [22, 6, 49, "Do not use any type assertions.", "1184085652"],
       [25, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -4605,28 +4598,30 @@ exports[`better eslint`] = {
       [318, 17, 3, "Unexpected any. Specify a different type.", "193409811"],
       [325, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
       [334, 19, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [364, 13, 18, "Do not use any type assertions.", "3420875325"],
-      [365, 9, 55, "Do not use any type assertions.", "1888720338"],
-      [365, 17, 10, "Do not use any type assertions.", "1501063862"],
-      [365, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [365, 61, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [370, 13, 18, "Do not use any type assertions.", "3420875325"],
+      [371, 9, 55, "Do not use any type assertions.", "1888720338"],
+      [371, 17, 10, "Do not use any type assertions.", "1501063862"],
+      [371, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [371, 61, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts:565128344": [
-      [18, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [47, 37, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [65, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [86, 43, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [93, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [100, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [102, 37, 17, "Do not use any type assertions.", "1733699692"],
-      [102, 51, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [169, 41, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [198, 29, 31, "Do not use any type assertions.", "1451241646"],
-      [198, 29, 13, "Do not use any type assertions.", "2146830713"],
-      [217, 32, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/DashExportModal/DashboardExporter.ts:568589687": [
+      [17, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [44, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [65, 43, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [72, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [79, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [82, 25, 17, "Do not use any type assertions.", "1733699692"],
+      [82, 39, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [83, 20, 33, "Do not use any type assertions.", "1729190460"],
+      [83, 21, 17, "Do not use any type assertions.", "1733699692"],
+      [83, 35, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [148, 41, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [176, 29, 31, "Do not use any type assertions.", "1451241646"],
+      [176, 29, 13, "Do not use any type assertions.", "2146830713"],
+      [195, 32, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/DashNav/DashNav.tsx:1533394562": [
-      [67, 87, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/DashNav/DashNav.tsx:574528540": [
+      [66, 87, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/dashboard/components/DashNav/DashNavTimeControls.test.tsx:3825334541": [
       [49, 17, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -4689,9 +4684,11 @@ exports[`better eslint`] = {
     "public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx:1752755114": [
       [40, 53, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx:428611755": [
+    "public/app/features/dashboard/components/DashboardSettings/GeneralSettings.test.tsx:1246666905": [
       [13, 14, 50, "Do not use any type assertions.", "3302172944"],
-      [15, 5, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [15, 5, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [19, 15, 428, "Do not use any type assertions.", "4070674009"],
+      [19, 15, 410, "Do not use any type assertions.", "815903200"]
     ],
     "public/app/features/dashboard/components/DashboardSettings/GeneralSettings.tsx:2117359978": [
       [38, 14, 51, "Do not use any type assertions.", "4093646718"]
@@ -4855,46 +4852,48 @@ exports[`better eslint`] = {
       [16, 40, 3, "Unexpected any. Specify a different type.", "193409811"],
       [30, 18, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/ShareModal/ShareEmbed.test.tsx:1798881678": [
-      [41, 3, 13, "Do not use any type assertions.", "538937261"],
-      [41, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [50, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [57, 22, 55, "Do not use any type assertions.", "2080143574"],
-      [61, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/ShareModal/ShareEmbed.test.tsx:2703340283": [
+      [39, 3, 13, "Do not use any type assertions.", "538937261"],
+      [39, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [48, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [54, 22, 55, "Do not use any type assertions.", "2080143574"],
+      [58, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/ShareModal/ShareExport.tsx:1231464422": [
-      [55, 67, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [59, 25, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [70, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [85, 67, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [89, 25, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [100, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [109, 28, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/ShareModal/ShareExport.tsx:3901008754": [
+      [51, 67, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [55, 25, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [66, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [81, 67, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [85, 25, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [96, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [105, 28, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:3716733755": [
-      [43, 3, 13, "Do not use any type assertions.", "538937261"],
-      [43, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [77, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [78, 18, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [81, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [82, 21, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [113, 24, 63, "Do not use any type assertions.", "3674793430"],
-      [117, 11, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [199, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [205, 22, 55, "Do not use any type assertions.", "2080143574"],
-      [209, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:2357087833": [
+      [33, 3, 13, "Do not use any type assertions.", "538937261"],
+      [33, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [42, 3, 13, "Do not use any type assertions.", "538937261"],
+      [42, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [76, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [77, 18, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [80, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [81, 21, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [111, 24, 63, "Do not use any type assertions.", "3674793430"],
+      [115, 11, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [197, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [203, 22, 55, "Do not use any type assertions.", "2080143574"],
+      [207, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/ShareModal/ShareModal.tsx:2780210084": [
+    "public/app/features/dashboard/components/ShareModal/ShareModal.tsx:3869940488": [
       [86, 20, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/components/ShareModal/SharePublicDashboard.test.tsx:3176925826": [
-      [20, 19, 68, "Do not use any type assertions.", "630749985"],
-      [20, 19, 54, "Do not use any type assertions.", "4291334336"],
-      [25, 6, 59, "Do not use any type assertions.", "3685154675"],
-      [25, 6, 49, "Do not use any type assertions.", "1184085652"],
-      [46, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [53, 22, 55, "Do not use any type assertions.", "2080143574"],
-      [57, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/ShareModal/SharePublicDashboard.test.tsx:3005912975": [
+      [18, 19, 68, "Do not use any type assertions.", "630749985"],
+      [18, 19, 54, "Do not use any type assertions.", "4291334336"],
+      [23, 6, 59, "Do not use any type assertions.", "3685154675"],
+      [23, 6, 49, "Do not use any type assertions.", "1184085652"],
+      [44, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [50, 22, 55, "Do not use any type assertions.", "2080143574"],
+      [54, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/dashboard/components/ShareModal/SharePublicDashboardUtils.test.tsx:3549968113": [
       [24, 18, 46, "Do not use any type assertions.", "2293567025"],
@@ -4902,8 +4901,8 @@ exports[`better eslint`] = {
       [36, 18, 30, "Do not use any type assertions.", "387012726"],
       [38, 14, 21, "Do not use any type assertions.", "3316176532"]
     ],
-    "public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx:2987761063": [
-      [149, 43, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx:305910085": [
+      [148, 43, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/dashboard/components/ShareModal/utils.test.ts:3192556439": [
       [34, 31, 115, "Do not use any type assertions.", "3780428905"],
@@ -4992,11 +4991,11 @@ exports[`better eslint`] = {
       [264, 15, 56, "Do not use any type assertions.", "2674630592"],
       [266, 13, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/containers/DashboardPage.tsx:3173260528": [
-      [108, 36, 40, "Do not use any type assertions.", "2547843745"],
-      [108, 73, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [144, 32, 40, "Do not use any type assertions.", "2547843745"],
-      [144, 69, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/containers/DashboardPage.tsx:707193595": [
+      [107, 36, 40, "Do not use any type assertions.", "2547843745"],
+      [107, 73, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [142, 32, 40, "Do not use any type assertions.", "2547843745"],
+      [142, 69, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/dashboard/containers/SoloPanelPage.test.tsx:1655234814": [
       [26, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5019,7 +5018,7 @@ exports[`better eslint`] = {
       [21, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
       [21, 59, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/dashgrid/DashboardGrid.tsx:25656274": [
+    "public/app/features/dashboard/dashgrid/DashboardGrid.tsx:3771579139": [
       [79, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
       [189, 40, 3, "Unexpected any. Specify a different type.", "193409811"],
       [189, 53, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5032,11 +5031,13 @@ exports[`better eslint`] = {
     "public/app/features/dashboard/dashgrid/LazyLoader.tsx:2512448803": [
       [52, 23, 60, "Do not use any type assertions.", "1332568031"]
     ],
-    "public/app/features/dashboard/dashgrid/PanelChrome.test.tsx:3660061275": [
+    "public/app/features/dashboard/dashgrid/PanelChrome.test.tsx:514058263": [
       [24, 27, 184, "Do not use any type assertions.", "2137031202"],
       [24, 27, 164, "Do not use any type assertions.", "4126965436"],
       [30, 18, 53, "Do not use any type assertions.", "3326921050"],
       [30, 18, 42, "Do not use any type assertions.", "1020693066"],
+      [36, 11, 258, "Do not use any type assertions.", "3677324054"],
+      [36, 11, 244, "Do not use any type assertions.", "2585800637"],
       [45, 15, 188, "Do not use any type assertions.", "3092730874"],
       [45, 15, 170, "Do not use any type assertions.", "2122268803"],
       [53, 12, 104, "Do not use any type assertions.", "4098692416"],
@@ -5203,7 +5204,7 @@ exports[`better eslint`] = {
       [1031, 24, 100, "Do not use any type assertions.", "1490128200"],
       [1031, 24, 89, "Do not use any type assertions.", "1592095128"]
     ],
-    "public/app/features/dashboard/state/DashboardModel.ts:2406615335": [
+    "public/app/features/dashboard/state/DashboardModel.ts:2545728044": [
       [61, 8, 3, "Unexpected any. Specify a different type.", "193409811"],
       [62, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
       [69, 6, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5229,6 +5230,7 @@ exports[`better eslint`] = {
       [312, 10, 3, "Unexpected any. Specify a different type.", "193409811"],
       [327, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
       [423, 32, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [446, 14, 22, "Do not use any type assertions.", "1197383730"],
       [473, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
       [689, 61, 3, "Unexpected any. Specify a different type.", "193409811"],
       [693, 62, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5243,7 +5245,7 @@ exports[`better eslint`] = {
       [1137, 40, 3, "Unexpected any. Specify a different type.", "193409811"],
       [1137, 48, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/state/PanelModel.test.ts:4035235685": [
+    "public/app/features/dashboard/state/PanelModel.test.ts:1787146930": [
       [29, 11, 92, "Do not use any type assertions.", "2976372744"],
       [34, 5, 3, "Unexpected any. Specify a different type.", "193409811"],
       [52, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5256,12 +5258,12 @@ exports[`better eslint`] = {
       [373, 28, 3, "Unexpected any. Specify a different type.", "193409811"],
       [376, 80, 25, "Do not use any type assertions.", "2825799852"],
       [376, 102, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [459, 49, 81, "Do not use any type assertions.", "1932069967"],
-      [460, 32, 15, "Do not use any type assertions.", "1703404951"],
-      [496, 25, 293, "Do not use any type assertions.", "3989849883"],
-      [498, 21, 213, "Do not use any type assertions.", "2695721884"]
+      [453, 49, 81, "Do not use any type assertions.", "1932069967"],
+      [454, 32, 15, "Do not use any type assertions.", "1703404951"],
+      [490, 25, 293, "Do not use any type assertions.", "3989849883"],
+      [492, 21, 213, "Do not use any type assertions.", "2695721884"]
     ],
-    "public/app/features/dashboard/state/PanelModel.ts:2979822970": [
+    "public/app/features/dashboard/state/PanelModel.ts:3953810869": [
       [112, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
       [131, 10, 3, "Unexpected any. Specify a different type.", "193409811"],
       [145, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5280,17 +5282,17 @@ exports[`better eslint`] = {
       [223, 7, 11, "Do not use any type assertions.", "3816020039"],
       [223, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
       [285, 17, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [369, 21, 11, "Do not use any type assertions.", "3816020039"],
-      [369, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [382, 7, 11, "Do not use any type assertions.", "3816020039"],
-      [382, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [433, 14, 11, "Do not use any type assertions.", "3816020039"],
-      [433, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [453, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [464, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [512, 22, 18, "Do not use any type assertions.", "1060162663"],
-      [595, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [654, 14, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [367, 21, 11, "Do not use any type assertions.", "3816020039"],
+      [367, 29, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [380, 7, 11, "Do not use any type assertions.", "3816020039"],
+      [380, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [431, 14, 11, "Do not use any type assertions.", "3816020039"],
+      [431, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [451, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [462, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [510, 22, 18, "Do not use any type assertions.", "1060162663"],
+      [593, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [652, 14, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/dashboard/state/TimeModel.ts:2763994651": [
       [3, 8, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5330,12 +5332,26 @@ exports[`better eslint`] = {
       [143, 17, 41, "Do not use any type assertions.", "1363816804"],
       [145, 11, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/dashboard/state/initDashboard.ts:1143357497": [
-      [216, 84, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/dashboard/state/initDashboard.ts:4291397377": [
+      [215, 71, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/dashboard/state/reducers.ts:2272523560": [
       [64, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
+    "public/app/features/dashboard/state/utils.test.ts:1279742222": [
+      [8, 38, 64, "Do not use any type assertions.", "3380969"],
+      [8, 38, 50, "Do not use any type assertions.", "3221043074"],
+      [9, 37, 64, "Do not use any type assertions.", "524183405"],
+      [9, 37, 50, "Do not use any type assertions.", "420885766"],
+      [17, 38, 64, "Do not use any type assertions.", "3380969"],
+      [17, 38, 50, "Do not use any type assertions.", "3221043074"],
+      [18, 37, 64, "Do not use any type assertions.", "1764689129"],
+      [18, 37, 50, "Do not use any type assertions.", "560997762"],
+      [26, 38, 127, "Do not use any type assertions.", "281200413"],
+      [26, 38, 113, "Do not use any type assertions.", "3150415926"],
+      [30, 37, 64, "Do not use any type assertions.", "524183405"],
+      [30, 37, 50, "Do not use any type assertions.", "420885766"]
+    ],
     "public/app/features/dashboard/utils/getPanelMenu.test.ts:2133911514": [
       [98, 18, 3, "Unexpected any. Specify a different type.", "193409811"],
       [99, 19, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -5402,12 +5418,8 @@ exports[`better eslint`] = {
     "public/app/features/datasources/DataSourceDashboards.tsx:3932611556": [
       [49, 16, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/datasources/DataSourcesListPage.test.tsx:368182366": [
-      [19, 17, 26, "Do not use any type assertions.", "3994646623"],
-      [22, 14, 126, "Do not use any type assertions.", "1409469672"]
-    ],
-    "public/app/features/datasources/DataSourcesListPage.tsx:247845505": [
-      [44, 14, 22, "Do not use any type assertions.", "2167463294"]
+    "public/app/features/datasources/DataSourcesListPage.test.tsx:3726518198": [
+      [32, 19, 26, "Do not use any type assertions.", "3994646623"]
     ],
     "public/app/features/datasources/__mocks__/dataSourcesMocks.ts:1217473343": [
       [23, 9, 35, "Do not use any type assertions.", "2095437639"]
@@ -5608,7 +5620,7 @@ exports[`better eslint`] = {
     "public/app/features/explore/ExploreQueryInspector.tsx:1760146357": [
       [33, 62, 44, "Do not use any type assertions.", "290789231"]
     ],
-    "public/app/features/explore/Logs.tsx:3417011349": [
+    "public/app/features/explore/Logs.tsx:4028397642": [
       [78, 77, 3, "Unexpected any. Specify a different type.", "193409811"],
       [198, 68, 17, "Do not use any type assertions.", "1830153619"]
     ],
@@ -5657,7 +5669,7 @@ exports[`better eslint`] = {
       [56, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
       [75, 24, 86, "Do not use any type assertions.", "2242309894"]
     ],
-    "public/app/features/explore/TraceView/TraceView.test.tsx:598956578": [
+    "public/app/features/explore/TraceView/TraceView.test.tsx:4208667279": [
       [61, 21, 79, "Do not use any type assertions.", "4192888253"],
       [65, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
       [159, 18, 9, "Do not use any type assertions.", "3815122951"],
@@ -5989,10 +6001,8 @@ exports[`better eslint`] = {
       [9, 6, 59, "Do not use any type assertions.", "3685154675"],
       [9, 6, 49, "Do not use any type assertions.", "1184085652"]
     ],
-    "public/app/features/geo/utils/frameVectorSource.ts:119928285": [
-      [28, 20, 29, "Do not use any type assertions.", "1337699239"],
-      [47, 21, 81, "Do not use any type assertions.", "1774144811"],
-      [52, 18, 13, "Do not use any type assertions.", "18139833"]
+    "public/app/features/geo/utils/frameVectorSource.ts:3630880852": [
+      [28, 20, 29, "Do not use any type assertions.", "1337699239"]
     ],
     "public/app/features/geo/utils/location.test.ts:3751297173": [
       [30, 61, 10, "Do not use any type assertions.", "525921067"],
@@ -6013,7 +6023,7 @@ exports[`better eslint`] = {
       [150, 23, 339, "Do not use any type assertions.", "1654092041"],
       [150, 23, 324, "Do not use any type assertions.", "1057375888"]
     ],
-    "public/app/features/inspector/InspectDataTab.tsx:269212810": [
+    "public/app/features/inspector/InspectDataTab.tsx:3622788309": [
       [172, 25, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/inspector/InspectErrorTab.tsx:1005725224": [
@@ -6146,7 +6156,7 @@ exports[`better eslint`] = {
       [81, 19, 3, "Unexpected any. Specify a different type.", "193409811"],
       [82, 25, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/manage-dashboards/components/ImportDashboardForm.tsx:123008784": [
+    "public/app/features/manage-dashboards/components/ImportDashboardForm.tsx:72231267": [
       [62, 28, 9, "Do not use any type assertions.", "3692209159"],
       [62, 34, 3, "Unexpected any. Specify a different type.", "193409811"],
       [125, 22, 23, "Do not use any type assertions.", "2412780303"],
@@ -6174,7 +6184,7 @@ exports[`better eslint`] = {
       [38, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
       [44, 23, 174, "Do not use any type assertions.", "1993531937"]
     ],
-    "public/app/features/manage-dashboards/state/actions.ts:658353090": [
+    "public/app/features/manage-dashboards/state/actions.ts:2109642147": [
       [43, 47, 3, "Unexpected any. Specify a different type.", "193409811"],
       [51, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
       [54, 20, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -6197,7 +6207,7 @@ exports[`better eslint`] = {
       [295, 9, 3, "Unexpected any. Specify a different type.", "193409811"],
       [319, 31, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/manage-dashboards/state/reducers.test.ts:354708423": [
+    "public/app/features/manage-dashboards/state/reducers.test.ts:4097685863": [
       [94, 25, 53, "Do not use any type assertions.", "3616064645"],
       [95, 23, 51, "Do not use any type assertions.", "2715348726"],
       [108, 25, 53, "Do not use any type assertions.", "3616064645"],
@@ -6208,7 +6218,7 @@ exports[`better eslint`] = {
       [125, 23, 51, "Do not use any type assertions.", "2715348726"],
       [128, 23, 71, "Do not use any type assertions.", "1935232832"]
     ],
-    "public/app/features/manage-dashboards/state/reducers.ts:2004505684": [
+    "public/app/features/manage-dashboards/state/reducers.ts:3417985415": [
       [58, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
       [68, 10, 21, "Do not use any type assertions.", "2133660528"],
       [76, 81, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -6370,8 +6380,8 @@ exports[`better eslint`] = {
       [32, 25, 3, "Unexpected any. Specify a different type.", "193409811"],
       [61, 22, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/plugins/admin/components/PluginDetailsBody.tsx:2575001007": [
-      [46, 35, 25, "Do not use any type assertions.", "3298329852"]
+    "public/app/features/plugins/admin/components/PluginDetailsBody.tsx:3199506957": [
+      [45, 35, 25, "Do not use any type assertions.", "3298329852"]
     ],
     "public/app/features/plugins/admin/components/PluginDetailsHeader.tsx:4233259": [
       [64, 48, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -6392,8 +6402,8 @@ exports[`better eslint`] = {
       [135, 28, 52, "Do not use any type assertions.", "963107955"],
       [177, 42, 56, "Do not use any type assertions.", "2128061450"]
     ],
-    "public/app/features/plugins/admin/helpers.ts:1783021315": [
-      [216, 5, 45, "Do not use any type assertions.", "2083447632"]
+    "public/app/features/plugins/admin/helpers.ts:2721255382": [
+      [215, 5, 45, "Do not use any type assertions.", "2083447632"]
     ],
     "public/app/features/plugins/admin/hooks/useHistory.tsx:3882862818": [
       [4, 22, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -6412,7 +6422,7 @@ exports[`better eslint`] = {
     "public/app/features/plugins/admin/pages/PluginDetails.test.tsx:186575126": [
       [85, 15, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/plugins/admin/pages/PluginDetails.tsx:2558474094": [
+    "public/app/features/plugins/admin/pages/PluginDetails.tsx:4160094062": [
       [43, 18, 32, "Do not use any type assertions.", "4000149916"],
       [87, 24, 20, "Do not use any type assertions.", "2850977225"]
     ],
@@ -6428,8 +6438,8 @@ exports[`better eslint`] = {
     "public/app/features/plugins/admin/state/selectors.ts:345773501": [
       [62, 23, 27, "Do not use any type assertions.", "1285719276"]
     ],
-    "public/app/features/plugins/admin/types.ts:804526334": [
-      [239, 10, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/plugins/admin/types.ts:593250396": [
+      [236, 10, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/plugins/built_in_plugins.ts:2973583336": [
       [93, 22, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -6533,16 +6543,16 @@ exports[`better eslint`] = {
     "public/app/features/profile/state/reducers.test.ts:1105044753": [
       [18, 15, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/query/components/QueryEditorRow.test.ts:4201471442": [
-      [7, 9, 60, "Do not use any type assertions.", "155833034"],
-      [50, 22, 101, "Do not use any type assertions.", "3734235969"],
-      [50, 22, 88, "Do not use any type assertions.", "3757401717"]
+    "public/app/features/query/components/QueryEditorRow.test.ts:589354782": [
+      [5, 9, 60, "Do not use any type assertions.", "155833034"],
+      [48, 22, 101, "Do not use any type assertions.", "3734235969"],
+      [48, 22, 88, "Do not use any type assertions.", "3757401717"]
     ],
-    "public/app/features/query/components/QueryEditorRow.tsx:209136238": [
-      [97, 22, 20, "Do not use any type assertions.", "2923490522"],
-      [144, 18, 46, "Do not use any type assertions.", "1673417097"],
-      [144, 18, 21, "Do not use any type assertions.", "1354497810"],
-      [356, 22, 40, "Do not use any type assertions.", "1350130209"]
+    "public/app/features/query/components/QueryEditorRow.tsx:3534885470": [
+      [95, 22, 20, "Do not use any type assertions.", "2923490522"],
+      [142, 18, 46, "Do not use any type assertions.", "1673417097"],
+      [142, 18, 21, "Do not use any type assertions.", "1354497810"],
+      [317, 22, 40, "Do not use any type assertions.", "1350130209"]
     ],
     "public/app/features/query/components/QueryEditorRowHeader.test.tsx:2607197828": [
       [99, 16, 32, "Do not use any type assertions.", "2255106576"]
@@ -6727,17 +6737,6 @@ exports[`better eslint`] = {
     "public/app/features/sandbox/TestStuffPage.tsx:3698683147": [
       [134, 30, 29, "Do not use any type assertions.", "3195381622"]
     ],
-    "public/app/features/search/components/DashboardSearch.test.tsx:3245889886": [
-      [18, 23, 33, "Do not use any type assertions.", "2540133228"],
-      [30, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [72, 14, 130, "Do not use any type assertions.", "3429995880"],
-      [75, 10, 3, "Unexpected any. Specify a different type.", "193409811"]
-    ],
-    "public/app/features/search/components/MoveToFolderModal.tsx:3435881653": [
-      [31, 21, 48, "Do not use any type assertions.", "646093117"],
-      [31, 93, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [64, 51, 15, "Do not use any type assertions.", "3135191849"]
-    ],
     "public/app/features/search/components/SearchCard.tsx:417509806": [
       [20, 36, 3, "Unexpected any. Specify a different type.", "193409811"],
       [116, 37, 32, "Do not use any type assertions.", "1966145380"],
@@ -6746,18 +6745,6 @@ exports[`better eslint`] = {
     "public/app/features/search/components/SearchItem.tsx:1278234167": [
       [15, 35, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/search/components/SearchResults.tsx:4264592788": [
-      [19, 35, 3, "Unexpected any. Specify a different type.", "193409811"]
-    ],
-    "public/app/features/search/hooks/useDashboardSearch.ts:2034499138": [
-      [61, 28, 32, "Do not use any type assertions.", "327142118"]
-    ],
-    "public/app/features/search/hooks/useManageDashboards.test.ts:3293235715": [
-      [31, 45, 41, "Do not use any type assertions.", "3856094708"],
-      [31, 45, 15, "Do not use any type assertions.", "363922340"],
-      [33, 43, 31, "Do not use any type assertions.", "2087413285"],
-      [33, 43, 13, "Do not use any type assertions.", "2146830713"]
-    ],
     "public/app/features/search/hooks/useSearchKeyboardSelection.ts:877924082": [
       [87, 24, 42, "Do not use any type assertions.", "3335657801"]
     ],
@@ -6789,32 +6776,13 @@ exports[`better eslint`] = {
       [62, 12, 21, "Do not use any type assertions.", "976337522"],
       [63, 14, 26, "Do not use any type assertions.", "2909521803"]
     ],
-    "public/app/features/search/page/components/columns.tsx:2440349722": [
-      [34, 20, 70, "Do not use any type assertions.", "512413936"],
-      [34, 21, 13, "Do not use any type assertions.", "3933930693"],
-      [34, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [49, 32, 21, "Do not use any type assertions.", "3454251755"],
-      [49, 50, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [145, 15, 56, "Do not use any type assertions.", "1375039711"]
-    ],
-    "public/app/features/search/reducers/dashboardSearch.test.ts:1813679195": [
-      [5, 66, 17, "Do not use any type assertions.", "3518965757"],
-      [5, 78, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [8, 42, 9, "Do not use any type assertions.", "3692209159"],
-      [8, 48, 3, "Unexpected any. Specify a different type.", "193409811"]
-    ],
-    "public/app/features/search/reducers/manageDashboards.test.ts:2083873033": [
-      [11, 26, 9, "Do not use any type assertions.", "3692209159"],
-      [11, 32, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [16, 43, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [17, 43, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [17, 77, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [23, 44, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [24, 44, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [24, 78, 3, "Unexpected any. Specify a different type.", "193409811"]
-    ],
-    "public/app/features/search/reducers/manageDashboards.ts:4114284001": [
-      [81, 11, 24, "Do not use any type assertions.", "1870559034"]
+    "public/app/features/search/page/components/columns.tsx:282017932": [
+      [33, 20, 70, "Do not use any type assertions.", "512413936"],
+      [33, 21, 13, "Do not use any type assertions.", "3933930693"],
+      [33, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [48, 32, 21, "Do not use any type assertions.", "3454251755"],
+      [48, 50, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [127, 15, 56, "Do not use any type assertions.", "1375039711"]
     ],
     "public/app/features/search/service/bluge.ts:59496993": [
       [21, 15, 68, "Do not use any type assertions.", "2766474629"],
@@ -7024,10 +6992,10 @@ exports[`better eslint`] = {
     "public/app/features/transformers/calculateHeatmap/editor/helper.ts:2898656130": [
       [10, 37, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/transformers/calculateHeatmap/heatmap.ts:3354697941": [
+    "public/app/features/transformers/calculateHeatmap/heatmap.ts:2895010613": [
       [65, 9, 52, "Do not use any type assertions.", "3480700880"],
-      [326, 63, 29, "Do not use any type assertions.", "255738422"],
-      [326, 89, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [306, 63, 29, "Do not use any type assertions.", "255738422"],
+      [306, 89, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/transformers/configFromQuery/ConfigFromQueryTransformerEditor.test.tsx:1060905279": [
       [44, 29, 21, "Do not use any type assertions.", "1548027068"]
@@ -7356,10 +7324,18 @@ exports[`better eslint`] = {
       [87, 60, 3, "Unexpected any. Specify a different type.", "193409811"],
       [88, 24, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/variables/inspect/utils.test.ts:1490985138": [
-      [346, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [1208, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [1707, 28, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/variables/inspect/utils.test.ts:554142034": [
+      [224, 11, 103, "Do not use any type assertions.", "2980842252"],
+      [224, 11, 89, "Do not use any type assertions.", "4144868007"],
+      [268, 11, 103, "Do not use any type assertions.", "2980842252"],
+      [268, 11, 89, "Do not use any type assertions.", "4144868007"],
+      [286, 11, 103, "Do not use any type assertions.", "2980842252"],
+      [286, 11, 89, "Do not use any type assertions.", "4144868007"],
+      [304, 11, 103, "Do not use any type assertions.", "2980842252"],
+      [304, 11, 89, "Do not use any type assertions.", "4144868007"],
+      [358, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [1220, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [1719, 28, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/features/variables/inspect/utils.ts:3863933569": [
       [62, 77, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -7402,11 +7378,11 @@ exports[`better eslint`] = {
     "public/app/features/variables/pickers/OptionsPicker/OptionPicker.test.tsx:2807633419": [
       [51, 15, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/variables/pickers/OptionsPicker/actions.test.ts:1831073775": [
-      [400, 15, 14, "Do not use any type assertions.", "241960896"],
-      [400, 24, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/features/variables/pickers/OptionsPicker/actions.test.ts:436404309": [
+      [365, 15, 14, "Do not use any type assertions.", "241960896"],
+      [365, 24, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/variables/pickers/OptionsPicker/actions.ts:4177332433": [
+    "public/app/features/variables/pickers/OptionsPicker/actions.ts:1878014439": [
       [79, 74, 3, "Unexpected any. Specify a different type.", "193409811"],
       [105, 61, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -7726,18 +7702,18 @@ exports[`better eslint`] = {
       [168, 77, 3, "Unexpected any. Specify a different type.", "193409811"],
       [168, 100, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/features/variables/utils.ts:724230159": [
+    "public/app/features/variables/utils.ts:3099442303": [
       [58, 42, 3, "Unexpected any. Specify a different type.", "193409811"],
       [74, 40, 3, "Unexpected any. Specify a different type.", "193409811"],
       [108, 41, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [161, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [174, 24, 30, "Do not use any type assertions.", "4095267826"],
-      [197, 41, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [197, 47, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [254, 42, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [254, 48, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [294, 44, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [305, 45, 9, "Do not use any type assertions.", "744351187"]
+      [145, 22, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [158, 24, 30, "Do not use any type assertions.", "4095267826"],
+      [181, 41, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [181, 47, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [238, 42, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [238, 48, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [278, 44, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [289, 45, 9, "Do not use any type assertions.", "744351187"]
     ],
     "public/app/plugins/datasource/alertmanager/ConfigEditor.tsx:2064418308": [
       [50, 36, 41, "Do not use any type assertions.", "3906591734"]
@@ -8284,7 +8260,7 @@ exports[`better eslint`] = {
       [1034, 11, 93, "Do not use any type assertions.", "2047151891"],
       [1037, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/elasticsearch/datasource.ts:2846413304": [
+    "public/app/plugins/datasource/elasticsearch/datasource.ts:1546021543": [
       [104, 55, 26, "Do not use any type assertions.", "3809377898"],
       [139, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
       [171, 13, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -9259,7 +9235,7 @@ exports[`better eslint`] = {
       [868, 15, 27, "Do not use any type assertions.", "2478144973"],
       [870, 9, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/loki/datasource.ts:1935613834": [
+    "public/app/plugins/datasource/loki/datasource.ts:979697429": [
       [219, 23, 3, "Unexpected any. Specify a different type.", "193409811"],
       [355, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
       [359, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -9407,10 +9383,10 @@ exports[`better eslint`] = {
       [51, 27, 3, "Unexpected any. Specify a different type.", "193409811"],
       [56, 19, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/mssql/response_parser.ts:3188817026": [
-      [7, 19, 44, "Do not use any type assertions.", "1721934533"],
-      [36, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [37, 19, 55, "Do not use any type assertions.", "52331741"]
+    "public/app/plugins/datasource/mssql/response_parser.ts:4040977456": [
+      [5, 19, 44, "Do not use any type assertions.", "1721934533"],
+      [37, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [38, 19, 55, "Do not use any type assertions.", "52331741"]
     ],
     "public/app/plugins/datasource/mssql/specs/datasource.test.ts:1031027185": [
       [11, 6, 59, "Do not use any type assertions.", "3685154675"],
@@ -9531,10 +9507,10 @@ exports[`better eslint`] = {
       [642, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
       [642, 30, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/mysql/response_parser.ts:2094461587": [
-      [7, 19, 44, "Do not use any type assertions.", "1721934533"],
-      [36, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [37, 19, 55, "Do not use any type assertions.", "52331741"]
+    "public/app/plugins/datasource/mysql/response_parser.ts:2781493345": [
+      [5, 19, 44, "Do not use any type assertions.", "1721934533"],
+      [37, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [38, 19, 55, "Do not use any type assertions.", "52331741"]
     ],
     "public/app/plugins/datasource/mysql/specs/datasource.test.ts:3991124757": [
       [19, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -9791,10 +9767,10 @@ exports[`better eslint`] = {
       [688, 24, 3, "Unexpected any. Specify a different type.", "193409811"],
       [688, 30, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/postgres/response_parser.ts:2167297341": [
-      [7, 19, 44, "Do not use any type assertions.", "1721934533"],
-      [36, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [37, 19, 55, "Do not use any type assertions.", "52331741"]
+    "public/app/plugins/datasource/postgres/response_parser.ts:2077296207": [
+      [5, 19, 44, "Do not use any type assertions.", "1721934533"],
+      [37, 45, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [38, 19, 55, "Do not use any type assertions.", "52331741"]
     ],
     "public/app/plugins/datasource/postgres/specs/datasource.test.ts:2366687477": [
       [19, 6, 59, "Do not use any type assertions.", "3685154675"],
@@ -10263,7 +10239,7 @@ exports[`better eslint`] = {
       [327, 27, 45, "Do not use any type assertions.", "881765776"],
       [330, 29, 45, "Do not use any type assertions.", "881765776"]
     ],
-    "public/app/plugins/datasource/prometheus/metric_find_query.test.ts:1350978765": [
+    "public/app/plugins/datasource/prometheus/metric_find_query.test.ts:142842024": [
       [12, 6, 59, "Do not use any type assertions.", "3685154675"],
       [12, 6, 49, "Do not use any type assertions.", "1184085652"],
       [18, 25, 178, "Do not use any type assertions.", "2743844758"],
@@ -10275,15 +10251,18 @@ exports[`better eslint`] = {
       [47, 5, 3, "Unexpected any. Specify a different type.", "193409811"],
       [59, 38, 3, "Unexpected any. Specify a different type.", "193409811"],
       [60, 42, 70, "Do not use any type assertions.", "164910658"],
-      [60, 42, 53, "Do not use any type assertions.", "1065771343"]
+      [60, 42, 53, "Do not use any type assertions.", "1065771343"],
+      [165, 21, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [216, 21, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [240, 21, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/prometheus/metric_find_query.ts:1417569751": [
+    "public/app/plugins/datasource/prometheus/metric_find_query.ts:3246701167": [
       [62, 70, 3, "Unexpected any. Specify a different type.", "193409811"],
       [83, 72, 3, "Unexpected any. Specify a different type.", "193409811"],
       [96, 72, 3, "Unexpected any. Specify a different type.", "193409811"],
       [122, 70, 3, "Unexpected any. Specify a different type.", "193409811"],
       [140, 43, 35, "Do not use any type assertions.", "2712117061"],
-      [188, 70, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [175, 70, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/plugins/datasource/prometheus/query_hints.test.ts:3821515673": [
       [45, 23, 28, "Do not use any type assertions.", "252196522"]
@@ -10348,20 +10327,20 @@ exports[`better eslint`] = {
       [163, 25, 27, "Do not use any type assertions.", "3051431932"],
       [163, 49, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx:2056401604": [
-      [67, 23, 155, "Do not use any type assertions.", "2419762696"],
-      [67, 23, 128, "Do not use any type assertions.", "1950878359"],
-      [71, 19, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [83, 23, 63, "Do not use any type assertions.", "168255657"],
-      [83, 23, 36, "Do not use any type assertions.", "381764118"],
-      [83, 56, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [112, 23, 92, "Do not use any type assertions.", "511072900"],
-      [112, 23, 65, "Do not use any type assertions.", "791801755"],
-      [112, 85, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [115, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [119, 23, 87, "Do not use any type assertions.", "1044305842"],
-      [119, 23, 60, "Do not use any type assertions.", "4026468781"],
-      [119, 80, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilterItem.tsx:3990888924": [
+      [65, 23, 155, "Do not use any type assertions.", "2419762696"],
+      [65, 23, 128, "Do not use any type assertions.", "1950878359"],
+      [69, 19, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [80, 23, 63, "Do not use any type assertions.", "168255657"],
+      [80, 23, 36, "Do not use any type assertions.", "381764118"],
+      [80, 56, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [108, 23, 92, "Do not use any type assertions.", "511072900"],
+      [108, 23, 65, "Do not use any type assertions.", "791801755"],
+      [108, 85, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [111, 30, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [115, 23, 87, "Do not use any type assertions.", "1044305842"],
+      [115, 23, 60, "Do not use any type assertions.", "4026468781"],
+      [115, 80, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/plugins/datasource/prometheus/querybuilder/shared/LabelFilters.tsx:1456752614": [
       [36, 15, 38, "Do not use any type assertions.", "1544016021"]
@@ -10817,15 +10796,15 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/barchart/TickSpacingEditor.tsx:335508426": [
       [28, 69, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/panel/barchart/bars.ts:3843272290": [
+    "public/app/plugins/panel/barchart/bars.ts:4025264055": [
       [51, 58, 3, "Unexpected any. Specify a different type.", "193409811"],
       [53, 42, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [414, 7, 17, "Do not use any type assertions.", "3632921021"],
-      [469, 23, 11, "Do not use any type assertions.", "319541530"],
-      [469, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [471, 23, 11, "Do not use any type assertions.", "319541530"],
-      [471, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [479, 22, 33, "Do not use any type assertions.", "3146060940"]
+      [409, 7, 17, "Do not use any type assertions.", "3632921021"],
+      [464, 23, 11, "Do not use any type assertions.", "319541530"],
+      [464, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [466, 23, 11, "Do not use any type assertions.", "319541530"],
+      [466, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [474, 22, 33, "Do not use any type assertions.", "3146060940"]
     ],
     "public/app/plugins/panel/barchart/module.tsx:780565076": [
       [70, 95, 9, "Do not use any type assertions.", "3692209159"],
@@ -10868,8 +10847,8 @@ exports[`better eslint`] = {
       [102, 16, 9, "Do not use any type assertions.", "3692209159"],
       [102, 22, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/panel/bargauge/BarGaugePanel.tsx:2584207123": [
-      [112, 75, 3, "Unexpected any. Specify a different type.", "193409811"]
+    "public/app/plugins/panel/bargauge/BarGaugePanel.tsx:3184205061": [
+      [114, 75, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/plugins/panel/candlestick/CandlestickPanel.tsx:3928129934": [
       [116, 26, 33, "Do not use any type assertions.", "1940217301"],
@@ -10930,9 +10909,10 @@ exports[`better eslint`] = {
       [41, 64, 3, "Unexpected any. Specify a different type.", "193409811"],
       [41, 69, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/panel/canvas/editor/LayerElementListEditor.tsx:2123096129": [
+    "public/app/plugins/panel/canvas/editor/LayerElementListEditor.tsx:2866351070": [
       [21, 33, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [40, 30, 44, "Do not use any type assertions.", "712744497"]
+      [40, 30, 44, "Do not use any type assertions.", "712744497"],
+      [50, 20, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/plugins/panel/canvas/editor/PlacementEditor.tsx:1494111960": [
       [33, 53, 3, "Unexpected any. Specify a different type.", "193409811"]
@@ -11654,15 +11634,14 @@ exports[`better eslint`] = {
     "public/app/plugins/panel/heatmap/fields.test.ts:2095719388": [
       [7, 32, 18, "Do not use any type assertions.", "739464119"]
     ],
-    "public/app/plugins/panel/heatmap/migrations.test.ts:22150861": [
-      [15, 18, 16, "Do not use any type assertions.", "388222280"],
-      [96, 8, 16, "Do not use any type assertions.", "388222280"],
-      [108, 8, 16, "Do not use any type assertions.", "388222280"]
+    "public/app/plugins/panel/heatmap/migrations.test.ts:1017455994": [
+      [15, 15, 3, "Unexpected any. Specify a different type.", "193409811"],
+      [18, 18, 16, "Do not use any type assertions.", "388222280"]
     ],
-    "public/app/plugins/panel/heatmap/migrations.ts:1677424344": [
+    "public/app/plugins/panel/heatmap/migrations.ts:2547355944": [
       [43, 47, 3, "Unexpected any. Specify a different type.", "193409811"],
-      [129, 22, 27, "Do not use any type assertions.", "3349635193"],
-      [162, 21, 3, "Unexpected any. Specify a different type.", "193409811"]
+      [128, 22, 27, "Do not use any type assertions.", "3349635193"],
+      [161, 21, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
     "public/app/plugins/panel/heatmap/module.tsx:3365492927": [
       [27, 16, 30, "Do not use any type assertions.", "3478399522"],
@@ -11675,29 +11654,29 @@ exports[`better eslint`] = {
       [87, 39, 23, "Do not use any type assertions.", "3906212682"],
       [87, 59, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/panel/heatmap/utils.ts:2227722730": [
+    "public/app/plugins/panel/heatmap/utils.ts:215809412": [
       [260, 23, 53, "Do not use any type assertions.", "4087268626"],
       [287, 49, 51, "Do not use any type assertions.", "4216242190"],
       [287, 49, 28, "Do not use any type assertions.", "1631991143"],
-      [488, 14, 190, "Do not use any type assertions.", "4120382085"],
-      [499, 14, 55, "Do not use any type assertions.", "2123957774"],
-      [499, 14, 43, "Do not use any type assertions.", "3195961945"],
-      [642, 19, 27, "Do not use any type assertions.", "3603045978"],
-      [642, 19, 15, "Do not use any type assertions.", "3099372941"],
-      [643, 19, 27, "Do not use any type assertions.", "3664280731"],
-      [643, 19, 15, "Do not use any type assertions.", "2963010956"],
-      [644, 23, 27, "Do not use any type assertions.", "1493467224"],
-      [644, 23, 15, "Do not use any type assertions.", "2572578447"],
-      [750, 25, 30, "Do not use any type assertions.", "1186575399"],
-      [750, 25, 16, "Do not use any type assertions.", "1728826198"],
-      [822, 22, 27, "Do not use any type assertions.", "3603045978"],
-      [822, 22, 15, "Do not use any type assertions.", "3099372941"],
-      [823, 22, 27, "Do not use any type assertions.", "3664280731"],
-      [823, 22, 15, "Do not use any type assertions.", "2963010956"],
-      [824, 22, 27, "Do not use any type assertions.", "1493467224"],
-      [824, 22, 15, "Do not use any type assertions.", "2572578447"],
-      [825, 23, 27, "Do not use any type assertions.", "1554701977"],
-      [825, 23, 15, "Do not use any type assertions.", "2436216462"]
+      [476, 14, 190, "Do not use any type assertions.", "4120382085"],
+      [487, 14, 55, "Do not use any type assertions.", "2123957774"],
+      [487, 14, 43, "Do not use any type assertions.", "3195961945"],
+      [630, 19, 27, "Do not use any type assertions.", "3603045978"],
+      [630, 19, 15, "Do not use any type assertions.", "3099372941"],
+      [631, 19, 27, "Do not use any type assertions.", "3664280731"],
+      [631, 19, 15, "Do not use any type assertions.", "2963010956"],
+      [632, 23, 27, "Do not use any type assertions.", "1493467224"],
+      [632, 23, 15, "Do not use any type assertions.", "2572578447"],
+      [738, 25, 30, "Do not use any type assertions.", "1186575399"],
+      [738, 25, 16, "Do not use any type assertions.", "1728826198"],
+      [810, 22, 27, "Do not use any type assertions.", "3603045978"],
+      [810, 22, 15, "Do not use any type assertions.", "3099372941"],
+      [811, 22, 27, "Do not use any type assertions.", "3664280731"],
+      [811, 22, 15, "Do not use any type assertions.", "2963010956"],
+      [812, 22, 27, "Do not use any type assertions.", "1493467224"],
+      [812, 22, 15, "Do not use any type assertions.", "2572578447"],
+      [813, 23, 27, "Do not use any type assertions.", "1554701977"],
+      [813, 23, 15, "Do not use any type assertions.", "2436216462"]
     ],
     "public/app/plugins/panel/histogram/Histogram.tsx:3993177092": [
       [130, 31, 3, "Unexpected any. Specify a different type.", "193409811"],
@@ -11742,8 +11721,8 @@ exports[`better eslint`] = {
       [100, 16, 495, "Do not use any type assertions.", "2521048876"],
       [100, 16, 477, "Do not use any type assertions.", "1400793553"]
     ],
-    "public/app/plugins/panel/logs/LogsPanel.tsx:1594220909": [
-      [93, 41, 28, "Do not use any type assertions.", "3428864287"]
+    "public/app/plugins/panel/logs/LogsPanel.tsx:4080293044": [
+      [95, 41, 28, "Do not use any type assertions.", "3428864287"]
     ],
     "public/app/plugins/panel/news/utils.test.ts:1075350837": [
       [25, 24, 2416, "Do not use any type assertions.", "1190328332"]
@@ -11815,7 +11794,7 @@ exports[`better eslint`] = {
       [194, 16, 3, "Unexpected any. Specify a different type.", "193409811"],
       [256, 16, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
-    "public/app/plugins/panel/piechart/PieChart.tsx:3082793434": [
+    "public/app/plugins/panel/piechart/PieChart.tsx:1361550264": [
       [201, 12, 3, "Unexpected any. Specify a different type.", "193409811"],
       [217, 12, 3, "Unexpected any. Specify a different type.", "193409811"]
     ],
@@ -12511,18 +12490,12 @@ exports[`no undocumented stories`] = {
     "packages/grafana-ui/src/components/PanelChrome/PanelChrome.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
-    "packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx:5381": [
-      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
-    ],
     "packages/grafana-ui/src/components/QueryField/QueryField.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
     "packages/grafana-ui/src/components/RefreshPicker/RefreshPicker.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
-    "packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx:5381": [
-      [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
-    ],
     "packages/grafana-ui/src/components/SecretTextArea/SecretTextArea.story.tsx:5381": [
       [0, 0, 0, "No undocumented stories are allowed, please add an .mdx file with some documentation", "5381"]
     ],
diff --git a/.betterer.ts b/.betterer.ts
index 9553bd4621f..236d57b7286 100644
--- a/.betterer.ts
+++ b/.betterer.ts
@@ -1,28 +1,18 @@
 import { regexp } from '@betterer/regexp';
-import { eslint } from '@betterer/eslint';
 import { BettererFileTest } from '@betterer/betterer';
+import { ESLint, Linter } from 'eslint';
+import { existsSync } from 'fs';
 
 export default {
   'no enzyme tests': () => regexp(/from 'enzyme'/g).include('**/*.test.*'),
-  'better eslint': () =>
-    eslint({
-      '@typescript-eslint/no-explicit-any': 'error',
-      '@typescript-eslint/consistent-type-assertions': [
-        'error',
-        {
-          assertionStyle: 'never',
-        },
-      ],
-    }).include('**/*.{ts,tsx}'),
-  'no undocumented stories': () => countUndocumentedStories().include('**/*.{story.tsx,mdx}'),
+  'better eslint': () => countEslintErrors().include('**/*.{ts,tsx}'),
+  'no undocumented stories': () => countUndocumentedStories().include('**/*.story.tsx'),
 };
 
 function countUndocumentedStories() {
   return new BettererFileTest(async (filePaths, fileTestResult) => {
-    const storyFilePaths = filePaths.filter((filePath) => filePath.endsWith('story.tsx'));
-    const mdxFilePaths = filePaths.filter((filePath) => filePath.endsWith('mdx'));
-    storyFilePaths.forEach((filePath) => {
-      if (!mdxFilePaths.includes(filePath.replace(/\.story.tsx$/, '.mdx'))) {
+    filePaths.forEach((filePath) => {
+      if (!existsSync(filePath.replace(/\.story.tsx$/, '.mdx'))) {
         // In this case the file contents don't matter:
         const file = fileTestResult.addFile(filePath, '');
         // Add the issue to the first character of the file:
@@ -31,3 +21,49 @@ function countUndocumentedStories() {
     });
   });
 }
+
+function countEslintErrors() {
+  return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
+    const { baseDirectory } = resolver;
+    const cli = new ESLint({ cwd: baseDirectory });
+
+    await Promise.all(
+      filePaths.map(async (filePath) => {
+        const linterOptions = (await cli.calculateConfigForFile(filePath)) as Linter.Config;
+
+        const rules: Partial<Linter.RulesRecord> = {
+          '@typescript-eslint/no-explicit-any': 'error',
+        };
+
+        if (!filePath.endsWith('.test.tsx') && !filePath.endsWith('.test.ts')) {
+          rules['@typescript-eslint/consistent-type-assertions'] = [
+            'error',
+            {
+              assertionStyle: 'never',
+            },
+          ];
+        }
+
+        const runner = new ESLint({
+          baseConfig: {
+            ...linterOptions,
+            rules,
+          },
+          useEslintrc: false,
+          cwd: baseDirectory,
+        });
+
+        const lintResults = await runner.lintFiles([filePath]);
+        lintResults
+          .filter((lintResult) => lintResult.source)
+          .forEach((lintResult) => {
+            const { messages } = lintResult;
+            const file = fileTestResult.addFile(filePath, '');
+            messages.forEach((message, index) => {
+              file.addIssue(0, 0, message.message, `${index}`);
+            });
+          });
+      })
+    );
+  });
+}
diff --git a/.drone.yml b/.drone.yml
index 9dac0630448..41e6ed13ffc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -91,7 +91,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -197,7 +197,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -243,7 +243,6 @@ steps:
       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
   depends_on:
   - gen-version
   - wire-install
@@ -455,7 +454,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -542,7 +541,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -632,7 +631,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -721,7 +720,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -789,7 +788,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -884,7 +883,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -979,7 +978,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin
+  - ./bin/grabpl build-plugins --jobs 8 --edition oss
   depends_on:
   - gen-version
   - yarn-install
@@ -1230,7 +1229,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
+  - ./bin/grabpl upload-packages --edition oss
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -1247,7 +1246,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition oss
   depends_on:
   - grafana-server
   environment:
@@ -1308,7 +1307,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1398,7 +1397,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -1486,10 +1485,16 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
+- commands:
+  - ./bin/grabpl gen-version --build-id ${DRONE_BUILD_NUMBER}
+  depends_on:
+  - grabpl
+  image: grafana/build-container:1.5.7
+  name: gen-version
 - commands:
   - echo $DRONE_RUNNER_NAME
   image: alpine:3.15
@@ -1571,7 +1576,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -1628,7 +1633,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin
+  - ./bin/grabpl build-plugins --jobs 8 --edition oss
   depends_on:
   - gen-version
   - yarn-install
@@ -1778,8 +1783,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss --src-bucket "$${PRERELEASE_BUCKET}" --src-dir
-    artifacts/static-assets
+  - ./bin/grabpl upload-cdn --edition oss
   depends_on:
   - grafana-server
   environment:
@@ -1790,7 +1794,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.1
   name: upload-cdn-assets
 - commands:
-  - ./bin/grabpl upload-packages --edition oss --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
+  - ./bin/grabpl upload-packages --edition oss
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -1869,7 +1873,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2004,7 +2008,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2098,7 +2102,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -2157,7 +2161,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2244,7 +2248,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin
+  - ./bin/grabpl build-plugins --jobs 8 --edition enterprise
   depends_on:
   - gen-version
   - yarn-install
@@ -2393,8 +2397,7 @@ steps:
     - success
     - failure
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "$${PRERELEASE_BUCKET}"
-    --src-dir artifacts/static-assets
+  - ./bin/grabpl upload-cdn --edition enterprise
   depends_on:
   - package
   environment:
@@ -2405,7 +2408,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.1
   name: upload-cdn-assets
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads
+  - ./bin/grabpl upload-packages --edition enterprise
   depends_on:
   - package
   environment:
@@ -2446,8 +2449,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: package-enterprise2
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "$${PRERELEASE_BUCKET}"
-    --src-dir artifacts/static-assets
+  - ./bin/grabpl upload-cdn --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -2458,7 +2460,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.1
   name: upload-cdn-assets-enterprise2
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket $${PRERELEASE_BUCKET}/artifacts/downloads-enterprise2
+  - ./bin/grabpl upload-packages --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -2505,7 +2507,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2688,7 +2690,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2830,7 +2832,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -2905,7 +2907,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -2983,7 +2985,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3044,7 +3046,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3123,7 +3125,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3185,7 +3187,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3223,7 +3225,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3261,7 +3263,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3317,7 +3319,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3365,7 +3367,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3414,7 +3416,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3471,7 +3473,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition oss --sign --signing-admin
+  - ./bin/grabpl build-plugins --jobs 8 --edition oss
   depends_on:
   - gen-version
   - yarn-install
@@ -3621,7 +3623,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
-  - ./bin/grabpl upload-cdn --edition oss --src-bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition oss
   depends_on:
   - grafana-server
   environment:
@@ -3635,7 +3637,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-packages --edition oss --packages-bucket grafana-downloads
+  - ./bin/grabpl upload-packages --edition oss
   depends_on:
   - end-to-end-tests-dashboards-suite
   - end-to-end-tests-panels-suite
@@ -3682,7 +3684,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.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3811,7 +3813,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -3899,7 +3901,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe
     -OutFile grabpl.exe
   image: grafana/ci-wix:0.1.1
   name: windows-init
@@ -3947,7 +3949,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4032,7 +4034,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-frontend-packages
 - commands:
-  - ./bin/grabpl build-plugins --jobs 8 --edition enterprise --sign --signing-admin
+  - ./bin/grabpl build-plugins --jobs 8 --edition enterprise
   depends_on:
   - gen-version
   - yarn-install
@@ -4193,7 +4195,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: build-storybook
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise --src-bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition enterprise
   depends_on:
   - package
   environment:
@@ -4207,7 +4209,7 @@ steps:
     repo:
     - grafana/grafana
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise --packages-bucket grafana-downloads
+  - ./bin/grabpl upload-packages --edition enterprise
   depends_on:
   - package
   environment:
@@ -4241,7 +4243,7 @@ steps:
   image: grafana/build-container:1.5.7
   name: package-enterprise2
 - commands:
-  - ./bin/grabpl upload-cdn --edition enterprise2 --src-bucket "grafana-static-assets"
+  - ./bin/grabpl upload-cdn --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -4252,7 +4254,7 @@ steps:
   image: grafana/grafana-ci-deploy:1.3.1
   name: upload-cdn-assets-enterprise2
 - commands:
-  - ./bin/grabpl upload-packages --edition enterprise2 --packages-bucket grafana-downloads-enterprise2
+  - ./bin/grabpl upload-packages --edition enterprise2
   depends_on:
   - package-enterprise2
   environment:
@@ -4293,7 +4295,7 @@ services: []
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4467,7 +4469,7 @@ services:
 steps:
 - commands:
   - mkdir -p bin
-  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/grabpl
+  - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/grabpl
   - chmod +x bin/grabpl
   image: byrnedo/alpine-curl:0.1.8
   name: grabpl
@@ -4600,7 +4602,7 @@ steps:
   name: identify-runner
 - commands:
   - $$ProgressPreference = "SilentlyContinue"
-  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.50/windows/grabpl.exe
+  - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.52/windows/grabpl.exe
     -OutFile grabpl.exe
   - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
   - cd grafana-enterprise
@@ -4797,6 +4799,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 12fbd61337ed1ae006e8c0ff71d1290e27b5910211369cdd47e1d604afd9befa
+hmac: b885bb4e5374691a66b4fa8c6f53cdcebeef573895ea629d4e8b0af715573cea
 
 ...
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 058656c2d25..ad9fff7905b 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -31,9 +31,9 @@ go.sum @grafana/backend-platform
 /pkg/build/ @grafana/grafana-release-eng
 
 # Cloud Datasources backend code
-/pkg/tsdb/cloudwatch @grafana/cloud-datasources
-/pkg/tsdb/azuremonitor @grafana/cloud-datasources
-/pkg/tsdb/cloudmonitoring @grafana/cloud-datasources
+/pkg/tsdb/cloudwatch @grafana/aws-plugins
+/pkg/tsdb/azuremonitor @grafana/cloud-provider-plugins
+/pkg/tsdb/cloudmonitoring @grafana/cloud-provider-plugins
 
 # Observability backend code
 /pkg/tsdb/prometheus @grafana/observability-metrics
@@ -108,6 +108,7 @@ pkg/tsdb/testdatasource/sims/ @grafana/grafana-edge-squad
 /public/app/features/comments/ @grafana/grafana-edge-squad
 /public/app/features/dimensions/ @grafana/grafana-edge-squad
 /public/app/features/geo/ @grafana/grafana-edge-squad
+/public/app/features/storage/ @grafana/grafana-edge-squad
 /public/app/features/live/ @grafana/grafana-edge-squad
 /public/app/features/explore/ @grafana/observability-experience-squad
 /public/app/features/plugins @grafana/plugins-platform-frontend
@@ -148,9 +149,9 @@ lerna.json @grafana/frontend-ops
 *.mdx @marcusolsson @jessover9000 @grafana/plugins-platform-frontend
 
 # Core datasources
-/public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources
+/public/app/plugins/datasource/cloudwatch @grafana/aws-plugins
 /public/app/plugins/datasource/elasticsearch @grafana/observability-logs-and-traces
-/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/cloud-datasources
+/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/cloud-provider-plugins
 /public/app/plugins/datasource/graphite @grafana/observability-metrics
 /public/app/plugins/datasource/influxdb @grafana/observability-metrics
 /public/app/plugins/datasource/jaeger @grafana/observability-logs-and-traces
@@ -160,7 +161,7 @@ lerna.json @grafana/frontend-ops
 /public/app/plugins/datasource/opentsdb @grafana/backend-platform
 /public/app/plugins/datasource/postgres @grafana/grafana-bi-squad
 /public/app/plugins/datasource/prometheus @grafana/observability-metrics
-/public/app/plugins/datasource/cloud-monitoring @grafana/cloud-datasources
+/public/app/plugins/datasource/cloud-monitoring @grafana/cloud-provider-plugins
 /public/app/plugins/datasource/zipkin @grafana/observability-logs-and-traces
 /public/app/plugins/datasource/tempo @grafana/observability-logs-and-traces
 /public/app/plugins/datasource/alertmanager @grafana/alerting-squad
diff --git a/.github/workflows/doc-validator.yml b/.github/workflows/doc-validator.yml
new file mode 100644
index 00000000000..63a2ef54dcb
--- /dev/null
+++ b/.github/workflows/doc-validator.yml
@@ -0,0 +1,16 @@
+name: "doc-validator"
+on:
+  pull_request:
+    paths: ["docs/sources/**"]
+  workflow_dispatch:
+jobs:
+  doc-validator:
+    runs-on: "ubuntu-latest"
+    container:
+      image: "grafana/doc-validator:latest"
+    steps:
+      - name: "Checkout code"
+        uses: "actions/checkout@v3"
+      - name: "Run doc-validator tool"
+        # Ensure that the CI always passes until all errors are resolved.
+        run: "doc-validator ./docs/sources || true"
diff --git a/contribute/architecture/backend/communication.md b/contribute/architecture/backend/communication.md
index f59f598cdf5..151da5978fc 100644
--- a/contribute/architecture/backend/communication.md
+++ b/contribute/architecture/backend/communication.md
@@ -2,9 +2,95 @@
 
 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.
+## Commands and queries
 
-There are three types of messages: _events_, _commands_, and _queries_.
+Grafana structures arguments to [services](services.md) using a command/query
+separation where commands are instructions for a mutation and queries retrieve
+records from a service.
+
+Services should define their methods as `func[T, U any](ctx context.Context, args T) (U, error)`.
+
+Each function should take two arguments. First, a `context.Context` that
+carries information about the tracing span, cancellation, and similar
+runtime information that might be relevant to the call. Secondly, `T` is
+a `struct` defined in the service's root package (see the instructions
+for [package hierarchy](package-hierarchy.md)) that contains zero or
+more arguments that can be passed to the method.
+
+The return values is more flexible, and may consist of none, one, or two
+values. If there are two values returned, the second value should be
+either an `bool` or `error` indicating the success or failure of the
+call. The first value `U` carries a value of any exported type that
+makes sense for the service.
+
+Following is an example of an interface providing method signatures for
+some calls adhering to these guidelines:
+
+```
+type Alphabetical interface {
+  // GetLetter returns either an error or letter.
+  GetLetter(context.Context, GetLetterQuery) (Letter, error)
+  // ListCachedLetters cannot fail, and doesn't return an error.
+  ListCachedLetters(context.Context, ListCachedLettersQuery) Letters
+  // DeleteLetter doesn't have any return values other than errors, so it
+  // returns only an error.
+  DeleteLetter(context.Contxt, DeleteLetterCommand) error
+}
+```
+
+> Because we request an operation to be performed, command are written in imperative mood, such as `CreateFolderCommand`, `GetDashboardQuery` and `DeletePlaylistCommand`.
+
+The use of complex types for arguments in Go means a few different
+things for us, it provides us with the equivalent of named parameters
+from other languages, and it reduces the headache of figuring out which
+argument is which that often occurs with three or more arguments.
+
+On the flip-side, it means that all input parameters are optional and
+that it is up to the programmer to make sure that the zero value is
+useful or at least safe for all fields and that while it's easy to add
+another field, if that field must be set for the correct function of the
+service that is not detectable at compile time.
+
+### Queries with Result fields
+
+Some queries have a Result field that is mutated and populated by the
+method being called. This is a remainder from when the _bus_ was used
+for sending commands and queries as well as for events.
+
+All bus commands and queries had to implement the Go type
+`func(ctx context.Context, msg interface{}) error`
+and mutation of the `msg` variable or returning structured information in
+`error` were the two most convenient ways to communicate with the caller.
+
+All `Result` fields should be refactored so that they are returned from
+the query method:
+
+```
+type GetQuery struct {
+  Something int
+
+  Result ResultType
+}
+
+func (s *Service) Get(ctx context.Context, cmd *GetQuery) error {
+  // ...do something
+  cmd.Result = result
+  return nil
+}
+```
+
+should become
+
+```
+type GetQuery struct {
+  Something int
+}
+
+func (s *Service) Get(ctx context.Context, cmd GetQuery) (ResultType, error) {
+  // ...do something
+  return result, nil
+}
+```
 
 ## Events
 
@@ -44,92 +130,3 @@ if err := s.bus.Publish(event); err != nil {
     return err
 }
 ```
-
-## Commands
-
-A command is a request for an action to be taken. Unlike an event's fire-and-forget approach, a command can fail as it is handled. The handler will then return an error.
-
-> Because we request an operation to be performed, command are written in imperative mood, such as `CreateFolderCommand`, and `DeletePlaylistCommand`.
-
-### Dispatch a command
-
-To dispatch a command, pass the `context.Context` and object to the `DispatchCtx` method:
-
-```go
-// context.Context from caller
-ctx := req.Request.Context()
-cmd := &models.SendStickersCommand {
-    UserID: "taylor",
-    Count: 1,
-}
-if err := s.bus.DispatchCtx(ctx, cmd); err != nil {
-  if err == bus.ErrHandlerNotFound {
-    return nil
-  }
-  return err
-}
-```
-
-> **Note:** `DispatchCtx` will return an error if no handler is registered for that command.
-
-> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
-
-**Tip:** Browse the available commands in the `models` package.
-
-### Handle commands
-
-Let other parts of the application dispatch commands to a service, by registering a _command handler_:
-
-To handle a command, register a command handler in the `Init` function.
-
-```go
-func (s *MyService) Init() error {
-    s.bus.AddHandlerCtx(s.SendStickers)
-    return nil
-}
-
-func (s *MyService) SendStickers(ctx context.Context, cmd *models.SendStickersCommand) error {
-    // ...
-}
-```
-
-> **Note:** The handler method may return an error if unable to complete the command.
-
-> **Note:** `AddHandler` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
-
-## Queries
-
-A command handler can optionally populate the command sent to it. This pattern is commonly used to implement _queries_.
-
-### Making a query
-
-To make a query, dispatch the query instance just like you would a command. When the `DispatchCtx` method returns, the `Results` field contains the result of the query.
-
-```go
-// context.Context from caller
-ctx := req.Request.Context()
-query := &models.FindDashboardQuery{
-    ID: "foo",
-}
-if err := bus.Dispatch(ctx, query); err != nil {
-    return err
-}
-// The query now contains a result.
-for _, item := range query.Results {
-    // ...
-}
-```
-
-> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
-
-### Return query results
-
-To return results for a query, set any of the fields on the query argument before returning:
-
-```go
-func (s *MyService) FindDashboard(ctx context.Context, query *models.FindDashboardQuery) error {
-    // ...
-    query.Result = dashboard
-    return nil
-}
-```
diff --git a/contribute/architecture/backend/errors.md b/contribute/architecture/backend/errors.md
new file mode 100644
index 00000000000..fa02090b6d8
--- /dev/null
+++ b/contribute/architecture/backend/errors.md
@@ -0,0 +1,81 @@
+# Errors
+
+Grafana introduced its own error type `github.com/grafana/grafana/pkg/util/errutil.Error`
+in June 2022. It's built on top of the Go `error` interface extended to
+contain all the information necessary by Grafana to handle errors in an
+informative and safe way.
+
+Previously, Grafana has passed around regular Go errors and have had to
+rely on bespoke solutions in API handlers to communicate informative
+messages to the end-user. With the new `errutil.Error`, the API handlers
+can be slimmed as information about public messaging, structured data
+related to the error, localization metadata, log level, HTTP status
+code, and so forth are carried by the error.
+
+## Basic use
+
+### Declaring errors
+
+For a service, declare the different categories of errors that may occur
+from your service (this corresponds to what you might want to have
+specific public error messages or their templates for) by globally
+constructing variables using the `errutil.NewBase(status, messageID, opts...)`
+function.
+
+The status code loosely corresponds to HTTP status codes and provides a
+default log level for errors to ensure that the request logging is
+properly informing administrators about various errors occurring in
+Grafana (e.g. `StatusBadRequest` is generally speaking not as relevant
+as `StatusInternal`). All available status codes live in the `errutil`
+package and have names starting with `Status`.
+
+The messageID is constructed as `<servicename>.<error-identifier>` where
+the `<servicename>` corresponds to the root service directory per
+[the package hierarchy](package-hierarchy.md) and `<error-identifier>`
+is a short identifier using dashes for word separation that identifies
+the specific category of errors within the service.
+
+To set a static message sent to the client when the error occurs, the
+`errutil.WithPublicMessage(message string)` option may be appended to
+the NewBase function call. For dynamic messages or more options, refer
+to the `errutil` package's GoDocs.
+
+Errors are then constructed using the `Base.Errorf` method, which
+functions like the [fmt.Errorf](https://pkg.go.dev/fmt#Errorf) method
+except that it creates an `errutil.Error`.
+
+```go
+package main
+
+import (
+  "errors"
+  "github.com/grafana/grafana/pkg/util/errutil"
+  "example.org/thing"
+)
+
+var ErrBaseNotFound = errutil.NewBase(errutil.StatusNotFound, "main.not-found", errutil.WithPublicMessage("Thing not found"))
+
+func Look(id int) (*Thing, error) {
+  t, err := thing.GetByID(id)
+  if errors.Is(err, thing.ErrNotFound) {
+    return nil, ErrBaseNotFound.Errorf("did not find thing with ID %d: %w", id, err)
+  }
+
+  return t, nil
+}
+```
+
+Check out [errutil's GoDocs](https://pkg.go.dev/github.com/grafana/grafana@v0.0.0-20220621133844-0f4fc1290421/pkg/util/errutil)
+for details on how to construct and use Grafana style errors.
+
+### Handling errors in the API
+
+API handlers use the `github.com/grafana/grafana/pkg/api/response.Err`
+function to create responses based on `errutil.Error`s.
+
+> **Note:** (@sakjur 2022-06) `response.Err` requires all errors to be
+> `errutil.Error` or it'll be considered an internal server error.
+> This is something that should be fixed in the near future to allow
+> fallback behavior to make it possible to correctly handle Grafana
+> style errors if they're present but allow fallback to a reasonable
+> default otherwise.
diff --git a/contribute/architecture/backend/package-hierarchy.md b/contribute/architecture/backend/package-hierarchy.md
index d940910cdd0..7f52da3682e 100644
--- a/contribute/architecture/backend/package-hierarchy.md
+++ b/contribute/architecture/backend/package-hierarchy.md
@@ -1,16 +1,217 @@
 # Package hierarchy
 
-The Go package hierarchy in Grafana should be organized logically (Ben Johnson's
-[article](https://medium.com/@benbjohnson/standard-package-layout-7cdbc8391fc1) served as inspiration), according to the
-following principles:
+The Go packages in Grafana should be packaged by feature, keeping
+packages as small as reasonable while retaining a clear sole ownership
+of a single domain.
 
-- Domain types and interfaces should be in "root" packages (not necessarily at the very top, of the hierarchy, but
-  logical roots)
-- Sub-packages should depend on roots - sub-packages here typically contain implementations, for example of services
+[Ben Johnson's standard package layout](https://medium.com/@benbjohnson/standard-package-layout-7cdbc8391fc1) serves as
+inspiration for the way we organize packages.
+
+## Principles of how to structure a service in Grafana
+
+[](services.md)
+
+### Domain types and interfaces should be in local "root" packages
+
+Let's say you're creating a _tea pot_ service, place everything another
+service needs to interact with the tea pot service in
+_pkg/services/teapot_, choosing a name according to
+[Go's package naming conventions](https://go.dev/blog/package-names).
+
+Typically, you'd have one or more interfaces that your service provides
+in the root package along with any types, errors, and other constants
+that makes sense for another service interacting with this service to
+use.
+
+Avoid depending on other services when structuring the root package to
+reduce the risk of running into circular dependencies.
+
+### Sub-packages should depend on roots, not the other way around
+
+Small-to-medium sized packages should be able to have only a single
+sub-package containing the implementation of the service. By moving the
+implementation into a separate package we reduce the risk of triggering
+circular dependencies (in Go, circular dependencies are evaluated per
+package and this structure logically moves it to be per type or function
+declaration).
+
+Large packages may need utilize multiple sub-packages at the discretion
+of the implementor. Keep interfaces and domain types to the root
+package.
+
+### Try to name sub-packages for project wide uniqueness
+
+Prefix sub-packages with the service name or an abbreviation of the
+service name (whichever is more appropriate) to provide an ideally
+unique package name. This allows `teaimpl` to be distinguished from
+`coffeeimpl` without the need for package aliases, and encourages the
+use of the same name to reference your package throughout the codebase.
+
+### A well-behaving service provides test doubles for itself
+
+Other services may depend on your service, and it's good practice to
+provide means for those services to set up a test instance of the
+dependency as needed. Refer to
+[Google Testing's Testing on the Toilet: Know Your Test Doubles](https://testing.googleblog.com/2013/07/testing-on-toilet-know-your-test-doubles.html) for a brief
+explanation of how we semantically aim to differentiate fakes, mocks,
+and stubs within our codebase.
+
+Place test doubles in a sub-package to your root package named
+`<servicename>test` or `<service-abbreviation>test`, such that the `teapot` service may have the
+`teapottest` or `teatest`
+
+A stub or mock may be sufficient if the service is not a dependency of a
+lot of services or if it's called primarily for side effects so that a
+no-op default behavior makes sense.
+
+Services which serve many other services and where it's feasible should
+provide an in-memory backed test fake that can be used like the
+regular service without the need of complicated setup.
+
+### Separate store and logic
+
+When building a new service, data validation, manipulation, scheduled
+events and so forth should be collected in a service implementation that
+is built to be agnostic about its store.
+
+The storage should be an interface that is not directly called from
+outside the service and should be kept to a minimum complexity to
+provide the functionality necessary for the service.
+
+A litmus test to reduce the complexity of the storage interface is
+whether an in-memory implementation is a feasible test double to build
+to test the service.
+
+### Outside the service root
+
+Some parts of the service definition remains outside the
+service directory and reflects the legacy package hierarchy.
+As of June 2022, the parts that remain outside the service are:
+
+#### Migrations
+
+`pkg/services/sqlstore/migrations` contains all migrations for SQL
+databases, for all services (not including Grafana Enterprise).
+Migrations are written per the [database.md](database.md#migrations) document.
+
+#### API endpoints
+
+`pkg/api/api.go` contains the endpoint definitions for the most of
+Grafana HTTP API (not including Grafana Enterprise).
 
 ## Practical example
 
-The `pkg/plugins` package contains plugin domain types, for example `DataPlugin`, and also interfaces
-such as `RequestHandler`. Then you have the `pkg/plugins/managers` subpackage, which contains concrete implementations
-such as the service `PluginManager`. The subpackage `pkg/plugins/backendplugin/coreplugin` contains `plugins.DataPlugin`
-implementations.
+The following is a simplified example of the package structure for a
+service that doesn't do anything in particular.
+
+None of the methods or functions are populated and in practice most
+packages will consist of multiple files. There isn't a Grafana-wide
+convention for which files should exist and contain what.
+
+`pkg/services/alphabetical`
+
+```
+package alphabetical
+
+type Alphabetical interface {
+  // GetLetter returns either an error or letter.
+  GetLetter(context.Context, GetLetterQuery) (Letter, error)
+  // ListCachedLetters cannot fail, and doesn't return an error.
+  ListCachedLetters(context.Context, ListCachedLettersQuery) Letters
+  // DeleteLetter doesn't have any return values other than errors, so it
+  // returns only an error.
+  DeleteLetter(context.Contxt, DeltaCommand) error
+}
+
+type Letter byte
+
+type Letters []Letter
+
+type GetLetterQuery struct {
+  ID int
+}
+
+// Create queries/commands for methods even if they are empty.
+type ListCachedLettersQuery struct {}
+
+type DeleteLetterCommand struct {
+  ID int
+}
+
+```
+
+`pkg/services/alphabetical/alphabeticalimpl`
+
+```
+package alphabeticalimpl
+
+// this name can be whatever, it's not supposed to be used from outside
+// the service except for in Wire.
+type Svc struct { … }
+
+func ProviceSvc(numbers numerical.Numerical, db db.DB) Svc { … }
+
+func (s *Svc) GetLetter(ctx context.Context, q root.GetLetterQuery) (root.Letter, error) { … }
+func (s *Svc) ListCachedLetters(ctx context.Context, q root.ListCachedLettersQuery) root.Letters { … }
+func (s *Svc) DeleteLetter(ctx context.Context, q root.DeleteLetterCommand) error { … }
+
+type letterStore interface {
+  Get(ctx.Context, id int) (root.Letter, error)
+  Delete(ctx.Context, root.DeleteLetterCommand) error
+}
+
+type sqlLetterStore struct {
+  db.DB
+}
+
+func (s *sqlStore) Get(ctx.Context, id int) (root.Letter, error) { … }
+func (s *sqlStore) Delete(ctx.Context, root.DeleteLetterCommand) error { … }
+```
+
+## Legacy package hierarchy
+
+> **Note:** A lot of services still adhere to the legacy model as outlined below. While it is ok to
+> extend existing services based on the legacy model, you are _strongly_ encouraged to structure any
+> new services or major refactorings using the new package layout.
+
+Grafana has long used a package-by-layer layout where domain types
+are placed in **pkg/models**, all SQL logic in **pkg/services/sqlstore**,
+and so forth.
+
+This is an example of how the _tea pot_ service could be structured
+throughout the codebase in the legacy model.
+
+- _pkg/_
+  - _api/_
+    - _api.go_ contains the endpoints for the
+    - _tea_pot.go_ contains methods on the _pkg/api.HTTPServer_ type
+      that interacts with the service based on queries coming in via the HTTP
+      API.
+    - _dtos/tea_pot.go_ extends the _pkg/models_ file with types
+      that are meant for translation to and from the API. It's not as commonly
+      present as _pkg/models_.
+  - _models/tea_pot.go_ contains the models for the service, this
+    includes the _command_ and _query_ structs that are used when calling
+    the service or SQL store methods related to the service and also any
+    models representing an abstraction provided by the service.
+  - _services/_
+    - _sqlstore_
+      - _tea_pot.go_ contains SQL queries for
+        interacting with stored objects related to the tea pot service.
+      - _migrations/tea_pot.go_ contains the migrations necessary to
+        build the
+    - _teapot/\*_ contains functions or a service for doing
+      logical operations beyond those done in _pkg/api_ or _pkg/services/sqlstore_
+      for the service.
+
+The implementation of legacy services varies widely from service to
+service, some or more of these files may be missing and there may be
+more files related to a service than those listed here.
+
+Some legacy services providing infrastructure will also take care of the
+integration with several domains. The cleanup service both
+provides the infrastructure to occasionally run cleanup scripts and
+defines the cleanup scripts. Ideally, this would be migrated
+to only handle the scheduling and synchronization of clean up jobs.
+The logic for the individual jobs would be placed with a service that is
+related to whatever is being cleaned up.
diff --git a/devenv/docker/blocks/influxdb/config.yaml b/devenv/docker/blocks/influxdb/config.yaml
deleted file mode 100644
index 15dd892ce27..00000000000
--- a/devenv/docker/blocks/influxdb/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-http-bind-address: :8086
\ No newline at end of file
diff --git a/devenv/docker/blocks/influxdb/docker-compose.yaml b/devenv/docker/blocks/influxdb/docker-compose.yaml
index 803eb4be511..244bb472107 100644
--- a/devenv/docker/blocks/influxdb/docker-compose.yaml
+++ b/devenv/docker/blocks/influxdb/docker-compose.yaml
@@ -5,6 +5,7 @@
       - '8086:8086'
     environment:
       INFLUXD_REPORTING_DISABLED: 'true'
+      INFLUXD_HTTP_BIND_ADDRESS: ':8086'
       DOCKER_INFLUXDB_INIT_MODE: 'setup'
       DOCKER_INFLUXDB_INIT_USERNAME: 'grafana'
       DOCKER_INFLUXDB_INIT_PASSWORD: 'grafana12345'
@@ -12,7 +13,6 @@
       DOCKER_INFLUXDB_INIT_BUCKET: 'mybucket'
       DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: 'mytoken'
     volumes:
-      - ./docker/blocks/influxdb/config.yaml:/etc/influxdb2/config.yaml
       - ./docker/blocks/influxdb/setup_influxql.sh:/docker-entrypoint-initdb.d/setup_influxql.sh
 
   telegraf:
diff --git a/devenv/docker/blocks/oauth/cloak.sql b/devenv/docker/blocks/oauth/cloak.sql
new file mode 100644
index 00000000000..b8f933d4723
--- /dev/null
+++ b/devenv/docker/blocks/oauth/cloak.sql
@@ -0,0 +1,5487 @@
+--
+-- PostgreSQL database dump
+--
+
+-- Dumped from database version 12.2 (Debian 12.2-2.pgdg100+1)
+-- Dumped by pg_dump version 12.2 (Debian 12.2-2.pgdg100+1)
+
+SET statement_timeout = 0;
+SET lock_timeout = 0;
+SET idle_in_transaction_session_timeout = 0;
+SET client_encoding = 'UTF8';
+SET standard_conforming_strings = on;
+SELECT pg_catalog.set_config('search_path', '', false);
+SET check_function_bodies = false;
+SET xmloption = content;
+SET client_min_messages = warning;
+SET row_security = off;
+
+SET default_tablespace = '';
+
+SET default_table_access_method = heap;
+
+--
+-- Name: admin_event_entity; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.admin_event_entity (
+    id character varying(36) NOT NULL,
+    admin_event_time bigint,
+    realm_id character varying(255),
+    operation_type character varying(255),
+    auth_realm_id character varying(255),
+    auth_client_id character varying(255),
+    auth_user_id character varying(255),
+    ip_address character varying(255),
+    resource_path character varying(2550),
+    representation text,
+    error character varying(255),
+    resource_type character varying(64)
+);
+
+
+ALTER TABLE public.admin_event_entity OWNER TO keycloak;
+
+--
+-- Name: associated_policy; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.associated_policy (
+    policy_id character varying(36) NOT NULL,
+    associated_policy_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.associated_policy OWNER TO keycloak;
+
+--
+-- Name: authentication_execution; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.authentication_execution (
+    id character varying(36) NOT NULL,
+    alias character varying(255),
+    authenticator character varying(36),
+    realm_id character varying(36),
+    flow_id character varying(36),
+    requirement integer,
+    priority integer,
+    authenticator_flow boolean DEFAULT false NOT NULL,
+    auth_flow_id character varying(36),
+    auth_config character varying(36)
+);
+
+
+ALTER TABLE public.authentication_execution OWNER TO keycloak;
+
+--
+-- Name: authentication_flow; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.authentication_flow (
+    id character varying(36) NOT NULL,
+    alias character varying(255),
+    description character varying(255),
+    realm_id character varying(36),
+    provider_id character varying(36) DEFAULT 'basic-flow'::character varying NOT NULL,
+    top_level boolean DEFAULT false NOT NULL,
+    built_in boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.authentication_flow OWNER TO keycloak;
+
+--
+-- Name: authenticator_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.authenticator_config (
+    id character varying(36) NOT NULL,
+    alias character varying(255),
+    realm_id character varying(36)
+);
+
+
+ALTER TABLE public.authenticator_config OWNER TO keycloak;
+
+--
+-- Name: authenticator_config_entry; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.authenticator_config_entry (
+    authenticator_id character varying(36) NOT NULL,
+    value text,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.authenticator_config_entry OWNER TO keycloak;
+
+--
+-- Name: broker_link; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.broker_link (
+    identity_provider character varying(255) NOT NULL,
+    storage_provider_id character varying(255),
+    realm_id character varying(36) NOT NULL,
+    broker_user_id character varying(255),
+    broker_username character varying(255),
+    token text,
+    user_id character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.broker_link OWNER TO keycloak;
+
+--
+-- Name: client; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client (
+    id character varying(36) NOT NULL,
+    enabled boolean DEFAULT false NOT NULL,
+    full_scope_allowed boolean DEFAULT false NOT NULL,
+    client_id character varying(255),
+    not_before integer,
+    public_client boolean DEFAULT false NOT NULL,
+    secret character varying(255),
+    base_url character varying(255),
+    bearer_only boolean DEFAULT false NOT NULL,
+    management_url character varying(255),
+    surrogate_auth_required boolean DEFAULT false NOT NULL,
+    realm_id character varying(36),
+    protocol character varying(255),
+    node_rereg_timeout integer DEFAULT 0,
+    frontchannel_logout boolean DEFAULT false NOT NULL,
+    consent_required boolean DEFAULT false NOT NULL,
+    name character varying(255),
+    service_accounts_enabled boolean DEFAULT false NOT NULL,
+    client_authenticator_type character varying(255),
+    root_url character varying(255),
+    description character varying(255),
+    registration_token character varying(255),
+    standard_flow_enabled boolean DEFAULT true NOT NULL,
+    implicit_flow_enabled boolean DEFAULT false NOT NULL,
+    direct_access_grants_enabled boolean DEFAULT false NOT NULL,
+    always_display_in_console boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.client OWNER TO keycloak;
+
+--
+-- Name: client_attributes; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_attributes (
+    client_id character varying(36) NOT NULL,
+    value character varying(4000),
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.client_attributes OWNER TO keycloak;
+
+--
+-- Name: client_auth_flow_bindings; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_auth_flow_bindings (
+    client_id character varying(36) NOT NULL,
+    flow_id character varying(36),
+    binding_name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.client_auth_flow_bindings OWNER TO keycloak;
+
+--
+-- Name: client_default_roles; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_default_roles (
+    client_id character varying(36) NOT NULL,
+    role_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_default_roles OWNER TO keycloak;
+
+--
+-- Name: client_initial_access; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_initial_access (
+    id character varying(36) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    "timestamp" integer,
+    expiration integer,
+    count integer,
+    remaining_count integer
+);
+
+
+ALTER TABLE public.client_initial_access OWNER TO keycloak;
+
+--
+-- Name: client_node_registrations; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_node_registrations (
+    client_id character varying(36) NOT NULL,
+    value integer,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.client_node_registrations OWNER TO keycloak;
+
+--
+-- Name: client_scope; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_scope (
+    id character varying(36) NOT NULL,
+    name character varying(255),
+    realm_id character varying(36),
+    description character varying(255),
+    protocol character varying(255)
+);
+
+
+ALTER TABLE public.client_scope OWNER TO keycloak;
+
+--
+-- Name: client_scope_attributes; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_scope_attributes (
+    scope_id character varying(36) NOT NULL,
+    value character varying(2048),
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.client_scope_attributes OWNER TO keycloak;
+
+--
+-- Name: client_scope_client; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_scope_client (
+    client_id character varying(36) NOT NULL,
+    scope_id character varying(36) NOT NULL,
+    default_scope boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.client_scope_client OWNER TO keycloak;
+
+--
+-- Name: client_scope_role_mapping; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_scope_role_mapping (
+    scope_id character varying(36) NOT NULL,
+    role_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_scope_role_mapping OWNER TO keycloak;
+
+--
+-- Name: client_session; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_session (
+    id character varying(36) NOT NULL,
+    client_id character varying(36),
+    redirect_uri character varying(255),
+    state character varying(255),
+    "timestamp" integer,
+    session_id character varying(36),
+    auth_method character varying(255),
+    realm_id character varying(255),
+    auth_user_id character varying(36),
+    current_action character varying(36)
+);
+
+
+ALTER TABLE public.client_session OWNER TO keycloak;
+
+--
+-- Name: client_session_auth_status; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_session_auth_status (
+    authenticator character varying(36) NOT NULL,
+    status integer,
+    client_session character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_session_auth_status OWNER TO keycloak;
+
+--
+-- Name: client_session_note; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_session_note (
+    name character varying(255) NOT NULL,
+    value character varying(255),
+    client_session character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_session_note OWNER TO keycloak;
+
+--
+-- Name: client_session_prot_mapper; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_session_prot_mapper (
+    protocol_mapper_id character varying(36) NOT NULL,
+    client_session character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_session_prot_mapper OWNER TO keycloak;
+
+--
+-- Name: client_session_role; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_session_role (
+    role_id character varying(255) NOT NULL,
+    client_session character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_session_role OWNER TO keycloak;
+
+--
+-- Name: client_user_session_note; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.client_user_session_note (
+    name character varying(255) NOT NULL,
+    value character varying(2048),
+    client_session character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.client_user_session_note OWNER TO keycloak;
+
+--
+-- Name: component; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.component (
+    id character varying(36) NOT NULL,
+    name character varying(255),
+    parent_id character varying(36),
+    provider_id character varying(36),
+    provider_type character varying(255),
+    realm_id character varying(36),
+    sub_type character varying(255)
+);
+
+
+ALTER TABLE public.component OWNER TO keycloak;
+
+--
+-- Name: component_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.component_config (
+    id character varying(36) NOT NULL,
+    component_id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    value character varying(4000)
+);
+
+
+ALTER TABLE public.component_config OWNER TO keycloak;
+
+--
+-- Name: composite_role; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.composite_role (
+    composite character varying(36) NOT NULL,
+    child_role character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.composite_role OWNER TO keycloak;
+
+--
+-- Name: credential; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.credential (
+    id character varying(36) NOT NULL,
+    salt bytea,
+    type character varying(255),
+    user_id character varying(36),
+    created_date bigint,
+    user_label character varying(255),
+    secret_data text,
+    credential_data text,
+    priority integer
+);
+
+
+ALTER TABLE public.credential OWNER TO keycloak;
+
+--
+-- Name: databasechangelog; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.databasechangelog (
+    id character varying(255) NOT NULL,
+    author character varying(255) NOT NULL,
+    filename character varying(255) NOT NULL,
+    dateexecuted timestamp without time zone NOT NULL,
+    orderexecuted integer NOT NULL,
+    exectype character varying(10) NOT NULL,
+    md5sum character varying(35),
+    description character varying(255),
+    comments character varying(255),
+    tag character varying(255),
+    liquibase character varying(20),
+    contexts character varying(255),
+    labels character varying(255),
+    deployment_id character varying(10)
+);
+
+
+ALTER TABLE public.databasechangelog OWNER TO keycloak;
+
+--
+-- Name: databasechangeloglock; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.databasechangeloglock (
+    id integer NOT NULL,
+    locked boolean NOT NULL,
+    lockgranted timestamp without time zone,
+    lockedby character varying(255)
+);
+
+
+ALTER TABLE public.databasechangeloglock OWNER TO keycloak;
+
+--
+-- Name: default_client_scope; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.default_client_scope (
+    realm_id character varying(36) NOT NULL,
+    scope_id character varying(36) NOT NULL,
+    default_scope boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.default_client_scope OWNER TO keycloak;
+
+--
+-- Name: event_entity; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.event_entity (
+    id character varying(36) NOT NULL,
+    client_id character varying(255),
+    details_json character varying(2550),
+    error character varying(255),
+    ip_address character varying(255),
+    realm_id character varying(255),
+    session_id character varying(255),
+    event_time bigint,
+    type character varying(255),
+    user_id character varying(255)
+);
+
+
+ALTER TABLE public.event_entity OWNER TO keycloak;
+
+--
+-- Name: fed_user_attribute; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_attribute (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    storage_provider_id character varying(36),
+    value character varying(2024)
+);
+
+
+ALTER TABLE public.fed_user_attribute OWNER TO keycloak;
+
+--
+-- Name: fed_user_consent; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_consent (
+    id character varying(36) NOT NULL,
+    client_id character varying(255),
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    storage_provider_id character varying(36),
+    created_date bigint,
+    last_updated_date bigint,
+    client_storage_provider character varying(36),
+    external_client_id character varying(255)
+);
+
+
+ALTER TABLE public.fed_user_consent OWNER TO keycloak;
+
+--
+-- Name: fed_user_consent_cl_scope; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_consent_cl_scope (
+    user_consent_id character varying(36) NOT NULL,
+    scope_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.fed_user_consent_cl_scope OWNER TO keycloak;
+
+--
+-- Name: fed_user_credential; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_credential (
+    id character varying(36) NOT NULL,
+    salt bytea,
+    type character varying(255),
+    created_date bigint,
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    storage_provider_id character varying(36),
+    user_label character varying(255),
+    secret_data text,
+    credential_data text,
+    priority integer
+);
+
+
+ALTER TABLE public.fed_user_credential OWNER TO keycloak;
+
+--
+-- Name: fed_user_group_membership; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_group_membership (
+    group_id character varying(36) NOT NULL,
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    storage_provider_id character varying(36)
+);
+
+
+ALTER TABLE public.fed_user_group_membership OWNER TO keycloak;
+
+--
+-- Name: fed_user_required_action; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_required_action (
+    required_action character varying(255) DEFAULT ' '::character varying NOT NULL,
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    storage_provider_id character varying(36)
+);
+
+
+ALTER TABLE public.fed_user_required_action OWNER TO keycloak;
+
+--
+-- Name: fed_user_role_mapping; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.fed_user_role_mapping (
+    role_id character varying(36) NOT NULL,
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    storage_provider_id character varying(36)
+);
+
+
+ALTER TABLE public.fed_user_role_mapping OWNER TO keycloak;
+
+--
+-- Name: federated_identity; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.federated_identity (
+    identity_provider character varying(255) NOT NULL,
+    realm_id character varying(36),
+    federated_user_id character varying(255),
+    federated_username character varying(255),
+    token text,
+    user_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.federated_identity OWNER TO keycloak;
+
+--
+-- Name: federated_user; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.federated_user (
+    id character varying(255) NOT NULL,
+    storage_provider_id character varying(255),
+    realm_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.federated_user OWNER TO keycloak;
+
+--
+-- Name: group_attribute; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.group_attribute (
+    id character varying(36) DEFAULT 'sybase-needs-something-here'::character varying NOT NULL,
+    name character varying(255) NOT NULL,
+    value character varying(255),
+    group_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.group_attribute OWNER TO keycloak;
+
+--
+-- Name: group_role_mapping; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.group_role_mapping (
+    role_id character varying(36) NOT NULL,
+    group_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.group_role_mapping OWNER TO keycloak;
+
+--
+-- Name: identity_provider; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.identity_provider (
+    internal_id character varying(36) NOT NULL,
+    enabled boolean DEFAULT false NOT NULL,
+    provider_alias character varying(255),
+    provider_id character varying(255),
+    store_token boolean DEFAULT false NOT NULL,
+    authenticate_by_default boolean DEFAULT false NOT NULL,
+    realm_id character varying(36),
+    add_token_role boolean DEFAULT true NOT NULL,
+    trust_email boolean DEFAULT false NOT NULL,
+    first_broker_login_flow_id character varying(36),
+    post_broker_login_flow_id character varying(36),
+    provider_display_name character varying(255),
+    link_only boolean DEFAULT false NOT NULL
+);
+
+
+ALTER TABLE public.identity_provider OWNER TO keycloak;
+
+--
+-- Name: identity_provider_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.identity_provider_config (
+    identity_provider_id character varying(36) NOT NULL,
+    value text,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.identity_provider_config OWNER TO keycloak;
+
+--
+-- Name: identity_provider_mapper; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.identity_provider_mapper (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    idp_alias character varying(255) NOT NULL,
+    idp_mapper_name character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.identity_provider_mapper OWNER TO keycloak;
+
+--
+-- Name: idp_mapper_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.idp_mapper_config (
+    idp_mapper_id character varying(36) NOT NULL,
+    value text,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.idp_mapper_config OWNER TO keycloak;
+
+--
+-- Name: keycloak_group; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.keycloak_group (
+    id character varying(36) NOT NULL,
+    name character varying(255),
+    parent_group character varying(36) NOT NULL,
+    realm_id character varying(36)
+);
+
+
+ALTER TABLE public.keycloak_group OWNER TO keycloak;
+
+--
+-- Name: keycloak_role; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.keycloak_role (
+    id character varying(36) NOT NULL,
+    client_realm_constraint character varying(255),
+    client_role boolean DEFAULT false NOT NULL,
+    description character varying(255),
+    name character varying(255),
+    realm_id character varying(255),
+    client character varying(36),
+    realm character varying(36)
+);
+
+
+ALTER TABLE public.keycloak_role OWNER TO keycloak;
+
+--
+-- Name: migration_model; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.migration_model (
+    id character varying(36) NOT NULL,
+    version character varying(36),
+    update_time bigint DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.migration_model OWNER TO keycloak;
+
+--
+-- Name: offline_client_session; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.offline_client_session (
+    user_session_id character varying(36) NOT NULL,
+    client_id character varying(255) NOT NULL,
+    offline_flag character varying(4) NOT NULL,
+    "timestamp" integer,
+    data text,
+    client_storage_provider character varying(36) DEFAULT 'local'::character varying NOT NULL,
+    external_client_id character varying(255) DEFAULT 'local'::character varying NOT NULL
+);
+
+
+ALTER TABLE public.offline_client_session OWNER TO keycloak;
+
+--
+-- Name: offline_user_session; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.offline_user_session (
+    user_session_id character varying(36) NOT NULL,
+    user_id character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL,
+    created_on integer NOT NULL,
+    offline_flag character varying(4) NOT NULL,
+    data text,
+    last_session_refresh integer DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.offline_user_session OWNER TO keycloak;
+
+--
+-- Name: policy_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.policy_config (
+    policy_id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    value text
+);
+
+
+ALTER TABLE public.policy_config OWNER TO keycloak;
+
+--
+-- Name: protocol_mapper; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.protocol_mapper (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    protocol character varying(255) NOT NULL,
+    protocol_mapper_name character varying(255) NOT NULL,
+    client_id character varying(36),
+    client_scope_id character varying(36)
+);
+
+
+ALTER TABLE public.protocol_mapper OWNER TO keycloak;
+
+--
+-- Name: protocol_mapper_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.protocol_mapper_config (
+    protocol_mapper_id character varying(36) NOT NULL,
+    value text,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.protocol_mapper_config OWNER TO keycloak;
+
+--
+-- Name: realm; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm (
+    id character varying(36) NOT NULL,
+    access_code_lifespan integer,
+    user_action_lifespan integer,
+    access_token_lifespan integer,
+    account_theme character varying(255),
+    admin_theme character varying(255),
+    email_theme character varying(255),
+    enabled boolean DEFAULT false NOT NULL,
+    events_enabled boolean DEFAULT false NOT NULL,
+    events_expiration bigint,
+    login_theme character varying(255),
+    name character varying(255),
+    not_before integer,
+    password_policy character varying(2550),
+    registration_allowed boolean DEFAULT false NOT NULL,
+    remember_me boolean DEFAULT false NOT NULL,
+    reset_password_allowed boolean DEFAULT false NOT NULL,
+    social boolean DEFAULT false NOT NULL,
+    ssl_required character varying(255),
+    sso_idle_timeout integer,
+    sso_max_lifespan integer,
+    update_profile_on_soc_login boolean DEFAULT false NOT NULL,
+    verify_email boolean DEFAULT false NOT NULL,
+    master_admin_client character varying(36),
+    login_lifespan integer,
+    internationalization_enabled boolean DEFAULT false NOT NULL,
+    default_locale character varying(255),
+    reg_email_as_username boolean DEFAULT false NOT NULL,
+    admin_events_enabled boolean DEFAULT false NOT NULL,
+    admin_events_details_enabled boolean DEFAULT false NOT NULL,
+    edit_username_allowed boolean DEFAULT false NOT NULL,
+    otp_policy_counter integer DEFAULT 0,
+    otp_policy_window integer DEFAULT 1,
+    otp_policy_period integer DEFAULT 30,
+    otp_policy_digits integer DEFAULT 6,
+    otp_policy_alg character varying(36) DEFAULT 'HmacSHA1'::character varying,
+    otp_policy_type character varying(36) DEFAULT 'totp'::character varying,
+    browser_flow character varying(36),
+    registration_flow character varying(36),
+    direct_grant_flow character varying(36),
+    reset_credentials_flow character varying(36),
+    client_auth_flow character varying(36),
+    offline_session_idle_timeout integer DEFAULT 0,
+    revoke_refresh_token boolean DEFAULT false NOT NULL,
+    access_token_life_implicit integer DEFAULT 0,
+    login_with_email_allowed boolean DEFAULT true NOT NULL,
+    duplicate_emails_allowed boolean DEFAULT false NOT NULL,
+    docker_auth_flow character varying(36),
+    refresh_token_max_reuse integer DEFAULT 0,
+    allow_user_managed_access boolean DEFAULT false NOT NULL,
+    sso_max_lifespan_remember_me integer DEFAULT 0 NOT NULL,
+    sso_idle_timeout_remember_me integer DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.realm OWNER TO keycloak;
+
+--
+-- Name: realm_attribute; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_attribute (
+    name character varying(255) NOT NULL,
+    value character varying(255),
+    realm_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.realm_attribute OWNER TO keycloak;
+
+--
+-- Name: realm_default_groups; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_default_groups (
+    realm_id character varying(36) NOT NULL,
+    group_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.realm_default_groups OWNER TO keycloak;
+
+--
+-- Name: realm_default_roles; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_default_roles (
+    realm_id character varying(36) NOT NULL,
+    role_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.realm_default_roles OWNER TO keycloak;
+
+--
+-- Name: realm_enabled_event_types; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_enabled_event_types (
+    realm_id character varying(36) NOT NULL,
+    value character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.realm_enabled_event_types OWNER TO keycloak;
+
+--
+-- Name: realm_events_listeners; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_events_listeners (
+    realm_id character varying(36) NOT NULL,
+    value character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.realm_events_listeners OWNER TO keycloak;
+
+--
+-- Name: realm_localizations; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_localizations (
+    realm_id character varying(255) NOT NULL,
+    locale character varying(255) NOT NULL,
+    texts text NOT NULL
+);
+
+
+ALTER TABLE public.realm_localizations OWNER TO keycloak;
+
+--
+-- Name: realm_required_credential; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_required_credential (
+    type character varying(255) NOT NULL,
+    form_label character varying(255),
+    input boolean DEFAULT false NOT NULL,
+    secret boolean DEFAULT false NOT NULL,
+    realm_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.realm_required_credential OWNER TO keycloak;
+
+--
+-- Name: realm_smtp_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_smtp_config (
+    realm_id character varying(36) NOT NULL,
+    value character varying(255),
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.realm_smtp_config OWNER TO keycloak;
+
+--
+-- Name: realm_supported_locales; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.realm_supported_locales (
+    realm_id character varying(36) NOT NULL,
+    value character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.realm_supported_locales OWNER TO keycloak;
+
+--
+-- Name: redirect_uris; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.redirect_uris (
+    client_id character varying(36) NOT NULL,
+    value character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.redirect_uris OWNER TO keycloak;
+
+--
+-- Name: required_action_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.required_action_config (
+    required_action_id character varying(36) NOT NULL,
+    value text,
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.required_action_config OWNER TO keycloak;
+
+--
+-- Name: required_action_provider; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.required_action_provider (
+    id character varying(36) NOT NULL,
+    alias character varying(255),
+    name character varying(255),
+    realm_id character varying(36),
+    enabled boolean DEFAULT false NOT NULL,
+    default_action boolean DEFAULT false NOT NULL,
+    provider_id character varying(255),
+    priority integer
+);
+
+
+ALTER TABLE public.required_action_provider OWNER TO keycloak;
+
+--
+-- Name: resource_attribute; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_attribute (
+    id character varying(36) DEFAULT 'sybase-needs-something-here'::character varying NOT NULL,
+    name character varying(255) NOT NULL,
+    value character varying(255),
+    resource_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.resource_attribute OWNER TO keycloak;
+
+--
+-- Name: resource_policy; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_policy (
+    resource_id character varying(36) NOT NULL,
+    policy_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.resource_policy OWNER TO keycloak;
+
+--
+-- Name: resource_scope; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_scope (
+    resource_id character varying(36) NOT NULL,
+    scope_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.resource_scope OWNER TO keycloak;
+
+--
+-- Name: resource_server; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_server (
+    id character varying(36) NOT NULL,
+    allow_rs_remote_mgmt boolean DEFAULT false NOT NULL,
+    policy_enforce_mode character varying(15) NOT NULL,
+    decision_strategy smallint DEFAULT 1 NOT NULL
+);
+
+
+ALTER TABLE public.resource_server OWNER TO keycloak;
+
+--
+-- Name: resource_server_perm_ticket; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_server_perm_ticket (
+    id character varying(36) NOT NULL,
+    owner character varying(255) NOT NULL,
+    requester character varying(255) NOT NULL,
+    created_timestamp bigint NOT NULL,
+    granted_timestamp bigint,
+    resource_id character varying(36) NOT NULL,
+    scope_id character varying(36),
+    resource_server_id character varying(36) NOT NULL,
+    policy_id character varying(36)
+);
+
+
+ALTER TABLE public.resource_server_perm_ticket OWNER TO keycloak;
+
+--
+-- Name: resource_server_policy; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_server_policy (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    description character varying(255),
+    type character varying(255) NOT NULL,
+    decision_strategy character varying(20),
+    logic character varying(20),
+    resource_server_id character varying(36) NOT NULL,
+    owner character varying(255)
+);
+
+
+ALTER TABLE public.resource_server_policy OWNER TO keycloak;
+
+--
+-- Name: resource_server_resource; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_server_resource (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    type character varying(255),
+    icon_uri character varying(255),
+    owner character varying(255) NOT NULL,
+    resource_server_id character varying(36) NOT NULL,
+    owner_managed_access boolean DEFAULT false NOT NULL,
+    display_name character varying(255)
+);
+
+
+ALTER TABLE public.resource_server_resource OWNER TO keycloak;
+
+--
+-- Name: resource_server_scope; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_server_scope (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    icon_uri character varying(255),
+    resource_server_id character varying(36) NOT NULL,
+    display_name character varying(255)
+);
+
+
+ALTER TABLE public.resource_server_scope OWNER TO keycloak;
+
+--
+-- Name: resource_uris; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.resource_uris (
+    resource_id character varying(36) NOT NULL,
+    value character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.resource_uris OWNER TO keycloak;
+
+--
+-- Name: role_attribute; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.role_attribute (
+    id character varying(36) NOT NULL,
+    role_id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    value character varying(255)
+);
+
+
+ALTER TABLE public.role_attribute OWNER TO keycloak;
+
+--
+-- Name: scope_mapping; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.scope_mapping (
+    client_id character varying(36) NOT NULL,
+    role_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.scope_mapping OWNER TO keycloak;
+
+--
+-- Name: scope_policy; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.scope_policy (
+    scope_id character varying(36) NOT NULL,
+    policy_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.scope_policy OWNER TO keycloak;
+
+--
+-- Name: user_attribute; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_attribute (
+    name character varying(255) NOT NULL,
+    value character varying(255),
+    user_id character varying(36) NOT NULL,
+    id character varying(36) DEFAULT 'sybase-needs-something-here'::character varying NOT NULL
+);
+
+
+ALTER TABLE public.user_attribute OWNER TO keycloak;
+
+--
+-- Name: user_consent; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_consent (
+    id character varying(36) NOT NULL,
+    client_id character varying(255),
+    user_id character varying(36) NOT NULL,
+    created_date bigint,
+    last_updated_date bigint,
+    client_storage_provider character varying(36),
+    external_client_id character varying(255)
+);
+
+
+ALTER TABLE public.user_consent OWNER TO keycloak;
+
+--
+-- Name: user_consent_client_scope; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_consent_client_scope (
+    user_consent_id character varying(36) NOT NULL,
+    scope_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.user_consent_client_scope OWNER TO keycloak;
+
+--
+-- Name: user_entity; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_entity (
+    id character varying(36) NOT NULL,
+    email character varying(255),
+    email_constraint character varying(255),
+    email_verified boolean DEFAULT false NOT NULL,
+    enabled boolean DEFAULT false NOT NULL,
+    federation_link character varying(255),
+    first_name character varying(255),
+    last_name character varying(255),
+    realm_id character varying(255),
+    username character varying(255),
+    created_timestamp bigint,
+    service_account_client_link character varying(255),
+    not_before integer DEFAULT 0 NOT NULL
+);
+
+
+ALTER TABLE public.user_entity OWNER TO keycloak;
+
+--
+-- Name: user_federation_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_federation_config (
+    user_federation_provider_id character varying(36) NOT NULL,
+    value character varying(255),
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.user_federation_config OWNER TO keycloak;
+
+--
+-- Name: user_federation_mapper; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_federation_mapper (
+    id character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    federation_provider_id character varying(36) NOT NULL,
+    federation_mapper_type character varying(255) NOT NULL,
+    realm_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.user_federation_mapper OWNER TO keycloak;
+
+--
+-- Name: user_federation_mapper_config; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_federation_mapper_config (
+    user_federation_mapper_id character varying(36) NOT NULL,
+    value character varying(255),
+    name character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.user_federation_mapper_config OWNER TO keycloak;
+
+--
+-- Name: user_federation_provider; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_federation_provider (
+    id character varying(36) NOT NULL,
+    changed_sync_period integer,
+    display_name character varying(255),
+    full_sync_period integer,
+    last_sync integer,
+    priority integer,
+    provider_name character varying(255),
+    realm_id character varying(36)
+);
+
+
+ALTER TABLE public.user_federation_provider OWNER TO keycloak;
+
+--
+-- Name: user_group_membership; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_group_membership (
+    group_id character varying(36) NOT NULL,
+    user_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.user_group_membership OWNER TO keycloak;
+
+--
+-- Name: user_required_action; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_required_action (
+    user_id character varying(36) NOT NULL,
+    required_action character varying(255) DEFAULT ' '::character varying NOT NULL
+);
+
+
+ALTER TABLE public.user_required_action OWNER TO keycloak;
+
+--
+-- Name: user_role_mapping; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_role_mapping (
+    role_id character varying(255) NOT NULL,
+    user_id character varying(36) NOT NULL
+);
+
+
+ALTER TABLE public.user_role_mapping OWNER TO keycloak;
+
+--
+-- Name: user_session; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_session (
+    id character varying(36) NOT NULL,
+    auth_method character varying(255),
+    ip_address character varying(255),
+    last_session_refresh integer,
+    login_username character varying(255),
+    realm_id character varying(255),
+    remember_me boolean DEFAULT false NOT NULL,
+    started integer,
+    user_id character varying(255),
+    user_session_state integer,
+    broker_session_id character varying(255),
+    broker_user_id character varying(255)
+);
+
+
+ALTER TABLE public.user_session OWNER TO keycloak;
+
+--
+-- Name: user_session_note; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.user_session_note (
+    user_session character varying(36) NOT NULL,
+    name character varying(255) NOT NULL,
+    value character varying(2048)
+);
+
+
+ALTER TABLE public.user_session_note OWNER TO keycloak;
+
+--
+-- Name: username_login_failure; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.username_login_failure (
+    realm_id character varying(36) NOT NULL,
+    username character varying(255) NOT NULL,
+    failed_login_not_before integer,
+    last_failure bigint,
+    last_ip_failure character varying(255),
+    num_failures integer
+);
+
+
+ALTER TABLE public.username_login_failure OWNER TO keycloak;
+
+--
+-- Name: web_origins; Type: TABLE; Schema: public; Owner: keycloak
+--
+
+CREATE TABLE public.web_origins (
+    client_id character varying(36) NOT NULL,
+    value character varying(255) NOT NULL
+);
+
+
+ALTER TABLE public.web_origins OWNER TO keycloak;
+
+--
+-- Data for Name: admin_event_entity; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.admin_event_entity (id, admin_event_time, realm_id, operation_type, auth_realm_id, auth_client_id, auth_user_id, ip_address, resource_path, representation, error, resource_type) FROM stdin;
+\.
+
+
+--
+-- Data for Name: associated_policy; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.associated_policy (policy_id, associated_policy_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: authentication_execution; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.authentication_execution (id, alias, authenticator, realm_id, flow_id, requirement, priority, authenticator_flow, auth_flow_id, auth_config) FROM stdin;
+a3eef0c8-a14f-4d33-b4ee-d9eba1e14350	\N	auth-cookie	master	ef998ef5-ca12-45db-a252-2e71b1419039	2	10	f	\N	\N
+c4489997-ee7b-4649-845e-70b79d3cd49f	\N	auth-spnego	master	ef998ef5-ca12-45db-a252-2e71b1419039	3	20	f	\N	\N
+6ae8f57d-d882-4e46-ad47-1e634302f979	\N	identity-provider-redirector	master	ef998ef5-ca12-45db-a252-2e71b1419039	2	25	f	\N	\N
+8478e3a6-1659-47a9-b7eb-503148adec2d	\N	\N	master	ef998ef5-ca12-45db-a252-2e71b1419039	2	30	t	4e407b0a-c011-4aef-bcf5-e8c5e649493e	\N
+da80fc4b-ebb0-4ef8-8594-8ba7a03506b9	\N	auth-username-password-form	master	4e407b0a-c011-4aef-bcf5-e8c5e649493e	0	10	f	\N	\N
+c54d81b7-e944-4b9d-9657-b01ee5bff6a4	\N	\N	master	4e407b0a-c011-4aef-bcf5-e8c5e649493e	1	20	t	8561a6a9-da18-4977-a92d-2c85763d042a	\N
+e57dc48f-3217-4401-a8dc-4d386396525a	\N	conditional-user-configured	master	8561a6a9-da18-4977-a92d-2c85763d042a	0	10	f	\N	\N
+69a60f10-cc10-4604-890a-59fe4eb255b7	\N	auth-otp-form	master	8561a6a9-da18-4977-a92d-2c85763d042a	0	20	f	\N	\N
+96dbd0ee-fcc4-4e27-85ac-a89bee432892	\N	direct-grant-validate-username	master	5f6f801e-0588-4a6e-860a-35483f5c1ec7	0	10	f	\N	\N
+bfbcc1e9-f129-4336-a0cd-b6960a811bd9	\N	direct-grant-validate-password	master	5f6f801e-0588-4a6e-860a-35483f5c1ec7	0	20	f	\N	\N
+079621e7-6daf-4df0-b3d3-97a3b53cdec1	\N	\N	master	5f6f801e-0588-4a6e-860a-35483f5c1ec7	1	30	t	99865746-4232-46f0-84b5-20952fe9eb51	\N
+511afd6e-e447-4877-8fe9-c54c938e70a6	\N	conditional-user-configured	master	99865746-4232-46f0-84b5-20952fe9eb51	0	10	f	\N	\N
+5a2470c4-3136-4cf0-8383-e74a413ccd48	\N	direct-grant-validate-otp	master	99865746-4232-46f0-84b5-20952fe9eb51	0	20	f	\N	\N
+47c96943-ad68-4d93-afff-ff54fc86eb0b	\N	registration-page-form	master	1695e7d2-ad80-4502-8479-8121a6e2a2f0	0	10	t	8fb96669-d28d-4173-a8f4-dc24d41c7d27	\N
+a6678624-1bd4-4793-bfac-68551cf0ac7c	\N	registration-user-creation	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	0	20	f	\N	\N
+5b45827d-5dfd-4152-a99e-373cb975ef87	\N	registration-profile-action	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	0	40	f	\N	\N
+5a2fb70d-63ae-4604-b37c-ae043d6a900d	\N	registration-password-action	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	0	50	f	\N	\N
+0b06a30e-daa7-498a-9fdb-899abbf36450	\N	registration-recaptcha-action	master	8fb96669-d28d-4173-a8f4-dc24d41c7d27	3	60	f	\N	\N
+b6ab0b5d-8184-4609-bb81-da8413dfb858	\N	reset-credentials-choose-user	master	954b046d-2b24-405e-84ee-c44ffe603df2	0	10	f	\N	\N
+300fb529-aee1-416d-803c-ca24e01af5a0	\N	reset-credential-email	master	954b046d-2b24-405e-84ee-c44ffe603df2	0	20	f	\N	\N
+de127e3d-11fa-4ddb-bd33-86ed8006be63	\N	reset-password	master	954b046d-2b24-405e-84ee-c44ffe603df2	0	30	f	\N	\N
+9d819c31-4238-4b6f-9318-95e1826d4a4c	\N	\N	master	954b046d-2b24-405e-84ee-c44ffe603df2	1	40	t	b379b44c-beef-4065-882c-d04cf6d4ffc8	\N
+65875994-0342-452e-b7ad-547a9092e302	\N	conditional-user-configured	master	b379b44c-beef-4065-882c-d04cf6d4ffc8	0	10	f	\N	\N
+0f202e0b-da55-43a5-95a6-a38cfeb97529	\N	reset-otp	master	b379b44c-beef-4065-882c-d04cf6d4ffc8	0	20	f	\N	\N
+988c39a0-4c44-4090-bdfd-4b5a8060e822	\N	client-secret	master	023dc515-c259-42bb-88a8-2e8d84abca92	2	10	f	\N	\N
+cd4e6875-71cf-436c-bf3f-5f5ac4402627	\N	client-jwt	master	023dc515-c259-42bb-88a8-2e8d84abca92	2	20	f	\N	\N
+fac88bab-1ea5-4617-bbda-d187cba68a45	\N	client-secret-jwt	master	023dc515-c259-42bb-88a8-2e8d84abca92	2	30	f	\N	\N
+d19571b1-5eeb-44d4-8866-273da4b34850	\N	client-x509	master	023dc515-c259-42bb-88a8-2e8d84abca92	2	40	f	\N	\N
+4198a01d-d3cd-49b2-8e8a-f506f2c46fc1	\N	idp-review-profile	master	242efff2-c3b7-42c0-a48a-77bb1b54502a	0	10	f	\N	8ab33625-af83-4fcd-aa77-6bd365100d7b
+d9b78c97-27b0-4eef-8d54-6143ca48cffd	\N	\N	master	242efff2-c3b7-42c0-a48a-77bb1b54502a	0	20	t	d46ab605-5f1e-4649-88bf-6c2dc79d636d	\N
+2a3faef7-dc89-4cf2-b299-d754a15af259	\N	idp-create-user-if-unique	master	d46ab605-5f1e-4649-88bf-6c2dc79d636d	2	10	f	\N	c7d1ba52-6053-4219-8118-a64cebfab1e1
+12c7ff48-2eec-4091-920f-6a1ad3d2d3ad	\N	\N	master	d46ab605-5f1e-4649-88bf-6c2dc79d636d	2	20	t	c39b0bc2-aba3-414d-ad3e-b648708e24d1	\N
+015a4d49-de8a-4cb0-b5c5-1868c30085d3	\N	idp-confirm-link	master	c39b0bc2-aba3-414d-ad3e-b648708e24d1	0	10	f	\N	\N
+0bfffcda-f282-4370-b55f-1b44519be4da	\N	\N	master	c39b0bc2-aba3-414d-ad3e-b648708e24d1	0	20	t	a7ca6b5a-fa8a-4f4a-bafa-ae178db785a3	\N
+8e0d10d1-47ff-4998-a26b-882ed2b71ab4	\N	idp-email-verification	master	a7ca6b5a-fa8a-4f4a-bafa-ae178db785a3	2	10	f	\N	\N
+6a396600-1b18-472c-b755-ad36857abf68	\N	\N	master	a7ca6b5a-fa8a-4f4a-bafa-ae178db785a3	2	20	t	ca3a3600-552c-4849-9a9d-826c8aa3e646	\N
+d600bb67-e258-44be-8f69-f1bae9c35a0f	\N	idp-username-password-form	master	ca3a3600-552c-4849-9a9d-826c8aa3e646	0	10	f	\N	\N
+638e46e8-cf88-4dfa-911d-5659854dd390	\N	\N	master	ca3a3600-552c-4849-9a9d-826c8aa3e646	1	20	t	a7d23655-efbb-4950-8ab6-50dbc85681a0	\N
+61fc6720-91ff-4ba3-880b-9d0a22deb7dc	\N	conditional-user-configured	master	a7d23655-efbb-4950-8ab6-50dbc85681a0	0	10	f	\N	\N
+90cc39a9-cddb-49bd-b9f5-d64d03341333	\N	auth-otp-form	master	a7d23655-efbb-4950-8ab6-50dbc85681a0	0	20	f	\N	\N
+b0634301-594e-42db-9736-6c90ebbeb8b2	\N	http-basic-authenticator	master	57c56583-d91c-4399-bd15-05a1a17d48c1	0	10	f	\N	\N
+34fa4d44-716b-4b2a-b98e-aa9748154292	\N	docker-http-basic-authenticator	master	032b05cf-0007-44da-a370-b42039f6b762	0	10	f	\N	\N
+4838277a-46ea-4d95-bd86-d8dc6fdce352	\N	no-cookie-redirect	master	1c7af06b-3085-46c3-849c-34c67f581b9e	0	10	f	\N	\N
+59a349ee-20ce-42d8-b20b-8f902c09742d	\N	\N	master	1c7af06b-3085-46c3-849c-34c67f581b9e	0	20	t	85c00992-77dd-4262-8744-a9dd8521e98e	\N
+d9b5fa46-6595-4406-9841-2c0720dbf644	\N	basic-auth	master	85c00992-77dd-4262-8744-a9dd8521e98e	0	10	f	\N	\N
+3a4ee6f1-1528-47c7-aeda-f317248b3b93	\N	basic-auth-otp	master	85c00992-77dd-4262-8744-a9dd8521e98e	3	20	f	\N	\N
+014847fc-06df-4ddf-a8f2-deeb0f1eb59a	\N	auth-spnego	master	85c00992-77dd-4262-8744-a9dd8521e98e	3	30	f	\N	\N
+b46bc4f6-2fe5-44d5-b47f-36880742cf50	\N	auth-cookie	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	2	10	f	\N	\N
+6cec48cc-066a-4e3e-8158-85351bfa4c27	\N	auth-spnego	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	3	20	f	\N	\N
+63c55c5a-ad11-4f83-9d6e-d8ca2efcaf66	\N	identity-provider-redirector	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	2	25	f	\N	\N
+9a986c59-e016-45e2-8eb6-77ccdd0fd0f5	\N	\N	grafana	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	2	30	t	c53e357f-e276-43aa-b36c-46366a7ffd35	\N
+85672b45-ebc9-40e8-a579-fbf5c4e2de9f	\N	auth-username-password-form	grafana	c53e357f-e276-43aa-b36c-46366a7ffd35	0	10	f	\N	\N
+09025e52-b379-4457-8ab4-74a2426a7139	\N	\N	grafana	c53e357f-e276-43aa-b36c-46366a7ffd35	1	20	t	cf4831e9-3e1d-452e-984e-e6d4d9eeafb5	\N
+64d5c6d6-1dde-4c42-b502-1abdf939e55b	\N	conditional-user-configured	grafana	cf4831e9-3e1d-452e-984e-e6d4d9eeafb5	0	10	f	\N	\N
+4b782423-ec3d-4e88-8fcf-fa12b4a34fc3	\N	auth-otp-form	grafana	cf4831e9-3e1d-452e-984e-e6d4d9eeafb5	0	20	f	\N	\N
+07052e96-64b2-41b5-95fc-e3ac6abcc577	\N	direct-grant-validate-username	grafana	b478ecfb-db7e-4797-a245-8fc3b4dec884	0	10	f	\N	\N
+10c22bdd-d243-44be-810f-d2fedbb973e1	\N	direct-grant-validate-password	grafana	b478ecfb-db7e-4797-a245-8fc3b4dec884	0	20	f	\N	\N
+6a6273e9-146c-4b4e-b7ce-42ed72cbc03f	\N	conditional-user-configured	grafana	b3491338-0630-4232-97e7-a518c254b248	0	10	f	\N	\N
+d87abeef-9f1d-46f5-9f36-acd7eaf21a72	\N	direct-grant-validate-otp	grafana	b3491338-0630-4232-97e7-a518c254b248	0	20	f	\N	\N
+4f204bab-0311-44b4-80b6-37d23fd0fd5a	\N	registration-page-form	grafana	9d02badd-cb1c-4655-bf5e-f888861433ff	0	10	t	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	\N
+2d4ee446-623c-42a0-8d4a-9f6c4f7f28ec	\N	registration-user-creation	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	0	20	f	\N	\N
+d806effc-dd17-4468-9a98-4e1c2f9e799d	\N	registration-profile-action	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	0	40	f	\N	\N
+306fa749-c191-43c6-bf04-0eb6d3d02732	\N	registration-password-action	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	0	50	f	\N	\N
+7de9bbee-eb3d-4f3e-a134-e7e8d4a6df25	\N	registration-recaptcha-action	grafana	c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	3	60	f	\N	\N
+8a31d18e-1622-4eac-8eff-9434fa9cade3	\N	reset-credentials-choose-user	grafana	3085fb68-fc1f-4e1c-a8be-33fb45194b04	0	10	f	\N	\N
+6006359c-b678-4526-90de-3dcfb3200868	\N	reset-credential-email	grafana	3085fb68-fc1f-4e1c-a8be-33fb45194b04	0	20	f	\N	\N
+e74add33-2692-4c20-8605-cc98c1901b98	\N	reset-password	grafana	3085fb68-fc1f-4e1c-a8be-33fb45194b04	0	30	f	\N	\N
+52942b96-3bf2-47e7-9863-a917f6df716c	\N	\N	grafana	3085fb68-fc1f-4e1c-a8be-33fb45194b04	1	40	t	079166ff-6d61-4bb2-a26d-374b8558f628	\N
+bc646947-4121-4d38-96b1-a8ed4b534cc7	\N	conditional-user-configured	grafana	079166ff-6d61-4bb2-a26d-374b8558f628	0	10	f	\N	\N
+efd9bb77-2d97-4ec0-9653-cd8fef30b307	\N	reset-otp	grafana	079166ff-6d61-4bb2-a26d-374b8558f628	0	20	f	\N	\N
+0bdc0916-5d84-4ac8-8cc9-0235cfb18262	\N	client-secret	grafana	cbb4b3ca-ced6-4046-8b59-f1c3959c7948	2	10	f	\N	\N
+919f02c4-745b-43f6-a50f-5bdc9792f017	\N	client-jwt	grafana	cbb4b3ca-ced6-4046-8b59-f1c3959c7948	2	20	f	\N	\N
+84e716ef-c5b6-4c8e-b4ca-acaa35b6e2a0	\N	client-secret-jwt	grafana	cbb4b3ca-ced6-4046-8b59-f1c3959c7948	2	30	f	\N	\N
+1da09fa3-1b81-4e97-bbd5-e5b5baccb73b	\N	client-x509	grafana	cbb4b3ca-ced6-4046-8b59-f1c3959c7948	2	40	f	\N	\N
+f707b2f6-05b1-4cc8-8eaf-ed7006975583	\N	idp-review-profile	grafana	0af1201c-a206-4393-9528-cb6083b9caa0	0	10	f	\N	e159a12b-cd0b-4241-a41c-e13f84e92052
+9762f956-a74f-40c7-b0a3-52a699892652	\N	\N	grafana	0af1201c-a206-4393-9528-cb6083b9caa0	0	20	t	df86516c-dcb1-41a8-877e-eb8805bcac8c	\N
+186e5f38-1a9f-4fa2-bc61-749118e4f76b	\N	idp-create-user-if-unique	grafana	df86516c-dcb1-41a8-877e-eb8805bcac8c	2	10	f	\N	f159d9c3-3ea7-460d-a719-b9c88bcbf650
+1b08ecd3-fc9f-4f17-bfa1-5bf0cc482d47	\N	\N	grafana	df86516c-dcb1-41a8-877e-eb8805bcac8c	2	20	t	9947a1b3-c26c-423f-b380-deadb5dce1ad	\N
+3fa35527-e92c-4159-a80d-98412291f023	\N	idp-confirm-link	grafana	9947a1b3-c26c-423f-b380-deadb5dce1ad	0	10	f	\N	\N
+ce94d52f-caf6-4388-a9e0-ac00870a8c6b	\N	\N	grafana	9947a1b3-c26c-423f-b380-deadb5dce1ad	0	20	t	3c15ac69-f452-49ab-94d6-92e6bf809ebc	\N
+4a901e36-7af7-406a-a274-ac39a7bc5c8f	\N	idp-email-verification	grafana	3c15ac69-f452-49ab-94d6-92e6bf809ebc	2	10	f	\N	\N
+5ff95eb9-2f72-42ea-92da-7bd11a7bc4f8	\N	\N	grafana	3c15ac69-f452-49ab-94d6-92e6bf809ebc	2	20	t	1075a862-7836-4d28-a191-8be19a6574cf	\N
+72dbe3c2-0648-493f-a1e4-4b8fd6fc73ea	\N	idp-username-password-form	grafana	1075a862-7836-4d28-a191-8be19a6574cf	0	10	f	\N	\N
+e42d20ac-5167-4048-8658-3ebe3e7b9a70	\N	\N	grafana	1075a862-7836-4d28-a191-8be19a6574cf	1	20	t	21fbd70a-286f-431a-abc4-fbf6590fcdc3	\N
+b8ce6905-73eb-493b-9ce1-408ec55e3c46	\N	conditional-user-configured	grafana	21fbd70a-286f-431a-abc4-fbf6590fcdc3	0	10	f	\N	\N
+54d7692d-c0e3-40ef-9ef9-d9e8227d618d	\N	auth-otp-form	grafana	21fbd70a-286f-431a-abc4-fbf6590fcdc3	0	20	f	\N	\N
+3722f24d-6ffb-4b20-a481-1fd8a17afdf6	\N	http-basic-authenticator	grafana	ba53abf5-9a64-4371-810b-67378eb3d781	0	10	f	\N	\N
+a700b05f-a61d-4eeb-ad75-1a3df05ed429	\N	docker-http-basic-authenticator	grafana	95e02703-f5bc-4e04-8bef-f6adc2d8173f	0	10	f	\N	\N
+035c4f94-03a6-4101-a729-f3c01ee4c490	\N	no-cookie-redirect	grafana	f397495e-d073-4ef1-babf-569a338db596	0	10	f	\N	\N
+29f310db-b302-44b2-9182-4b91648cbabf	\N	\N	grafana	f397495e-d073-4ef1-babf-569a338db596	0	20	t	56c40f89-4d69-46fd-bb18-d6c01808d2af	\N
+4e7d257c-e013-4597-a44d-b186a85606af	\N	basic-auth	grafana	56c40f89-4d69-46fd-bb18-d6c01808d2af	0	10	f	\N	\N
+2ba05817-a59f-4e72-a565-f3b4591390dc	\N	basic-auth-otp	grafana	56c40f89-4d69-46fd-bb18-d6c01808d2af	3	20	f	\N	\N
+5db9c781-6718-4674-a833-9a4ac3e8212e	\N	auth-spnego	grafana	56c40f89-4d69-46fd-bb18-d6c01808d2af	3	30	f	\N	\N
+5f032dbb-bd37-425b-af1e-ba555c7a8245	\N	\N	grafana	b478ecfb-db7e-4797-a245-8fc3b4dec884	1	30	t	b3491338-0630-4232-97e7-a518c254b248	\N
+\.
+
+
+--
+-- Data for Name: authentication_flow; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.authentication_flow (id, alias, description, realm_id, provider_id, top_level, built_in) FROM stdin;
+ef998ef5-ca12-45db-a252-2e71b1419039	browser	browser based authentication	master	basic-flow	t	t
+4e407b0a-c011-4aef-bcf5-e8c5e649493e	forms	Username, password, otp and other auth forms.	master	basic-flow	f	t
+8561a6a9-da18-4977-a92d-2c85763d042a	Browser - Conditional OTP	Flow to determine if the OTP is required for the authentication	master	basic-flow	f	t
+5f6f801e-0588-4a6e-860a-35483f5c1ec7	direct grant	OpenID Connect Resource Owner Grant	master	basic-flow	t	t
+99865746-4232-46f0-84b5-20952fe9eb51	Direct Grant - Conditional OTP	Flow to determine if the OTP is required for the authentication	master	basic-flow	f	t
+1695e7d2-ad80-4502-8479-8121a6e2a2f0	registration	registration flow	master	basic-flow	t	t
+8fb96669-d28d-4173-a8f4-dc24d41c7d27	registration form	registration form	master	form-flow	f	t
+954b046d-2b24-405e-84ee-c44ffe603df2	reset credentials	Reset credentials for a user if they forgot their password or something	master	basic-flow	t	t
+b379b44c-beef-4065-882c-d04cf6d4ffc8	Reset - Conditional OTP	Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.	master	basic-flow	f	t
+023dc515-c259-42bb-88a8-2e8d84abca92	clients	Base authentication for clients	master	client-flow	t	t
+242efff2-c3b7-42c0-a48a-77bb1b54502a	first broker login	Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account	master	basic-flow	t	t
+d46ab605-5f1e-4649-88bf-6c2dc79d636d	User creation or linking	Flow for the existing/non-existing user alternatives	master	basic-flow	f	t
+c39b0bc2-aba3-414d-ad3e-b648708e24d1	Handle Existing Account	Handle what to do if there is existing account with same email/username like authenticated identity provider	master	basic-flow	f	t
+a7ca6b5a-fa8a-4f4a-bafa-ae178db785a3	Account verification options	Method with which to verity the existing account	master	basic-flow	f	t
+ca3a3600-552c-4849-9a9d-826c8aa3e646	Verify Existing Account by Re-authentication	Reauthentication of existing account	master	basic-flow	f	t
+a7d23655-efbb-4950-8ab6-50dbc85681a0	First broker login - Conditional OTP	Flow to determine if the OTP is required for the authentication	master	basic-flow	f	t
+57c56583-d91c-4399-bd15-05a1a17d48c1	saml ecp	SAML ECP Profile Authentication Flow	master	basic-flow	t	t
+032b05cf-0007-44da-a370-b42039f6b762	docker auth	Used by Docker clients to authenticate against the IDP	master	basic-flow	t	t
+1c7af06b-3085-46c3-849c-34c67f581b9e	http challenge	An authentication flow based on challenge-response HTTP Authentication Schemes	master	basic-flow	t	t
+85c00992-77dd-4262-8744-a9dd8521e98e	Authentication Options	Authentication options.	master	basic-flow	f	t
+a38aeb47-f27e-4e68-82ff-7cc7371a47a7	browser	browser based authentication	grafana	basic-flow	t	t
+c53e357f-e276-43aa-b36c-46366a7ffd35	forms	Username, password, otp and other auth forms.	grafana	basic-flow	f	t
+cf4831e9-3e1d-452e-984e-e6d4d9eeafb5	Browser - Conditional OTP	Flow to determine if the OTP is required for the authentication	grafana	basic-flow	f	t
+b478ecfb-db7e-4797-a245-8fc3b4dec884	direct grant	OpenID Connect Resource Owner Grant	grafana	basic-flow	t	t
+b3491338-0630-4232-97e7-a518c254b248	Direct Grant - Conditional OTP	Flow to determine if the OTP is required for the authentication	grafana	basic-flow	f	t
+9d02badd-cb1c-4655-bf5e-f888861433ff	registration	registration flow	grafana	basic-flow	t	t
+c3ed2ad1-cfb4-49fa-8c75-cf5047527c68	registration form	registration form	grafana	form-flow	f	t
+3085fb68-fc1f-4e1c-a8be-33fb45194b04	reset credentials	Reset credentials for a user if they forgot their password or something	grafana	basic-flow	t	t
+079166ff-6d61-4bb2-a26d-374b8558f628	Reset - Conditional OTP	Flow to determine if the OTP should be reset or not. Set to REQUIRED to force.	grafana	basic-flow	f	t
+cbb4b3ca-ced6-4046-8b59-f1c3959c7948	clients	Base authentication for clients	grafana	client-flow	t	t
+0af1201c-a206-4393-9528-cb6083b9caa0	first broker login	Actions taken after first broker login with identity provider account, which is not yet linked to any Keycloak account	grafana	basic-flow	t	t
+df86516c-dcb1-41a8-877e-eb8805bcac8c	User creation or linking	Flow for the existing/non-existing user alternatives	grafana	basic-flow	f	t
+9947a1b3-c26c-423f-b380-deadb5dce1ad	Handle Existing Account	Handle what to do if there is existing account with same email/username like authenticated identity provider	grafana	basic-flow	f	t
+3c15ac69-f452-49ab-94d6-92e6bf809ebc	Account verification options	Method with which to verity the existing account	grafana	basic-flow	f	t
+1075a862-7836-4d28-a191-8be19a6574cf	Verify Existing Account by Re-authentication	Reauthentication of existing account	grafana	basic-flow	f	t
+21fbd70a-286f-431a-abc4-fbf6590fcdc3	First broker login - Conditional OTP	Flow to determine if the OTP is required for the authentication	grafana	basic-flow	f	t
+ba53abf5-9a64-4371-810b-67378eb3d781	saml ecp	SAML ECP Profile Authentication Flow	grafana	basic-flow	t	t
+95e02703-f5bc-4e04-8bef-f6adc2d8173f	docker auth	Used by Docker clients to authenticate against the IDP	grafana	basic-flow	t	t
+f397495e-d073-4ef1-babf-569a338db596	http challenge	An authentication flow based on challenge-response HTTP Authentication Schemes	grafana	basic-flow	t	t
+56c40f89-4d69-46fd-bb18-d6c01808d2af	Authentication Options	Authentication options.	grafana	basic-flow	f	t
+\.
+
+
+--
+-- Data for Name: authenticator_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.authenticator_config (id, alias, realm_id) FROM stdin;
+8ab33625-af83-4fcd-aa77-6bd365100d7b	review profile config	master
+c7d1ba52-6053-4219-8118-a64cebfab1e1	create unique user config	master
+e159a12b-cd0b-4241-a41c-e13f84e92052	review profile config	grafana
+f159d9c3-3ea7-460d-a719-b9c88bcbf650	create unique user config	grafana
+\.
+
+
+--
+-- Data for Name: authenticator_config_entry; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.authenticator_config_entry (authenticator_id, value, name) FROM stdin;
+8ab33625-af83-4fcd-aa77-6bd365100d7b	missing	update.profile.on.first.login
+c7d1ba52-6053-4219-8118-a64cebfab1e1	false	require.password.update.after.registration
+e159a12b-cd0b-4241-a41c-e13f84e92052	missing	update.profile.on.first.login
+f159d9c3-3ea7-460d-a719-b9c88bcbf650	false	require.password.update.after.registration
+\.
+
+
+--
+-- Data for Name: broker_link; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.broker_link (identity_provider, storage_provider_id, realm_id, broker_user_id, broker_username, token, user_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client (id, enabled, full_scope_allowed, client_id, not_before, public_client, secret, base_url, bearer_only, management_url, surrogate_auth_required, realm_id, protocol, node_rereg_timeout, frontchannel_logout, consent_required, name, service_accounts_enabled, client_authenticator_type, root_url, description, registration_token, standard_flow_enabled, implicit_flow_enabled, direct_access_grants_enabled, always_display_in_console) FROM stdin;
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	t	master-realm	0	f	e223073e-1025-4f3a-90d3-e79e3e4e8ffe	\N	t	\N	f	master	\N	0	f	f	master Realm	f	client-secret	\N	\N	\N	t	f	f	f
+eed689c6-49da-4d91-98eb-cd495bcc07a3	t	f	account	0	f	edbe696c-b249-49c5-af33-b7e36f28a259	/realms/master/account/	f	\N	f	master	openid-connect	0	f	f	${client_account}	f	client-secret	${authBaseUrl}	\N	\N	t	f	f	f
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	t	f	account-console	0	t	3c802dbd-ab38-4f29-a7cd-799000d7fa6b	/realms/master/account/	f	\N	f	master	openid-connect	0	f	f	${client_account-console}	f	client-secret	${authBaseUrl}	\N	\N	t	f	f	f
+1e30397c-eac2-41fb-87bc-d90484992e65	t	f	broker	0	f	44f53260-bed3-434f-b44f-bc4a8a546243	\N	f	\N	f	master	openid-connect	0	f	f	${client_broker}	f	client-secret	\N	\N	\N	t	f	f	f
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	t	f	security-admin-console	0	t	0abe5b86-38bd-458c-aee5-c88495207eef	/admin/master/console/	f	\N	f	master	openid-connect	0	f	f	${client_security-admin-console}	f	client-secret	${authAdminUrl}	\N	\N	t	f	f	f
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	t	f	admin-cli	0	t	1cf461d4-8b50-45d9-b69a-7703c4d99f54	\N	f	\N	f	master	openid-connect	0	f	f	${client_admin-cli}	f	client-secret	\N	\N	\N	f	f	t	f
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	t	grafana-realm	0	f	969c7bb6-18d9-47d9-bd3a-b4440be4afe6	\N	t	\N	f	master	\N	0	f	f	grafana Realm	f	client-secret	\N	\N	\N	t	f	f	f
+a8698f4f-5fa1-4baa-be05-87d03052af49	t	f	realm-management	0	f	a313dae0-428d-4b35-b5cd-724201173481	\N	t	\N	f	grafana	openid-connect	0	f	f	${client_realm-management}	f	client-secret	\N	\N	\N	t	f	f	f
+a5a8fed6-0bca-4646-9946-2fe84175353b	t	f	account	0	f	d0b8b6b6-2a02-412c-84d1-716418c4f591	/realms/grafana/account/	f	\N	f	grafana	openid-connect	0	f	f	${client_account}	f	client-secret	${authBaseUrl}	\N	\N	t	f	f	f
+230081b5-9161-45c3-9e08-9eda5412f7f7	t	f	account-console	0	t	5cf0655c-c137-438c-9c3c-bea9541f41f1	/realms/grafana/account/	f	\N	f	grafana	openid-connect	0	f	f	${client_account-console}	f	client-secret	${authBaseUrl}	\N	\N	t	f	f	f
+77ff47f8-f578-477d-8c06-e70a846332f5	t	f	broker	0	f	589951e9-e77f-4d1d-90cd-796848190eff	\N	f	\N	f	grafana	openid-connect	0	f	f	${client_broker}	f	client-secret	\N	\N	\N	t	f	f	f
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	t	f	security-admin-console	0	t	27d2217e-9934-4971-93b8-77969e47ecf7	/admin/grafana/console/	f	\N	f	grafana	openid-connect	0	f	f	${client_security-admin-console}	f	client-secret	${authAdminUrl}	\N	\N	t	f	f	f
+6bd2d943-9800-4839-9ddc-03c04930cd9f	t	f	admin-cli	0	t	da0811c3-5031-4f35-9dc5-441050461a37	\N	f	\N	f	grafana	openid-connect	0	f	f	${client_admin-cli}	f	client-secret	\N	\N	\N	f	f	t	f
+09b79548-8426-4c0e-8e0b-7488467532c7	t	t	grafana-oauth	0	f	d17b9ea9-bcb1-43d2-b132-d339e55872a8	http://localhost:3000	f	http://localhost:3000	f	grafana	openid-connect	-1	f	f	\N	f	client-secret	http://localhost:3000	\N	\N	t	f	t	f
+\.
+
+
+--
+-- Data for Name: client_attributes; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_attributes (client_id, value, name) FROM stdin;
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	S256	pkce.code.challenge.method
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	S256	pkce.code.challenge.method
+230081b5-9161-45c3-9e08-9eda5412f7f7	S256	pkce.code.challenge.method
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	S256	pkce.code.challenge.method
+09b79548-8426-4c0e-8e0b-7488467532c7	true	backchannel.logout.session.required
+09b79548-8426-4c0e-8e0b-7488467532c7	false	backchannel.logout.revoke.offline.tokens
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.server.signature
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.server.signature.keyinfo.ext
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.assertion.signature
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.client.signature
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.encrypt
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.authnstatement
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.onetimeuse.condition
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml_force_name_id_format
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.multivalued.roles
+09b79548-8426-4c0e-8e0b-7488467532c7	false	saml.force.post.binding
+09b79548-8426-4c0e-8e0b-7488467532c7	false	exclude.session.state.from.auth.response
+09b79548-8426-4c0e-8e0b-7488467532c7	false	tls.client.certificate.bound.access.tokens
+09b79548-8426-4c0e-8e0b-7488467532c7	false	client_credentials.use_refresh_token
+09b79548-8426-4c0e-8e0b-7488467532c7	false	display.on.consent.screen
+09b79548-8426-4c0e-8e0b-7488467532c7		backchannel.logout.url
+\.
+
+
+--
+-- Data for Name: client_auth_flow_bindings; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_auth_flow_bindings (client_id, flow_id, binding_name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_default_roles; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_default_roles (client_id, role_id) FROM stdin;
+eed689c6-49da-4d91-98eb-cd495bcc07a3	86a4b6a9-93db-4177-a72f-95fd937a2c8d
+eed689c6-49da-4d91-98eb-cd495bcc07a3	619ba870-921e-4f28-b26c-89b11f39dddf
+a5a8fed6-0bca-4646-9946-2fe84175353b	f1311ecb-6a6a-49d6-bb16-5132daf93a64
+a5a8fed6-0bca-4646-9946-2fe84175353b	18a7066b-fe71-410e-9581-69f78347ec29
+\.
+
+
+--
+-- Data for Name: client_initial_access; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_initial_access (id, realm_id, "timestamp", expiration, count, remaining_count) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_node_registrations; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_node_registrations (client_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_scope; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_scope (id, name, realm_id, description, protocol) FROM stdin;
+0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	offline_access	master	OpenID Connect built-in scope: offline_access	openid-connect
+47f35d4b-35c7-4c6d-8bae-eff0a5046861	role_list	master	SAML role list	saml
+66deef47-2158-4d5b-a75f-0bf42f642e7b	profile	master	OpenID Connect built-in scope: profile	openid-connect
+94ef659c-4c4a-4a33-98e8-bfcf443e9268	email	master	OpenID Connect built-in scope: email	openid-connect
+96a960d2-c203-4ef0-a53c-c3edd01f2305	address	master	OpenID Connect built-in scope: address	openid-connect
+3f705379-3361-486d-b75a-f7b4e4be492c	phone	master	OpenID Connect built-in scope: phone	openid-connect
+b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	roles	master	OpenID Connect scope for add user roles to the access token	openid-connect
+619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	web-origins	master	OpenID Connect scope for add allowed web origins to the access token	openid-connect
+42bfb506-bf0d-424e-8649-53a9a93d252d	microprofile-jwt	master	Microprofile - JWT built-in scope	openid-connect
+0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	offline_access	grafana	OpenID Connect built-in scope: offline_access	openid-connect
+a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	role_list	grafana	SAML role list	saml
+74daf2cd-40d4-4304-87a8-92cdca808512	profile	grafana	OpenID Connect built-in scope: profile	openid-connect
+96d521d3-facc-4b5a-a8b4-a879bae6be07	email	grafana	OpenID Connect built-in scope: email	openid-connect
+a5bb3a5f-fd26-4be6-9557-26e20a03d33d	address	grafana	OpenID Connect built-in scope: address	openid-connect
+d6ffe9fc-a03c-4496-85dc-dbb5e7754587	phone	grafana	OpenID Connect built-in scope: phone	openid-connect
+d6077ed7-b265-4f82-9336-24614967bd5d	roles	grafana	OpenID Connect scope for add user roles to the access token	openid-connect
+699671ab-e7c1-4fcf-beb8-ea54f1471fc1	web-origins	grafana	OpenID Connect scope for add allowed web origins to the access token	openid-connect
+c61f5b19-c17e-49a1-91b8-a0296411b928	microprofile-jwt	grafana	Microprofile - JWT built-in scope	openid-connect
+f619a55a-d565-4cc0-8bf4-4dbaab5382fe	username	grafana		openid-connect
+0a7c7dde-23d7-4a93-bdee-4a8963aee9a4	login	grafana	login	openid-connect
+d4723cd4-f717-44b7-a9b0-6c32c5ecd23f	name	grafana	user name	openid-connect
+\.
+
+
+--
+-- Data for Name: client_scope_attributes; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_scope_attributes (scope_id, value, name) FROM stdin;
+0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	true	display.on.consent.screen
+0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	${offlineAccessScopeConsentText}	consent.screen.text
+47f35d4b-35c7-4c6d-8bae-eff0a5046861	true	display.on.consent.screen
+47f35d4b-35c7-4c6d-8bae-eff0a5046861	${samlRoleListScopeConsentText}	consent.screen.text
+66deef47-2158-4d5b-a75f-0bf42f642e7b	true	display.on.consent.screen
+66deef47-2158-4d5b-a75f-0bf42f642e7b	${profileScopeConsentText}	consent.screen.text
+66deef47-2158-4d5b-a75f-0bf42f642e7b	true	include.in.token.scope
+94ef659c-4c4a-4a33-98e8-bfcf443e9268	true	display.on.consent.screen
+94ef659c-4c4a-4a33-98e8-bfcf443e9268	${emailScopeConsentText}	consent.screen.text
+94ef659c-4c4a-4a33-98e8-bfcf443e9268	true	include.in.token.scope
+96a960d2-c203-4ef0-a53c-c3edd01f2305	true	display.on.consent.screen
+96a960d2-c203-4ef0-a53c-c3edd01f2305	${addressScopeConsentText}	consent.screen.text
+96a960d2-c203-4ef0-a53c-c3edd01f2305	true	include.in.token.scope
+3f705379-3361-486d-b75a-f7b4e4be492c	true	display.on.consent.screen
+3f705379-3361-486d-b75a-f7b4e4be492c	${phoneScopeConsentText}	consent.screen.text
+3f705379-3361-486d-b75a-f7b4e4be492c	true	include.in.token.scope
+b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	true	display.on.consent.screen
+b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	${rolesScopeConsentText}	consent.screen.text
+b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	false	include.in.token.scope
+619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	false	display.on.consent.screen
+619cf41a-5ff8-4a04-9f1e-50717e5f7ce8		consent.screen.text
+619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	false	include.in.token.scope
+42bfb506-bf0d-424e-8649-53a9a93d252d	false	display.on.consent.screen
+42bfb506-bf0d-424e-8649-53a9a93d252d	true	include.in.token.scope
+0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	true	display.on.consent.screen
+0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	${offlineAccessScopeConsentText}	consent.screen.text
+a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	true	display.on.consent.screen
+a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	${samlRoleListScopeConsentText}	consent.screen.text
+74daf2cd-40d4-4304-87a8-92cdca808512	true	display.on.consent.screen
+74daf2cd-40d4-4304-87a8-92cdca808512	${profileScopeConsentText}	consent.screen.text
+74daf2cd-40d4-4304-87a8-92cdca808512	true	include.in.token.scope
+96d521d3-facc-4b5a-a8b4-a879bae6be07	true	display.on.consent.screen
+96d521d3-facc-4b5a-a8b4-a879bae6be07	${emailScopeConsentText}	consent.screen.text
+96d521d3-facc-4b5a-a8b4-a879bae6be07	true	include.in.token.scope
+a5bb3a5f-fd26-4be6-9557-26e20a03d33d	true	display.on.consent.screen
+a5bb3a5f-fd26-4be6-9557-26e20a03d33d	${addressScopeConsentText}	consent.screen.text
+a5bb3a5f-fd26-4be6-9557-26e20a03d33d	true	include.in.token.scope
+d6ffe9fc-a03c-4496-85dc-dbb5e7754587	true	display.on.consent.screen
+d6ffe9fc-a03c-4496-85dc-dbb5e7754587	${phoneScopeConsentText}	consent.screen.text
+d6ffe9fc-a03c-4496-85dc-dbb5e7754587	true	include.in.token.scope
+d6077ed7-b265-4f82-9336-24614967bd5d	true	display.on.consent.screen
+d6077ed7-b265-4f82-9336-24614967bd5d	${rolesScopeConsentText}	consent.screen.text
+d6077ed7-b265-4f82-9336-24614967bd5d	false	include.in.token.scope
+699671ab-e7c1-4fcf-beb8-ea54f1471fc1	false	display.on.consent.screen
+699671ab-e7c1-4fcf-beb8-ea54f1471fc1		consent.screen.text
+699671ab-e7c1-4fcf-beb8-ea54f1471fc1	false	include.in.token.scope
+c61f5b19-c17e-49a1-91b8-a0296411b928	false	display.on.consent.screen
+c61f5b19-c17e-49a1-91b8-a0296411b928	true	include.in.token.scope
+f619a55a-d565-4cc0-8bf4-4dbaab5382fe	true	display.on.consent.screen
+f619a55a-d565-4cc0-8bf4-4dbaab5382fe	true	include.in.token.scope
+0a7c7dde-23d7-4a93-bdee-4a8963aee9a4	true	display.on.consent.screen
+0a7c7dde-23d7-4a93-bdee-4a8963aee9a4	true	include.in.token.scope
+d4723cd4-f717-44b7-a9b0-6c32c5ecd23f	true	display.on.consent.screen
+d4723cd4-f717-44b7-a9b0-6c32c5ecd23f	true	include.in.token.scope
+\.
+
+
+--
+-- Data for Name: client_scope_client; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_scope_client (client_id, scope_id, default_scope) FROM stdin;
+eed689c6-49da-4d91-98eb-cd495bcc07a3	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+1e30397c-eac2-41fb-87bc-d90484992e65	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+eed689c6-49da-4d91-98eb-cd495bcc07a3	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+eed689c6-49da-4d91-98eb-cd495bcc07a3	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+eed689c6-49da-4d91-98eb-cd495bcc07a3	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+eed689c6-49da-4d91-98eb-cd495bcc07a3	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+eed689c6-49da-4d91-98eb-cd495bcc07a3	3f705379-3361-486d-b75a-f7b4e4be492c	f
+eed689c6-49da-4d91-98eb-cd495bcc07a3	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+eed689c6-49da-4d91-98eb-cd495bcc07a3	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+eed689c6-49da-4d91-98eb-cd495bcc07a3	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	3f705379-3361-486d-b75a-f7b4e4be492c	f
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	3f705379-3361-486d-b75a-f7b4e4be492c	f
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+63d16a7e-aa65-486e-a0e1-81f928d3e3b8	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+1e30397c-eac2-41fb-87bc-d90484992e65	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+1e30397c-eac2-41fb-87bc-d90484992e65	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+1e30397c-eac2-41fb-87bc-d90484992e65	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+1e30397c-eac2-41fb-87bc-d90484992e65	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+1e30397c-eac2-41fb-87bc-d90484992e65	3f705379-3361-486d-b75a-f7b4e4be492c	f
+1e30397c-eac2-41fb-87bc-d90484992e65	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+1e30397c-eac2-41fb-87bc-d90484992e65	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+1e30397c-eac2-41fb-87bc-d90484992e65	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	3f705379-3361-486d-b75a-f7b4e4be492c	f
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+3cd285ea-0f6e-43b6-ab5c-d021c33a551b	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	3f705379-3361-486d-b75a-f7b4e4be492c	f
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	47f35d4b-35c7-4c6d-8bae-eff0a5046861	t
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	3f705379-3361-486d-b75a-f7b4e4be492c	f
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+ef7f6eac-9fff-44aa-a86c-5125d52acc82	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+a5a8fed6-0bca-4646-9946-2fe84175353b	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+230081b5-9161-45c3-9e08-9eda5412f7f7	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+6bd2d943-9800-4839-9ddc-03c04930cd9f	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+77ff47f8-f578-477d-8c06-e70a846332f5	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+a8698f4f-5fa1-4baa-be05-87d03052af49	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+a5a8fed6-0bca-4646-9946-2fe84175353b	d6077ed7-b265-4f82-9336-24614967bd5d	t
+a5a8fed6-0bca-4646-9946-2fe84175353b	74daf2cd-40d4-4304-87a8-92cdca808512	t
+a5a8fed6-0bca-4646-9946-2fe84175353b	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+a5a8fed6-0bca-4646-9946-2fe84175353b	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+a5a8fed6-0bca-4646-9946-2fe84175353b	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+a5a8fed6-0bca-4646-9946-2fe84175353b	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+a5a8fed6-0bca-4646-9946-2fe84175353b	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+a5a8fed6-0bca-4646-9946-2fe84175353b	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+230081b5-9161-45c3-9e08-9eda5412f7f7	d6077ed7-b265-4f82-9336-24614967bd5d	t
+230081b5-9161-45c3-9e08-9eda5412f7f7	74daf2cd-40d4-4304-87a8-92cdca808512	t
+230081b5-9161-45c3-9e08-9eda5412f7f7	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+230081b5-9161-45c3-9e08-9eda5412f7f7	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+230081b5-9161-45c3-9e08-9eda5412f7f7	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+230081b5-9161-45c3-9e08-9eda5412f7f7	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+230081b5-9161-45c3-9e08-9eda5412f7f7	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+230081b5-9161-45c3-9e08-9eda5412f7f7	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+6bd2d943-9800-4839-9ddc-03c04930cd9f	d6077ed7-b265-4f82-9336-24614967bd5d	t
+6bd2d943-9800-4839-9ddc-03c04930cd9f	74daf2cd-40d4-4304-87a8-92cdca808512	t
+6bd2d943-9800-4839-9ddc-03c04930cd9f	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+6bd2d943-9800-4839-9ddc-03c04930cd9f	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+6bd2d943-9800-4839-9ddc-03c04930cd9f	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+6bd2d943-9800-4839-9ddc-03c04930cd9f	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+6bd2d943-9800-4839-9ddc-03c04930cd9f	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+6bd2d943-9800-4839-9ddc-03c04930cd9f	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+77ff47f8-f578-477d-8c06-e70a846332f5	d6077ed7-b265-4f82-9336-24614967bd5d	t
+77ff47f8-f578-477d-8c06-e70a846332f5	74daf2cd-40d4-4304-87a8-92cdca808512	t
+77ff47f8-f578-477d-8c06-e70a846332f5	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+77ff47f8-f578-477d-8c06-e70a846332f5	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+77ff47f8-f578-477d-8c06-e70a846332f5	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+77ff47f8-f578-477d-8c06-e70a846332f5	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+77ff47f8-f578-477d-8c06-e70a846332f5	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+77ff47f8-f578-477d-8c06-e70a846332f5	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+a8698f4f-5fa1-4baa-be05-87d03052af49	d6077ed7-b265-4f82-9336-24614967bd5d	t
+a8698f4f-5fa1-4baa-be05-87d03052af49	74daf2cd-40d4-4304-87a8-92cdca808512	t
+a8698f4f-5fa1-4baa-be05-87d03052af49	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+a8698f4f-5fa1-4baa-be05-87d03052af49	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+a8698f4f-5fa1-4baa-be05-87d03052af49	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+a8698f4f-5fa1-4baa-be05-87d03052af49	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+a8698f4f-5fa1-4baa-be05-87d03052af49	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+a8698f4f-5fa1-4baa-be05-87d03052af49	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	d6077ed7-b265-4f82-9336-24614967bd5d	t
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	74daf2cd-40d4-4304-87a8-92cdca808512	t
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+09b79548-8426-4c0e-8e0b-7488467532c7	a1d5ab0b-6c06-4dc5-bdca-3fefe915f4f3	t
+09b79548-8426-4c0e-8e0b-7488467532c7	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+09b79548-8426-4c0e-8e0b-7488467532c7	d6077ed7-b265-4f82-9336-24614967bd5d	t
+09b79548-8426-4c0e-8e0b-7488467532c7	d4723cd4-f717-44b7-a9b0-6c32c5ecd23f	t
+09b79548-8426-4c0e-8e0b-7488467532c7	0a7c7dde-23d7-4a93-bdee-4a8963aee9a4	t
+09b79548-8426-4c0e-8e0b-7488467532c7	74daf2cd-40d4-4304-87a8-92cdca808512	t
+\.
+
+
+--
+-- Data for Name: client_scope_role_mapping; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_scope_role_mapping (scope_id, role_id) FROM stdin;
+0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	16d5987b-dcbb-4650-8f52-3469f3974846
+0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	c49bddc6-ec92-4caa-bc04-57ba80a92eb9
+\.
+
+
+--
+-- Data for Name: client_session; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_session (id, client_id, redirect_uri, state, "timestamp", session_id, auth_method, realm_id, auth_user_id, current_action) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_session_auth_status; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_session_auth_status (authenticator, status, client_session) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_session_note; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_session_note (name, value, client_session) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_session_prot_mapper; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_session_prot_mapper (protocol_mapper_id, client_session) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_session_role; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_session_role (role_id, client_session) FROM stdin;
+\.
+
+
+--
+-- Data for Name: client_user_session_note; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.client_user_session_note (name, value, client_session) FROM stdin;
+\.
+
+
+--
+-- Data for Name: component; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.component (id, name, parent_id, provider_id, provider_type, realm_id, sub_type) FROM stdin;
+bf743b0a-d8f9-4635-bcbe-e1c8b92075e2	Trusted Hosts	master	trusted-hosts	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	anonymous
+d6e91e34-9d10-46e6-a343-c767cd9817ab	Consent Required	master	consent-required	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	anonymous
+b914dfd7-6556-40b2-8055-bf0a131d9b6a	Full Scope Disabled	master	scope	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	anonymous
+2ab822d8-3278-42f3-a27a-e9d7104ce361	Max Clients Limit	master	max-clients	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	anonymous
+f95566ed-b955-4668-88fc-e7413fd98615	Allowed Protocol Mapper Types	master	allowed-protocol-mappers	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	anonymous
+588cf9d4-1fb1-43d5-b454-9f9239d1dda7	Allowed Client Scopes	master	allowed-client-templates	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	anonymous
+28d2466c-5af6-4786-a8a2-c25d6cb4833f	Allowed Protocol Mapper Types	master	allowed-protocol-mappers	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	authenticated
+1dc5700c-668d-4988-8920-f1b21f22aaa2	Allowed Client Scopes	master	allowed-client-templates	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	master	authenticated
+ec24e563-c82e-4a0f-89db-6c2b75e5383a	fallback-HS256	master	hmac-generated	org.keycloak.keys.KeyProvider	master	\N
+281b3291-097c-42af-8d52-46606d3b669f	fallback-RS256	master	rsa-generated	org.keycloak.keys.KeyProvider	master	\N
+80af2f23-4a51-498a-a011-732cf9cfa8f8	rsa-generated	grafana	rsa-generated	org.keycloak.keys.KeyProvider	grafana	\N
+a5b75d44-0bf1-400e-9e87-4293efeb3051	hmac-generated	grafana	hmac-generated	org.keycloak.keys.KeyProvider	grafana	\N
+9877acf2-e1cc-4038-a3c2-75db29b432e0	aes-generated	grafana	aes-generated	org.keycloak.keys.KeyProvider	grafana	\N
+5a1232c0-4243-454f-a26e-5d771efd3585	Trusted Hosts	grafana	trusted-hosts	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	anonymous
+5382514f-29bc-4cfd-b1b9-e1cf85dc1ed3	Consent Required	grafana	consent-required	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	anonymous
+1e55b1d2-5402-4b33-8c4a-59d0d5ddba32	Full Scope Disabled	grafana	scope	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	anonymous
+3021f045-3220-4e56-872c-d3491f6601f6	Max Clients Limit	grafana	max-clients	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	anonymous
+cb7cf482-8ac6-4999-ab67-1d48fef549f5	Allowed Protocol Mapper Types	grafana	allowed-protocol-mappers	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	anonymous
+7488860e-5bba-4f89-bde2-c63b0290cc0f	Allowed Client Scopes	grafana	allowed-client-templates	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	anonymous
+261e38de-3e1f-40a3-9200-f5aac1975701	Allowed Protocol Mapper Types	grafana	allowed-protocol-mappers	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	authenticated
+4223e0de-8a82-464f-b466-048d3682d8df	Allowed Client Scopes	grafana	allowed-client-templates	org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy	grafana	authenticated
+\.
+
+
+--
+-- Data for Name: component_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.component_config (id, component_id, name, value) FROM stdin;
+9a09b41f-3340-49d7-b65c-fb02300ac5a0	1dc5700c-668d-4988-8920-f1b21f22aaa2	allow-default-scopes	true
+81cf1edb-60cb-4336-8e61-3676e82a8496	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	saml-role-list-mapper
+ebd9fd67-3468-4640-a130-dadf8bd0d3dd	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	oidc-address-mapper
+5a2075e1-ff50-4221-ba0f-13c221b745f1	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	oidc-sha256-pairwise-sub-mapper
+d47557df-07ff-4cae-bedd-b584c0697852	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	saml-user-attribute-mapper
+91a7d433-6520-4710-a95a-b1d6ed1932f7	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	oidc-usermodel-attribute-mapper
+35c3fff3-1779-4ea1-b8c2-b93b746ad4df	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	oidc-usermodel-property-mapper
+64312a90-809f-455e-b89e-52b9f0a34229	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	oidc-full-name-mapper
+5f0a8c49-4279-41bc-9b1f-cdf3acf14bc9	f95566ed-b955-4668-88fc-e7413fd98615	allowed-protocol-mapper-types	saml-user-property-mapper
+2ae4acc4-c6d6-4d2f-92c6-3a222a7d078a	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-sha256-pairwise-sub-mapper
+880a35e4-65a1-4697-836d-fbc46641d676	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-full-name-mapper
+b087e631-754f-4c03-8cfc-354c7e7456fe	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-usermodel-property-mapper
+079e63d4-0862-4e63-a62f-1a168cbbc25c	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	saml-user-property-mapper
+da61fbc2-7533-4bc1-b0c4-357db9f108e4	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-address-mapper
+37a4be58-26b0-4d4a-9c41-a89b27fc25f6	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	saml-user-attribute-mapper
+0eb7fcb8-1afb-4d73-bbf7-9827e7669990	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	oidc-usermodel-attribute-mapper
+1e0e9459-5116-46b7-a247-0212c2e8d719	28d2466c-5af6-4786-a8a2-c25d6cb4833f	allowed-protocol-mapper-types	saml-role-list-mapper
+6bd5567c-e438-4884-a7ad-4f0450f2c75b	2ab822d8-3278-42f3-a27a-e9d7104ce361	max-clients	200
+13ec6e6a-b4a9-4ca6-bee5-fe6d7df07bd4	588cf9d4-1fb1-43d5-b454-9f9239d1dda7	allow-default-scopes	true
+9e4f8b41-d2e6-4b67-9784-f319b804b66b	bf743b0a-d8f9-4635-bcbe-e1c8b92075e2	host-sending-registration-request-must-match	true
+4ca659f4-e9cf-45ff-a891-42b973fee220	bf743b0a-d8f9-4635-bcbe-e1c8b92075e2	client-uris-must-match	true
+69a74c94-26ec-40d1-8859-c3077a84c374	ec24e563-c82e-4a0f-89db-6c2b75e5383a	secret	R0msuv6OjhKyzluLnbkkgkM1s0Mi5aK0Ck-3o-kbGMwsE2TPdzsoH-9Z_P2OEmJ6dqppkp9H8eZE9pdC8uDJHA
+19b2af74-0667-4ade-993e-d734eb465a16	ec24e563-c82e-4a0f-89db-6c2b75e5383a	algorithm	HS256
+b2a0d967-1111-4c79-9273-e05450fe26c5	ec24e563-c82e-4a0f-89db-6c2b75e5383a	priority	-100
+63fba7e3-ad5f-475b-a367-8c0af5302b0b	ec24e563-c82e-4a0f-89db-6c2b75e5383a	kid	e19299b5-a2bc-45d4-bd71-2beeaab7dfbf
+c2e6f8d9-fa94-4cda-8cab-558695b50ae4	281b3291-097c-42af-8d52-46606d3b669f	privateKey	MIIEowIBAAKCAQEAjuRpHyJ/1ki93NW9sMrppl7MC4DfzODtvirvslRfYvhVMm0rMWPw2q1bqrrzQMR+VdKQbp+M7jt9PYryNrzsGy+iiD7mi+KTrLnmQ+c+r867flwbivBB0LR63LidcpOExVUuREwilOcywfFXeFiBQ9Tbxcwztu6J+b9kjlSYNSg+JCzn2Wn2kMQXSTd2ddxBHs8bmxyibg18UMovJLt42E8/C8+3iP7++5gSy9FeVCjf1eIh7EF3LwPNJxeyJhd3fNfmB8YnWGoz2Jw1RZE7Hm/BW5uSsM7rQpkvEACHbsMCSlzxvJjzSGHYG+PksMgfiDLiezxBQhgD+5Z5DhImywIDAQABAoIBAFAAKaq40gHS8Bm3wWA9+tqesHawTJyUQgb6WwDopA7xIiH9ZPVeEvcbn/rSeGaGnITIQvzsbybiP5g5NqrW0wnVfZXyQXmH/U3zNqxFx57+i5KPVwxOv0puAWuaIOyJEwi4TBMI3UOovY4/5M0IIDct8W2oijudCbq+ITpeumjnrJxwV0aSlD6hYKiL4OWtcFJiAu+ZeSOlQOTY2jielAvlnOmFygx2KWE7I/JUhu2w2hO2Q1aQHPgbbPR8VxRZLID411VztuW3T4w9ur057YRIqB16ZwI6knMETGxHc1rYo6mMh+t45rWHzJ+hKJC/NKQ+IRI1U4YfUXDkdAg2b+ECgYEAyHdHS9p9lcQQFqkZVL2FLeEAbhkosAZjIe7gblj2Kt57QKJ6NJangV61hqHAr93uU3DJu5bertsCZjqN7SHelusyUXEBc4SrFhftjZNFsnRB/yj3jU3ag11Ro40cBW7fosUgrieUI3CZEB0SPdXoc7LgwheEViKu9zyPl+PcyD8CgYEAtnoZBJMaEl6mjkXjLhKM5U5eT50pDPct9p/pl5fwpBxPkJJXBYMuybjff1D+VlAboMOImLOijjjgS7bcr/DvnOCIhqy9FMT+57KxAaa1ZcrQ4MUj3Tj4Vg0kDMbu5GMZ40lmOjR6tTrIy0riOk64rJAPztcLoV2gFl98Dwp83nUCgYA6UpGYnQGqn/c6UIpBID5uAac5YPJ4e/M9fR0onZNJF59uR5ccU7R6LA7OE6NWx0++UPMwM42n+6nwChseoZr794OVNDaC4FdSPzXq2a0OZUqKLOYQ41SuoWjOF5DOd9pypb2DTZqI0QqHKJ4VBXXyq1k+vs7OrJqQ7bqtKyshywKBgQCw/1PfBRTH9rlVzWJkISg7kD2YudfEtMoHq+s32PBZLwDaOahhN3Kdxk47v4NEk6WI1cFcZPnrPC4MIw6DNpAlOgITp+AsEj0y3zgkYuEXIJhlPbPg9E6loU9zeU7lh17oAR1AngDcY227CyLO7ebhs0cyGZM1bYxHx0ydhk3CtQKBgHIT08PBgZYhHPJZ09H76gKTKcoL2XS4uEJb6/xjp4ACa1wlFhWZmUOq/DhWeAx313Mf5sRAGQGieiaPamBwt9cOai6V+Agk1YMS97Fg4eV/aYThor8qi1O3dEGSFw4GaGGwvL7Trvcpogk2N6+Pm2LJ5aPy048FPnR+YZ9/yIzr
+c35d99d1-ca8d-4f82-bbb8-0a7b663e9d09	281b3291-097c-42af-8d52-46606d3b669f	algorithm	RS256
+3f4c9dd6-37cc-444d-b9d0-caba781e20cd	281b3291-097c-42af-8d52-46606d3b669f	priority	-100
+4bc9ffd3-9f15-442f-bdbf-aa5a73adfa65	281b3291-097c-42af-8d52-46606d3b669f	certificate	MIICmzCCAYMCBgF+u1WYqDANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjIwMjAyMTY0NTU2WhcNMzIwMjAyMTY0NzM2WjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCO5GkfIn/WSL3c1b2wyummXswLgN/M4O2+Ku+yVF9i+FUybSsxY/DarVuquvNAxH5V0pBun4zuO309ivI2vOwbL6KIPuaL4pOsueZD5z6vzrt+XBuK8EHQtHrcuJ1yk4TFVS5ETCKU5zLB8Vd4WIFD1NvFzDO27on5v2SOVJg1KD4kLOfZafaQxBdJN3Z13EEezxubHKJuDXxQyi8ku3jYTz8Lz7eI/v77mBLL0V5UKN/V4iHsQXcvA80nF7ImF3d81+YHxidYajPYnDVFkTseb8Fbm5KwzutCmS8QAIduwwJKXPG8mPNIYdgb4+SwyB+IMuJ7PEFCGAP7lnkOEibLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAIXG0C7YyWpCrpIUfq3dKFSISjUJ3yfJsm7UX43YeFhSk0XKaeNaP0IfDa1zu4x2BbmsKZn8QI6DHENRPxcVFutkjuVbdLUWz8JxnpKzvKHiJX+CnL1PZ1RKM6coQi/hX1uI3dNM/kQk/FzkhspD2l3Q/7F2ix5sFk6G0UrlvJ7NgR2hy4DujhvsO+tF5hq2ZvLn4WCbiMgLPzDIcvDSm1ytWPSpSKGJs+zANotZnVRTkYF5bXKQH8EEdbgcU9sIHy/UJ08bSQ/9H/j2X8W+62eOchQjzNK5DslwoN2jakK0JJeNvRfIM8ETucLC4e+jCAB2QaeKnjpX7CrA8hiN8AM=
+a3fdfa84-e986-426d-ba8e-49f2bdb91cd8	a5b75d44-0bf1-400e-9e87-4293efeb3051	priority	100
+0240dece-6d4d-41e0-a64f-5e863a44354a	a5b75d44-0bf1-400e-9e87-4293efeb3051	algorithm	HS256
+93341052-b55f-43fd-8f15-72b5812024d3	a5b75d44-0bf1-400e-9e87-4293efeb3051	secret	YrYYWSiul7DxTUeKd5ZeFlyrDLvJj0aOY5UMijdFx6qaDkwjMSl74kMAso4cID-qX582X_n-_vcbWFkwpdJDyA
+ea21db3f-c474-445c-926d-e7d161e5721f	a5b75d44-0bf1-400e-9e87-4293efeb3051	kid	bb678665-e694-435a-b5bb-8c11e4727c1c
+bb8c28ca-bb74-4a07-82c3-8293354517be	9877acf2-e1cc-4038-a3c2-75db29b432e0	secret	mjCx83NwCZkLHZ5sRvZ7lw
+08300dda-1f12-45b7-98b5-23805cb1ed84	9877acf2-e1cc-4038-a3c2-75db29b432e0	priority	100
+64ea89c8-a2ce-4d2d-896d-aa49e7ca9fcc	9877acf2-e1cc-4038-a3c2-75db29b432e0	kid	7d80efc5-222b-4b6d-9b99-c3b516a59733
+bec1483f-75e7-46e8-916c-102db4cbefb5	80af2f23-4a51-498a-a011-732cf9cfa8f8	certificate	MIICnTCCAYUCBgF+u1ir8jANBgkqhkiG9w0BAQsFADASMRAwDgYDVQQDDAdncmFmYW5hMB4XDTIyMDIwMjE2NDkxN1oXDTMyMDIwMjE2NTA1N1owEjEQMA4GA1UEAwwHZ3JhZmFuYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKg5kB303DkDs5jSW1b7b7kvKfxIJorHD+7wPz2TcisfTu7rchrqAJiR/HtsPICyAw1h5ef8fGgCJf/k0z00osl/COvK8iHUdvGUnubuKUXaVwlbyaTnnyjSMUAkx+67OCrkY9B2drtZrtVc+fwnggqCsCkpoXg97tcUyfPlcUJnanxsYbirZ5KH+/e+x1jlsuBiwxascmB4IoT/zJknk5l1IVXmSOiDgqhzKRfHhVlRijOlfKyCn/EDtiv7wyQTP9wvd97zGPJqkkF2yNxueMftJsgGkF6+CZMY71BioOWAt2V8OwI32b/1v30DhtBmKdoUNGpEeCjSk91zzZqTFZUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEABlW64QxuREB81VMGsyhj4Q5RykFaVuD5O8YlwUpmVfAVLzb0Drf54Kn4bnpnckKyYV+T+HsN4QXt81UE41xH0Aai2H3vrGH+PJf6aLPCDE+jpMqtN3n6IgImJXJPL8upMfhhWDv4nkM4uynEwWupzmrKi4oJuTETSMktJby4o6//XWnCzCVMoAGFJU4gtjBUzOMLW26zD+yc+BuUtfR3HzItVHSZKQSNSFO0kVS68RgrER8qJw07z3BOJ2bPpPM0PYyEngGMaowz/T6lI32ymGMWYMAnslthS1KAW9xcTBwnrW1nMhe5a0LPxIktys/wJtxIHZLc5sOddGT4xYklLg==
+48e8b904-1393-43a4-aaa1-30e2d9634b36	80af2f23-4a51-498a-a011-732cf9cfa8f8	privateKey	MIIEowIBAAKCAQEAqDmQHfTcOQOzmNJbVvtvuS8p/EgmiscP7vA/PZNyKx9O7utyGuoAmJH8e2w8gLIDDWHl5/x8aAIl/+TTPTSiyX8I68ryIdR28ZSe5u4pRdpXCVvJpOefKNIxQCTH7rs4KuRj0HZ2u1mu1Vz5/CeCCoKwKSmheD3u1xTJ8+VxQmdqfGxhuKtnkof7977HWOWy4GLDFqxyYHgihP/MmSeTmXUhVeZI6IOCqHMpF8eFWVGKM6V8rIKf8QO2K/vDJBM/3C933vMY8mqSQXbI3G54x+0myAaQXr4JkxjvUGKg5YC3ZXw7AjfZv/W/fQOG0GYp2hQ0akR4KNKT3XPNmpMVlQIDAQABAoIBAF3kEt3FZoyj1j97WOOJXmf7PPHDy081n1z61jEl9FjBFqse2gbPiBmfkU3JsVMbB70WYN1D/KOIX3EdZBELKbhQoMgJ826SSPi4vJ+jWYHVRTLB+h+B70E3X6mvXa+O6uB1rIgTNl2Gxp/rTtM/scLwAiZXR/n2hzGgNr9b1gT7D7kyCUIKDiJsQed2pA6ZbSDNTQQDE2qeN/Rr/+VV4XRuIIdBXn+Brap8ihjx4Gnn/SDBKM3MZoacwgS+9CZNhLjs8Ou4xD+KyitbbGGY4ZK/ZW2eSAH4ra8vVGTDK6bJrMTAE/73A23Evp/sKtRkFqcNumJ3rCykcAJorDUK48ECgYEA0TpkTwK6f2a72ncmw7Xzy4zdu+FdkI9PzWmS4IrbYOYRwsRMQLowsUPIdtU0EMrs7PRl1dSQa3/kAnw5J8wogkqVf4dJ3/lb/N5qtsjHP87N35QMXnMdE/BC6o7t5e+iRoHMloAuSBonGC9uBn1UeHWrNeLCB8+upJoSEBKbEQ0CgYEAzdSoKL4CJo31gVEqoJFPzPemsYGmV6Zl1Vj8mqMbQd8wcJoSJWbNV/3sfpIqdvOJOXQrzm+LYIbhhUnS3ZlGBmFsqUtC7dw3AqLg53msCyJLxmCIib0m/ONCY9qczV4OkUM6HVAdgzmMqqhk5ZB70IdUyStn2meqXKXLGFlLJKkCgYEAuizHTTcUVIFJ7x/PMp8ZjKqQM7pZ02Rykkm7FGr6wsJ2U2TwpTgIU/QI0RTt+3NWV5MxepBm4gEvFrcK9MrJ0QYk+RGdPttYay5Ors8B3Vlb//Jw/ypXWYKVSLpeHhiZwTuGnPT6OdZrqy2pLcUgAQBTlONt3B2FPZqLMBoeOZECgYBuCwm0bpF7x13AO4LMwaOmc6jdMfGa3s2G2MKEcjt6ZjbhnJ2i/Wk/Z/RuXvrxCZcN7nwVLDGZ88LSnftsmiuD8cZEZIZt4NRQRoBzgOtoMHfOoYGeElCr11yBQjme2nBzXTvOvCxrIfOAsfLvgOWRQSklPF2TuOSuD72bUPIJsQKBgBbeb8rIXKRRFC3A0IkKm8C51gG8mMgPdxZMKKuVhpb6D8B5aPh+WW44yNOpn7LInYI4jzf3Kv+kcj0PNH3nFaplnyCGFfmUIg27SAsRcrJcTlXtIKooZw6oPU+dQfAo11suArVAVD6OQc/7z99VoIpLN0cUHfS/g0H1dx/r/32o
+258b8704-0587-4208-996f-96627992e370	80af2f23-4a51-498a-a011-732cf9cfa8f8	priority	100
+12cd94c5-bd7e-4a5c-95e2-256b0bcf14bd	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	oidc-address-mapper
+f33b34f1-3793-4786-a281-b286fce52f45	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	saml-role-list-mapper
+d056c1de-9aa1-46a0-a644-fafb33088967	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	saml-user-property-mapper
+de895b7b-16e0-4f8e-95c4-055b4fd70c91	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	saml-user-attribute-mapper
+aec970eb-6722-4ed6-b8d3-4bbbfb2e3324	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	oidc-usermodel-attribute-mapper
+43020e0a-dac7-4255-9e30-b838279905d4	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	oidc-usermodel-property-mapper
+b8ec71f0-39a3-476d-baae-ee3632cadd2a	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	oidc-full-name-mapper
+7bbfd5ae-854e-42b6-ac26-017656bafa61	261e38de-3e1f-40a3-9200-f5aac1975701	allowed-protocol-mapper-types	oidc-sha256-pairwise-sub-mapper
+07031bc1-b7b6-44b1-bdf7-8b9f5a31db40	3021f045-3220-4e56-872c-d3491f6601f6	max-clients	200
+c9bba7d6-e8f7-46bd-9c58-15cf58860eae	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	saml-role-list-mapper
+5c047fce-366d-4c39-8846-14a975a4dc07	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	saml-user-attribute-mapper
+8961856f-6ae2-4e98-b372-0e9c18ee8e17	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	oidc-usermodel-attribute-mapper
+79445172-82cc-46fd-97ef-059b9f75ea39	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	oidc-full-name-mapper
+db4114c8-392d-427a-9e23-c430401cd93f	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	oidc-sha256-pairwise-sub-mapper
+b52190d4-ee85-492b-9589-dbfee4afa60d	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	oidc-address-mapper
+a0173a1b-dd1a-450c-8a6e-f2e1d7a5d3d8	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	saml-user-property-mapper
+0e4535b0-2979-40f7-ad71-b57275cd0fdc	cb7cf482-8ac6-4999-ab67-1d48fef549f5	allowed-protocol-mapper-types	oidc-usermodel-property-mapper
+aa3d34ee-58f9-4017-83ff-69f252d2b54b	4223e0de-8a82-464f-b466-048d3682d8df	allow-default-scopes	true
+e77f7d11-31d8-468e-8232-cd5045556d23	5a1232c0-4243-454f-a26e-5d771efd3585	host-sending-registration-request-must-match	true
+230d9d99-1b5c-49c5-853a-75967443a767	5a1232c0-4243-454f-a26e-5d771efd3585	client-uris-must-match	true
+53a1ee77-7350-40cb-be63-6ac417f14e6f	7488860e-5bba-4f89-bde2-c63b0290cc0f	allow-default-scopes	true
+\.
+
+
+--
+-- Data for Name: composite_role; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.composite_role (composite, child_role) FROM stdin;
+4a3204aa-320e-4584-b8ee-ea2989b3f330	847ebc80-6849-4c47-9f9e-5bba0c0d754d
+4a3204aa-320e-4584-b8ee-ea2989b3f330	103dc6a6-5e7a-4c27-b4f0-9dbb1fdcf214
+4a3204aa-320e-4584-b8ee-ea2989b3f330	13c94e3b-b22f-4503-bc56-75e1bd2a927f
+4a3204aa-320e-4584-b8ee-ea2989b3f330	4364a376-4ed0-4051-aeab-609f62420e5d
+4a3204aa-320e-4584-b8ee-ea2989b3f330	f12af4b7-8828-47a5-abbc-dbb09b9d409e
+4a3204aa-320e-4584-b8ee-ea2989b3f330	2606a5b9-699b-488a-a819-d6f368e66697
+4a3204aa-320e-4584-b8ee-ea2989b3f330	2cf34980-2606-4faf-bc40-b9a47c69ef1c
+4a3204aa-320e-4584-b8ee-ea2989b3f330	13e61c6b-aff6-4ef8-ab56-ad4abefcb101
+4a3204aa-320e-4584-b8ee-ea2989b3f330	632bad74-a33f-4fd5-9393-ec0a07898b1a
+4a3204aa-320e-4584-b8ee-ea2989b3f330	4607a008-f45c-45f5-b506-6de020b7e366
+4a3204aa-320e-4584-b8ee-ea2989b3f330	edd471cc-81d5-43e4-bb43-41fe88ff537d
+4a3204aa-320e-4584-b8ee-ea2989b3f330	4c2b4e2a-e792-4ffd-969d-e33ecdf7158f
+4a3204aa-320e-4584-b8ee-ea2989b3f330	38282bc7-ea21-46db-a36e-ca621d3275b4
+4a3204aa-320e-4584-b8ee-ea2989b3f330	12111f4a-16ee-4ee7-8576-7956b9440dc5
+4a3204aa-320e-4584-b8ee-ea2989b3f330	f417ae21-5fb4-40fb-bda8-54c61ce7461d
+4a3204aa-320e-4584-b8ee-ea2989b3f330	7adeaf33-05d3-4a81-a7bf-f99c721b5d9c
+4a3204aa-320e-4584-b8ee-ea2989b3f330	60870d03-d96a-4371-bdad-e3fac925a8df
+4a3204aa-320e-4584-b8ee-ea2989b3f330	94363dbd-a6b8-4678-8231-50208c32c22c
+f12af4b7-8828-47a5-abbc-dbb09b9d409e	7adeaf33-05d3-4a81-a7bf-f99c721b5d9c
+4364a376-4ed0-4051-aeab-609f62420e5d	f417ae21-5fb4-40fb-bda8-54c61ce7461d
+4364a376-4ed0-4051-aeab-609f62420e5d	94363dbd-a6b8-4678-8231-50208c32c22c
+619ba870-921e-4f28-b26c-89b11f39dddf	a42d235d-2864-4a99-9592-211d89d0407d
+828c3ba8-a13d-49f5-8975-8eb00afbf7de	a1a08dbc-4553-4be7-85f5-88c417bdcd45
+4a3204aa-320e-4584-b8ee-ea2989b3f330	b44e0fe0-0fb7-4e12-a6f0-b352431a0f57
+4a3204aa-320e-4584-b8ee-ea2989b3f330	95dfed9c-47fe-489b-aa28-52f0d7aa7c49
+4a3204aa-320e-4584-b8ee-ea2989b3f330	07e1586d-a943-46d9-9c3d-1f3544c8c27f
+4a3204aa-320e-4584-b8ee-ea2989b3f330	293d0c06-6dce-4303-9cd3-dfdd6d1275b8
+4a3204aa-320e-4584-b8ee-ea2989b3f330	cfdeeb7b-c70e-496b-9605-70377168a6cb
+4a3204aa-320e-4584-b8ee-ea2989b3f330	74252705-a339-4513-97ca-d5617977d5ff
+4a3204aa-320e-4584-b8ee-ea2989b3f330	77c3f67e-21d7-4c18-9971-4baf4c20eeaa
+4a3204aa-320e-4584-b8ee-ea2989b3f330	5de01bf1-bfac-4ea2-8fb1-ed95594fe1da
+4a3204aa-320e-4584-b8ee-ea2989b3f330	a72adc0b-5220-48e4-a66a-9e15dca5f574
+4a3204aa-320e-4584-b8ee-ea2989b3f330	f29b8efa-3c08-410a-a5c0-15b52253d2e2
+4a3204aa-320e-4584-b8ee-ea2989b3f330	dd3ecc72-aaee-43d5-8f7e-f6dcdfb5a608
+4a3204aa-320e-4584-b8ee-ea2989b3f330	9d5a8bab-e112-4e1c-8196-604f3d0143ea
+4a3204aa-320e-4584-b8ee-ea2989b3f330	ffff4251-e0a4-4f9c-8bf6-5461b2f52766
+4a3204aa-320e-4584-b8ee-ea2989b3f330	5fafdde9-71f7-4f67-9c1d-f3f4bc7f5128
+4a3204aa-320e-4584-b8ee-ea2989b3f330	6cfc2ac6-bdd7-4b90-ac16-27a75f2eb00a
+4a3204aa-320e-4584-b8ee-ea2989b3f330	c3ded8eb-c970-4e43-bea9-5e07795d20ef
+4a3204aa-320e-4584-b8ee-ea2989b3f330	811c2a39-6614-46fb-acf5-889d52248171
+4a3204aa-320e-4584-b8ee-ea2989b3f330	2a90f228-2ca4-413f-bc4b-7939af8abcbf
+cfdeeb7b-c70e-496b-9605-70377168a6cb	c3ded8eb-c970-4e43-bea9-5e07795d20ef
+293d0c06-6dce-4303-9cd3-dfdd6d1275b8	2a90f228-2ca4-413f-bc4b-7939af8abcbf
+293d0c06-6dce-4303-9cd3-dfdd6d1275b8	6cfc2ac6-bdd7-4b90-ac16-27a75f2eb00a
+85afffb5-2069-4873-b6c8-08159c1e4bdd	d0e4028d-a604-427a-9262-a1a9513dafc8
+85afffb5-2069-4873-b6c8-08159c1e4bdd	2b8b60c5-d388-4925-b735-858df38dae6e
+85afffb5-2069-4873-b6c8-08159c1e4bdd	e9c997c8-ad6b-4a99-81e1-c248e94fbeac
+85afffb5-2069-4873-b6c8-08159c1e4bdd	8c4449b9-5add-40ba-a19f-cf5d80425e68
+85afffb5-2069-4873-b6c8-08159c1e4bdd	a5f31b90-986b-46d5-a385-a639b4e19e37
+85afffb5-2069-4873-b6c8-08159c1e4bdd	99bd546f-a5ed-47f8-862c-9a5e8345bf3b
+85afffb5-2069-4873-b6c8-08159c1e4bdd	9096d8df-9d5b-4fb5-b93e-49acc6df0be5
+85afffb5-2069-4873-b6c8-08159c1e4bdd	03230264-ed7a-46b2-939d-53ebe9a59812
+85afffb5-2069-4873-b6c8-08159c1e4bdd	2240d1de-5ac4-44ac-91be-cee70e1dd22b
+85afffb5-2069-4873-b6c8-08159c1e4bdd	6d2fd708-445b-44a8-b950-f1350a15dd14
+85afffb5-2069-4873-b6c8-08159c1e4bdd	82266aa3-67ea-485a-a078-4671eb141853
+85afffb5-2069-4873-b6c8-08159c1e4bdd	d6dad388-8c69-4bba-940e-371afc98042e
+85afffb5-2069-4873-b6c8-08159c1e4bdd	5d7868e1-0c4a-46cc-8bac-bd19c0ea1bde
+85afffb5-2069-4873-b6c8-08159c1e4bdd	85e6229e-e246-4e9a-8b39-7bae49754f7d
+85afffb5-2069-4873-b6c8-08159c1e4bdd	bc618c28-98d1-477d-b4fc-c5ec7cd7f271
+85afffb5-2069-4873-b6c8-08159c1e4bdd	5059b239-0dce-4bb2-9c55-a6afc8dcbe3b
+85afffb5-2069-4873-b6c8-08159c1e4bdd	ac28461f-3416-4af4-be65-abc739dbeee5
+8c4449b9-5add-40ba-a19f-cf5d80425e68	bc618c28-98d1-477d-b4fc-c5ec7cd7f271
+e9c997c8-ad6b-4a99-81e1-c248e94fbeac	ac28461f-3416-4af4-be65-abc739dbeee5
+e9c997c8-ad6b-4a99-81e1-c248e94fbeac	85e6229e-e246-4e9a-8b39-7bae49754f7d
+18a7066b-fe71-410e-9581-69f78347ec29	68fdbd76-8688-47a6-b68d-3298a5401f05
+c7e799a5-1250-4bc8-b7c6-ffdc58361477	daaedcc6-e7a6-488e-921e-7022aa808da7
+4a3204aa-320e-4584-b8ee-ea2989b3f330	b8a4faaf-86d9-43eb-bb18-0eaa654b35a7
+85afffb5-2069-4873-b6c8-08159c1e4bdd	5e2301d7-2a9e-4f2d-a940-9bd442b15d8c
+\.
+
+
+--
+-- Data for Name: credential; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.credential (id, salt, type, user_id, created_date, user_label, secret_data, credential_data, priority) FROM stdin;
+d4b2c483-1dd3-47f6-86bf-42548009918d	\N	password	74e29604-ff35-42bb-a26d-4d0b81ef0917	1643820449817	\N	{"value":"Hou7HlbGvohOx6II0VSCP4BIGI4Cyzy+BcXbPUQe/kaMQzNU77kH2pOKZ236UPfkiCyOLe7A3oS0afExA+ymAQ==","salt":"urXvCw0KdWf9s74km4G+lA==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+b8c9b8b4-5943-43fe-9274-d63fd3e4a139	\N	password	c685749a-645e-4396-b9ee-6eedbfd89d5e	1656420634344	\N	{"value":"IAOFzbDfWwzosZc+Z5nFm/i0B4foqmU4Q0EKG34RU3iwlIYUseEB3BoJqLEfM3Rj9oOSryEbCzblWRDS/5Padw==","salt":"7VR1+KwLVRZ6PenxaQoQTA==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+94aeafd3-71a5-4966-b2b6-34a083df6e92	\N	password	bdce2246-bb51-4f55-bb81-b7b8856225bc	1656425248776	\N	{"value":"uD8KlRNocvZwYq1VZUShVp88zEtMUEeQnLYkW8ZvZXDdn1w1EahwnpNWYIc5QewEm3Nnf3DBYlUUrrbMC4XyfQ==","salt":"REwgUSsxRA/sqM5ujSrpcg==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+624725ce-9e36-4501-8bc8-ec39ee6b98d5	\N	password	56eff2b3-e36a-4e3e-84a1-361ad312667b	1656428741229	\N	{"value":"4UBzDNd3oPxP54/z7ez1Bd3xSfKJBpbE3rQppM3Xg+2bLaLNoU90TPEK+8SWbpMAFBKHz53qPWrZ50MbNgcGSA==","salt":"iTNvn3xr0acn9wqQxJ3d/A==","additionalParameters":{}}	{"hashIterations":27500,"algorithm":"pbkdf2-sha256","additionalParameters":{}}	10
+\.
+
+
+--
+-- Data for Name: databasechangelog; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.databasechangelog (id, author, filename, dateexecuted, orderexecuted, exectype, md5sum, description, comments, tag, liquibase, contexts, labels, deployment_id) FROM stdin;
+1.0.0.Final-KEYCLOAK-5461	sthorger@redhat.com	META-INF/jpa-changelog-1.0.0.Final.xml	2022-02-02 16:47:26.017844	1	EXECUTED	7:4e70412f24a3f382c82183742ec79317	createTable tableName=APPLICATION_DEFAULT_ROLES; createTable tableName=CLIENT; createTable tableName=CLIENT_SESSION; createTable tableName=CLIENT_SESSION_ROLE; createTable tableName=COMPOSITE_ROLE; createTable tableName=CREDENTIAL; createTable tab...		\N	3.5.4	\N	\N	3820445829
+1.0.0.Final-KEYCLOAK-5461	sthorger@redhat.com	META-INF/db2-jpa-changelog-1.0.0.Final.xml	2022-02-02 16:47:26.03122	2	MARK_RAN	7:cb16724583e9675711801c6875114f28	createTable tableName=APPLICATION_DEFAULT_ROLES; createTable tableName=CLIENT; createTable tableName=CLIENT_SESSION; createTable tableName=CLIENT_SESSION_ROLE; createTable tableName=COMPOSITE_ROLE; createTable tableName=CREDENTIAL; createTable tab...		\N	3.5.4	\N	\N	3820445829
+1.1.0.Beta1	sthorger@redhat.com	META-INF/jpa-changelog-1.1.0.Beta1.xml	2022-02-02 16:47:26.06085	3	EXECUTED	7:0310eb8ba07cec616460794d42ade0fa	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=CLIENT_ATTRIBUTES; createTable tableName=CLIENT_SESSION_NOTE; createTable tableName=APP_NODE_REGISTRATIONS; addColumn table...		\N	3.5.4	\N	\N	3820445829
+1.1.0.Final	sthorger@redhat.com	META-INF/jpa-changelog-1.1.0.Final.xml	2022-02-02 16:47:26.065284	4	EXECUTED	7:5d25857e708c3233ef4439df1f93f012	renameColumn newColumnName=EVENT_TIME, oldColumnName=TIME, tableName=EVENT_ENTITY		\N	3.5.4	\N	\N	3820445829
+1.2.0.Beta1	psilva@redhat.com	META-INF/jpa-changelog-1.2.0.Beta1.xml	2022-02-02 16:47:26.130908	5	EXECUTED	7:c7a54a1041d58eb3817a4a883b4d4e84	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=PROTOCOL_MAPPER; createTable tableName=PROTOCOL_MAPPER_CONFIG; createTable tableName=...		\N	3.5.4	\N	\N	3820445829
+1.2.0.Beta1	psilva@redhat.com	META-INF/db2-jpa-changelog-1.2.0.Beta1.xml	2022-02-02 16:47:26.133863	6	MARK_RAN	7:2e01012df20974c1c2a605ef8afe25b7	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION; createTable tableName=PROTOCOL_MAPPER; createTable tableName=PROTOCOL_MAPPER_CONFIG; createTable tableName=...		\N	3.5.4	\N	\N	3820445829
+1.2.0.RC1	bburke@redhat.com	META-INF/jpa-changelog-1.2.0.CR1.xml	2022-02-02 16:47:26.183318	7	EXECUTED	7:0f08df48468428e0f30ee59a8ec01a41	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=MIGRATION_MODEL; createTable tableName=IDENTITY_P...		\N	3.5.4	\N	\N	3820445829
+1.2.0.RC1	bburke@redhat.com	META-INF/db2-jpa-changelog-1.2.0.CR1.xml	2022-02-02 16:47:26.186858	8	MARK_RAN	7:a77ea2ad226b345e7d689d366f185c8c	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=MIGRATION_MODEL; createTable tableName=IDENTITY_P...		\N	3.5.4	\N	\N	3820445829
+1.2.0.Final	keycloak	META-INF/jpa-changelog-1.2.0.Final.xml	2022-02-02 16:47:26.19172	9	EXECUTED	7:a3377a2059aefbf3b90ebb4c4cc8e2ab	update tableName=CLIENT; update tableName=CLIENT; update tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+1.3.0	bburke@redhat.com	META-INF/jpa-changelog-1.3.0.xml	2022-02-02 16:47:26.242162	10	EXECUTED	7:04c1dbedc2aa3e9756d1a1668e003451	delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete tableName=USER_SESSION; createTable tableName=ADMI...		\N	3.5.4	\N	\N	3820445829
+1.4.0	bburke@redhat.com	META-INF/jpa-changelog-1.4.0.xml	2022-02-02 16:47:26.275929	11	EXECUTED	7:36ef39ed560ad07062d956db861042ba	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
+1.4.0	bburke@redhat.com	META-INF/db2-jpa-changelog-1.4.0.xml	2022-02-02 16:47:26.278548	12	MARK_RAN	7:d909180b2530479a716d3f9c9eaea3d7	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
+1.5.0	bburke@redhat.com	META-INF/jpa-changelog-1.5.0.xml	2022-02-02 16:47:26.287616	13	EXECUTED	7:cf12b04b79bea5152f165eb41f3955f6	delete tableName=CLIENT_SESSION_AUTH_STATUS; delete tableName=CLIENT_SESSION_ROLE; delete tableName=CLIENT_SESSION_PROT_MAPPER; delete tableName=CLIENT_SESSION_NOTE; delete tableName=CLIENT_SESSION; delete tableName=USER_SESSION_NOTE; delete table...		\N	3.5.4	\N	\N	3820445829
+1.6.1_from15	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.299798	14	EXECUTED	7:7e32c8f05c755e8675764e7d5f514509	addColumn tableName=REALM; addColumn tableName=KEYCLOAK_ROLE; addColumn tableName=CLIENT; createTable tableName=OFFLINE_USER_SESSION; createTable tableName=OFFLINE_CLIENT_SESSION; addPrimaryKey constraintName=CONSTRAINT_OFFL_US_SES_PK2, tableName=...		\N	3.5.4	\N	\N	3820445829
+1.6.1_from16-pre	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.302088	15	MARK_RAN	7:980ba23cc0ec39cab731ce903dd01291	delete tableName=OFFLINE_CLIENT_SESSION; delete tableName=OFFLINE_USER_SESSION		\N	3.5.4	\N	\N	3820445829
+1.6.1_from16	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.303889	16	MARK_RAN	7:2fa220758991285312eb84f3b4ff5336	dropPrimaryKey constraintName=CONSTRAINT_OFFLINE_US_SES_PK, tableName=OFFLINE_USER_SESSION; dropPrimaryKey constraintName=CONSTRAINT_OFFLINE_CL_SES_PK, tableName=OFFLINE_CLIENT_SESSION; addColumn tableName=OFFLINE_USER_SESSION; update tableName=OF...		\N	3.5.4	\N	\N	3820445829
+1.6.1	mposolda@redhat.com	META-INF/jpa-changelog-1.6.1.xml	2022-02-02 16:47:26.306641	17	EXECUTED	7:d41d8cd98f00b204e9800998ecf8427e	empty		\N	3.5.4	\N	\N	3820445829
+1.7.0	bburke@redhat.com	META-INF/jpa-changelog-1.7.0.xml	2022-02-02 16:47:26.338791	18	EXECUTED	7:91ace540896df890cc00a0490ee52bbc	createTable tableName=KEYCLOAK_GROUP; createTable tableName=GROUP_ROLE_MAPPING; createTable tableName=GROUP_ATTRIBUTE; createTable tableName=USER_GROUP_MEMBERSHIP; createTable tableName=REALM_DEFAULT_GROUPS; addColumn tableName=IDENTITY_PROVIDER; ...		\N	3.5.4	\N	\N	3820445829
+1.8.0	mposolda@redhat.com	META-INF/jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.381463	19	EXECUTED	7:c31d1646dfa2618a9335c00e07f89f24	addColumn tableName=IDENTITY_PROVIDER; createTable tableName=CLIENT_TEMPLATE; createTable tableName=CLIENT_TEMPLATE_ATTRIBUTES; createTable tableName=TEMPLATE_SCOPE_MAPPING; dropNotNullConstraint columnName=CLIENT_ID, tableName=PROTOCOL_MAPPER; ad...		\N	3.5.4	\N	\N	3820445829
+1.8.0-2	keycloak	META-INF/jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.390165	20	EXECUTED	7:df8bc21027a4f7cbbb01f6344e89ce07	dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; update tableName=CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part1	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.679075	45	EXECUTED	7:6a48ce645a3525488a90fbf76adf3bb3	addColumn tableName=RESOURCE_SERVER_POLICY; addColumn tableName=RESOURCE_SERVER_RESOURCE; addColumn tableName=RESOURCE_SERVER_SCOPE		\N	3.5.4	\N	\N	3820445829
+1.8.0	mposolda@redhat.com	META-INF/db2-jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.392862	21	MARK_RAN	7:f987971fe6b37d963bc95fee2b27f8df	addColumn tableName=IDENTITY_PROVIDER; createTable tableName=CLIENT_TEMPLATE; createTable tableName=CLIENT_TEMPLATE_ATTRIBUTES; createTable tableName=TEMPLATE_SCOPE_MAPPING; dropNotNullConstraint columnName=CLIENT_ID, tableName=PROTOCOL_MAPPER; ad...		\N	3.5.4	\N	\N	3820445829
+1.8.0-2	keycloak	META-INF/db2-jpa-changelog-1.8.0.xml	2022-02-02 16:47:26.395652	22	MARK_RAN	7:df8bc21027a4f7cbbb01f6344e89ce07	dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; update tableName=CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+1.9.0	mposolda@redhat.com	META-INF/jpa-changelog-1.9.0.xml	2022-02-02 16:47:26.40969	23	EXECUTED	7:ed2dc7f799d19ac452cbcda56c929e47	update tableName=REALM; update tableName=REALM; update tableName=REALM; update tableName=REALM; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=REALM; update tableName=REALM; customChange; dr...		\N	3.5.4	\N	\N	3820445829
+1.9.1	keycloak	META-INF/jpa-changelog-1.9.1.xml	2022-02-02 16:47:26.414344	24	EXECUTED	7:80b5db88a5dda36ece5f235be8757615	modifyDataType columnName=PRIVATE_KEY, tableName=REALM; modifyDataType columnName=PUBLIC_KEY, tableName=REALM; modifyDataType columnName=CERTIFICATE, tableName=REALM		\N	3.5.4	\N	\N	3820445829
+1.9.1	keycloak	META-INF/db2-jpa-changelog-1.9.1.xml	2022-02-02 16:47:26.416193	25	MARK_RAN	7:1437310ed1305a9b93f8848f301726ce	modifyDataType columnName=PRIVATE_KEY, tableName=REALM; modifyDataType columnName=CERTIFICATE, tableName=REALM		\N	3.5.4	\N	\N	3820445829
+1.9.2	keycloak	META-INF/jpa-changelog-1.9.2.xml	2022-02-02 16:47:26.437367	26	EXECUTED	7:b82ffb34850fa0836be16deefc6a87c4	createIndex indexName=IDX_USER_EMAIL, tableName=USER_ENTITY; createIndex indexName=IDX_USER_ROLE_MAPPING, tableName=USER_ROLE_MAPPING; createIndex indexName=IDX_USER_GROUP_MAPPING, tableName=USER_GROUP_MEMBERSHIP; createIndex indexName=IDX_USER_CO...		\N	3.5.4	\N	\N	3820445829
+authz-2.0.0	psilva@redhat.com	META-INF/jpa-changelog-authz-2.0.0.xml	2022-02-02 16:47:26.481647	27	EXECUTED	7:9cc98082921330d8d9266decdd4bd658	createTable tableName=RESOURCE_SERVER; addPrimaryKey constraintName=CONSTRAINT_FARS, tableName=RESOURCE_SERVER; addUniqueConstraint constraintName=UK_AU8TT6T700S9V50BU18WS5HA6, tableName=RESOURCE_SERVER; createTable tableName=RESOURCE_SERVER_RESOU...		\N	3.5.4	\N	\N	3820445829
+authz-2.5.1	psilva@redhat.com	META-INF/jpa-changelog-authz-2.5.1.xml	2022-02-02 16:47:26.484459	28	EXECUTED	7:03d64aeed9cb52b969bd30a7ac0db57e	update tableName=RESOURCE_SERVER_POLICY		\N	3.5.4	\N	\N	3820445829
+2.1.0-KEYCLOAK-5461	bburke@redhat.com	META-INF/jpa-changelog-2.1.0.xml	2022-02-02 16:47:26.523006	29	EXECUTED	7:f1f9fd8710399d725b780f463c6b21cd	createTable tableName=BROKER_LINK; createTable tableName=FED_USER_ATTRIBUTE; createTable tableName=FED_USER_CONSENT; createTable tableName=FED_USER_CONSENT_ROLE; createTable tableName=FED_USER_CONSENT_PROT_MAPPER; createTable tableName=FED_USER_CR...		\N	3.5.4	\N	\N	3820445829
+2.2.0	bburke@redhat.com	META-INF/jpa-changelog-2.2.0.xml	2022-02-02 16:47:26.532066	30	EXECUTED	7:53188c3eb1107546e6f765835705b6c1	addColumn tableName=ADMIN_EVENT_ENTITY; createTable tableName=CREDENTIAL_ATTRIBUTE; createTable tableName=FED_CREDENTIAL_ATTRIBUTE; modifyDataType columnName=VALUE, tableName=CREDENTIAL; addForeignKeyConstraint baseTableName=FED_CREDENTIAL_ATTRIBU...		\N	3.5.4	\N	\N	3820445829
+2.3.0	bburke@redhat.com	META-INF/jpa-changelog-2.3.0.xml	2022-02-02 16:47:26.541837	31	EXECUTED	7:d6e6f3bc57a0c5586737d1351725d4d4	createTable tableName=FEDERATED_USER; addPrimaryKey constraintName=CONSTR_FEDERATED_USER, tableName=FEDERATED_USER; dropDefaultValue columnName=TOTP, tableName=USER_ENTITY; dropColumn columnName=TOTP, tableName=USER_ENTITY; addColumn tableName=IDE...		\N	3.5.4	\N	\N	3820445829
+2.4.0	bburke@redhat.com	META-INF/jpa-changelog-2.4.0.xml	2022-02-02 16:47:26.545809	32	EXECUTED	7:454d604fbd755d9df3fd9c6329043aa5	customChange		\N	3.5.4	\N	\N	3820445829
+2.5.0	bburke@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.549823	33	EXECUTED	7:57e98a3077e29caf562f7dbf80c72600	customChange; modifyDataType columnName=USER_ID, tableName=OFFLINE_USER_SESSION		\N	3.5.4	\N	\N	3820445829
+2.5.0-unicode-oracle	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.55176	34	MARK_RAN	7:e4c7e8f2256210aee71ddc42f538b57a	modifyDataType columnName=DESCRIPTION, tableName=AUTHENTICATION_FLOW; modifyDataType columnName=DESCRIPTION, tableName=CLIENT_TEMPLATE; modifyDataType columnName=DESCRIPTION, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=DESCRIPTION,...		\N	3.5.4	\N	\N	3820445829
+2.5.0-unicode-other-dbs	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.567305	35	EXECUTED	7:09a43c97e49bc626460480aa1379b522	modifyDataType columnName=DESCRIPTION, tableName=AUTHENTICATION_FLOW; modifyDataType columnName=DESCRIPTION, tableName=CLIENT_TEMPLATE; modifyDataType columnName=DESCRIPTION, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=DESCRIPTION,...		\N	3.5.4	\N	\N	3820445829
+2.5.0-duplicate-email-support	slawomir@dabek.name	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.570727	36	EXECUTED	7:26bfc7c74fefa9126f2ce702fb775553	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
+2.5.0-unique-group-names	hmlnarik@redhat.com	META-INF/jpa-changelog-2.5.0.xml	2022-02-02 16:47:26.578396	37	EXECUTED	7:a161e2ae671a9020fff61e996a207377	addUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+2.5.1	bburke@redhat.com	META-INF/jpa-changelog-2.5.1.xml	2022-02-02 16:47:26.581391	38	EXECUTED	7:37fc1781855ac5388c494f1442b3f717	addColumn tableName=FED_USER_CONSENT		\N	3.5.4	\N	\N	3820445829
+3.0.0	bburke@redhat.com	META-INF/jpa-changelog-3.0.0.xml	2022-02-02 16:47:26.584204	39	EXECUTED	7:13a27db0dae6049541136adad7261d27	addColumn tableName=IDENTITY_PROVIDER		\N	3.5.4	\N	\N	3820445829
+3.2.0-fix	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.585877	40	MARK_RAN	7:550300617e3b59e8af3a6294df8248a3	addNotNullConstraint columnName=REALM_ID, tableName=CLIENT_INITIAL_ACCESS		\N	3.5.4	\N	\N	3820445829
+3.2.0-fix-with-keycloak-5416	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.587657	41	MARK_RAN	7:e3a9482b8931481dc2772a5c07c44f17	dropIndex indexName=IDX_CLIENT_INIT_ACC_REALM, tableName=CLIENT_INITIAL_ACCESS; addNotNullConstraint columnName=REALM_ID, tableName=CLIENT_INITIAL_ACCESS; createIndex indexName=IDX_CLIENT_INIT_ACC_REALM, tableName=CLIENT_INITIAL_ACCESS		\N	3.5.4	\N	\N	3820445829
+3.2.0-fix-offline-sessions	hmlnarik	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.591561	42	EXECUTED	7:72b07d85a2677cb257edb02b408f332d	customChange		\N	3.5.4	\N	\N	3820445829
+3.2.0-fixed	keycloak	META-INF/jpa-changelog-3.2.0.xml	2022-02-02 16:47:26.669981	43	EXECUTED	7:a72a7858967bd414835d19e04d880312	addColumn tableName=REALM; dropPrimaryKey constraintName=CONSTRAINT_OFFL_CL_SES_PK2, tableName=OFFLINE_CLIENT_SESSION; dropColumn columnName=CLIENT_SESSION_ID, tableName=OFFLINE_CLIENT_SESSION; addPrimaryKey constraintName=CONSTRAINT_OFFL_CL_SES_P...		\N	3.5.4	\N	\N	3820445829
+3.3.0	keycloak	META-INF/jpa-changelog-3.3.0.xml	2022-02-02 16:47:26.673701	44	EXECUTED	7:94edff7cf9ce179e7e85f0cd78a3cf2c	addColumn tableName=USER_ENTITY		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part2-KEYCLOAK-6095	hmlnarik@redhat.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.681987	46	EXECUTED	7:e64b5dcea7db06077c6e57d3b9e5ca14	customChange		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part3-fixed	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.683661	47	MARK_RAN	7:fd8cf02498f8b1e72496a20afc75178c	dropIndex indexName=IDX_RES_SERV_POL_RES_SERV, tableName=RESOURCE_SERVER_POLICY; dropIndex indexName=IDX_RES_SRV_RES_RES_SRV, tableName=RESOURCE_SERVER_RESOURCE; dropIndex indexName=IDX_RES_SRV_SCOPE_RES_SRV, tableName=RESOURCE_SERVER_SCOPE		\N	3.5.4	\N	\N	3820445829
+authz-3.4.0.CR1-resource-server-pk-change-part3-fixed-nodropindex	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.702743	48	EXECUTED	7:542794f25aa2b1fbabb7e577d6646319	addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, tableName=RESOURCE_SERVER_POLICY; addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, tableName=RESOURCE_SERVER_RESOURCE; addNotNullConstraint columnName=RESOURCE_SERVER_CLIENT_ID, ...		\N	3.5.4	\N	\N	3820445829
+authn-3.4.0.CR1-refresh-token-max-reuse	glavoie@gmail.com	META-INF/jpa-changelog-authz-3.4.0.CR1.xml	2022-02-02 16:47:26.706593	49	EXECUTED	7:edad604c882df12f74941dac3cc6d650	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
+3.4.0	keycloak	META-INF/jpa-changelog-3.4.0.xml	2022-02-02 16:47:26.734467	50	EXECUTED	7:0f88b78b7b46480eb92690cbf5e44900	addPrimaryKey constraintName=CONSTRAINT_REALM_DEFAULT_ROLES, tableName=REALM_DEFAULT_ROLES; addPrimaryKey constraintName=CONSTRAINT_COMPOSITE_ROLE, tableName=COMPOSITE_ROLE; addPrimaryKey constraintName=CONSTR_REALM_DEFAULT_GROUPS, tableName=REALM...		\N	3.5.4	\N	\N	3820445829
+3.4.0-KEYCLOAK-5230	hmlnarik@redhat.com	META-INF/jpa-changelog-3.4.0.xml	2022-02-02 16:47:26.78037	51	EXECUTED	7:d560e43982611d936457c327f872dd59	createIndex indexName=IDX_FU_ATTRIBUTE, tableName=FED_USER_ATTRIBUTE; createIndex indexName=IDX_FU_CONSENT, tableName=FED_USER_CONSENT; createIndex indexName=IDX_FU_CONSENT_RU, tableName=FED_USER_CONSENT; createIndex indexName=IDX_FU_CREDENTIAL, t...		\N	3.5.4	\N	\N	3820445829
+3.4.1	psilva@redhat.com	META-INF/jpa-changelog-3.4.1.xml	2022-02-02 16:47:26.783989	52	EXECUTED	7:c155566c42b4d14ef07059ec3b3bbd8e	modifyDataType columnName=VALUE, tableName=CLIENT_ATTRIBUTES		\N	3.5.4	\N	\N	3820445829
+3.4.2	keycloak	META-INF/jpa-changelog-3.4.2.xml	2022-02-02 16:47:26.786619	53	EXECUTED	7:b40376581f12d70f3c89ba8ddf5b7dea	update tableName=REALM		\N	3.5.4	\N	\N	3820445829
+3.4.2-KEYCLOAK-5172	mkanis@redhat.com	META-INF/jpa-changelog-3.4.2.xml	2022-02-02 16:47:26.788788	54	EXECUTED	7:a1132cc395f7b95b3646146c2e38f168	update tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+4.0.0-KEYCLOAK-6335	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.794881	55	EXECUTED	7:d8dc5d89c789105cfa7ca0e82cba60af	createTable tableName=CLIENT_AUTH_FLOW_BINDINGS; addPrimaryKey constraintName=C_CLI_FLOW_BIND, tableName=CLIENT_AUTH_FLOW_BINDINGS		\N	3.5.4	\N	\N	3820445829
+4.0.0-CLEANUP-UNUSED-TABLE	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.799493	56	EXECUTED	7:7822e0165097182e8f653c35517656a3	dropTable tableName=CLIENT_IDENTITY_PROV_MAPPING		\N	3.5.4	\N	\N	3820445829
+4.0.0-KEYCLOAK-6228	bburke@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.810686	57	EXECUTED	7:c6538c29b9c9a08f9e9ea2de5c2b6375	dropUniqueConstraint constraintName=UK_JKUWUVD56ONTGSUHOGM8UEWRT, tableName=USER_CONSENT; dropNotNullConstraint columnName=CLIENT_ID, tableName=USER_CONSENT; addColumn tableName=USER_CONSENT; addUniqueConstraint constraintName=UK_JKUWUVD56ONTGSUHO...		\N	3.5.4	\N	\N	3820445829
+4.0.0-KEYCLOAK-5579-fixed	mposolda@redhat.com	META-INF/jpa-changelog-4.0.0.xml	2022-02-02 16:47:26.861332	58	EXECUTED	7:6d4893e36de22369cf73bcb051ded875	dropForeignKeyConstraint baseTableName=CLIENT_TEMPLATE_ATTRIBUTES, constraintName=FK_CL_TEMPL_ATTR_TEMPL; renameTable newTableName=CLIENT_SCOPE_ATTRIBUTES, oldTableName=CLIENT_TEMPLATE_ATTRIBUTES; renameColumn newColumnName=SCOPE_ID, oldColumnName...		\N	3.5.4	\N	\N	3820445829
+authz-4.0.0.CR1	psilva@redhat.com	META-INF/jpa-changelog-authz-4.0.0.CR1.xml	2022-02-02 16:47:26.877018	59	EXECUTED	7:57960fc0b0f0dd0563ea6f8b2e4a1707	createTable tableName=RESOURCE_SERVER_PERM_TICKET; addPrimaryKey constraintName=CONSTRAINT_FAPMT, tableName=RESOURCE_SERVER_PERM_TICKET; addForeignKeyConstraint baseTableName=RESOURCE_SERVER_PERM_TICKET, constraintName=FK_FRSRHO213XCX4WNKOG82SSPMT...		\N	3.5.4	\N	\N	3820445829
+authz-4.0.0.Beta3	psilva@redhat.com	META-INF/jpa-changelog-authz-4.0.0.Beta3.xml	2022-02-02 16:47:26.881203	60	EXECUTED	7:2b4b8bff39944c7097977cc18dbceb3b	addColumn tableName=RESOURCE_SERVER_POLICY; addColumn tableName=RESOURCE_SERVER_PERM_TICKET; addForeignKeyConstraint baseTableName=RESOURCE_SERVER_PERM_TICKET, constraintName=FK_FRSRPO2128CX4WNKOG82SSRFY, referencedTableName=RESOURCE_SERVER_POLICY		\N	3.5.4	\N	\N	3820445829
+authz-4.2.0.Final	mhajas@redhat.com	META-INF/jpa-changelog-authz-4.2.0.Final.xml	2022-02-02 16:47:26.886177	61	EXECUTED	7:2aa42a964c59cd5b8ca9822340ba33a8	createTable tableName=RESOURCE_URIS; addForeignKeyConstraint baseTableName=RESOURCE_URIS, constraintName=FK_RESOURCE_SERVER_URIS, referencedTableName=RESOURCE_SERVER_RESOURCE; customChange; dropColumn columnName=URI, tableName=RESOURCE_SERVER_RESO...		\N	3.5.4	\N	\N	3820445829
+authz-4.2.0.Final-KEYCLOAK-9944	hmlnarik@redhat.com	META-INF/jpa-changelog-authz-4.2.0.Final.xml	2022-02-02 16:47:26.890482	62	EXECUTED	7:9ac9e58545479929ba23f4a3087a0346	addPrimaryKey constraintName=CONSTRAINT_RESOUR_URIS_PK, tableName=RESOURCE_URIS		\N	3.5.4	\N	\N	3820445829
+4.2.0-KEYCLOAK-6313	wadahiro@gmail.com	META-INF/jpa-changelog-4.2.0.xml	2022-02-02 16:47:26.893518	63	EXECUTED	7:14d407c35bc4fe1976867756bcea0c36	addColumn tableName=REQUIRED_ACTION_PROVIDER		\N	3.5.4	\N	\N	3820445829
+4.3.0-KEYCLOAK-7984	wadahiro@gmail.com	META-INF/jpa-changelog-4.3.0.xml	2022-02-02 16:47:26.895621	64	EXECUTED	7:241a8030c748c8548e346adee548fa93	update tableName=REQUIRED_ACTION_PROVIDER		\N	3.5.4	\N	\N	3820445829
+4.6.0-KEYCLOAK-7950	psilva@redhat.com	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.89756	65	EXECUTED	7:7d3182f65a34fcc61e8d23def037dc3f	update tableName=RESOURCE_SERVER_RESOURCE		\N	3.5.4	\N	\N	3820445829
+4.6.0-KEYCLOAK-8377	keycloak	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.908059	66	EXECUTED	7:b30039e00a0b9715d430d1b0636728fa	createTable tableName=ROLE_ATTRIBUTE; addPrimaryKey constraintName=CONSTRAINT_ROLE_ATTRIBUTE_PK, tableName=ROLE_ATTRIBUTE; addForeignKeyConstraint baseTableName=ROLE_ATTRIBUTE, constraintName=FK_ROLE_ATTRIBUTE_ID, referencedTableName=KEYCLOAK_ROLE...		\N	3.5.4	\N	\N	3820445829
+4.6.0-KEYCLOAK-8555	gideonray@gmail.com	META-INF/jpa-changelog-4.6.0.xml	2022-02-02 16:47:26.912693	67	EXECUTED	7:3797315ca61d531780f8e6f82f258159	createIndex indexName=IDX_COMPONENT_PROVIDER_TYPE, tableName=COMPONENT		\N	3.5.4	\N	\N	3820445829
+4.7.0-KEYCLOAK-1267	sguilhen@redhat.com	META-INF/jpa-changelog-4.7.0.xml	2022-02-02 16:47:26.915771	68	EXECUTED	7:c7aa4c8d9573500c2d347c1941ff0301	addColumn tableName=REALM		\N	3.5.4	\N	\N	3820445829
+4.7.0-KEYCLOAK-7275	keycloak	META-INF/jpa-changelog-4.7.0.xml	2022-02-02 16:47:26.924465	69	EXECUTED	7:b207faee394fc074a442ecd42185a5dd	renameColumn newColumnName=CREATED_ON, oldColumnName=LAST_SESSION_REFRESH, tableName=OFFLINE_USER_SESSION; addNotNullConstraint columnName=CREATED_ON, tableName=OFFLINE_USER_SESSION; addColumn tableName=OFFLINE_USER_SESSION; customChange; createIn...		\N	3.5.4	\N	\N	3820445829
+4.8.0-KEYCLOAK-8835	sguilhen@redhat.com	META-INF/jpa-changelog-4.8.0.xml	2022-02-02 16:47:26.928034	70	EXECUTED	7:ab9a9762faaba4ddfa35514b212c4922	addNotNullConstraint columnName=SSO_MAX_LIFESPAN_REMEMBER_ME, tableName=REALM; addNotNullConstraint columnName=SSO_IDLE_TIMEOUT_REMEMBER_ME, tableName=REALM		\N	3.5.4	\N	\N	3820445829
+authz-7.0.0-KEYCLOAK-10443	psilva@redhat.com	META-INF/jpa-changelog-authz-7.0.0.xml	2022-02-02 16:47:26.93061	71	EXECUTED	7:b9710f74515a6ccb51b72dc0d19df8c4	addColumn tableName=RESOURCE_SERVER		\N	3.5.4	\N	\N	3820445829
+8.0.0-adding-credential-columns	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.933771	72	EXECUTED	7:ec9707ae4d4f0b7452fee20128083879	addColumn tableName=CREDENTIAL; addColumn tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+8.0.0-updating-credential-data-not-oracle	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.937673	73	EXECUTED	7:03b3f4b264c3c68ba082250a80b74216	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+8.0.0-updating-credential-data-oracle	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.939218	74	MARK_RAN	7:64c5728f5ca1f5aa4392217701c4fe23	update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL; update tableName=FED_USER_CREDENTIAL		\N	3.5.4	\N	\N	3820445829
+8.0.0-credential-cleanup-fixed	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.945819	75	EXECUTED	7:b48da8c11a3d83ddd6b7d0c8c2219345	dropDefaultValue columnName=COUNTER, tableName=CREDENTIAL; dropDefaultValue columnName=DIGITS, tableName=CREDENTIAL; dropDefaultValue columnName=PERIOD, tableName=CREDENTIAL; dropDefaultValue columnName=ALGORITHM, tableName=CREDENTIAL; dropColumn ...		\N	3.5.4	\N	\N	3820445829
+8.0.0-resource-tag-support	keycloak	META-INF/jpa-changelog-8.0.0.xml	2022-02-02 16:47:26.950255	76	EXECUTED	7:a73379915c23bfad3e8f5c6d5c0aa4bd	addColumn tableName=MIGRATION_MODEL; createIndex indexName=IDX_UPDATE_TIME, tableName=MIGRATION_MODEL		\N	3.5.4	\N	\N	3820445829
+9.0.0-always-display-client	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.955505	77	EXECUTED	7:39e0073779aba192646291aa2332493d	addColumn tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+9.0.0-drop-constraints-for-column-increase	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.957216	78	MARK_RAN	7:81f87368f00450799b4bf42ea0b3ec34	dropUniqueConstraint constraintName=UK_FRSR6T700S9V50BU18WS5PMT, tableName=RESOURCE_SERVER_PERM_TICKET; dropUniqueConstraint constraintName=UK_FRSR6T700S9V50BU18WS5HA6, tableName=RESOURCE_SERVER_RESOURCE; dropPrimaryKey constraintName=CONSTRAINT_O...		\N	3.5.4	\N	\N	3820445829
+9.0.0-increase-column-size-federated-fk	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.966746	79	EXECUTED	7:20b37422abb9fb6571c618148f013a15	modifyDataType columnName=CLIENT_ID, tableName=FED_USER_CONSENT; modifyDataType columnName=CLIENT_REALM_CONSTRAINT, tableName=KEYCLOAK_ROLE; modifyDataType columnName=OWNER, tableName=RESOURCE_SERVER_POLICY; modifyDataType columnName=CLIENT_ID, ta...		\N	3.5.4	\N	\N	3820445829
+9.0.0-recreate-constraints-after-column-increase	keycloak	META-INF/jpa-changelog-9.0.0.xml	2022-02-02 16:47:26.969643	80	MARK_RAN	7:1970bb6cfb5ee800736b95ad3fb3c78a	addNotNullConstraint columnName=CLIENT_ID, tableName=OFFLINE_CLIENT_SESSION; addNotNullConstraint columnName=OWNER, tableName=RESOURCE_SERVER_PERM_TICKET; addNotNullConstraint columnName=REQUESTER, tableName=RESOURCE_SERVER_PERM_TICKET; addNotNull...		\N	3.5.4	\N	\N	3820445829
+9.0.1-add-index-to-client.client_id	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.975764	81	EXECUTED	7:45d9b25fc3b455d522d8dcc10a0f4c80	createIndex indexName=IDX_CLIENT_ID, tableName=CLIENT		\N	3.5.4	\N	\N	3820445829
+9.0.1-KEYCLOAK-12579-drop-constraints	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.977227	82	MARK_RAN	7:890ae73712bc187a66c2813a724d037f	dropUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+9.0.1-KEYCLOAK-12579-add-not-null-constraint	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.980058	83	EXECUTED	7:0a211980d27fafe3ff50d19a3a29b538	addNotNullConstraint columnName=PARENT_GROUP, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+9.0.1-KEYCLOAK-12579-recreate-constraints	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.981645	84	MARK_RAN	7:a161e2ae671a9020fff61e996a207377	addUniqueConstraint constraintName=SIBLING_NAMES, tableName=KEYCLOAK_GROUP		\N	3.5.4	\N	\N	3820445829
+9.0.1-add-index-to-events	keycloak	META-INF/jpa-changelog-9.0.1.xml	2022-02-02 16:47:26.985465	85	EXECUTED	7:01c49302201bdf815b0a18d1f98a55dc	createIndex indexName=IDX_EVENT_TIME, tableName=EVENT_ENTITY		\N	3.5.4	\N	\N	3820445829
+map-remove-ri	keycloak	META-INF/jpa-changelog-11.0.0.xml	2022-02-02 16:47:26.98869	86	EXECUTED	7:3dace6b144c11f53f1ad2c0361279b86	dropForeignKeyConstraint baseTableName=REALM, constraintName=FK_TRAF444KK6QRKMS7N56AIWQ5Y; dropForeignKeyConstraint baseTableName=KEYCLOAK_ROLE, constraintName=FK_KJHO5LE2C0RAL09FL8CM9WFW9		\N	3.5.4	\N	\N	3820445829
+map-remove-ri	keycloak	META-INF/jpa-changelog-12.0.0.xml	2022-02-02 16:47:26.992854	87	EXECUTED	7:578d0b92077eaf2ab95ad0ec087aa903	dropForeignKeyConstraint baseTableName=REALM_DEFAULT_GROUPS, constraintName=FK_DEF_GROUPS_GROUP; dropForeignKeyConstraint baseTableName=REALM_DEFAULT_ROLES, constraintName=FK_H4WPD7W4HSOOLNI3H0SW7BTJE; dropForeignKeyConstraint baseTableName=CLIENT...		\N	3.5.4	\N	\N	3820445829
+12.1.0-add-realm-localization-table	keycloak	META-INF/jpa-changelog-12.0.0.xml	2022-02-02 16:47:26.999694	88	EXECUTED	7:c95abe90d962c57a09ecaee57972835d	createTable tableName=REALM_LOCALIZATIONS; addPrimaryKey tableName=REALM_LOCALIZATIONS		\N	3.5.4	\N	\N	3820445829
+\.
+
+
+--
+-- Data for Name: databasechangeloglock; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.databasechangeloglock (id, locked, lockgranted, lockedby) FROM stdin;
+1	f	\N	\N
+1000	f	\N	\N
+1001	f	\N	\N
+\.
+
+
+--
+-- Data for Name: default_client_scope; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.default_client_scope (realm_id, scope_id, default_scope) FROM stdin;
+master	0cc71c8c-fb37-41f2-b4d8-13210d3cf8be	f
+master	66deef47-2158-4d5b-a75f-0bf42f642e7b	t
+master	94ef659c-4c4a-4a33-98e8-bfcf443e9268	t
+master	96a960d2-c203-4ef0-a53c-c3edd01f2305	f
+master	3f705379-3361-486d-b75a-f7b4e4be492c	f
+master	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7	t
+master	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8	t
+master	42bfb506-bf0d-424e-8649-53a9a93d252d	f
+grafana	0e98d5f9-d3f7-4b1d-9791-d442524fc2ab	f
+grafana	74daf2cd-40d4-4304-87a8-92cdca808512	t
+grafana	96d521d3-facc-4b5a-a8b4-a879bae6be07	t
+grafana	a5bb3a5f-fd26-4be6-9557-26e20a03d33d	f
+grafana	d6ffe9fc-a03c-4496-85dc-dbb5e7754587	f
+grafana	d6077ed7-b265-4f82-9336-24614967bd5d	t
+grafana	699671ab-e7c1-4fcf-beb8-ea54f1471fc1	t
+grafana	c61f5b19-c17e-49a1-91b8-a0296411b928	f
+\.
+
+
+--
+-- Data for Name: event_entity; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.event_entity (id, client_id, details_json, error, ip_address, realm_id, session_id, event_time, type, user_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_attribute; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_attribute (id, name, user_id, realm_id, storage_provider_id, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_consent; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_consent (id, client_id, user_id, realm_id, storage_provider_id, created_date, last_updated_date, client_storage_provider, external_client_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_consent_cl_scope; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_consent_cl_scope (user_consent_id, scope_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_credential; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_credential (id, salt, type, created_date, user_id, realm_id, storage_provider_id, user_label, secret_data, credential_data, priority) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_group_membership; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_group_membership (group_id, user_id, realm_id, storage_provider_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_required_action; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_required_action (required_action, user_id, realm_id, storage_provider_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: fed_user_role_mapping; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.fed_user_role_mapping (role_id, user_id, realm_id, storage_provider_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: federated_identity; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.federated_identity (identity_provider, realm_id, federated_user_id, federated_username, token, user_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: federated_user; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.federated_user (id, storage_provider_id, realm_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: group_attribute; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.group_attribute (id, name, value, group_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: group_role_mapping; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.group_role_mapping (role_id, group_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: identity_provider; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.identity_provider (internal_id, enabled, provider_alias, provider_id, store_token, authenticate_by_default, realm_id, add_token_role, trust_email, first_broker_login_flow_id, post_broker_login_flow_id, provider_display_name, link_only) FROM stdin;
+\.
+
+
+--
+-- Data for Name: identity_provider_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.identity_provider_config (identity_provider_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: identity_provider_mapper; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.identity_provider_mapper (id, name, idp_alias, idp_mapper_name, realm_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: idp_mapper_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.idp_mapper_config (idp_mapper_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: keycloak_group; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.keycloak_group (id, name, parent_group, realm_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: keycloak_role; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.keycloak_role (id, client_realm_constraint, client_role, description, name, realm_id, client, realm) FROM stdin;
+4a3204aa-320e-4584-b8ee-ea2989b3f330	master	f	${role_admin}	admin	master	\N	master
+847ebc80-6849-4c47-9f9e-5bba0c0d754d	master	f	${role_create-realm}	create-realm	master	\N	master
+103dc6a6-5e7a-4c27-b4f0-9dbb1fdcf214	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_create-client}	create-client	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+13c94e3b-b22f-4503-bc56-75e1bd2a927f	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_view-realm}	view-realm	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+4364a376-4ed0-4051-aeab-609f62420e5d	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_view-users}	view-users	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+f12af4b7-8828-47a5-abbc-dbb09b9d409e	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_view-clients}	view-clients	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+2606a5b9-699b-488a-a819-d6f368e66697	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_view-events}	view-events	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+2cf34980-2606-4faf-bc40-b9a47c69ef1c	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_view-identity-providers}	view-identity-providers	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+13e61c6b-aff6-4ef8-ab56-ad4abefcb101	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_view-authorization}	view-authorization	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+632bad74-a33f-4fd5-9393-ec0a07898b1a	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_manage-realm}	manage-realm	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+4607a008-f45c-45f5-b506-6de020b7e366	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_manage-users}	manage-users	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+edd471cc-81d5-43e4-bb43-41fe88ff537d	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_manage-clients}	manage-clients	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+4c2b4e2a-e792-4ffd-969d-e33ecdf7158f	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_manage-events}	manage-events	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+38282bc7-ea21-46db-a36e-ca621d3275b4	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_manage-identity-providers}	manage-identity-providers	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+12111f4a-16ee-4ee7-8576-7956b9440dc5	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_manage-authorization}	manage-authorization	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+f417ae21-5fb4-40fb-bda8-54c61ce7461d	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_query-users}	query-users	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+7adeaf33-05d3-4a81-a7bf-f99c721b5d9c	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_query-clients}	query-clients	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+60870d03-d96a-4371-bdad-e3fac925a8df	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_query-realms}	query-realms	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+94363dbd-a6b8-4678-8231-50208c32c22c	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_query-groups}	query-groups	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+86a4b6a9-93db-4177-a72f-95fd937a2c8d	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_view-profile}	view-profile	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+619ba870-921e-4f28-b26c-89b11f39dddf	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_manage-account}	manage-account	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+a42d235d-2864-4a99-9592-211d89d0407d	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_manage-account-links}	manage-account-links	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+44798fae-3813-41e6-9352-6fb2d28a15a6	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_view-applications}	view-applications	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+a1a08dbc-4553-4be7-85f5-88c417bdcd45	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_view-consent}	view-consent	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+828c3ba8-a13d-49f5-8975-8eb00afbf7de	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_manage-consent}	manage-consent	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+f537ddeb-0973-445c-8f32-3beed99461ba	eed689c6-49da-4d91-98eb-cd495bcc07a3	t	${role_delete-account}	delete-account	master	eed689c6-49da-4d91-98eb-cd495bcc07a3	\N
+102d3759-c50d-4325-932d-c7a02fc17cb8	1e30397c-eac2-41fb-87bc-d90484992e65	t	${role_read-token}	read-token	master	1e30397c-eac2-41fb-87bc-d90484992e65	\N
+b44e0fe0-0fb7-4e12-a6f0-b352431a0f57	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	t	${role_impersonation}	impersonation	master	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	\N
+16d5987b-dcbb-4650-8f52-3469f3974846	master	f	${role_offline-access}	offline_access	master	\N	master
+c014bfd1-a210-4e7a-8a26-35d1f5e8f1ed	master	f	${role_uma_authorization}	uma_authorization	master	\N	master
+95dfed9c-47fe-489b-aa28-52f0d7aa7c49	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_create-client}	create-client	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+07e1586d-a943-46d9-9c3d-1f3544c8c27f	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_view-realm}	view-realm	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+293d0c06-6dce-4303-9cd3-dfdd6d1275b8	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_view-users}	view-users	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+cfdeeb7b-c70e-496b-9605-70377168a6cb	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_view-clients}	view-clients	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+74252705-a339-4513-97ca-d5617977d5ff	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_view-events}	view-events	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+77c3f67e-21d7-4c18-9971-4baf4c20eeaa	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_view-identity-providers}	view-identity-providers	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+5de01bf1-bfac-4ea2-8fb1-ed95594fe1da	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_view-authorization}	view-authorization	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+a72adc0b-5220-48e4-a66a-9e15dca5f574	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_manage-realm}	manage-realm	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+f29b8efa-3c08-410a-a5c0-15b52253d2e2	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_manage-users}	manage-users	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+dd3ecc72-aaee-43d5-8f7e-f6dcdfb5a608	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_manage-clients}	manage-clients	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+9d5a8bab-e112-4e1c-8196-604f3d0143ea	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_manage-events}	manage-events	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+ffff4251-e0a4-4f9c-8bf6-5461b2f52766	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_manage-identity-providers}	manage-identity-providers	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+5fafdde9-71f7-4f67-9c1d-f3f4bc7f5128	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_manage-authorization}	manage-authorization	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+6cfc2ac6-bdd7-4b90-ac16-27a75f2eb00a	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_query-users}	query-users	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+c3ded8eb-c970-4e43-bea9-5e07795d20ef	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_query-clients}	query-clients	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+811c2a39-6614-46fb-acf5-889d52248171	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_query-realms}	query-realms	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+2a90f228-2ca4-413f-bc4b-7939af8abcbf	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_query-groups}	query-groups	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+85afffb5-2069-4873-b6c8-08159c1e4bdd	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_realm-admin}	realm-admin	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+d0e4028d-a604-427a-9262-a1a9513dafc8	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_create-client}	create-client	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+2b8b60c5-d388-4925-b735-858df38dae6e	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_view-realm}	view-realm	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+e9c997c8-ad6b-4a99-81e1-c248e94fbeac	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_view-users}	view-users	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+8c4449b9-5add-40ba-a19f-cf5d80425e68	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_view-clients}	view-clients	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+a5f31b90-986b-46d5-a385-a639b4e19e37	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_view-events}	view-events	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+99bd546f-a5ed-47f8-862c-9a5e8345bf3b	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_view-identity-providers}	view-identity-providers	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+9096d8df-9d5b-4fb5-b93e-49acc6df0be5	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_view-authorization}	view-authorization	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+03230264-ed7a-46b2-939d-53ebe9a59812	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_manage-realm}	manage-realm	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+2240d1de-5ac4-44ac-91be-cee70e1dd22b	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_manage-users}	manage-users	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+6d2fd708-445b-44a8-b950-f1350a15dd14	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_manage-clients}	manage-clients	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+82266aa3-67ea-485a-a078-4671eb141853	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_manage-events}	manage-events	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+d6dad388-8c69-4bba-940e-371afc98042e	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_manage-identity-providers}	manage-identity-providers	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+5d7868e1-0c4a-46cc-8bac-bd19c0ea1bde	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_manage-authorization}	manage-authorization	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+85e6229e-e246-4e9a-8b39-7bae49754f7d	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_query-users}	query-users	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+bc618c28-98d1-477d-b4fc-c5ec7cd7f271	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_query-clients}	query-clients	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+5059b239-0dce-4bb2-9c55-a6afc8dcbe3b	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_query-realms}	query-realms	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+ac28461f-3416-4af4-be65-abc739dbeee5	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_query-groups}	query-groups	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+f1311ecb-6a6a-49d6-bb16-5132daf93a64	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_view-profile}	view-profile	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+18a7066b-fe71-410e-9581-69f78347ec29	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_manage-account}	manage-account	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+68fdbd76-8688-47a6-b68d-3298a5401f05	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_manage-account-links}	manage-account-links	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+cb37c15a-5330-4e30-9421-e0b962a266de	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_view-applications}	view-applications	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+daaedcc6-e7a6-488e-921e-7022aa808da7	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_view-consent}	view-consent	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+c7e799a5-1250-4bc8-b7c6-ffdc58361477	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_manage-consent}	manage-consent	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+744bfdff-0e88-438a-b852-282a1b2aad3e	a5a8fed6-0bca-4646-9946-2fe84175353b	t	${role_delete-account}	delete-account	grafana	a5a8fed6-0bca-4646-9946-2fe84175353b	\N
+b8a4faaf-86d9-43eb-bb18-0eaa654b35a7	ef7f6eac-9fff-44aa-a86c-5125d52acc82	t	${role_impersonation}	impersonation	master	ef7f6eac-9fff-44aa-a86c-5125d52acc82	\N
+5e2301d7-2a9e-4f2d-a940-9bd442b15d8c	a8698f4f-5fa1-4baa-be05-87d03052af49	t	${role_impersonation}	impersonation	grafana	a8698f4f-5fa1-4baa-be05-87d03052af49	\N
+77ba7b40-e312-40d7-9da0-de41f0ed3b8c	77ff47f8-f578-477d-8c06-e70a846332f5	t	${role_read-token}	read-token	grafana	77ff47f8-f578-477d-8c06-e70a846332f5	\N
+c49bddc6-ec92-4caa-bc04-57ba80a92eb9	grafana	f	${role_offline-access}	offline_access	grafana	\N	grafana
+0f3d47bb-002a-4cd0-a502-725f224308a7	grafana	f	${role_uma_authorization}	uma_authorization	grafana	\N	grafana
+60f1b1ea-9059-41ea-acef-573643b24709	grafana	f	Grafana Organization Administrator	admin	grafana	\N	grafana
+c029a218-4519-4537-ae12-d8f3c27a0003	grafana	f	Grafana Server Admin	serveradmin	grafana	\N	grafana
+c9a776f9-2740-435f-a725-4dbcc17a6c91	grafana	f	Grafana Viewer	viewer	grafana	\N	grafana
+c4c74006-c346-48cf-8cf1-1617e3e1cde1	grafana	f	Grafana Editor	editor	grafana	\N	grafana
+\.
+
+
+--
+-- Data for Name: migration_model; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.migration_model (id, version, update_time) FROM stdin;
+g5slr	12.0.1	1643820448
+\.
+
+
+--
+-- Data for Name: offline_client_session; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.offline_client_session (user_session_id, client_id, offline_flag, "timestamp", data, client_storage_provider, external_client_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: offline_user_session; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.offline_user_session (user_session_id, user_id, realm_id, created_on, offline_flag, data, last_session_refresh) FROM stdin;
+\.
+
+
+--
+-- Data for Name: policy_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.policy_config (policy_id, name, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: protocol_mapper; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.protocol_mapper (id, name, protocol, protocol_mapper_name, client_id, client_scope_id) FROM stdin;
+e4931993-ceb0-4048-8a37-ca4f438099f3	audience resolve	openid-connect	oidc-audience-resolve-mapper	11c67f5b-dde7-4680-b05b-c9c59d78bda4	\N
+c1c53a76-92ee-42b8-8420-92a815267f71	locale	openid-connect	oidc-usermodel-attribute-mapper	2f521d09-7304-4b5e-a94b-7cc7300b8b50	\N
+ddc7c8be-0753-417f-9d0e-ea22008f23f9	full name	openid-connect	oidc-full-name-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	family name	openid-connect	oidc-usermodel-property-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+563b93e7-e66d-454f-9f34-4538cab6f260	given name	openid-connect	oidc-usermodel-property-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	middle name	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+6aff4774-b4cf-4775-b4e5-0b20c549d181	nickname	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+5a603582-2511-483b-8e05-be891c7642b1	username	openid-connect	oidc-usermodel-property-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+9e111324-2508-4a4b-841a-19883a331f66	profile	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	picture	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+412ba9b5-f535-4263-9600-b23c2f682fc9	website	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+3741c094-0c4f-42fb-a178-89ceb85adeda	gender	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	birthdate	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+7f9b6774-17f5-417a-8fad-576fc862920c	zoneinfo	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	locale	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	updated at	openid-connect	oidc-usermodel-attribute-mapper	\N	66deef47-2158-4d5b-a75f-0bf42f642e7b
+b47f8f1c-0242-40c3-973a-d58a25022d6e	email	openid-connect	oidc-usermodel-property-mapper	\N	94ef659c-4c4a-4a33-98e8-bfcf443e9268
+a5fcd319-279d-4995-8896-4bf810343ad2	email verified	openid-connect	oidc-usermodel-property-mapper	\N	94ef659c-4c4a-4a33-98e8-bfcf443e9268
+4d697f62-b924-4b0c-8202-0a82ee08684c	address	openid-connect	oidc-address-mapper	\N	96a960d2-c203-4ef0-a53c-c3edd01f2305
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	phone number	openid-connect	oidc-usermodel-attribute-mapper	\N	3f705379-3361-486d-b75a-f7b4e4be492c
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	phone number verified	openid-connect	oidc-usermodel-attribute-mapper	\N	3f705379-3361-486d-b75a-f7b4e4be492c
+bc41b27d-2e1b-48af-8184-e88e03f950e2	realm roles	openid-connect	oidc-usermodel-realm-role-mapper	\N	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7
+967cee35-09fd-400f-a634-db3fdbab2420	client roles	openid-connect	oidc-usermodel-client-role-mapper	\N	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7
+543542f4-71b1-4fef-8832-bb14b553ad9a	audience resolve	openid-connect	oidc-audience-resolve-mapper	\N	b8a9cdd1-2f30-4e23-a721-78b01cfba1d7
+bf72f65b-9d9c-4c88-9cb9-478edbb721db	allowed web origins	openid-connect	oidc-allowed-origins-mapper	\N	619cf41a-5ff8-4a04-9f1e-50717e5f7ce8
+98402b93-9012-4e47-b008-99ffaf93043e	upn	openid-connect	oidc-usermodel-property-mapper	\N	42bfb506-bf0d-424e-8649-53a9a93d252d
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	groups	openid-connect	oidc-usermodel-realm-role-mapper	\N	42bfb506-bf0d-424e-8649-53a9a93d252d
+7be7c4e2-7281-4226-acec-77f77b3072dc	audience resolve	openid-connect	oidc-audience-resolve-mapper	230081b5-9161-45c3-9e08-9eda5412f7f7	\N
+c5adae03-51f5-4acb-baeb-c0241a16757e	full name	openid-connect	oidc-full-name-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	family name	openid-connect	oidc-usermodel-property-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	given name	openid-connect	oidc-usermodel-property-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	middle name	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+21dd6189-62cb-4039-9590-9096ff6d14b2	nickname	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	username	openid-connect	oidc-usermodel-property-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	profile	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	picture	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+02f83a6b-7a50-4541-9b12-968a23e2cf78	website	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	gender	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	birthdate	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+49703eaa-a556-431d-b828-c64d8c791d00	zoneinfo	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+2b9ace9b-a654-4178-bb28-c8062569453c	locale	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+60babdab-a8a4-41a4-98b0-08bd40182cdf	updated at	openid-connect	oidc-usermodel-attribute-mapper	\N	74daf2cd-40d4-4304-87a8-92cdca808512
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	email	openid-connect	oidc-usermodel-property-mapper	\N	96d521d3-facc-4b5a-a8b4-a879bae6be07
+b75ba788-217a-47ad-bc81-2e8f4dcce913	email verified	openid-connect	oidc-usermodel-property-mapper	\N	96d521d3-facc-4b5a-a8b4-a879bae6be07
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	address	openid-connect	oidc-address-mapper	\N	a5bb3a5f-fd26-4be6-9557-26e20a03d33d
+13c34a80-7711-4a0d-97b0-b29a501294fa	phone number	openid-connect	oidc-usermodel-attribute-mapper	\N	d6ffe9fc-a03c-4496-85dc-dbb5e7754587
+b4854867-3bfb-409b-92a8-6ec37db17f99	phone number verified	openid-connect	oidc-usermodel-attribute-mapper	\N	d6ffe9fc-a03c-4496-85dc-dbb5e7754587
+1fc8999a-04d9-421b-8557-e417a3750358	realm roles	openid-connect	oidc-usermodel-realm-role-mapper	\N	d6077ed7-b265-4f82-9336-24614967bd5d
+384e97dd-36ad-4b0e-af63-d0cb3a2153d4	allowed web origins	openid-connect	oidc-allowed-origins-mapper	\N	699671ab-e7c1-4fcf-beb8-ea54f1471fc1
+f03cac68-3f0e-4068-9adf-ee64567689a7	upn	openid-connect	oidc-usermodel-property-mapper	\N	c61f5b19-c17e-49a1-91b8-a0296411b928
+04183ee1-b558-4f63-839f-922d30b34a9e	groups	openid-connect	oidc-usermodel-realm-role-mapper	\N	c61f5b19-c17e-49a1-91b8-a0296411b928
+df78645e-c32b-4160-b79f-42e622d71982	locale	openid-connect	oidc-usermodel-attribute-mapper	805aebc8-9d01-42b6-bcce-6ce48ca63ef0	\N
+0108b99f-2f31-4e73-9597-cb29e0e8c486	username	openid-connect	oidc-usermodel-property-mapper	\N	f619a55a-d565-4cc0-8bf4-4dbaab5382fe
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	login	openid-connect	oidc-usermodel-property-mapper	\N	0a7c7dde-23d7-4a93-bdee-4a8963aee9a4
+2f8ee9af-b6dd-4790-9e7b-cce83a603566	name	openid-connect	oidc-full-name-mapper	\N	d4723cd4-f717-44b7-a9b0-6c32c5ecd23f
+\.
+
+
+--
+-- Data for Name: protocol_mapper_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.protocol_mapper_config (protocol_mapper_id, value, name) FROM stdin;
+c1c53a76-92ee-42b8-8420-92a815267f71	true	userinfo.token.claim
+c1c53a76-92ee-42b8-8420-92a815267f71	locale	user.attribute
+c1c53a76-92ee-42b8-8420-92a815267f71	true	id.token.claim
+c1c53a76-92ee-42b8-8420-92a815267f71	true	access.token.claim
+c1c53a76-92ee-42b8-8420-92a815267f71	locale	claim.name
+c1c53a76-92ee-42b8-8420-92a815267f71	String	jsonType.label
+ddc7c8be-0753-417f-9d0e-ea22008f23f9	true	userinfo.token.claim
+ddc7c8be-0753-417f-9d0e-ea22008f23f9	true	id.token.claim
+ddc7c8be-0753-417f-9d0e-ea22008f23f9	true	access.token.claim
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	true	userinfo.token.claim
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	lastName	user.attribute
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	true	id.token.claim
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	true	access.token.claim
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	family_name	claim.name
+fc77e0b8-b586-40dc-bc3d-7aa04a9c0f19	String	jsonType.label
+563b93e7-e66d-454f-9f34-4538cab6f260	true	userinfo.token.claim
+563b93e7-e66d-454f-9f34-4538cab6f260	firstName	user.attribute
+563b93e7-e66d-454f-9f34-4538cab6f260	true	id.token.claim
+563b93e7-e66d-454f-9f34-4538cab6f260	true	access.token.claim
+563b93e7-e66d-454f-9f34-4538cab6f260	given_name	claim.name
+563b93e7-e66d-454f-9f34-4538cab6f260	String	jsonType.label
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	true	userinfo.token.claim
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	middleName	user.attribute
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	true	id.token.claim
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	true	access.token.claim
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	middle_name	claim.name
+30fa9092-eb2a-4a55-8d73-82e6e23334ec	String	jsonType.label
+6aff4774-b4cf-4775-b4e5-0b20c549d181	true	userinfo.token.claim
+6aff4774-b4cf-4775-b4e5-0b20c549d181	nickname	user.attribute
+6aff4774-b4cf-4775-b4e5-0b20c549d181	true	id.token.claim
+6aff4774-b4cf-4775-b4e5-0b20c549d181	true	access.token.claim
+6aff4774-b4cf-4775-b4e5-0b20c549d181	nickname	claim.name
+6aff4774-b4cf-4775-b4e5-0b20c549d181	String	jsonType.label
+5a603582-2511-483b-8e05-be891c7642b1	true	userinfo.token.claim
+5a603582-2511-483b-8e05-be891c7642b1	username	user.attribute
+5a603582-2511-483b-8e05-be891c7642b1	true	id.token.claim
+5a603582-2511-483b-8e05-be891c7642b1	true	access.token.claim
+5a603582-2511-483b-8e05-be891c7642b1	preferred_username	claim.name
+5a603582-2511-483b-8e05-be891c7642b1	String	jsonType.label
+9e111324-2508-4a4b-841a-19883a331f66	true	userinfo.token.claim
+9e111324-2508-4a4b-841a-19883a331f66	profile	user.attribute
+9e111324-2508-4a4b-841a-19883a331f66	true	id.token.claim
+9e111324-2508-4a4b-841a-19883a331f66	true	access.token.claim
+9e111324-2508-4a4b-841a-19883a331f66	profile	claim.name
+9e111324-2508-4a4b-841a-19883a331f66	String	jsonType.label
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	true	userinfo.token.claim
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	picture	user.attribute
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	true	id.token.claim
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	true	access.token.claim
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	picture	claim.name
+5906ef3c-7b55-4b10-9ba1-0f3a25f3b005	String	jsonType.label
+412ba9b5-f535-4263-9600-b23c2f682fc9	true	userinfo.token.claim
+412ba9b5-f535-4263-9600-b23c2f682fc9	website	user.attribute
+412ba9b5-f535-4263-9600-b23c2f682fc9	true	id.token.claim
+412ba9b5-f535-4263-9600-b23c2f682fc9	true	access.token.claim
+412ba9b5-f535-4263-9600-b23c2f682fc9	website	claim.name
+412ba9b5-f535-4263-9600-b23c2f682fc9	String	jsonType.label
+3741c094-0c4f-42fb-a178-89ceb85adeda	true	userinfo.token.claim
+3741c094-0c4f-42fb-a178-89ceb85adeda	gender	user.attribute
+3741c094-0c4f-42fb-a178-89ceb85adeda	true	id.token.claim
+3741c094-0c4f-42fb-a178-89ceb85adeda	true	access.token.claim
+3741c094-0c4f-42fb-a178-89ceb85adeda	gender	claim.name
+3741c094-0c4f-42fb-a178-89ceb85adeda	String	jsonType.label
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	true	userinfo.token.claim
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	birthdate	user.attribute
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	true	id.token.claim
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	true	access.token.claim
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	birthdate	claim.name
+ae6e2dbc-b310-4443-acd2-894d4e9dcb79	String	jsonType.label
+7f9b6774-17f5-417a-8fad-576fc862920c	true	userinfo.token.claim
+7f9b6774-17f5-417a-8fad-576fc862920c	zoneinfo	user.attribute
+7f9b6774-17f5-417a-8fad-576fc862920c	true	id.token.claim
+7f9b6774-17f5-417a-8fad-576fc862920c	true	access.token.claim
+7f9b6774-17f5-417a-8fad-576fc862920c	zoneinfo	claim.name
+7f9b6774-17f5-417a-8fad-576fc862920c	String	jsonType.label
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	true	userinfo.token.claim
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	locale	user.attribute
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	true	id.token.claim
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	true	access.token.claim
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	locale	claim.name
+7257c710-d01b-4c50-bb4f-060cfc8fe4b3	String	jsonType.label
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	true	userinfo.token.claim
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	updatedAt	user.attribute
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	true	id.token.claim
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	true	access.token.claim
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	updated_at	claim.name
+1ab8f9c8-42cc-4604-8c04-43f8243acc9b	String	jsonType.label
+b47f8f1c-0242-40c3-973a-d58a25022d6e	true	userinfo.token.claim
+b47f8f1c-0242-40c3-973a-d58a25022d6e	email	user.attribute
+b47f8f1c-0242-40c3-973a-d58a25022d6e	true	id.token.claim
+b47f8f1c-0242-40c3-973a-d58a25022d6e	true	access.token.claim
+b47f8f1c-0242-40c3-973a-d58a25022d6e	email	claim.name
+b47f8f1c-0242-40c3-973a-d58a25022d6e	String	jsonType.label
+a5fcd319-279d-4995-8896-4bf810343ad2	true	userinfo.token.claim
+a5fcd319-279d-4995-8896-4bf810343ad2	emailVerified	user.attribute
+a5fcd319-279d-4995-8896-4bf810343ad2	true	id.token.claim
+a5fcd319-279d-4995-8896-4bf810343ad2	true	access.token.claim
+a5fcd319-279d-4995-8896-4bf810343ad2	email_verified	claim.name
+a5fcd319-279d-4995-8896-4bf810343ad2	boolean	jsonType.label
+4d697f62-b924-4b0c-8202-0a82ee08684c	formatted	user.attribute.formatted
+4d697f62-b924-4b0c-8202-0a82ee08684c	country	user.attribute.country
+4d697f62-b924-4b0c-8202-0a82ee08684c	postal_code	user.attribute.postal_code
+4d697f62-b924-4b0c-8202-0a82ee08684c	true	userinfo.token.claim
+4d697f62-b924-4b0c-8202-0a82ee08684c	street	user.attribute.street
+4d697f62-b924-4b0c-8202-0a82ee08684c	true	id.token.claim
+4d697f62-b924-4b0c-8202-0a82ee08684c	region	user.attribute.region
+4d697f62-b924-4b0c-8202-0a82ee08684c	true	access.token.claim
+4d697f62-b924-4b0c-8202-0a82ee08684c	locality	user.attribute.locality
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	true	userinfo.token.claim
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	phoneNumber	user.attribute
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	true	id.token.claim
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	true	access.token.claim
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	phone_number	claim.name
+d1eaf34e-6818-419c-b3c1-8f1b3627ca17	String	jsonType.label
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	true	userinfo.token.claim
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	phoneNumberVerified	user.attribute
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	true	id.token.claim
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	true	access.token.claim
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	phone_number_verified	claim.name
+ee0ec8fa-c020-4cb9-991e-30180fe0c5dc	boolean	jsonType.label
+bc41b27d-2e1b-48af-8184-e88e03f950e2	true	multivalued
+bc41b27d-2e1b-48af-8184-e88e03f950e2	foo	user.attribute
+bc41b27d-2e1b-48af-8184-e88e03f950e2	true	access.token.claim
+bc41b27d-2e1b-48af-8184-e88e03f950e2	realm_access.roles	claim.name
+bc41b27d-2e1b-48af-8184-e88e03f950e2	String	jsonType.label
+967cee35-09fd-400f-a634-db3fdbab2420	true	multivalued
+967cee35-09fd-400f-a634-db3fdbab2420	foo	user.attribute
+967cee35-09fd-400f-a634-db3fdbab2420	true	access.token.claim
+967cee35-09fd-400f-a634-db3fdbab2420	resource_access.${client_id}.roles	claim.name
+967cee35-09fd-400f-a634-db3fdbab2420	String	jsonType.label
+98402b93-9012-4e47-b008-99ffaf93043e	true	userinfo.token.claim
+98402b93-9012-4e47-b008-99ffaf93043e	username	user.attribute
+98402b93-9012-4e47-b008-99ffaf93043e	true	id.token.claim
+98402b93-9012-4e47-b008-99ffaf93043e	true	access.token.claim
+98402b93-9012-4e47-b008-99ffaf93043e	upn	claim.name
+98402b93-9012-4e47-b008-99ffaf93043e	String	jsonType.label
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	true	multivalued
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	foo	user.attribute
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	true	id.token.claim
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	true	access.token.claim
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	groups	claim.name
+39d571e6-0b8b-4b6d-aa2d-9cff126decd0	String	jsonType.label
+c5adae03-51f5-4acb-baeb-c0241a16757e	true	userinfo.token.claim
+c5adae03-51f5-4acb-baeb-c0241a16757e	true	id.token.claim
+c5adae03-51f5-4acb-baeb-c0241a16757e	true	access.token.claim
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	true	userinfo.token.claim
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	lastName	user.attribute
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	true	id.token.claim
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	true	access.token.claim
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	family_name	claim.name
+6d019964-a5e5-4737-a8bf-90c34ce33c0f	String	jsonType.label
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	true	userinfo.token.claim
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	firstName	user.attribute
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	true	id.token.claim
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	true	access.token.claim
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	given_name	claim.name
+e9cb431c-e1f1-4ce9-941e-a8a88bfce413	String	jsonType.label
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	true	userinfo.token.claim
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	middleName	user.attribute
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	true	id.token.claim
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	true	access.token.claim
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	middle_name	claim.name
+4cec49ad-50de-4fed-bf61-3928d88b9cfc	String	jsonType.label
+21dd6189-62cb-4039-9590-9096ff6d14b2	true	userinfo.token.claim
+21dd6189-62cb-4039-9590-9096ff6d14b2	nickname	user.attribute
+21dd6189-62cb-4039-9590-9096ff6d14b2	true	id.token.claim
+21dd6189-62cb-4039-9590-9096ff6d14b2	true	access.token.claim
+21dd6189-62cb-4039-9590-9096ff6d14b2	nickname	claim.name
+21dd6189-62cb-4039-9590-9096ff6d14b2	String	jsonType.label
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	true	userinfo.token.claim
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	username	user.attribute
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	true	id.token.claim
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	true	access.token.claim
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	preferred_username	claim.name
+bcb6bed8-ebfc-450b-b4a6-17f5bdfaa37c	String	jsonType.label
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	true	userinfo.token.claim
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	profile	user.attribute
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	true	id.token.claim
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	true	access.token.claim
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	profile	claim.name
+c21b39cc-c761-4cf4-a4a4-6de3ff05476d	String	jsonType.label
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	true	userinfo.token.claim
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	picture	user.attribute
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	true	id.token.claim
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	true	access.token.claim
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	picture	claim.name
+aeec7bd1-953e-4ba0-b146-c87f1e20f73f	String	jsonType.label
+02f83a6b-7a50-4541-9b12-968a23e2cf78	true	userinfo.token.claim
+02f83a6b-7a50-4541-9b12-968a23e2cf78	website	user.attribute
+02f83a6b-7a50-4541-9b12-968a23e2cf78	true	id.token.claim
+02f83a6b-7a50-4541-9b12-968a23e2cf78	true	access.token.claim
+02f83a6b-7a50-4541-9b12-968a23e2cf78	website	claim.name
+02f83a6b-7a50-4541-9b12-968a23e2cf78	String	jsonType.label
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	true	userinfo.token.claim
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	gender	user.attribute
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	true	id.token.claim
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	true	access.token.claim
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	gender	claim.name
+013a3f59-6a7f-42e4-9fce-4fc420a1b3ea	String	jsonType.label
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	true	userinfo.token.claim
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	birthdate	user.attribute
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	true	id.token.claim
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	true	access.token.claim
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	birthdate	claim.name
+04b7ca11-80bd-44a1-87c3-835e7fb9e9f5	String	jsonType.label
+49703eaa-a556-431d-b828-c64d8c791d00	true	userinfo.token.claim
+49703eaa-a556-431d-b828-c64d8c791d00	zoneinfo	user.attribute
+49703eaa-a556-431d-b828-c64d8c791d00	true	id.token.claim
+49703eaa-a556-431d-b828-c64d8c791d00	true	access.token.claim
+49703eaa-a556-431d-b828-c64d8c791d00	zoneinfo	claim.name
+49703eaa-a556-431d-b828-c64d8c791d00	String	jsonType.label
+2b9ace9b-a654-4178-bb28-c8062569453c	true	userinfo.token.claim
+2b9ace9b-a654-4178-bb28-c8062569453c	locale	user.attribute
+2b9ace9b-a654-4178-bb28-c8062569453c	true	id.token.claim
+2b9ace9b-a654-4178-bb28-c8062569453c	true	access.token.claim
+2b9ace9b-a654-4178-bb28-c8062569453c	locale	claim.name
+2b9ace9b-a654-4178-bb28-c8062569453c	String	jsonType.label
+60babdab-a8a4-41a4-98b0-08bd40182cdf	true	userinfo.token.claim
+60babdab-a8a4-41a4-98b0-08bd40182cdf	updatedAt	user.attribute
+60babdab-a8a4-41a4-98b0-08bd40182cdf	true	id.token.claim
+60babdab-a8a4-41a4-98b0-08bd40182cdf	true	access.token.claim
+60babdab-a8a4-41a4-98b0-08bd40182cdf	updated_at	claim.name
+60babdab-a8a4-41a4-98b0-08bd40182cdf	String	jsonType.label
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	true	userinfo.token.claim
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	email	user.attribute
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	true	id.token.claim
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	true	access.token.claim
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	email	claim.name
+75ae2f8d-a382-47e7-978a-f51bf12b80ae	String	jsonType.label
+b75ba788-217a-47ad-bc81-2e8f4dcce913	true	userinfo.token.claim
+b75ba788-217a-47ad-bc81-2e8f4dcce913	emailVerified	user.attribute
+b75ba788-217a-47ad-bc81-2e8f4dcce913	true	id.token.claim
+b75ba788-217a-47ad-bc81-2e8f4dcce913	true	access.token.claim
+b75ba788-217a-47ad-bc81-2e8f4dcce913	email_verified	claim.name
+b75ba788-217a-47ad-bc81-2e8f4dcce913	boolean	jsonType.label
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	formatted	user.attribute.formatted
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	country	user.attribute.country
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	postal_code	user.attribute.postal_code
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	true	userinfo.token.claim
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	street	user.attribute.street
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	true	id.token.claim
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	region	user.attribute.region
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	true	access.token.claim
+c83418a1-6b68-4fd7-8b97-d22f0e2e0ad0	locality	user.attribute.locality
+13c34a80-7711-4a0d-97b0-b29a501294fa	true	userinfo.token.claim
+13c34a80-7711-4a0d-97b0-b29a501294fa	phoneNumber	user.attribute
+13c34a80-7711-4a0d-97b0-b29a501294fa	true	id.token.claim
+13c34a80-7711-4a0d-97b0-b29a501294fa	true	access.token.claim
+13c34a80-7711-4a0d-97b0-b29a501294fa	phone_number	claim.name
+13c34a80-7711-4a0d-97b0-b29a501294fa	String	jsonType.label
+b4854867-3bfb-409b-92a8-6ec37db17f99	true	userinfo.token.claim
+b4854867-3bfb-409b-92a8-6ec37db17f99	phoneNumberVerified	user.attribute
+b4854867-3bfb-409b-92a8-6ec37db17f99	true	id.token.claim
+b4854867-3bfb-409b-92a8-6ec37db17f99	true	access.token.claim
+b4854867-3bfb-409b-92a8-6ec37db17f99	phone_number_verified	claim.name
+b4854867-3bfb-409b-92a8-6ec37db17f99	boolean	jsonType.label
+1fc8999a-04d9-421b-8557-e417a3750358	true	multivalued
+1fc8999a-04d9-421b-8557-e417a3750358	foo	user.attribute
+1fc8999a-04d9-421b-8557-e417a3750358	true	access.token.claim
+1fc8999a-04d9-421b-8557-e417a3750358	String	jsonType.label
+f03cac68-3f0e-4068-9adf-ee64567689a7	true	userinfo.token.claim
+f03cac68-3f0e-4068-9adf-ee64567689a7	username	user.attribute
+f03cac68-3f0e-4068-9adf-ee64567689a7	true	id.token.claim
+f03cac68-3f0e-4068-9adf-ee64567689a7	true	access.token.claim
+f03cac68-3f0e-4068-9adf-ee64567689a7	upn	claim.name
+f03cac68-3f0e-4068-9adf-ee64567689a7	String	jsonType.label
+04183ee1-b558-4f63-839f-922d30b34a9e	true	multivalued
+04183ee1-b558-4f63-839f-922d30b34a9e	foo	user.attribute
+04183ee1-b558-4f63-839f-922d30b34a9e	true	id.token.claim
+04183ee1-b558-4f63-839f-922d30b34a9e	true	access.token.claim
+04183ee1-b558-4f63-839f-922d30b34a9e	groups	claim.name
+04183ee1-b558-4f63-839f-922d30b34a9e	String	jsonType.label
+df78645e-c32b-4160-b79f-42e622d71982	true	userinfo.token.claim
+df78645e-c32b-4160-b79f-42e622d71982	locale	user.attribute
+df78645e-c32b-4160-b79f-42e622d71982	true	id.token.claim
+df78645e-c32b-4160-b79f-42e622d71982	true	access.token.claim
+df78645e-c32b-4160-b79f-42e622d71982	locale	claim.name
+df78645e-c32b-4160-b79f-42e622d71982	String	jsonType.label
+0108b99f-2f31-4e73-9597-cb29e0e8c486	true	userinfo.token.claim
+0108b99f-2f31-4e73-9597-cb29e0e8c486	username	user.attribute
+0108b99f-2f31-4e73-9597-cb29e0e8c486	true	id.token.claim
+0108b99f-2f31-4e73-9597-cb29e0e8c486	true	access.token.claim
+0108b99f-2f31-4e73-9597-cb29e0e8c486	preferred_username	claim.name
+0108b99f-2f31-4e73-9597-cb29e0e8c486	String	jsonType.label
+1fc8999a-04d9-421b-8557-e417a3750358	true	userinfo.token.claim
+1fc8999a-04d9-421b-8557-e417a3750358	roles	claim.name
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	true	userinfo.token.claim
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	username	user.attribute
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	true	id.token.claim
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	true	access.token.claim
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	login	claim.name
+70b0a264-a7c3-43ff-b24f-14ca4f5f118e	String	jsonType.label
+2f8ee9af-b6dd-4790-9e7b-cce83a603566	true	id.token.claim
+2f8ee9af-b6dd-4790-9e7b-cce83a603566	true	access.token.claim
+2f8ee9af-b6dd-4790-9e7b-cce83a603566	true	userinfo.token.claim
+1fc8999a-04d9-421b-8557-e417a3750358	true	id.token.claim
+\.
+
+
+--
+-- Data for Name: realm; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm (id, access_code_lifespan, user_action_lifespan, access_token_lifespan, account_theme, admin_theme, email_theme, enabled, events_enabled, events_expiration, login_theme, name, not_before, password_policy, registration_allowed, remember_me, reset_password_allowed, social, ssl_required, sso_idle_timeout, sso_max_lifespan, update_profile_on_soc_login, verify_email, master_admin_client, login_lifespan, internationalization_enabled, default_locale, reg_email_as_username, admin_events_enabled, admin_events_details_enabled, edit_username_allowed, otp_policy_counter, otp_policy_window, otp_policy_period, otp_policy_digits, otp_policy_alg, otp_policy_type, browser_flow, registration_flow, direct_grant_flow, reset_credentials_flow, client_auth_flow, offline_session_idle_timeout, revoke_refresh_token, access_token_life_implicit, login_with_email_allowed, duplicate_emails_allowed, docker_auth_flow, refresh_token_max_reuse, allow_user_managed_access, sso_max_lifespan_remember_me, sso_idle_timeout_remember_me) FROM stdin;
+master	60	300	60	\N	\N	\N	t	f	0	\N	master	1643820855	\N	f	f	f	f	EXTERNAL	1800	36000	f	f	3cd285ea-0f6e-43b6-ab5c-d021c33a551b	1800	f	\N	f	f	f	f	0	1	30	6	HmacSHA1	totp	ef998ef5-ca12-45db-a252-2e71b1419039	1695e7d2-ad80-4502-8479-8121a6e2a2f0	5f6f801e-0588-4a6e-860a-35483f5c1ec7	954b046d-2b24-405e-84ee-c44ffe603df2	023dc515-c259-42bb-88a8-2e8d84abca92	2592000	f	900	t	f	032b05cf-0007-44da-a370-b42039f6b762	0	f	0	0
+grafana	60	300	300	\N	\N	\N	t	f	0	\N	grafana	1643820879	\N	f	f	f	f	EXTERNAL	1800	36000	f	f	ef7f6eac-9fff-44aa-a86c-5125d52acc82	1800	f	\N	f	f	f	f	0	1	30	6	HmacSHA1	totp	a38aeb47-f27e-4e68-82ff-7cc7371a47a7	9d02badd-cb1c-4655-bf5e-f888861433ff	b478ecfb-db7e-4797-a245-8fc3b4dec884	3085fb68-fc1f-4e1c-a8be-33fb45194b04	cbb4b3ca-ced6-4046-8b59-f1c3959c7948	2592000	f	900	t	f	95e02703-f5bc-4e04-8bef-f6adc2d8173f	0	f	0	0
+\.
+
+
+--
+-- Data for Name: realm_attribute; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_attribute (name, value, realm_id) FROM stdin;
+_browser_header.contentSecurityPolicyReportOnly		master
+_browser_header.xContentTypeOptions	nosniff	master
+_browser_header.xRobotsTag	none	master
+_browser_header.xFrameOptions	SAMEORIGIN	master
+_browser_header.contentSecurityPolicy	frame-src 'self'; frame-ancestors 'self'; object-src 'none';	master
+_browser_header.xXSSProtection	1; mode=block	master
+_browser_header.strictTransportSecurity	max-age=31536000; includeSubDomains	master
+bruteForceProtected	false	master
+permanentLockout	false	master
+maxFailureWaitSeconds	900	master
+minimumQuickLoginWaitSeconds	60	master
+waitIncrementSeconds	60	master
+quickLoginCheckMilliSeconds	1000	master
+maxDeltaTimeSeconds	43200	master
+failureFactor	30	master
+displayName	Keycloak	master
+displayNameHtml	<div class="kc-logo-text"><span>Keycloak</span></div>	master
+offlineSessionMaxLifespanEnabled	false	master
+offlineSessionMaxLifespan	5184000	master
+_browser_header.contentSecurityPolicyReportOnly		grafana
+_browser_header.xContentTypeOptions	nosniff	grafana
+_browser_header.xRobotsTag	none	grafana
+_browser_header.xFrameOptions	SAMEORIGIN	grafana
+_browser_header.contentSecurityPolicy	frame-src 'self'; frame-ancestors 'self'; object-src 'none';	grafana
+_browser_header.xXSSProtection	1; mode=block	grafana
+_browser_header.strictTransportSecurity	max-age=31536000; includeSubDomains	grafana
+bruteForceProtected	false	grafana
+permanentLockout	false	grafana
+maxFailureWaitSeconds	900	grafana
+minimumQuickLoginWaitSeconds	60	grafana
+waitIncrementSeconds	60	grafana
+quickLoginCheckMilliSeconds	1000	grafana
+maxDeltaTimeSeconds	43200	grafana
+failureFactor	30	grafana
+offlineSessionMaxLifespanEnabled	false	grafana
+offlineSessionMaxLifespan	5184000	grafana
+actionTokenGeneratedByAdminLifespan	43200	grafana
+actionTokenGeneratedByUserLifespan	300	grafana
+webAuthnPolicyRpEntityName	keycloak	grafana
+webAuthnPolicySignatureAlgorithms	ES256	grafana
+webAuthnPolicyRpId		grafana
+webAuthnPolicyAttestationConveyancePreference	not specified	grafana
+webAuthnPolicyAuthenticatorAttachment	not specified	grafana
+webAuthnPolicyRequireResidentKey	not specified	grafana
+webAuthnPolicyUserVerificationRequirement	not specified	grafana
+webAuthnPolicyCreateTimeout	0	grafana
+webAuthnPolicyAvoidSameAuthenticatorRegister	false	grafana
+webAuthnPolicyRpEntityNamePasswordless	keycloak	grafana
+webAuthnPolicySignatureAlgorithmsPasswordless	ES256	grafana
+webAuthnPolicyRpIdPasswordless		grafana
+webAuthnPolicyAttestationConveyancePreferencePasswordless	not specified	grafana
+webAuthnPolicyAuthenticatorAttachmentPasswordless	not specified	grafana
+webAuthnPolicyRequireResidentKeyPasswordless	not specified	grafana
+webAuthnPolicyUserVerificationRequirementPasswordless	not specified	grafana
+webAuthnPolicyCreateTimeoutPasswordless	0	grafana
+webAuthnPolicyAvoidSameAuthenticatorRegisterPasswordless	false	grafana
+\.
+
+
+--
+-- Data for Name: realm_default_groups; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_default_groups (realm_id, group_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: realm_default_roles; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_default_roles (realm_id, role_id) FROM stdin;
+master	16d5987b-dcbb-4650-8f52-3469f3974846
+master	c014bfd1-a210-4e7a-8a26-35d1f5e8f1ed
+grafana	c49bddc6-ec92-4caa-bc04-57ba80a92eb9
+grafana	0f3d47bb-002a-4cd0-a502-725f224308a7
+\.
+
+
+--
+-- Data for Name: realm_enabled_event_types; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_enabled_event_types (realm_id, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: realm_events_listeners; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_events_listeners (realm_id, value) FROM stdin;
+master	jboss-logging
+grafana	jboss-logging
+\.
+
+
+--
+-- Data for Name: realm_localizations; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_localizations (realm_id, locale, texts) FROM stdin;
+\.
+
+
+--
+-- Data for Name: realm_required_credential; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_required_credential (type, form_label, input, secret, realm_id) FROM stdin;
+password	password	t	t	master
+password	password	t	t	grafana
+\.
+
+
+--
+-- Data for Name: realm_smtp_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_smtp_config (realm_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: realm_supported_locales; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.realm_supported_locales (realm_id, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: redirect_uris; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.redirect_uris (client_id, value) FROM stdin;
+eed689c6-49da-4d91-98eb-cd495bcc07a3	/realms/master/account/*
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	/realms/master/account/*
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	/admin/master/console/*
+a5a8fed6-0bca-4646-9946-2fe84175353b	/realms/grafana/account/*
+230081b5-9161-45c3-9e08-9eda5412f7f7	/realms/grafana/account/*
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	/admin/grafana/console/*
+09b79548-8426-4c0e-8e0b-7488467532c7	http://localhost:3000/*
+\.
+
+
+--
+-- Data for Name: required_action_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.required_action_config (required_action_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: required_action_provider; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.required_action_provider (id, alias, name, realm_id, enabled, default_action, provider_id, priority) FROM stdin;
+ad4dfd2c-307a-4563-b93a-0bb726b4ccaa	VERIFY_EMAIL	Verify Email	master	t	f	VERIFY_EMAIL	50
+2c7fffa4-ff20-4015-9a97-cc6a19e698ba	UPDATE_PROFILE	Update Profile	master	t	f	UPDATE_PROFILE	40
+c76d17f4-eacf-497a-ab5a-f78936bbc50e	CONFIGURE_TOTP	Configure OTP	master	t	f	CONFIGURE_TOTP	10
+83de9f97-43df-4265-982c-5414a2b19985	UPDATE_PASSWORD	Update Password	master	t	f	UPDATE_PASSWORD	30
+9f538737-770e-4731-abd9-e98172a85d2f	terms_and_conditions	Terms and Conditions	master	f	f	terms_and_conditions	20
+306fc47e-d8ae-4bb1-b2bc-53608a44536c	update_user_locale	Update User Locale	master	t	f	update_user_locale	1000
+f158f7d8-8b7f-414c-b1bd-0dde83c91133	delete_account	Delete Account	master	f	f	delete_account	60
+969a57d1-c906-4f49-87d6-3cbba2f3898a	VERIFY_EMAIL	Verify Email	grafana	t	f	VERIFY_EMAIL	50
+233d5b8e-6f36-450f-bffd-43b82e27295c	UPDATE_PROFILE	Update Profile	grafana	t	f	UPDATE_PROFILE	40
+ab3a9aa7-3d1b-4fb1-93ad-9412142deed3	CONFIGURE_TOTP	Configure OTP	grafana	t	f	CONFIGURE_TOTP	10
+988d8e0d-35ef-4e6a-8b48-821cca56acf2	UPDATE_PASSWORD	Update Password	grafana	t	f	UPDATE_PASSWORD	30
+0e2b6144-5c2c-4dcb-92d8-00529b19a7a5	terms_and_conditions	Terms and Conditions	grafana	f	f	terms_and_conditions	20
+94993a02-f883-4f8a-a549-d48f95aabed2	update_user_locale	Update User Locale	grafana	t	f	update_user_locale	1000
+72d09b7f-acde-4b90-af9a-ea3c642a2f6d	delete_account	Delete Account	grafana	f	f	delete_account	60
+\.
+
+
+--
+-- Data for Name: resource_attribute; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_attribute (id, name, value, resource_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_policy; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_policy (resource_id, policy_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_scope; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_scope (resource_id, scope_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_server; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_server (id, allow_rs_remote_mgmt, policy_enforce_mode, decision_strategy) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_server_perm_ticket; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_server_perm_ticket (id, owner, requester, created_timestamp, granted_timestamp, resource_id, scope_id, resource_server_id, policy_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_server_policy; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_server_policy (id, name, description, type, decision_strategy, logic, resource_server_id, owner) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_server_resource; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_server_resource (id, name, type, icon_uri, owner, resource_server_id, owner_managed_access, display_name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_server_scope; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_server_scope (id, name, icon_uri, resource_server_id, display_name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: resource_uris; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.resource_uris (resource_id, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: role_attribute; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.role_attribute (id, role_id, name, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: scope_mapping; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.scope_mapping (client_id, role_id) FROM stdin;
+11c67f5b-dde7-4680-b05b-c9c59d78bda4	619ba870-921e-4f28-b26c-89b11f39dddf
+230081b5-9161-45c3-9e08-9eda5412f7f7	18a7066b-fe71-410e-9581-69f78347ec29
+\.
+
+
+--
+-- Data for Name: scope_policy; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.scope_policy (scope_id, policy_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_attribute; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_attribute (name, value, user_id, id) FROM stdin;
+role	Viewer	bdce2246-bb51-4f55-bb81-b7b8856225bc	6110e90d-fb7c-4910-a283-b0518a1a25f5
+login	oauth-viewer	bdce2246-bb51-4f55-bb81-b7b8856225bc	4ff52580-a54a-40ea-838d-b58b5ed120d2
+\.
+
+
+--
+-- Data for Name: user_consent; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_consent (id, client_id, user_id, created_date, last_updated_date, client_storage_provider, external_client_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_consent_client_scope; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_consent_client_scope (user_consent_id, scope_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_entity; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_entity (id, email, email_constraint, email_verified, enabled, federation_link, first_name, last_name, realm_id, username, created_timestamp, service_account_client_link, not_before) FROM stdin;
+74e29604-ff35-42bb-a26d-4d0b81ef0917	\N	c8a5d425-4bad-4b76-8828-0e39bae03b67	f	t	\N	\N	\N	master	admin	1643820449683	\N	0
+c685749a-645e-4396-b9ee-6eedbfd89d5e	oauth-admin@example.org	oauth-admin@example.org	f	t	\N	Admin	Oauth	grafana	oauth-admin	1656418530879	\N	0
+56eff2b3-e36a-4e3e-84a1-361ad312667b	oauth-editor@example.org	oauth-editor@example.org	f	t	\N	Editor	Oauth	grafana	oauth-editor	1656418563005	\N	0
+bdce2246-bb51-4f55-bb81-b7b8856225bc	oauth-viewer@example.org	oauth-viewer@example.org	f	t	\N	Viewer	Oauth	grafana	oauth-viewer	1656425237046	\N	0
+\.
+
+
+--
+-- Data for Name: user_federation_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_federation_config (user_federation_provider_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_federation_mapper; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_federation_mapper (id, name, federation_provider_id, federation_mapper_type, realm_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_federation_mapper_config; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_federation_mapper_config (user_federation_mapper_id, value, name) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_federation_provider; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_federation_provider (id, changed_sync_period, display_name, full_sync_period, last_sync, priority, provider_name, realm_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_group_membership; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_group_membership (group_id, user_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_required_action; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_required_action (user_id, required_action) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_role_mapping; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_role_mapping (role_id, user_id) FROM stdin;
+16d5987b-dcbb-4650-8f52-3469f3974846	74e29604-ff35-42bb-a26d-4d0b81ef0917
+c014bfd1-a210-4e7a-8a26-35d1f5e8f1ed	74e29604-ff35-42bb-a26d-4d0b81ef0917
+86a4b6a9-93db-4177-a72f-95fd937a2c8d	74e29604-ff35-42bb-a26d-4d0b81ef0917
+619ba870-921e-4f28-b26c-89b11f39dddf	74e29604-ff35-42bb-a26d-4d0b81ef0917
+4a3204aa-320e-4584-b8ee-ea2989b3f330	74e29604-ff35-42bb-a26d-4d0b81ef0917
+c49bddc6-ec92-4caa-bc04-57ba80a92eb9	c685749a-645e-4396-b9ee-6eedbfd89d5e
+0f3d47bb-002a-4cd0-a502-725f224308a7	c685749a-645e-4396-b9ee-6eedbfd89d5e
+f1311ecb-6a6a-49d6-bb16-5132daf93a64	c685749a-645e-4396-b9ee-6eedbfd89d5e
+18a7066b-fe71-410e-9581-69f78347ec29	c685749a-645e-4396-b9ee-6eedbfd89d5e
+c49bddc6-ec92-4caa-bc04-57ba80a92eb9	56eff2b3-e36a-4e3e-84a1-361ad312667b
+0f3d47bb-002a-4cd0-a502-725f224308a7	56eff2b3-e36a-4e3e-84a1-361ad312667b
+f1311ecb-6a6a-49d6-bb16-5132daf93a64	56eff2b3-e36a-4e3e-84a1-361ad312667b
+18a7066b-fe71-410e-9581-69f78347ec29	56eff2b3-e36a-4e3e-84a1-361ad312667b
+60f1b1ea-9059-41ea-acef-573643b24709	c685749a-645e-4396-b9ee-6eedbfd89d5e
+c4c74006-c346-48cf-8cf1-1617e3e1cde1	56eff2b3-e36a-4e3e-84a1-361ad312667b
+c49bddc6-ec92-4caa-bc04-57ba80a92eb9	bdce2246-bb51-4f55-bb81-b7b8856225bc
+0f3d47bb-002a-4cd0-a502-725f224308a7	bdce2246-bb51-4f55-bb81-b7b8856225bc
+f1311ecb-6a6a-49d6-bb16-5132daf93a64	bdce2246-bb51-4f55-bb81-b7b8856225bc
+18a7066b-fe71-410e-9581-69f78347ec29	bdce2246-bb51-4f55-bb81-b7b8856225bc
+\.
+
+
+--
+-- Data for Name: user_session; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_session (id, auth_method, ip_address, last_session_refresh, login_username, realm_id, remember_me, started, user_id, user_session_state, broker_session_id, broker_user_id) FROM stdin;
+\.
+
+
+--
+-- Data for Name: user_session_note; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.user_session_note (user_session, name, value) FROM stdin;
+\.
+
+
+--
+-- Data for Name: username_login_failure; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.username_login_failure (realm_id, username, failed_login_not_before, last_failure, last_ip_failure, num_failures) FROM stdin;
+\.
+
+
+--
+-- Data for Name: web_origins; Type: TABLE DATA; Schema: public; Owner: keycloak
+--
+
+COPY public.web_origins (client_id, value) FROM stdin;
+2f521d09-7304-4b5e-a94b-7cc7300b8b50	+
+805aebc8-9d01-42b6-bcce-6ce48ca63ef0	+
+09b79548-8426-4c0e-8e0b-7488467532c7	http://localhost:3000
+\.
+
+
+--
+-- Name: username_login_failure CONSTRAINT_17-2; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.username_login_failure
+    ADD CONSTRAINT "CONSTRAINT_17-2" PRIMARY KEY (realm_id, username);
+
+
+--
+-- Name: keycloak_role UK_J3RWUVD56ONTGSUHOGM184WW2-2; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.keycloak_role
+    ADD CONSTRAINT "UK_J3RWUVD56ONTGSUHOGM184WW2-2" UNIQUE (name, client_realm_constraint);
+
+
+--
+-- Name: client_auth_flow_bindings c_cli_flow_bind; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_auth_flow_bindings
+    ADD CONSTRAINT c_cli_flow_bind PRIMARY KEY (client_id, binding_name);
+
+
+--
+-- Name: client_scope_client c_cli_scope_bind; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_client
+    ADD CONSTRAINT c_cli_scope_bind PRIMARY KEY (client_id, scope_id);
+
+
+--
+-- Name: client_initial_access cnstr_client_init_acc_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_initial_access
+    ADD CONSTRAINT cnstr_client_init_acc_pk PRIMARY KEY (id);
+
+
+--
+-- Name: realm_default_groups con_group_id_def_groups; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_default_groups
+    ADD CONSTRAINT con_group_id_def_groups UNIQUE (group_id);
+
+
+--
+-- Name: broker_link constr_broker_link_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.broker_link
+    ADD CONSTRAINT constr_broker_link_pk PRIMARY KEY (identity_provider, user_id);
+
+
+--
+-- Name: client_user_session_note constr_cl_usr_ses_note; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_user_session_note
+    ADD CONSTRAINT constr_cl_usr_ses_note PRIMARY KEY (client_session, name);
+
+
+--
+-- Name: client_default_roles constr_client_default_roles; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_default_roles
+    ADD CONSTRAINT constr_client_default_roles PRIMARY KEY (client_id, role_id);
+
+
+--
+-- Name: component_config constr_component_config_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.component_config
+    ADD CONSTRAINT constr_component_config_pk PRIMARY KEY (id);
+
+
+--
+-- Name: component constr_component_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.component
+    ADD CONSTRAINT constr_component_pk PRIMARY KEY (id);
+
+
+--
+-- Name: fed_user_required_action constr_fed_required_action; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_required_action
+    ADD CONSTRAINT constr_fed_required_action PRIMARY KEY (required_action, user_id);
+
+
+--
+-- Name: fed_user_attribute constr_fed_user_attr_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_attribute
+    ADD CONSTRAINT constr_fed_user_attr_pk PRIMARY KEY (id);
+
+
+--
+-- Name: fed_user_consent constr_fed_user_consent_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_consent
+    ADD CONSTRAINT constr_fed_user_consent_pk PRIMARY KEY (id);
+
+
+--
+-- Name: fed_user_credential constr_fed_user_cred_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_credential
+    ADD CONSTRAINT constr_fed_user_cred_pk PRIMARY KEY (id);
+
+
+--
+-- Name: fed_user_group_membership constr_fed_user_group; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_group_membership
+    ADD CONSTRAINT constr_fed_user_group PRIMARY KEY (group_id, user_id);
+
+
+--
+-- Name: fed_user_role_mapping constr_fed_user_role; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_role_mapping
+    ADD CONSTRAINT constr_fed_user_role PRIMARY KEY (role_id, user_id);
+
+
+--
+-- Name: federated_user constr_federated_user; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.federated_user
+    ADD CONSTRAINT constr_federated_user PRIMARY KEY (id);
+
+
+--
+-- Name: realm_default_groups constr_realm_default_groups; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_default_groups
+    ADD CONSTRAINT constr_realm_default_groups PRIMARY KEY (realm_id, group_id);
+
+
+--
+-- Name: realm_enabled_event_types constr_realm_enabl_event_types; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_enabled_event_types
+    ADD CONSTRAINT constr_realm_enabl_event_types PRIMARY KEY (realm_id, value);
+
+
+--
+-- Name: realm_events_listeners constr_realm_events_listeners; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_events_listeners
+    ADD CONSTRAINT constr_realm_events_listeners PRIMARY KEY (realm_id, value);
+
+
+--
+-- Name: realm_supported_locales constr_realm_supported_locales; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_supported_locales
+    ADD CONSTRAINT constr_realm_supported_locales PRIMARY KEY (realm_id, value);
+
+
+--
+-- Name: identity_provider constraint_2b; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider
+    ADD CONSTRAINT constraint_2b PRIMARY KEY (internal_id);
+
+
+--
+-- Name: client_attributes constraint_3c; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_attributes
+    ADD CONSTRAINT constraint_3c PRIMARY KEY (client_id, name);
+
+
+--
+-- Name: event_entity constraint_4; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.event_entity
+    ADD CONSTRAINT constraint_4 PRIMARY KEY (id);
+
+
+--
+-- Name: federated_identity constraint_40; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.federated_identity
+    ADD CONSTRAINT constraint_40 PRIMARY KEY (identity_provider, user_id);
+
+
+--
+-- Name: realm constraint_4a; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm
+    ADD CONSTRAINT constraint_4a PRIMARY KEY (id);
+
+
+--
+-- Name: client_session_role constraint_5; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_role
+    ADD CONSTRAINT constraint_5 PRIMARY KEY (client_session, role_id);
+
+
+--
+-- Name: user_session constraint_57; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_session
+    ADD CONSTRAINT constraint_57 PRIMARY KEY (id);
+
+
+--
+-- Name: user_federation_provider constraint_5c; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_provider
+    ADD CONSTRAINT constraint_5c PRIMARY KEY (id);
+
+
+--
+-- Name: client_session_note constraint_5e; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_note
+    ADD CONSTRAINT constraint_5e PRIMARY KEY (client_session, name);
+
+
+--
+-- Name: client constraint_7; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client
+    ADD CONSTRAINT constraint_7 PRIMARY KEY (id);
+
+
+--
+-- Name: client_session constraint_8; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session
+    ADD CONSTRAINT constraint_8 PRIMARY KEY (id);
+
+
+--
+-- Name: scope_mapping constraint_81; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.scope_mapping
+    ADD CONSTRAINT constraint_81 PRIMARY KEY (client_id, role_id);
+
+
+--
+-- Name: client_node_registrations constraint_84; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_node_registrations
+    ADD CONSTRAINT constraint_84 PRIMARY KEY (client_id, name);
+
+
+--
+-- Name: realm_attribute constraint_9; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_attribute
+    ADD CONSTRAINT constraint_9 PRIMARY KEY (name, realm_id);
+
+
+--
+-- Name: realm_required_credential constraint_92; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_required_credential
+    ADD CONSTRAINT constraint_92 PRIMARY KEY (realm_id, type);
+
+
+--
+-- Name: keycloak_role constraint_a; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.keycloak_role
+    ADD CONSTRAINT constraint_a PRIMARY KEY (id);
+
+
+--
+-- Name: admin_event_entity constraint_admin_event_entity; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.admin_event_entity
+    ADD CONSTRAINT constraint_admin_event_entity PRIMARY KEY (id);
+
+
+--
+-- Name: authenticator_config_entry constraint_auth_cfg_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authenticator_config_entry
+    ADD CONSTRAINT constraint_auth_cfg_pk PRIMARY KEY (authenticator_id, name);
+
+
+--
+-- Name: authentication_execution constraint_auth_exec_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authentication_execution
+    ADD CONSTRAINT constraint_auth_exec_pk PRIMARY KEY (id);
+
+
+--
+-- Name: authentication_flow constraint_auth_flow_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authentication_flow
+    ADD CONSTRAINT constraint_auth_flow_pk PRIMARY KEY (id);
+
+
+--
+-- Name: authenticator_config constraint_auth_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authenticator_config
+    ADD CONSTRAINT constraint_auth_pk PRIMARY KEY (id);
+
+
+--
+-- Name: client_session_auth_status constraint_auth_status_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_auth_status
+    ADD CONSTRAINT constraint_auth_status_pk PRIMARY KEY (client_session, authenticator);
+
+
+--
+-- Name: user_role_mapping constraint_c; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_role_mapping
+    ADD CONSTRAINT constraint_c PRIMARY KEY (role_id, user_id);
+
+
+--
+-- Name: composite_role constraint_composite_role; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.composite_role
+    ADD CONSTRAINT constraint_composite_role PRIMARY KEY (composite, child_role);
+
+
+--
+-- Name: client_session_prot_mapper constraint_cs_pmp_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_prot_mapper
+    ADD CONSTRAINT constraint_cs_pmp_pk PRIMARY KEY (client_session, protocol_mapper_id);
+
+
+--
+-- Name: identity_provider_config constraint_d; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider_config
+    ADD CONSTRAINT constraint_d PRIMARY KEY (identity_provider_id, name);
+
+
+--
+-- Name: policy_config constraint_dpc; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.policy_config
+    ADD CONSTRAINT constraint_dpc PRIMARY KEY (policy_id, name);
+
+
+--
+-- Name: realm_smtp_config constraint_e; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_smtp_config
+    ADD CONSTRAINT constraint_e PRIMARY KEY (realm_id, name);
+
+
+--
+-- Name: credential constraint_f; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.credential
+    ADD CONSTRAINT constraint_f PRIMARY KEY (id);
+
+
+--
+-- Name: user_federation_config constraint_f9; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_config
+    ADD CONSTRAINT constraint_f9 PRIMARY KEY (user_federation_provider_id, name);
+
+
+--
+-- Name: resource_server_perm_ticket constraint_fapmt; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_perm_ticket
+    ADD CONSTRAINT constraint_fapmt PRIMARY KEY (id);
+
+
+--
+-- Name: resource_server_resource constraint_farsr; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_resource
+    ADD CONSTRAINT constraint_farsr PRIMARY KEY (id);
+
+
+--
+-- Name: resource_server_policy constraint_farsrp; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_policy
+    ADD CONSTRAINT constraint_farsrp PRIMARY KEY (id);
+
+
+--
+-- Name: associated_policy constraint_farsrpap; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.associated_policy
+    ADD CONSTRAINT constraint_farsrpap PRIMARY KEY (policy_id, associated_policy_id);
+
+
+--
+-- Name: resource_policy constraint_farsrpp; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_policy
+    ADD CONSTRAINT constraint_farsrpp PRIMARY KEY (resource_id, policy_id);
+
+
+--
+-- Name: resource_server_scope constraint_farsrs; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_scope
+    ADD CONSTRAINT constraint_farsrs PRIMARY KEY (id);
+
+
+--
+-- Name: resource_scope constraint_farsrsp; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_scope
+    ADD CONSTRAINT constraint_farsrsp PRIMARY KEY (resource_id, scope_id);
+
+
+--
+-- Name: scope_policy constraint_farsrsps; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.scope_policy
+    ADD CONSTRAINT constraint_farsrsps PRIMARY KEY (scope_id, policy_id);
+
+
+--
+-- Name: user_entity constraint_fb; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_entity
+    ADD CONSTRAINT constraint_fb PRIMARY KEY (id);
+
+
+--
+-- Name: user_federation_mapper_config constraint_fedmapper_cfg_pm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_mapper_config
+    ADD CONSTRAINT constraint_fedmapper_cfg_pm PRIMARY KEY (user_federation_mapper_id, name);
+
+
+--
+-- Name: user_federation_mapper constraint_fedmapperpm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_mapper
+    ADD CONSTRAINT constraint_fedmapperpm PRIMARY KEY (id);
+
+
+--
+-- Name: fed_user_consent_cl_scope constraint_fgrntcsnt_clsc_pm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.fed_user_consent_cl_scope
+    ADD CONSTRAINT constraint_fgrntcsnt_clsc_pm PRIMARY KEY (user_consent_id, scope_id);
+
+
+--
+-- Name: user_consent_client_scope constraint_grntcsnt_clsc_pm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_consent_client_scope
+    ADD CONSTRAINT constraint_grntcsnt_clsc_pm PRIMARY KEY (user_consent_id, scope_id);
+
+
+--
+-- Name: user_consent constraint_grntcsnt_pm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_consent
+    ADD CONSTRAINT constraint_grntcsnt_pm PRIMARY KEY (id);
+
+
+--
+-- Name: keycloak_group constraint_group; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.keycloak_group
+    ADD CONSTRAINT constraint_group PRIMARY KEY (id);
+
+
+--
+-- Name: group_attribute constraint_group_attribute_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.group_attribute
+    ADD CONSTRAINT constraint_group_attribute_pk PRIMARY KEY (id);
+
+
+--
+-- Name: group_role_mapping constraint_group_role; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.group_role_mapping
+    ADD CONSTRAINT constraint_group_role PRIMARY KEY (role_id, group_id);
+
+
+--
+-- Name: identity_provider_mapper constraint_idpm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider_mapper
+    ADD CONSTRAINT constraint_idpm PRIMARY KEY (id);
+
+
+--
+-- Name: idp_mapper_config constraint_idpmconfig; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.idp_mapper_config
+    ADD CONSTRAINT constraint_idpmconfig PRIMARY KEY (idp_mapper_id, name);
+
+
+--
+-- Name: migration_model constraint_migmod; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.migration_model
+    ADD CONSTRAINT constraint_migmod PRIMARY KEY (id);
+
+
+--
+-- Name: offline_client_session constraint_offl_cl_ses_pk3; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.offline_client_session
+    ADD CONSTRAINT constraint_offl_cl_ses_pk3 PRIMARY KEY (user_session_id, client_id, client_storage_provider, external_client_id, offline_flag);
+
+
+--
+-- Name: offline_user_session constraint_offl_us_ses_pk2; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.offline_user_session
+    ADD CONSTRAINT constraint_offl_us_ses_pk2 PRIMARY KEY (user_session_id, offline_flag);
+
+
+--
+-- Name: protocol_mapper constraint_pcm; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.protocol_mapper
+    ADD CONSTRAINT constraint_pcm PRIMARY KEY (id);
+
+
+--
+-- Name: protocol_mapper_config constraint_pmconfig; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.protocol_mapper_config
+    ADD CONSTRAINT constraint_pmconfig PRIMARY KEY (protocol_mapper_id, name);
+
+
+--
+-- Name: realm_default_roles constraint_realm_default_roles; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_default_roles
+    ADD CONSTRAINT constraint_realm_default_roles PRIMARY KEY (realm_id, role_id);
+
+
+--
+-- Name: redirect_uris constraint_redirect_uris; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.redirect_uris
+    ADD CONSTRAINT constraint_redirect_uris PRIMARY KEY (client_id, value);
+
+
+--
+-- Name: required_action_config constraint_req_act_cfg_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.required_action_config
+    ADD CONSTRAINT constraint_req_act_cfg_pk PRIMARY KEY (required_action_id, name);
+
+
+--
+-- Name: required_action_provider constraint_req_act_prv_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.required_action_provider
+    ADD CONSTRAINT constraint_req_act_prv_pk PRIMARY KEY (id);
+
+
+--
+-- Name: user_required_action constraint_required_action; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_required_action
+    ADD CONSTRAINT constraint_required_action PRIMARY KEY (required_action, user_id);
+
+
+--
+-- Name: resource_uris constraint_resour_uris_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_uris
+    ADD CONSTRAINT constraint_resour_uris_pk PRIMARY KEY (resource_id, value);
+
+
+--
+-- Name: role_attribute constraint_role_attribute_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.role_attribute
+    ADD CONSTRAINT constraint_role_attribute_pk PRIMARY KEY (id);
+
+
+--
+-- Name: user_attribute constraint_user_attribute_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_attribute
+    ADD CONSTRAINT constraint_user_attribute_pk PRIMARY KEY (id);
+
+
+--
+-- Name: user_group_membership constraint_user_group; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_group_membership
+    ADD CONSTRAINT constraint_user_group PRIMARY KEY (group_id, user_id);
+
+
+--
+-- Name: user_session_note constraint_usn_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_session_note
+    ADD CONSTRAINT constraint_usn_pk PRIMARY KEY (user_session, name);
+
+
+--
+-- Name: web_origins constraint_web_origins; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.web_origins
+    ADD CONSTRAINT constraint_web_origins PRIMARY KEY (client_id, value);
+
+
+--
+-- Name: client_scope_attributes pk_cl_tmpl_attr; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_attributes
+    ADD CONSTRAINT pk_cl_tmpl_attr PRIMARY KEY (scope_id, name);
+
+
+--
+-- Name: client_scope pk_cli_template; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope
+    ADD CONSTRAINT pk_cli_template PRIMARY KEY (id);
+
+
+--
+-- Name: databasechangeloglock pk_databasechangeloglock; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.databasechangeloglock
+    ADD CONSTRAINT pk_databasechangeloglock PRIMARY KEY (id);
+
+
+--
+-- Name: resource_server pk_resource_server; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server
+    ADD CONSTRAINT pk_resource_server PRIMARY KEY (id);
+
+
+--
+-- Name: client_scope_role_mapping pk_template_scope; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_role_mapping
+    ADD CONSTRAINT pk_template_scope PRIMARY KEY (scope_id, role_id);
+
+
+--
+-- Name: default_client_scope r_def_cli_scope_bind; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.default_client_scope
+    ADD CONSTRAINT r_def_cli_scope_bind PRIMARY KEY (realm_id, scope_id);
+
+
+--
+-- Name: realm_localizations realm_localizations_pkey; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_localizations
+    ADD CONSTRAINT realm_localizations_pkey PRIMARY KEY (realm_id, locale);
+
+
+--
+-- Name: resource_attribute res_attr_pk; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_attribute
+    ADD CONSTRAINT res_attr_pk PRIMARY KEY (id);
+
+
+--
+-- Name: keycloak_group sibling_names; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.keycloak_group
+    ADD CONSTRAINT sibling_names UNIQUE (realm_id, parent_group, name);
+
+
+--
+-- Name: identity_provider uk_2daelwnibji49avxsrtuf6xj33; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider
+    ADD CONSTRAINT uk_2daelwnibji49avxsrtuf6xj33 UNIQUE (provider_alias, realm_id);
+
+
+--
+-- Name: client_default_roles uk_8aelwnibji49avxsrtuf6xjow; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_default_roles
+    ADD CONSTRAINT uk_8aelwnibji49avxsrtuf6xjow UNIQUE (role_id);
+
+
+--
+-- Name: client uk_b71cjlbenv945rb6gcon438at; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client
+    ADD CONSTRAINT uk_b71cjlbenv945rb6gcon438at UNIQUE (realm_id, client_id);
+
+
+--
+-- Name: client_scope uk_cli_scope; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope
+    ADD CONSTRAINT uk_cli_scope UNIQUE (realm_id, name);
+
+
+--
+-- Name: user_entity uk_dykn684sl8up1crfei6eckhd7; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_entity
+    ADD CONSTRAINT uk_dykn684sl8up1crfei6eckhd7 UNIQUE (realm_id, email_constraint);
+
+
+--
+-- Name: resource_server_resource uk_frsr6t700s9v50bu18ws5ha6; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_resource
+    ADD CONSTRAINT uk_frsr6t700s9v50bu18ws5ha6 UNIQUE (name, owner, resource_server_id);
+
+
+--
+-- Name: resource_server_perm_ticket uk_frsr6t700s9v50bu18ws5pmt; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_perm_ticket
+    ADD CONSTRAINT uk_frsr6t700s9v50bu18ws5pmt UNIQUE (owner, requester, resource_server_id, resource_id, scope_id);
+
+
+--
+-- Name: resource_server_policy uk_frsrpt700s9v50bu18ws5ha6; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_policy
+    ADD CONSTRAINT uk_frsrpt700s9v50bu18ws5ha6 UNIQUE (name, resource_server_id);
+
+
+--
+-- Name: resource_server_scope uk_frsrst700s9v50bu18ws5ha6; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_scope
+    ADD CONSTRAINT uk_frsrst700s9v50bu18ws5ha6 UNIQUE (name, resource_server_id);
+
+
+--
+-- Name: realm_default_roles uk_h4wpd7w4hsoolni3h0sw7btje; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_default_roles
+    ADD CONSTRAINT uk_h4wpd7w4hsoolni3h0sw7btje UNIQUE (role_id);
+
+
+--
+-- Name: user_consent uk_jkuwuvd56ontgsuhogm8uewrt; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_consent
+    ADD CONSTRAINT uk_jkuwuvd56ontgsuhogm8uewrt UNIQUE (client_id, client_storage_provider, external_client_id, user_id);
+
+
+--
+-- Name: realm uk_orvsdmla56612eaefiq6wl5oi; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm
+    ADD CONSTRAINT uk_orvsdmla56612eaefiq6wl5oi UNIQUE (name);
+
+
+--
+-- Name: user_entity uk_ru8tt6t700s9v50bu18ws5ha6; Type: CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_entity
+    ADD CONSTRAINT uk_ru8tt6t700s9v50bu18ws5ha6 UNIQUE (realm_id, username);
+
+
+--
+-- Name: idx_assoc_pol_assoc_pol_id; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_assoc_pol_assoc_pol_id ON public.associated_policy USING btree (associated_policy_id);
+
+
+--
+-- Name: idx_auth_config_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_auth_config_realm ON public.authenticator_config USING btree (realm_id);
+
+
+--
+-- Name: idx_auth_exec_flow; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_auth_exec_flow ON public.authentication_execution USING btree (flow_id);
+
+
+--
+-- Name: idx_auth_exec_realm_flow; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_auth_exec_realm_flow ON public.authentication_execution USING btree (realm_id, flow_id);
+
+
+--
+-- Name: idx_auth_flow_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_auth_flow_realm ON public.authentication_flow USING btree (realm_id);
+
+
+--
+-- Name: idx_cl_clscope; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_cl_clscope ON public.client_scope_client USING btree (scope_id);
+
+
+--
+-- Name: idx_client_def_roles_client; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_client_def_roles_client ON public.client_default_roles USING btree (client_id);
+
+
+--
+-- Name: idx_client_id; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_client_id ON public.client USING btree (client_id);
+
+
+--
+-- Name: idx_client_init_acc_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_client_init_acc_realm ON public.client_initial_access USING btree (realm_id);
+
+
+--
+-- Name: idx_client_session_session; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_client_session_session ON public.client_session USING btree (session_id);
+
+
+--
+-- Name: idx_clscope_attrs; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_clscope_attrs ON public.client_scope_attributes USING btree (scope_id);
+
+
+--
+-- Name: idx_clscope_cl; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_clscope_cl ON public.client_scope_client USING btree (client_id);
+
+
+--
+-- Name: idx_clscope_protmap; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_clscope_protmap ON public.protocol_mapper USING btree (client_scope_id);
+
+
+--
+-- Name: idx_clscope_role; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_clscope_role ON public.client_scope_role_mapping USING btree (scope_id);
+
+
+--
+-- Name: idx_compo_config_compo; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_compo_config_compo ON public.component_config USING btree (component_id);
+
+
+--
+-- Name: idx_component_provider_type; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_component_provider_type ON public.component USING btree (provider_type);
+
+
+--
+-- Name: idx_component_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_component_realm ON public.component USING btree (realm_id);
+
+
+--
+-- Name: idx_composite; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_composite ON public.composite_role USING btree (composite);
+
+
+--
+-- Name: idx_composite_child; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_composite_child ON public.composite_role USING btree (child_role);
+
+
+--
+-- Name: idx_defcls_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_defcls_realm ON public.default_client_scope USING btree (realm_id);
+
+
+--
+-- Name: idx_defcls_scope; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_defcls_scope ON public.default_client_scope USING btree (scope_id);
+
+
+--
+-- Name: idx_event_time; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_event_time ON public.event_entity USING btree (realm_id, event_time);
+
+
+--
+-- Name: idx_fedidentity_feduser; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fedidentity_feduser ON public.federated_identity USING btree (federated_user_id);
+
+
+--
+-- Name: idx_fedidentity_user; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fedidentity_user ON public.federated_identity USING btree (user_id);
+
+
+--
+-- Name: idx_fu_attribute; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_attribute ON public.fed_user_attribute USING btree (user_id, realm_id, name);
+
+
+--
+-- Name: idx_fu_cnsnt_ext; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_cnsnt_ext ON public.fed_user_consent USING btree (user_id, client_storage_provider, external_client_id);
+
+
+--
+-- Name: idx_fu_consent; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_consent ON public.fed_user_consent USING btree (user_id, client_id);
+
+
+--
+-- Name: idx_fu_consent_ru; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_consent_ru ON public.fed_user_consent USING btree (realm_id, user_id);
+
+
+--
+-- Name: idx_fu_credential; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_credential ON public.fed_user_credential USING btree (user_id, type);
+
+
+--
+-- Name: idx_fu_credential_ru; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_credential_ru ON public.fed_user_credential USING btree (realm_id, user_id);
+
+
+--
+-- Name: idx_fu_group_membership; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_group_membership ON public.fed_user_group_membership USING btree (user_id, group_id);
+
+
+--
+-- Name: idx_fu_group_membership_ru; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_group_membership_ru ON public.fed_user_group_membership USING btree (realm_id, user_id);
+
+
+--
+-- Name: idx_fu_required_action; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_required_action ON public.fed_user_required_action USING btree (user_id, required_action);
+
+
+--
+-- Name: idx_fu_required_action_ru; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_required_action_ru ON public.fed_user_required_action USING btree (realm_id, user_id);
+
+
+--
+-- Name: idx_fu_role_mapping; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_role_mapping ON public.fed_user_role_mapping USING btree (user_id, role_id);
+
+
+--
+-- Name: idx_fu_role_mapping_ru; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_fu_role_mapping_ru ON public.fed_user_role_mapping USING btree (realm_id, user_id);
+
+
+--
+-- Name: idx_group_attr_group; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_group_attr_group ON public.group_attribute USING btree (group_id);
+
+
+--
+-- Name: idx_group_role_mapp_group; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_group_role_mapp_group ON public.group_role_mapping USING btree (group_id);
+
+
+--
+-- Name: idx_id_prov_mapp_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_id_prov_mapp_realm ON public.identity_provider_mapper USING btree (realm_id);
+
+
+--
+-- Name: idx_ident_prov_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_ident_prov_realm ON public.identity_provider USING btree (realm_id);
+
+
+--
+-- Name: idx_keycloak_role_client; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_keycloak_role_client ON public.keycloak_role USING btree (client);
+
+
+--
+-- Name: idx_keycloak_role_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_keycloak_role_realm ON public.keycloak_role USING btree (realm);
+
+
+--
+-- Name: idx_offline_uss_createdon; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_offline_uss_createdon ON public.offline_user_session USING btree (created_on);
+
+
+--
+-- Name: idx_protocol_mapper_client; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_protocol_mapper_client ON public.protocol_mapper USING btree (client_id);
+
+
+--
+-- Name: idx_realm_attr_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_attr_realm ON public.realm_attribute USING btree (realm_id);
+
+
+--
+-- Name: idx_realm_clscope; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_clscope ON public.client_scope USING btree (realm_id);
+
+
+--
+-- Name: idx_realm_def_grp_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_def_grp_realm ON public.realm_default_groups USING btree (realm_id);
+
+
+--
+-- Name: idx_realm_def_roles_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_def_roles_realm ON public.realm_default_roles USING btree (realm_id);
+
+
+--
+-- Name: idx_realm_evt_list_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_evt_list_realm ON public.realm_events_listeners USING btree (realm_id);
+
+
+--
+-- Name: idx_realm_evt_types_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_evt_types_realm ON public.realm_enabled_event_types USING btree (realm_id);
+
+
+--
+-- Name: idx_realm_master_adm_cli; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_master_adm_cli ON public.realm USING btree (master_admin_client);
+
+
+--
+-- Name: idx_realm_supp_local_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_realm_supp_local_realm ON public.realm_supported_locales USING btree (realm_id);
+
+
+--
+-- Name: idx_redir_uri_client; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_redir_uri_client ON public.redirect_uris USING btree (client_id);
+
+
+--
+-- Name: idx_req_act_prov_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_req_act_prov_realm ON public.required_action_provider USING btree (realm_id);
+
+
+--
+-- Name: idx_res_policy_policy; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_res_policy_policy ON public.resource_policy USING btree (policy_id);
+
+
+--
+-- Name: idx_res_scope_scope; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_res_scope_scope ON public.resource_scope USING btree (scope_id);
+
+
+--
+-- Name: idx_res_serv_pol_res_serv; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_res_serv_pol_res_serv ON public.resource_server_policy USING btree (resource_server_id);
+
+
+--
+-- Name: idx_res_srv_res_res_srv; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_res_srv_res_res_srv ON public.resource_server_resource USING btree (resource_server_id);
+
+
+--
+-- Name: idx_res_srv_scope_res_srv; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_res_srv_scope_res_srv ON public.resource_server_scope USING btree (resource_server_id);
+
+
+--
+-- Name: idx_role_attribute; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_role_attribute ON public.role_attribute USING btree (role_id);
+
+
+--
+-- Name: idx_role_clscope; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_role_clscope ON public.client_scope_role_mapping USING btree (role_id);
+
+
+--
+-- Name: idx_scope_mapping_role; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_scope_mapping_role ON public.scope_mapping USING btree (role_id);
+
+
+--
+-- Name: idx_scope_policy_policy; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_scope_policy_policy ON public.scope_policy USING btree (policy_id);
+
+
+--
+-- Name: idx_update_time; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_update_time ON public.migration_model USING btree (update_time);
+
+
+--
+-- Name: idx_us_sess_id_on_cl_sess; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_us_sess_id_on_cl_sess ON public.offline_client_session USING btree (user_session_id);
+
+
+--
+-- Name: idx_usconsent_clscope; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_usconsent_clscope ON public.user_consent_client_scope USING btree (user_consent_id);
+
+
+--
+-- Name: idx_user_attribute; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_attribute ON public.user_attribute USING btree (user_id);
+
+
+--
+-- Name: idx_user_consent; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_consent ON public.user_consent USING btree (user_id);
+
+
+--
+-- Name: idx_user_credential; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_credential ON public.credential USING btree (user_id);
+
+
+--
+-- Name: idx_user_email; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_email ON public.user_entity USING btree (email);
+
+
+--
+-- Name: idx_user_group_mapping; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_group_mapping ON public.user_group_membership USING btree (user_id);
+
+
+--
+-- Name: idx_user_reqactions; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_reqactions ON public.user_required_action USING btree (user_id);
+
+
+--
+-- Name: idx_user_role_mapping; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_user_role_mapping ON public.user_role_mapping USING btree (user_id);
+
+
+--
+-- Name: idx_usr_fed_map_fed_prv; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_usr_fed_map_fed_prv ON public.user_federation_mapper USING btree (federation_provider_id);
+
+
+--
+-- Name: idx_usr_fed_map_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_usr_fed_map_realm ON public.user_federation_mapper USING btree (realm_id);
+
+
+--
+-- Name: idx_usr_fed_prv_realm; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_usr_fed_prv_realm ON public.user_federation_provider USING btree (realm_id);
+
+
+--
+-- Name: idx_web_orig_client; Type: INDEX; Schema: public; Owner: keycloak
+--
+
+CREATE INDEX idx_web_orig_client ON public.web_origins USING btree (client_id);
+
+
+--
+-- Name: client_session_auth_status auth_status_constraint; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_auth_status
+    ADD CONSTRAINT auth_status_constraint FOREIGN KEY (client_session) REFERENCES public.client_session(id);
+
+
+--
+-- Name: identity_provider fk2b4ebc52ae5c3b34; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider
+    ADD CONSTRAINT fk2b4ebc52ae5c3b34 FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: client_attributes fk3c47c64beacca966; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_attributes
+    ADD CONSTRAINT fk3c47c64beacca966 FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: federated_identity fk404288b92ef007a6; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.federated_identity
+    ADD CONSTRAINT fk404288b92ef007a6 FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: client_node_registrations fk4129723ba992f594; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_node_registrations
+    ADD CONSTRAINT fk4129723ba992f594 FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: client_session_note fk5edfb00ff51c2736; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_note
+    ADD CONSTRAINT fk5edfb00ff51c2736 FOREIGN KEY (client_session) REFERENCES public.client_session(id);
+
+
+--
+-- Name: user_session_note fk5edfb00ff51d3472; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_session_note
+    ADD CONSTRAINT fk5edfb00ff51d3472 FOREIGN KEY (user_session) REFERENCES public.user_session(id);
+
+
+--
+-- Name: client_session_role fk_11b7sgqw18i532811v7o2dv76; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_role
+    ADD CONSTRAINT fk_11b7sgqw18i532811v7o2dv76 FOREIGN KEY (client_session) REFERENCES public.client_session(id);
+
+
+--
+-- Name: redirect_uris fk_1burs8pb4ouj97h5wuppahv9f; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.redirect_uris
+    ADD CONSTRAINT fk_1burs8pb4ouj97h5wuppahv9f FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: user_federation_provider fk_1fj32f6ptolw2qy60cd8n01e8; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_provider
+    ADD CONSTRAINT fk_1fj32f6ptolw2qy60cd8n01e8 FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: client_session_prot_mapper fk_33a8sgqw18i532811v7o2dk89; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session_prot_mapper
+    ADD CONSTRAINT fk_33a8sgqw18i532811v7o2dk89 FOREIGN KEY (client_session) REFERENCES public.client_session(id);
+
+
+--
+-- Name: realm_required_credential fk_5hg65lybevavkqfki3kponh9v; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_required_credential
+    ADD CONSTRAINT fk_5hg65lybevavkqfki3kponh9v FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: resource_attribute fk_5hrm2vlf9ql5fu022kqepovbr; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_attribute
+    ADD CONSTRAINT fk_5hrm2vlf9ql5fu022kqepovbr FOREIGN KEY (resource_id) REFERENCES public.resource_server_resource(id);
+
+
+--
+-- Name: user_attribute fk_5hrm2vlf9ql5fu043kqepovbr; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_attribute
+    ADD CONSTRAINT fk_5hrm2vlf9ql5fu043kqepovbr FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: user_required_action fk_6qj3w1jw9cvafhe19bwsiuvmd; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_required_action
+    ADD CONSTRAINT fk_6qj3w1jw9cvafhe19bwsiuvmd FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: keycloak_role fk_6vyqfe4cn4wlq8r6kt5vdsj5c; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.keycloak_role
+    ADD CONSTRAINT fk_6vyqfe4cn4wlq8r6kt5vdsj5c FOREIGN KEY (realm) REFERENCES public.realm(id);
+
+
+--
+-- Name: realm_smtp_config fk_70ej8xdxgxd0b9hh6180irr0o; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_smtp_config
+    ADD CONSTRAINT fk_70ej8xdxgxd0b9hh6180irr0o FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: realm_attribute fk_8shxd6l3e9atqukacxgpffptw; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_attribute
+    ADD CONSTRAINT fk_8shxd6l3e9atqukacxgpffptw FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: composite_role fk_a63wvekftu8jo1pnj81e7mce2; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.composite_role
+    ADD CONSTRAINT fk_a63wvekftu8jo1pnj81e7mce2 FOREIGN KEY (composite) REFERENCES public.keycloak_role(id);
+
+
+--
+-- Name: authentication_execution fk_auth_exec_flow; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authentication_execution
+    ADD CONSTRAINT fk_auth_exec_flow FOREIGN KEY (flow_id) REFERENCES public.authentication_flow(id);
+
+
+--
+-- Name: authentication_execution fk_auth_exec_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authentication_execution
+    ADD CONSTRAINT fk_auth_exec_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: authentication_flow fk_auth_flow_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authentication_flow
+    ADD CONSTRAINT fk_auth_flow_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: authenticator_config fk_auth_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.authenticator_config
+    ADD CONSTRAINT fk_auth_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: client_session fk_b4ao2vcvat6ukau74wbwtfqo1; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_session
+    ADD CONSTRAINT fk_b4ao2vcvat6ukau74wbwtfqo1 FOREIGN KEY (session_id) REFERENCES public.user_session(id);
+
+
+--
+-- Name: user_role_mapping fk_c4fqv34p1mbylloxang7b1q3l; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_role_mapping
+    ADD CONSTRAINT fk_c4fqv34p1mbylloxang7b1q3l FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: client_scope_client fk_c_cli_scope_client; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_client
+    ADD CONSTRAINT fk_c_cli_scope_client FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: client_scope_client fk_c_cli_scope_scope; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_client
+    ADD CONSTRAINT fk_c_cli_scope_scope FOREIGN KEY (scope_id) REFERENCES public.client_scope(id);
+
+
+--
+-- Name: client_scope_attributes fk_cl_scope_attr_scope; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_attributes
+    ADD CONSTRAINT fk_cl_scope_attr_scope FOREIGN KEY (scope_id) REFERENCES public.client_scope(id);
+
+
+--
+-- Name: client_scope_role_mapping fk_cl_scope_rm_scope; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope_role_mapping
+    ADD CONSTRAINT fk_cl_scope_rm_scope FOREIGN KEY (scope_id) REFERENCES public.client_scope(id);
+
+
+--
+-- Name: client_user_session_note fk_cl_usr_ses_note; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_user_session_note
+    ADD CONSTRAINT fk_cl_usr_ses_note FOREIGN KEY (client_session) REFERENCES public.client_session(id);
+
+
+--
+-- Name: protocol_mapper fk_cli_scope_mapper; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.protocol_mapper
+    ADD CONSTRAINT fk_cli_scope_mapper FOREIGN KEY (client_scope_id) REFERENCES public.client_scope(id);
+
+
+--
+-- Name: client_initial_access fk_client_init_acc_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_initial_access
+    ADD CONSTRAINT fk_client_init_acc_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: component_config fk_component_config; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.component_config
+    ADD CONSTRAINT fk_component_config FOREIGN KEY (component_id) REFERENCES public.component(id);
+
+
+--
+-- Name: component fk_component_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.component
+    ADD CONSTRAINT fk_component_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: realm_default_groups fk_def_groups_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_default_groups
+    ADD CONSTRAINT fk_def_groups_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: realm_default_roles fk_evudb1ppw84oxfax2drs03icc; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_default_roles
+    ADD CONSTRAINT fk_evudb1ppw84oxfax2drs03icc FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: user_federation_mapper_config fk_fedmapper_cfg; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_mapper_config
+    ADD CONSTRAINT fk_fedmapper_cfg FOREIGN KEY (user_federation_mapper_id) REFERENCES public.user_federation_mapper(id);
+
+
+--
+-- Name: user_federation_mapper fk_fedmapperpm_fedprv; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_mapper
+    ADD CONSTRAINT fk_fedmapperpm_fedprv FOREIGN KEY (federation_provider_id) REFERENCES public.user_federation_provider(id);
+
+
+--
+-- Name: user_federation_mapper fk_fedmapperpm_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_mapper
+    ADD CONSTRAINT fk_fedmapperpm_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: associated_policy fk_frsr5s213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.associated_policy
+    ADD CONSTRAINT fk_frsr5s213xcx4wnkog82ssrfy FOREIGN KEY (associated_policy_id) REFERENCES public.resource_server_policy(id);
+
+
+--
+-- Name: scope_policy fk_frsrasp13xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.scope_policy
+    ADD CONSTRAINT fk_frsrasp13xcx4wnkog82ssrfy FOREIGN KEY (policy_id) REFERENCES public.resource_server_policy(id);
+
+
+--
+-- Name: resource_server_perm_ticket fk_frsrho213xcx4wnkog82sspmt; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_perm_ticket
+    ADD CONSTRAINT fk_frsrho213xcx4wnkog82sspmt FOREIGN KEY (resource_server_id) REFERENCES public.resource_server(id);
+
+
+--
+-- Name: resource_server_resource fk_frsrho213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_resource
+    ADD CONSTRAINT fk_frsrho213xcx4wnkog82ssrfy FOREIGN KEY (resource_server_id) REFERENCES public.resource_server(id);
+
+
+--
+-- Name: resource_server_perm_ticket fk_frsrho213xcx4wnkog83sspmt; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_perm_ticket
+    ADD CONSTRAINT fk_frsrho213xcx4wnkog83sspmt FOREIGN KEY (resource_id) REFERENCES public.resource_server_resource(id);
+
+
+--
+-- Name: resource_server_perm_ticket fk_frsrho213xcx4wnkog84sspmt; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_perm_ticket
+    ADD CONSTRAINT fk_frsrho213xcx4wnkog84sspmt FOREIGN KEY (scope_id) REFERENCES public.resource_server_scope(id);
+
+
+--
+-- Name: associated_policy fk_frsrpas14xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.associated_policy
+    ADD CONSTRAINT fk_frsrpas14xcx4wnkog82ssrfy FOREIGN KEY (policy_id) REFERENCES public.resource_server_policy(id);
+
+
+--
+-- Name: scope_policy fk_frsrpass3xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.scope_policy
+    ADD CONSTRAINT fk_frsrpass3xcx4wnkog82ssrfy FOREIGN KEY (scope_id) REFERENCES public.resource_server_scope(id);
+
+
+--
+-- Name: resource_server_perm_ticket fk_frsrpo2128cx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_perm_ticket
+    ADD CONSTRAINT fk_frsrpo2128cx4wnkog82ssrfy FOREIGN KEY (policy_id) REFERENCES public.resource_server_policy(id);
+
+
+--
+-- Name: resource_server_policy fk_frsrpo213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_policy
+    ADD CONSTRAINT fk_frsrpo213xcx4wnkog82ssrfy FOREIGN KEY (resource_server_id) REFERENCES public.resource_server(id);
+
+
+--
+-- Name: resource_scope fk_frsrpos13xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_scope
+    ADD CONSTRAINT fk_frsrpos13xcx4wnkog82ssrfy FOREIGN KEY (resource_id) REFERENCES public.resource_server_resource(id);
+
+
+--
+-- Name: resource_policy fk_frsrpos53xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_policy
+    ADD CONSTRAINT fk_frsrpos53xcx4wnkog82ssrfy FOREIGN KEY (resource_id) REFERENCES public.resource_server_resource(id);
+
+
+--
+-- Name: resource_policy fk_frsrpp213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_policy
+    ADD CONSTRAINT fk_frsrpp213xcx4wnkog82ssrfy FOREIGN KEY (policy_id) REFERENCES public.resource_server_policy(id);
+
+
+--
+-- Name: resource_scope fk_frsrps213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_scope
+    ADD CONSTRAINT fk_frsrps213xcx4wnkog82ssrfy FOREIGN KEY (scope_id) REFERENCES public.resource_server_scope(id);
+
+
+--
+-- Name: resource_server_scope fk_frsrso213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_server_scope
+    ADD CONSTRAINT fk_frsrso213xcx4wnkog82ssrfy FOREIGN KEY (resource_server_id) REFERENCES public.resource_server(id);
+
+
+--
+-- Name: composite_role fk_gr7thllb9lu8q4vqa4524jjy8; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.composite_role
+    ADD CONSTRAINT fk_gr7thllb9lu8q4vqa4524jjy8 FOREIGN KEY (child_role) REFERENCES public.keycloak_role(id);
+
+
+--
+-- Name: user_consent_client_scope fk_grntcsnt_clsc_usc; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_consent_client_scope
+    ADD CONSTRAINT fk_grntcsnt_clsc_usc FOREIGN KEY (user_consent_id) REFERENCES public.user_consent(id);
+
+
+--
+-- Name: user_consent fk_grntcsnt_user; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_consent
+    ADD CONSTRAINT fk_grntcsnt_user FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: group_attribute fk_group_attribute_group; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.group_attribute
+    ADD CONSTRAINT fk_group_attribute_group FOREIGN KEY (group_id) REFERENCES public.keycloak_group(id);
+
+
+--
+-- Name: keycloak_group fk_group_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.keycloak_group
+    ADD CONSTRAINT fk_group_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: group_role_mapping fk_group_role_group; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.group_role_mapping
+    ADD CONSTRAINT fk_group_role_group FOREIGN KEY (group_id) REFERENCES public.keycloak_group(id);
+
+
+--
+-- Name: realm_enabled_event_types fk_h846o4h0w8epx5nwedrf5y69j; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_enabled_event_types
+    ADD CONSTRAINT fk_h846o4h0w8epx5nwedrf5y69j FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: realm_events_listeners fk_h846o4h0w8epx5nxev9f5y69j; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_events_listeners
+    ADD CONSTRAINT fk_h846o4h0w8epx5nxev9f5y69j FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: identity_provider_mapper fk_idpm_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider_mapper
+    ADD CONSTRAINT fk_idpm_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: idp_mapper_config fk_idpmconfig; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.idp_mapper_config
+    ADD CONSTRAINT fk_idpmconfig FOREIGN KEY (idp_mapper_id) REFERENCES public.identity_provider_mapper(id);
+
+
+--
+-- Name: web_origins fk_lojpho213xcx4wnkog82ssrfy; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.web_origins
+    ADD CONSTRAINT fk_lojpho213xcx4wnkog82ssrfy FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: client_default_roles fk_nuilts7klwqw2h8m2b5joytky; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_default_roles
+    ADD CONSTRAINT fk_nuilts7klwqw2h8m2b5joytky FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: scope_mapping fk_ouse064plmlr732lxjcn1q5f1; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.scope_mapping
+    ADD CONSTRAINT fk_ouse064plmlr732lxjcn1q5f1 FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: client fk_p56ctinxxb9gsk57fo49f9tac; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client
+    ADD CONSTRAINT fk_p56ctinxxb9gsk57fo49f9tac FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: protocol_mapper fk_pcm_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.protocol_mapper
+    ADD CONSTRAINT fk_pcm_realm FOREIGN KEY (client_id) REFERENCES public.client(id);
+
+
+--
+-- Name: credential fk_pfyr0glasqyl0dei3kl69r6v0; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.credential
+    ADD CONSTRAINT fk_pfyr0glasqyl0dei3kl69r6v0 FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: protocol_mapper_config fk_pmconfig; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.protocol_mapper_config
+    ADD CONSTRAINT fk_pmconfig FOREIGN KEY (protocol_mapper_id) REFERENCES public.protocol_mapper(id);
+
+
+--
+-- Name: default_client_scope fk_r_def_cli_scope_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.default_client_scope
+    ADD CONSTRAINT fk_r_def_cli_scope_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: default_client_scope fk_r_def_cli_scope_scope; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.default_client_scope
+    ADD CONSTRAINT fk_r_def_cli_scope_scope FOREIGN KEY (scope_id) REFERENCES public.client_scope(id);
+
+
+--
+-- Name: client_scope fk_realm_cli_scope; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.client_scope
+    ADD CONSTRAINT fk_realm_cli_scope FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: required_action_provider fk_req_act_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.required_action_provider
+    ADD CONSTRAINT fk_req_act_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: resource_uris fk_resource_server_uris; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.resource_uris
+    ADD CONSTRAINT fk_resource_server_uris FOREIGN KEY (resource_id) REFERENCES public.resource_server_resource(id);
+
+
+--
+-- Name: role_attribute fk_role_attribute_id; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.role_attribute
+    ADD CONSTRAINT fk_role_attribute_id FOREIGN KEY (role_id) REFERENCES public.keycloak_role(id);
+
+
+--
+-- Name: realm_supported_locales fk_supported_locales_realm; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.realm_supported_locales
+    ADD CONSTRAINT fk_supported_locales_realm FOREIGN KEY (realm_id) REFERENCES public.realm(id);
+
+
+--
+-- Name: user_federation_config fk_t13hpu1j94r2ebpekr39x5eu5; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_federation_config
+    ADD CONSTRAINT fk_t13hpu1j94r2ebpekr39x5eu5 FOREIGN KEY (user_federation_provider_id) REFERENCES public.user_federation_provider(id);
+
+
+--
+-- Name: user_group_membership fk_user_group_user; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.user_group_membership
+    ADD CONSTRAINT fk_user_group_user FOREIGN KEY (user_id) REFERENCES public.user_entity(id);
+
+
+--
+-- Name: policy_config fkdc34197cf864c4e43; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.policy_config
+    ADD CONSTRAINT fkdc34197cf864c4e43 FOREIGN KEY (policy_id) REFERENCES public.resource_server_policy(id);
+
+
+--
+-- Name: identity_provider_config fkdc4897cf864c4e43; Type: FK CONSTRAINT; Schema: public; Owner: keycloak
+--
+
+ALTER TABLE ONLY public.identity_provider_config
+    ADD CONSTRAINT fkdc4897cf864c4e43 FOREIGN KEY (identity_provider_id) REFERENCES public.identity_provider(internal_id);
+
+
+--
+-- PostgreSQL database dump complete
+--
+
diff --git a/devenv/docker/blocks/oauth/docker-build-keycloak-m1-image.sh b/devenv/docker/blocks/oauth/docker-build-keycloak-m1-image.sh
new file mode 100644
index 00000000000..46c1ef09fa3
--- /dev/null
+++ b/devenv/docker/blocks/oauth/docker-build-keycloak-m1-image.sh
@@ -0,0 +1,9 @@
+#/bin/sh
+
+VERSION=12.0.1 # set version here
+
+cd /tmp
+git clone git@github.com:keycloak/keycloak-containers.git
+cd keycloak-containers/server
+git checkout $VERSION
+docker build -t "quay.io/keycloak/keycloak:${VERSION}" .
diff --git a/devenv/docker/blocks/oauth/docker-compose.yaml b/devenv/docker/blocks/oauth/docker-compose.yaml
new file mode 100644
index 00000000000..ac42a218068
--- /dev/null
+++ b/devenv/docker/blocks/oauth/docker-compose.yaml
@@ -0,0 +1,30 @@
+  oauthkeycloakdb:
+    image: postgres:12.2
+    container_name: oauthkeycloakdb
+    environment:
+      POSTGRES_DB: keycloak
+      POSTGRES_USER: keycloak
+      POSTGRES_PASSWORD: password
+    volumes:
+      - ./docker/blocks/oauth/cloak.sql:/docker-entrypoint-initdb.d/cloak.sql
+    restart: unless-stopped
+  
+  oauthkeycloak:
+    image: quay.io/keycloak/keycloak:12.0.1
+    container_name: oauthkeycloak
+    environment:
+      DB_VENDOR: POSTGRES
+      DB_ADDR: oauthkeycloakdb
+      DB_DATABASE: keycloak
+      DB_USER: keycloak
+      DB_PASSWORD: password
+      KEYCLOAK_USER: admin
+      KEYCLOAK_PASSWORD: admin
+      PROXY_ADDRESS_FORWARDING: "true"
+    ports:
+      - 8087:8080
+    depends_on:
+      - oauthkeycloakdb
+    links:
+      - "oauthkeycloakdb:oauthkeycloakdb"
+    restart: unless-stopped
diff --git a/devenv/docker/blocks/oauth/readme.md b/devenv/docker/blocks/oauth/readme.md
new file mode 100644
index 00000000000..a40f212a2a8
--- /dev/null
+++ b/devenv/docker/blocks/oauth/readme.md
@@ -0,0 +1,65 @@
+# OAUTH BLOCK
+
+## Devenv setup
+
+To launch the block, use the oauth source. Ex:
+```bash
+make devenv sources="oauth"
+```
+
+Here is the conf you need to add to your configuration file (conf/custom.ini):
+
+```ini
+[auth]
+signout_redirect_url = http://localhost:8087/auth/realms/grafana/protocol/openid-connect/logout?redirect_uri=http%3A%2F%2Flocalhost%3A3000%2Flogin
+
+[auth.generic_oauth]
+enabled = true
+name = Keycloak-OAuth
+allow_sign_up = true
+client_id = grafana-oauth
+client_secret = d17b9ea9-bcb1-43d2-b132-d339e55872a8
+empty_scopes = true
+email_attribute_path = email
+login_attribute_path = login
+name_attribute_path = name
+auth_url = http://localhost:8087/auth/realms/grafana/protocol/openid-connect/auth
+token_url = http://localhost:8087/auth/realms/grafana/protocol/openid-connect/token
+api_url = http://localhost:8087/auth/realms/grafana/protocol/openid-connect/userinfo
+role_attribute_path = contains(roles[*], 'admin') && 'Admin' || contains(roles[*], 'editor') && 'Editor' || 'Viewer'
+```
+
+## Backing up keycloak DB
+
+In case you want to make changes to the devenv setup, you can dump keycloack's DB:
+
+```bash
+cd devenv;
+docker-compose exec -T oauthkeycloakdb bash -c "pg_dump -U keycloak keycloak" > docker/blocks/oauth/cloak.sql
+```
+
+## Connecting to keycloack:
+
+- keycloak admin:                     http://localhost:8087
+- keycloak admin login:               admin:admin
+- grafana oauth viewer login:          oauth-viewer:grafana
+- grafana oauth editor login:          oauth-editor:grafana
+- grafana oauth admin login:           oauth-admin:grafana
+
+# Troubleshooting
+
+## Mac M1 Users
+
+The new arm64 architecture does not build for the latest docker image of keycloack. Refer to https://github.com/docker/for-mac/issues/5310 for the issue to see if it resolved.
+Until then you need to build the docker image locally and then run `devenv`.
+
+1. Remove any lingering keycloack image
+```sh
+$ docker rmi $(docker images | grep 'keycloack')
+```
+1. Build keycloack image locally
+```sh
+$ ./docker-build-keycloack-m1-image.sh
+```
+1. Start from beginning of this readme
+
diff --git a/docs/sources/administration/provisioning/_index.md b/docs/sources/administration/provisioning/_index.md
index 721a565aa34..befc09072bc 100644
--- a/docs/sources/administration/provisioning/_index.md
+++ b/docs/sources/administration/provisioning/_index.md
@@ -233,7 +233,10 @@ datasources:
 
 > This feature is available from v7.1
 
-You can manage plugins in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "../../setup-grafana/configure-grafana/#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.
+You can manage plugin applications in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "../../setup-grafana/configure-grafana/#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.
+
+> **Note:** This feature enables you to provision plugin configurations, not the plugins themselves.
+> The plugins must already be installed on the grafana instance
 
 ### Example plugin configuration file
 
diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions.md
index b69f9c702b0..28e3437b11f 100644
--- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions.md
+++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions.md
@@ -74,7 +74,7 @@ The following tables list permissions associated with basic and fixed roles.
 | `fixed:settings:reader`                | `settings:read`                                                                                                                                                                                                                                                      | Read Grafana instance settings.                                                                                                                                                                                                                                                       |
 | `fixed:settings:writer`                | All permissions from `fixed:settings:reader` and<br>`settings:write`                                                                                                                                                                                                 | Read and update Grafana instance settings.                                                                                                                                                                                                                                            |
 | `fixed:stats:reader`                   | `server.stats:read`                                                                                                                                                                                                                                                  | Read Grafana instance statistics.                                                                                                                                                                                                                                                     |
-| `fixed:teams:creator`                  | `teams:create`<br>`org.users:read`                                                                                                                                                                                                                                   | Create a team and list organization users (required to manage the created team).                                                                                                                                                                                                      |
+| `fixed:teams:creator`                  | `teams:create`<br>`org.users:read`<br>`serviceaccounts:read`                                                                                                                                                                                                         | Create a team and list organization users and service accounts (required to manage the created team).                                                                                                                                                                                 |
 | `fixed:teams:writer`                   | `teams:create`<br>`teams:delete`<br>`teams:read`<br>`teams:write`<br>`teams.permissions:read`<br>`teams.permissions:write`                                                                                                                                           | Create, read, update and delete teams and manage team memberships.                                                                                                                                                                                                                    |
 | `fixed:users:reader`                   | `users:read`<br>`users.quotas:read`<br>`users.authtoken:read`<br>`                                                                                                                                                                                                   | Read all users and their information, such as team memberships, authentication tokens, and quotas.                                                                                                                                                                                    |
 | `fixed:users:writer`                   | All permissions from `fixed:users:reader` and <br>`users:write`<br>`users:create`<br>`users:delete`<br>`users:enable`<br>`users:disable`<br>`users.password:write`<br>`users.permissions:write`<br>`users:logout`<br>`users.authtoken:write`<br>`users.quotas:write` | Read and update all attributes and settings for all users in Grafana: update user information, read user information, create or enable or disable a user, make a user a Grafana administrator, sign out a user, update a user’s authentication token, or update quotas for all users. |
diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md
index f1102173c9e..87cb3c45bdd 100644
--- a/docs/sources/alerting/_index.md
+++ b/docs/sources/alerting/_index.md
@@ -19,7 +19,7 @@ Watch this video to learn more about Grafana Alerting: {{< vimeo 720001629 >}}
 
 The following diagram gives you an overview of how Grafana Alerting works and introduces you to some of the key concepts that work together and form the core of our flexible and powerful alerting engine.
 
-{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram.jpg" caption="Grafana Alerting overview" >}}
+{{< figure src="/static/img/docs/alerting/unified/about-alerting-flow-diagram-latest.png" caption="Grafana Alerting overview" >}}
 
 1. Alert rules
 
diff --git a/docs/sources/alerting/fundamentals/annotation-label/_index.md b/docs/sources/alerting/fundamentals/annotation-label/_index.md
index 4d2dd03bf7e..8270a4ce178 100644
--- a/docs/sources/alerting/fundamentals/annotation-label/_index.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/_index.md
@@ -16,7 +16,7 @@ weight: 401
 
 # Annotations and labels for alerting rules
 
-Annotations and labels are key value pairs associated with alerts originating from the alerting rule, datasource response, and as a result of alerting rule evaluation. They can be used in alert notifications directly or in [templates]({{< relref "../../contact-points/message-templating/" >}}) and [template functions]({{< relref "../../contact-points/message-templating/template-functions/" >}}) to create notification contact dynamically.
+Annotations and labels are key value pairs associated with alerts originating from the alerting rule, datasource response, and as a result of alerting rule evaluation. They can be used in alert notifications directly or in [templates]({{< relref "../../contact-points/message-templating/" >}}) and [template functions]({{< relref "../../contact-points/fundamentals/annotation-label/template-functions/" >}}) to create notification contact dynamically.
 
 ## Annotations
 
diff --git a/docs/sources/alerting/contact-points/message-templating/example-template-functions.md b/docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md
similarity index 89%
rename from docs/sources/alerting/contact-points/message-templating/example-template-functions.md
rename to docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md
index 76693eda54d..b6f13464476 100644
--- a/docs/sources/alerting/contact-points/message-templating/example-template-functions.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md
@@ -1,9 +1,7 @@
 ---
 aliases:
   - /docs/grafana/latest/alerting/contact-points/message-templating/example-template-functions/
-  - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/
-  - /docs/grafana/latest/alerting/message-templating/template-functions/
-  - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/fundamentals/annotation-label/example-template-functions/
 keywords:
   - grafana
   - alerting
diff --git a/docs/sources/alerting/contact-points/message-templating/template-functions.md b/docs/sources/alerting/fundamentals/annotation-label/template-functions.md
similarity index 96%
rename from docs/sources/alerting/contact-points/message-templating/template-functions.md
rename to docs/sources/alerting/fundamentals/annotation-label/template-functions.md
index 567f0452703..c7c3635c525 100644
--- a/docs/sources/alerting/contact-points/message-templating/template-functions.md
+++ b/docs/sources/alerting/fundamentals/annotation-label/template-functions.md
@@ -3,6 +3,8 @@ aliases:
   - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/
   - /docs/grafana/latest/alerting/message-templating/template-functions/
   - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/
+  - /docs/grafana/latest/alerting/fundamentals/annotation-label/template-functions/
+  - /docs/grafana/latest/alerting/unified-alerting/fundamentals/annotation-label/template-functions/
 keywords:
   - grafana
   - alerting
@@ -15,7 +17,7 @@ weight: 125
 
 # Template Functions
 
-Template functions allow you to process labels and annotations to generate dynamic notifications.
+Template functions allow you to process alert evaluation results to generate dynamic notifications.
 
 | Name                                      | Argument type                                                | Return type            | Description                                                                                                                                 |
 | ----------------------------------------- | ------------------------------------------------------------ | ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
diff --git a/docs/sources/alerting/fundamentals/data-source-alerting.md b/docs/sources/alerting/fundamentals/data-source-alerting.md
new file mode 100644
index 00000000000..08ad66165e7
--- /dev/null
+++ b/docs/sources/alerting/fundamentals/data-source-alerting.md
@@ -0,0 +1,39 @@
+---
+aliases:
+  - /docs/grafana/latest/alerting/fundamentals/data-source-alerting/
+description: Data sources in Grafana Alerting
+title: Data sources
+weight: 100
+---
+
+# Data sources
+
+There are a number of data sources that are compatible with Grafana Alerting. Each data source is supported by a plugin. You can use one of the built-in data sources listed below, use [external data source plugins](https://grafana.com/grafana/plugins/?type=datasource), or create your own data source plugin.
+
+If you are creating your own data source plugin, make sure it is a backend plugin as Grafana Alerting requires this in order to be able to evaluate rules using the data source. Frontend data sources are not supported, because the evaluation engine runs on the backend.
+
+Specifying { "alerting": true, “backend”: true } in the plugin.json file indicates that the data source plugin is compatible with Grafana Alerting and includes the backend data-fetching code. For more information, refer to [Build a data source backend plugin](https://grafana.com/tutorials/build-a-data-source-backend-plugin/).
+
+These are the data sources that are compatible with and supported by Grafana Alerting.
+
+- [AWS CloudWatch]({{< relref "../../datasources/aws-cloudwatch/" >}})
+- [Azure Monitor]({{< relref "../../datasources/azuremonitor/" >}})
+- [Elasticsearch]({{< relref "../../datasources/elasticsearch/" >}})
+- [Google Cloud Monitoring]({{< relref "../../google-cloud-monitoring/" >}})
+- [Graphite]({{< relref "../../datasources/graphite/" >}})
+- [InfluxDB]({{< relref "influxdb/" >}})
+- [Loki]({{< relref "../../datasources/loki/" >}})
+- ]Microsoft SQL Server (MSSQL)]({{< relref "../../datasources/mssql/" >}})
+- [MySQL]({{< relref "../../datasources/mysql/" >}})
+- [Open TSDB]({{< relref "../../datasources/opentsdb/" >}})
+- [PostgreSQL]({{< relref "../../datasources/postgres/" >}})
+- [Prometheus]({{< relref "../../datasources/prometheus/" >}})
+- [Jaeger]({{< relref "../../datasources/jaeger/" >}})
+- [Zipkin]({{< relref "../../datasources/zipkin/" >}})
+- [Tempo]({{< relref "../../datasources/tempo/" >}})
+- [Testdata]({{< relref "../../datasources/testdata/" >}})
+
+## Useful links
+
+- [Grafana data sources]({{< relref "../../data-sources/" >}})
+- [Add a data source]({{< relref "../../data-sources/add-a-data-source/" >}})
diff --git a/docs/sources/best-practices/best-practices-for-creating-dashboards.md b/docs/sources/best-practices/best-practices-for-creating-dashboards.md
index 932946faa84..91b765d8e20 100644
--- a/docs/sources/best-practices/best-practices-for-creating-dashboards.md
+++ b/docs/sources/best-practices/best-practices-for-creating-dashboards.md
@@ -51,6 +51,6 @@ Once you have a strategy or design guidelines, write them down to help maintain
 - Use the left and right Y-axes when displaying time series with different units or ranges.
 - Add documentation to dashboards and panels.
   - To add documentation to a dashboard, add a [Text panel visualization]({{< relref "../visualizations/text-panel/" >}}) to the dashboard. Record things like the purpose of the dashboard, useful resource links, and any instructions users might need to interact with the dashboard. Check out this [Wikimedia example](https://grafana.wikimedia.org/d/000000066/resourceloader?orgId=1).
-  - To add documentation to a panel, [edit the panel settings]({{< relref "../panels/working-with-panels/add-panel/" >}}) and add a description. Any text you add will appear if you hover your cursor over the small `i` in the top left corner of the panel.
+  - To add documentation to a panel, edit the panel settings and add a description. Any text you add will appear if you hover your cursor over the small `i` in the top left corner of the panel.
 - Reuse your dashboards and enforce consistency by using [templates and variables]({{< relref "../variables/" >}}).
 - Be careful with stacking graph data. The visualizations can be misleading, and hide important data. We recommend turning it off in most cases.
diff --git a/docs/sources/dashboards/add-organize-panels.md b/docs/sources/dashboards/add-organize-panels.md
new file mode 100644
index 00000000000..52854224f1c
--- /dev/null
+++ b/docs/sources/dashboards/add-organize-panels.md
@@ -0,0 +1,108 @@
+---
+aliases:
+  - /docs/grafana/latest/panels/working-with-panels/navigate-panel-editor/
+  - /docs/grafana/latest/panels/working-with-panels/navigate-inspector-panel/
+  - /docs/grafana/latest/dashboards/dashboard-create/
+  - /docs/grafana/latest/features/dashboard/dashboards/
+  - /docs/grafana/latest/panels/working-with-panels/add-panel/
+  - /docs/grafana/latest/dashboards/add-organize-panels/
+title: Add and organize panels
+menuTitle: Add and organize panels
+weight: 2
+---
+
+# Add and organize panels
+
+This section describes the areas of the Grafana panel editor.
+
+1. Panel header: The header section lists the dashboard in which the panel appears and the following controls:
+
+   - **Dashboard settings (gear) icon -** Click to access the dashboard settings.
+   - **Discard -** Discards changes you have made to the panel since you last saved the dashboard.
+   - **Save -** Saves changes you made to the panel.
+   - **Apply -** Applies changes you made and closes the panel editor, returning you to the dashboard. You will have to save the dashboard to persist the applied changes.
+
+1. Visualization preview: The visualization preview section contains the following options:
+
+   - **Table view -** Convert any visualization to a table so that you can see the data. Table views are useful for troubleshooting.
+   - **Fill -** The visualization preview fills the available space. If you change the width of the side pane or height of the bottom pane the visualization changes to fill the available space.
+   - **Actual -** The visualization preview will have the exact size as the size on the dashboard. If not enough space is available, the visualization will scale down preserving the aspect ratio.
+   - **Time range controls -** For more information, refer to [Time range controls]({{< relref "time-range-controls/" >}}).
+
+1. Data section: The data section contains tabs where you enter queries, transform your data, and create alert rules (if applicable).
+
+   - **Query tab -** Select your data source and enter queries here. For more information, refer to [Add a query]({{< relref "../panels/query-a-data-source/add-a-query/" >}}).
+   - **Transform tab -** Apply data transformations. For more information, refer to [Transform data]({{< relref "../panels/transform-data/" >}}).
+   - **Alert tab -** Write alert rules. For more information, refer to [Overview of Grafana 8 alerting]({{< relref "../alerting/" >}}).
+
+1. Panel display options: The display options section contains tabs where you configure almost every aspect of your data visualization, including:
+
+   - [Apply color to series and fields]({{< relref "../panels/working-with-panels/apply-color-to-series/" >}})
+   - [Format a standard field]({{< relref "../panels/working-with-panels/format-standard-fields/" >}})
+   - [Add a title and description to a panel]({{< relref "../panels/working-with-panels/add-title-and-description/" >}})
+
+> Not all options are available for each visualization.
+
+{{< figure src="/static/img/docs/panel-editor/panel-editor-8-0.png" class="docs-image--no-shadow" max-width="1500px" >}}
+
+## Open the panel inspect drawer
+
+The inspect drawer helps you understand and troubleshoot your panels. You can view the raw data for any panel, export that data to a comma-separated values (CSV) file, view query requests, and export panel and data JSON.
+
+> **Note:** Not all panel types include all tabs. For example, dashboard list panels do not have raw data to inspect, so they do not display the Stats, Data, or Query tabs.
+
+The panel inspector consists of the following options:
+
+1. The panel inspect drawer displays opens a drawer on the right side. Click the arrow in the upper right corner to expand or reduce the drawer pane.
+
+1. **Data tab -** Shows the raw data returned by the query with transformations applied. Field options such as overrides and value mappings are not applied by default.
+
+1. **Stats tab -** Shows how long your query takes and how much it returns.
+
+1. **JSON tab -** Allows you to view and copy the panel JSON, panel data JSON, and data frame structure JSON. This is useful if you are provisioning or administering Grafana.
+
+1. **Query tab -** Shows you the requests to the server sent when Grafana queries the data source.
+
+1. **Error tab -** Shows the error. Only visible when query returns error.
+
+## Create a dashboard and add a panel
+
+Dashboards and panels allow you to show your data in visual form. Each panel needs at least one query to display a visualization.
+
+**Before you begin:**
+
+- Ensure that you have the proper permissions. For more information about permissions, refer to [About users and permissions]({{< relref "../administration/roles-and-permissions/" >}}).
+- Identify the dashboard to which you want to add the panel.
+- Understand the query language of the target data source.
+- Ensure that data source for which you are writing a query has been added. For more information about adding a data source, refer to [Add a data source]({{< relref "../datasources/add-a-data-source/" >}}) if you need instructions.
+
+**To create a dashboard and add a panel**:
+
+1. Sign in to Grafana, hover your cursor over **Dashboard**, and click **+ New Dashboard**.
+1. Click **Add a new panel**.
+1. In the first line of the **Query** tab, click the drop-down list and select a data source.
+1. Write or construct a query in the query language of your data source.
+
+   For more information about data sources, refer to [Data sources]({{< relref "../datasources/" >}}) for specific guidelines.
+
+1. In the Visualization list, select a visualization type.
+
+   Grafana displays a preview of your query results with the visualization applied.
+
+   ![](/static/img/docs/panel-editor/select-visualization-8-0.png)
+
+   For more information about individual visualizations, refer to [Visualizations options]({{< relref "../visualizations/" >}}).
+
+1. Refer to the following documentation for ways you can adjust panel settings.
+
+   While not required, most visualizations need some adjustment before they properly display the information that you need.
+
+   - [Format data using value mapping]({{< relref "../panels/format-data/about-value-mapping/" >}})
+   - [Visualization-specific options]({{< relref "../visualizations/" >}})
+   - [Override field values]({{< relref "../panels/override-field-values/about-field-overrides/" >}})
+   - [Configure thresholds]({{< relref "../panels/configure-thresholds/" >}})
+   - [Apply color to series and fields]({{< relref "../panels/working-with-panels/apply-color-to-series/" >}})
+
+1. Add a note to describe the visualization (or describe your changes) and then click **Save** in the upper-right corner of the page.
+
+   Notes can be helpful if you need to revert the dashboard to a previous version.
diff --git a/docs/sources/dashboards/manage-library-panels.md b/docs/sources/dashboards/manage-library-panels.md
new file mode 100644
index 00000000000..12b718837ae
--- /dev/null
+++ b/docs/sources/dashboards/manage-library-panels.md
@@ -0,0 +1,87 @@
+---
+aliases:
+  - /docs/grafana/latest/panels/panel-library/
+  - /docs/grafana/latest/panels/library-panels/
+  - /docs/grafana/latest/panels/library-panels/create-library-panel/
+  - /docs/grafana/latest/panels/library-panels/add-library-panel/
+  - /docs/grafana/latest/panels/library-panels/unlink-library-panel/
+  - /docs/grafana/latest/panels/library-panels/manage-library-panel/
+  - /docs/grafana/latest/panels/library-panels/delete-library-panel/
+  - /docs/grafana/latest/dashboards/manage-library-panels/
+title: Manage Grafana library panels
+menuTitle: Manage library panels
+weight: 3
+---
+
+# Manage Grafana library panels
+
+A library panel is a reusable panel that you can use in any dashboard. When you make a change to a library panel, that change propagates to all instances of where the panel is used. Library panels streamline reuse of panels across multiple dashboards.
+
+You can save a library panel in a folder alongside saved dashboards.
+
+## Create a library panel
+
+When you create a library panel, the panel on the source dashboard is converted to a library panel as well. You need to save the original dashboard once a panel is converted.
+
+1. Open a panel in edit mode.
+1. In the panel display options, click the down arrow option to bring changes to the visualization.
+   {{< figure src="/static/img/docs/library-panels/create-lib-panel-from-edit-8-0.png" class="docs-image--no-shadow" max-width= "800px" caption="Screenshot of the edit panel" >}}
+1. Click the **Library panels** option, and then click **Create library panel** to open the create dialog.
+   {{< figure src="/static/img/docs/library-panels/create-lib-panel-8-0.png" class="docs-image--no-shadow" max-width= "500px" caption="Screenshot of the create library panel dialog" >}}
+1. In **Library panel name**, enter the name.
+1. In **Save in folder**, select the folder to save the library panel.
+1. Click **Create library panel** to save your changes.
+1. Save the dashboard.
+
+Once created, you can modify the library panel using any dashboard on which it appears. After you save the changes, all instances of the library panel reflect these modifications.
+
+{{< figure src="/static/img/docs/library-panels/create-from-more-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
+
+## Add a library panel to a dashboard
+
+Add a Grafana library panel to a dashboard when you want to provide visualizations to other dashboard users.
+
+1. Hover over the **Dashboards** option on the left menu, then select **New dashboard** from the drop-down options.
+
+   The **Add** panel dialog opens.
+   {{< figure src="/static/img/docs/library-panels/add-library-panel-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
+
+1. Click the **Add a panel from the panel library** option.
+
+   You will see a list of your library panels.
+
+1. Filter the list or search to find the panel you want to add.
+1. Click a panel to add it to the dashboard.
+
+## Unlink a library panel
+
+Unlink a library panel when you want to make a change to the panel and not affect other instances of the library panel.
+
+1. Hover over **Dashboard** on the left menu, and then click **Library panels**.
+1. Select a library panel that is being used in different dashboards.
+1. Select the panel you want to unlink.
+1. Click the title of the panel and then click **Edit**. The panel opens in edit mode.
+1. Click the **Unlink** option on the top right corner of the page.
+
+## View a list of library panels
+
+You can view a list of available library panels and search for a library panel.
+
+1. Hover over the **Dashboard** option on the left menu, then click **Library panels**.
+
+   You can see a list of previously defined library panels.
+   {{< figure src="/static/img/docs/library-panels/library-panel-list-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
+
+1. Search for a specific library panel if you know its name.
+
+   You can also filter the panels by folder or type.
+
+## Delete a library panel
+
+Delete a library panel when you no longer need it.
+
+1. Hover over **Dashboard** on the left menu, and select **Library panels**.
+
+1. Select the panel you want to delete.
+
+1. Click the delete icon next to the library panel name.
diff --git a/docs/sources/dashboards/use-dashboards.md b/docs/sources/dashboards/use-dashboards.md
index b8c11c162f6..213ae424317 100644
--- a/docs/sources/dashboards/use-dashboards.md
+++ b/docs/sources/dashboards/use-dashboards.md
@@ -10,7 +10,7 @@ aliases:
   - /docs/grafana/latest/reference/search/
 title: 'Use dashboards'
 menuTitle: Use dashboards
-weight: 2
+weight: 1
 keywords:
   - dashboard
   - search
diff --git a/docs/sources/datasources/azuremonitor/_index.md b/docs/sources/datasources/azuremonitor/_index.md
index 095824c0798..3df80deaf61 100644
--- a/docs/sources/datasources/azuremonitor/_index.md
+++ b/docs/sources/datasources/azuremonitor/_index.md
@@ -103,7 +103,7 @@ Further documentation on multi-dimensional metrics is available [here](https://d
 
 #### Supported Azure Monitor metrics
 
-Not all metrics returned by the Azure Monitor Metrics API have values. To make it easier for you when building a query, the Grafana data source has a list of supported metrics and ignores metrics which will never have values. This list is updated regularly as new services and metrics are added to the Azure cloud. For more information about the list of metrics, refer to [current supported namespaces](https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/supported_namespaces.ts).
+Not all metrics returned by the Azure Monitor Metrics API have values. To make it easier for you when building a query, the Grafana data source has a list of supported metrics and ignores metrics which will never have values. This list is updated regularly as new services and metrics are added to the Azure cloud. For more information about the list of metrics, refer to [current supported namespaces](https://github.com/grafana/grafana/blob/main/public/app/plugins/datasource/grafana-azure-monitor-datasource/azureMetadata/metricNamespaces.ts).
 
 ### Querying Azure Monitor Logs
 
diff --git a/docs/sources/datasources/jaeger.md b/docs/sources/datasources/jaeger.md
index 20ab026c23f..8c67c20fc4d 100644
--- a/docs/sources/datasources/jaeger.md
+++ b/docs/sources/datasources/jaeger.md
@@ -66,6 +66,16 @@ This is a configuration for the beta Node Graph visualization. The Node Graph is
 
 -- **Enable Node Graph -** Enables the Node Graph visualization.
 
+### Span bar label
+
+You can configure the span bar label. The span bar label allows you add additional information to the span bar row.
+
+Select one of the following four options. The default selection is Duration.
+
+- **None -** Do not show any additional information on the span bar row.
+- **Duration -** Show the span duration on the span bar row.
+- **Tag -** Show the span tag on the span bar row. Note: You will also need to specify the tag key to use to get the tag value. For example, `span.kind`.
+
 ## Query traces
 
 You can query and display traces from Jaeger via [Explore]({{< relref "../explore/" >}}).
diff --git a/docs/sources/datasources/tempo.md b/docs/sources/datasources/tempo.md
index 5c5ad785c87..8442e65f72f 100644
--- a/docs/sources/datasources/tempo.md
+++ b/docs/sources/datasources/tempo.md
@@ -84,6 +84,16 @@ This is a configuration for the Loki search query type.
 
 -- **Data source -** The Loki instance in which you want to search traces. You must configure derived fields in the Loki instance.
 
+### Span bar label
+
+You can configure the span bar label. The span bar label allows you add additional information to the span bar row.
+
+Select one of the following four options. The default selection is Duration.
+
+- **None -** Do not show any additional information on the span bar row.
+- **Duration -** Show the span duration on the span bar row.
+- **Tag -** Show the span tag on the span bar row. Note: You will also need to specify the tag key to use to get the tag value. For example, `span.kind`.
+
 ## Query traces
 
 You can query and display traces from Tempo via [Explore]({{< relref "../explore/" >}}).
diff --git a/docs/sources/datasources/zipkin.md b/docs/sources/datasources/zipkin.md
index d9fbcdd53c5..48a543cf8ce 100644
--- a/docs/sources/datasources/zipkin.md
+++ b/docs/sources/datasources/zipkin.md
@@ -65,6 +65,16 @@ This is a configuration for the beta Node Graph visualization. The Node Graph is
 
 -- **Enable Node Graph -** Enables the Node Graph visualization.
 
+### Span bar label
+
+You can configure the span bar label. The span bar label allows you add additional information to the span bar row.
+
+Select one of the following four options. The default selection is Duration.
+
+- **None -** Do not show any additional information on the span bar row.
+- **Duration -** Show the span duration on the span bar row.
+- **Tag -** Show the span tag on the span bar row. Note: You will also need to specify the tag key to use to get the tag value. For example, `span.kind`.
+
 ## Query traces
 
 Querying and displaying traces from Zipkin is available via [Explore]({{< relref "../explore/" >}}).
diff --git a/docs/sources/panels/format-data/edit-value-mapping.md b/docs/sources/panels/format-data/edit-value-mapping.md
index 4b2d3b2c13d..16ca9fc996f 100644
--- a/docs/sources/panels/format-data/edit-value-mapping.md
+++ b/docs/sources/panels/format-data/edit-value-mapping.md
@@ -12,7 +12,6 @@ You can change a value mapping at any time.
 
 ## Before you begin
 
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
 - Ensure you have an existing value mapping to edit.
 
 **To edit a value mapping**:
diff --git a/docs/sources/panels/format-data/map-a-range.md b/docs/sources/panels/format-data/map-a-range.md
index f11b22bf920..bc86d1fbc6e 100644
--- a/docs/sources/panels/format-data/map-a-range.md
+++ b/docs/sources/panels/format-data/map-a-range.md
@@ -10,12 +10,6 @@ weight: 30
 
 Map a range of values when you want to format multiple, continuous values.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To map a range**:
-
 1. Edit the panel for which you want to map a range of values.
 1. In panel display options, in the **Value mappings** section, click **Add value mappings**.
 1. Click **Add a new mapping** and then select **Range**.
diff --git a/docs/sources/panels/format-data/map-a-regular-expression.md b/docs/sources/panels/format-data/map-a-regular-expression.md
index 6e0792b9062..75879c7c91b 100644
--- a/docs/sources/panels/format-data/map-a-regular-expression.md
+++ b/docs/sources/panels/format-data/map-a-regular-expression.md
@@ -10,14 +10,8 @@ weight: 40
 
 Map a regular expression when you want to format the text and color of a regular expression value.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To map a regular expression**:
-
 1. Edit the panel for which you want to map a regular expression.
-1. In the panel display options, in the **Value mappings** section, click **Add value mappings**.
+1. In the **Value mappings** section of the panel display options, click **Add value mappings**.
 1. Click **Add a new mapping** and then select **Regex**.
 1. Enter the regular expression pattern for Grafana to match.
 1. (Optional) Enter display text.
diff --git a/docs/sources/panels/format-data/map-a-special-value.md b/docs/sources/panels/format-data/map-a-special-value.md
index e7001a108a4..b4a3005f1c8 100644
--- a/docs/sources/panels/format-data/map-a-special-value.md
+++ b/docs/sources/panels/format-data/map-a-special-value.md
@@ -10,12 +10,6 @@ weight: 50
 
 Map a special value when you want to format uncommon, boolean, or empty values.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To map a special value**:
-
 1. Edit the panel for which you want to map a special value.
 1. In panel display options, locate the **Value mappings** section and click **Add value mappings**.
 1. Click **Add a new mapping** and then select **Special**.
diff --git a/docs/sources/panels/format-data/map-a-value.md b/docs/sources/panels/format-data/map-a-value.md
index db848227bb6..02e39594fe8 100644
--- a/docs/sources/panels/format-data/map-a-value.md
+++ b/docs/sources/panels/format-data/map-a-value.md
@@ -10,12 +10,6 @@ weight: 20
 
 Map a value when you want to format a single value.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To map a value**:
-
 1. Open a panel for which you want to map a value.
 1. In panel display options, locate the **Value mappings** section and click **Add value mappings**.
 1. Click **Add a new mapping** and then select **Value**.
diff --git a/docs/sources/panels/library-panels/_index.md b/docs/sources/panels/library-panels/_index.md
deleted file mode 100644
index 7e35d457ecf..00000000000
--- a/docs/sources/panels/library-panels/_index.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/
-  - /docs/grafana/latest/panels/panel-library/
-  - /docs/sources/panels/library-panels/
-title: Create reusable Grafana panels
-weight: 700
----
-
-# Create reusable Grafana panels
-
-Library panels enable you to create reusable panels that you can add to any dashboard in your organization.
-
-{{< section >}}
diff --git a/docs/sources/panels/library-panels/about-library-panels.md b/docs/sources/panels/library-panels/about-library-panels.md
deleted file mode 100644
index 5a1bd2c905a..00000000000
--- a/docs/sources/panels/library-panels/about-library-panels.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/about-library-panels/
-  - /docs/sources/panels/library-panels/about-library-panels/
-title: About Grafana library panels
-weight: 10
----
-
-# About Grafana panel libraries
-
-A library panel is a reusable panel that you can use in any dashboard. When you make a change to a library panel, that change propagates to all instances of where the panel is used. Library panels streamline reuse of panels across multiple dashboards.
-
-You can save a library panel in a folder alongside saved dashboards.
diff --git a/docs/sources/panels/library-panels/add-library-panel.md b/docs/sources/panels/library-panels/add-library-panel.md
deleted file mode 100644
index 49daa67e8fc..00000000000
--- a/docs/sources/panels/library-panels/add-library-panel.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/add-library-panel/
-  - /docs/sources/panels/library-panels/add-library-panel/
-title: Add a Grafana library panel to a dashboard
-weight: 30
----
-
-# Add a Grafana library panel to a dashboard
-
-Add a Grafana library panel to a dashboard when you want to provide visualizations to other dashboard users.
-
-## Before you begin
-
-- [Create a library panel]({{< relref "create-library-panel/" >}}).
-
-**To add a library panel to a dashboard**:
-
-1. Hover over the **Dashboards** option on the left menu, then select **New dashboard** from the drop-down options.
-
-   The **Add** panel dialog opens.
-   {{< figure src="/static/img/docs/library-panels/add-library-panel-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
-
-1. Click the **Add a panel from the panel library** option.
-
-   You will see a list of your library panels.
-
-1. Filter the list or search to find the panel you want to add.
-1. Click a panel to add it to the dashboard.
diff --git a/docs/sources/panels/library-panels/create-library-panel.md b/docs/sources/panels/library-panels/create-library-panel.md
deleted file mode 100644
index d8f8d18eb97..00000000000
--- a/docs/sources/panels/library-panels/create-library-panel.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/create-library-panel/
-  - /docs/sources/panels/library-panels/create-library-panel/
-title: Create a Grafana library panel
-weight: 20
----
-
-# Create a Grafana library panel
-
-When you create a library panel, the panel on the source dashboard is converted to a library panel as well. You need to save the original dashboard once a panel is converted.
-
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To create a library panel**:
-
-1. Open a panel in edit mode.
-1. In the panel display options, click the down arrow option to bring changes to the visualization.
-   {{< figure src="/static/img/docs/library-panels/create-lib-panel-from-edit-8-0.png" class="docs-image--no-shadow" max-width= "800px" caption="Screenshot of the edit panel" >}}
-1. Click the **Library panels** option, and then click **Create new library panel** to open the create dialog.
-   {{< figure src="/static/img/docs/library-panels/create-lib-panel-8-0.png" class="docs-image--no-shadow" max-width= "500px" caption="Screenshot of the create library panel dialog" >}}
-1. In **Library panel name**, enter the name.
-1. In **Save in folder**, select the folder to save the library panel.
-1. Click **Create library panel** to save your changes.
-1. Save the dashboard.
-
-Once created, you can modify the library panel using any dashboard on which it appears. After you save the changes, all instances of the library panel reflect these modifications.
-
-{{< figure src="/static/img/docs/library-panels/create-from-more-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
diff --git a/docs/sources/panels/library-panels/delete-library-panel.md b/docs/sources/panels/library-panels/delete-library-panel.md
deleted file mode 100644
index 2d799887449..00000000000
--- a/docs/sources/panels/library-panels/delete-library-panel.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/delete-library-panel/
-  - /docs/sources/panels/library-panels/delete-library-panel/
-title: Delete a Grafana library panel
-weight: 60
----
-
-# Delete a Grafana library panel
-
-Delete a library panel when you no longer need it.
-
-## Before you begin
-
-- Verify that the panel does not appear on a dashboard.
-
-**To delete a library panel**:
-
-1. Hover over **Dashboard** on the left menu, and select Library panels from the drop-down options.
-1. Select a library panel that is being used in different dashboards.
-
-   You will see a list of all the dashboards.
-
-1. Select the panel you want to delete.
-1. Click the delete icon next to the library panel name.
diff --git a/docs/sources/panels/library-panels/manage-library-panel.md b/docs/sources/panels/library-panels/manage-library-panel.md
deleted file mode 100644
index f15c9d4faca..00000000000
--- a/docs/sources/panels/library-panels/manage-library-panel.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/manage-library-panel/
-  - /docs/sources/panels/library-panels/manage-library-panel/
-title: Manage Grafana library panels
-weight: 40
----
-
-# Manage Grafana library panels
-
-You can adjust library panel configuration at any time.
-
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To view and manage a library panel**:
-
-1. Hover over the **Dashboard** option on the left menu, then click **Library panels**.
-
-   You can see a list of previously defined library panels.
-   {{< figure src="/static/img/docs/library-panels/library-panel-list-8-0.png" class="docs-image--no-shadow" max-width= "900px" caption="Screenshot of the edit panel" >}}
-
-1. Search for a specific library panel if you know its name.
-
-   You can also filter the panels by folder or type.
diff --git a/docs/sources/panels/library-panels/unlink-library-panel.md b/docs/sources/panels/library-panels/unlink-library-panel.md
deleted file mode 100644
index 06173090d11..00000000000
--- a/docs/sources/panels/library-panels/unlink-library-panel.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/library-panels/unlink-library-panel/
-  - /docs/sources/panels/library-panels/unlink-library-panel/
-title: Unlink a Grafana library panel
-weight: 50
----
-
-# Unlink a Grafana library panel
-
-Unlink a library panel when you want to make a change to the panel and not affect other instances of the library panel.
-
-## Before you begin
-
-- Identify the panel you want to unlink.
-
-**To unlink a library panel from a dashboard**:
-
-1. Hover over **Dashboard** on the left menu, and then click **Library panels**.
-1. Select a library panel that is being used in different dashboards.
-1. Select the panel you want to unlink.
-1. Click the title of the panel and then click **Edit**. The panel opens in edit mode.
-1. Click the **Unlink** option on the top right corner of the page.
diff --git a/docs/sources/panels/override-field-values/add-a-field-override.md b/docs/sources/panels/override-field-values/add-a-field-override.md
index aa64da1546d..c89a37e302e 100644
--- a/docs/sources/panels/override-field-values/add-a-field-override.md
+++ b/docs/sources/panels/override-field-values/add-a-field-override.md
@@ -10,12 +10,6 @@ weight: 30
 
 You can override a field when you want to change the display of the value in the visualization.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-
-**To add a field override**:
-
 1. Edit the panel to which you want to add an override.
 1. In the panel display options, in the **Overrides** section, click **Add field override**.
 
diff --git a/docs/sources/panels/override-field-values/delete-a-field-override.md b/docs/sources/panels/override-field-values/delete-a-field-override.md
index 3557932847f..887a09a7b2f 100644
--- a/docs/sources/panels/override-field-values/delete-a-field-override.md
+++ b/docs/sources/panels/override-field-values/delete-a-field-override.md
@@ -12,13 +12,6 @@ Delete a field override when you no longer need it.
 
 When you delete an override, the appearance of value defaults to its original format. This change impacts dashboards and dashboard users that rely on an affected panel.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-- [Add a field override]({{< relref "add-a-field-override/" >}}).
-
-**To delete a field override**:
-
 1. Edit the panel that contains the override you want to delete.
 1. In panel display options, click the **Overrides** tab.
 1. Click the override you want to delete and then click the associated trash icon.
diff --git a/docs/sources/panels/override-field-values/edit-field-override.md b/docs/sources/panels/override-field-values/edit-field-override.md
index 87299454e9b..64c3ea0b620 100644
--- a/docs/sources/panels/override-field-values/edit-field-override.md
+++ b/docs/sources/panels/override-field-values/edit-field-override.md
@@ -10,11 +10,6 @@ weight: 40
 
 Edit a field override when you want to make changes to an override setting.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-- [Add a field override]({{< relref "add-a-field-override/" >}}).
-
 **To edit a field override**:
 
 1. Edit the panel that contains the overrides you want to edit.
diff --git a/docs/sources/panels/override-field-values/view-field-override.md b/docs/sources/panels/override-field-values/view-field-override.md
index 6c8de2c741f..2fbe8f609a0 100644
--- a/docs/sources/panels/override-field-values/view-field-override.md
+++ b/docs/sources/panels/override-field-values/view-field-override.md
@@ -10,11 +10,6 @@ weight: 20
 
 You can view field overrides in the panel display options.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-- [Add a field override]({{< relref "add-a-field-override/" >}}).
-
 **To view field overrides**:
 
 1. Open for edit the panel that contains the overrides you want to view.
diff --git a/docs/sources/panels/query-a-data-source/add-a-query.md b/docs/sources/panels/query-a-data-source/add-a-query.md
index 6fea5855c44..61eb69897bf 100644
--- a/docs/sources/panels/query-a-data-source/add-a-query.md
+++ b/docs/sources/panels/query-a-data-source/add-a-query.md
@@ -14,7 +14,6 @@ A query returns data that Grafana visualizes in dashboards. When you create a pa
 
 - [Add a data source](../../../datasources/add-a-data-source).
 - Ensure that you know the query language of the data source.
-- [Add a panel]({{< relref "../working-with-panels/add-panel/" >}}).
 
 **To add a query**:
 
diff --git a/docs/sources/panels/query-a-data-source/download-raw-query-results.md b/docs/sources/panels/query-a-data-source/download-raw-query-results.md
index 6205539ae03..f607a1cf915 100644
--- a/docs/sources/panels/query-a-data-source/download-raw-query-results.md
+++ b/docs/sources/panels/query-a-data-source/download-raw-query-results.md
@@ -10,13 +10,6 @@ weight: 70
 
 Grafana generates a CSV file that contains your data, including any transformations to that data. You can choose to view the data before or after the panel applies field options or field option overrides.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-- [Add a query]({{< relref "add-a-query/" >}}).
-
-**To download raw query results**:
-
 1. Edit the panel that contains the query data you want to download.
 1. In the query editor, click **Query Inspector**.
 1. Click **Data**.
diff --git a/docs/sources/panels/query-a-data-source/inspect-query-performance.md b/docs/sources/panels/query-a-data-source/inspect-query-performance.md
index 367b956254c..dede421aab6 100644
--- a/docs/sources/panels/query-a-data-source/inspect-query-performance.md
+++ b/docs/sources/panels/query-a-data-source/inspect-query-performance.md
@@ -10,13 +10,6 @@ weight: 80
 
 The **Stats** tab displays statistics that tell you how long your query takes, how many queries you send, and the number of rows returned. This information can help you troubleshoot your queries, especially if any of the numbers are unexpectedly high or low.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-- [Add a query]({{< relref "add-a-query/" >}}).
-
-**To inspect query performance**:
-
 1. Edit the panel that contains the query with performance you want to inspect.
 1. In the query editor, click **Query Inspector**.
 1. Click **Stats**.
diff --git a/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md b/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md
index 9b241cd61ae..2214db2fc3d 100644
--- a/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md
+++ b/docs/sources/panels/query-a-data-source/inspect-request-and-response-data.md
@@ -10,13 +10,6 @@ weight: 90
 
 Inspect query request and response data when you want to troubleshoot a query that returns unexpected results, or fails to return expected results.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
-- [Add a query]({{< relref "add-a-query/" >}}).
-
-**To inspect query request and response data**:
-
 1. Edit the panel that contains the query you want to export.
 1. In the query editor, click **Query Inspector**.
 1. Click **Refresh**.
diff --git a/docs/sources/panels/query-a-data-source/share-query.md b/docs/sources/panels/query-a-data-source/share-query.md
index 13ebda3724e..fcd3caff58a 100644
--- a/docs/sources/panels/query-a-data-source/share-query.md
+++ b/docs/sources/panels/query-a-data-source/share-query.md
@@ -14,9 +14,7 @@ The Dashboard data source lets you select a panel in your dashboard that contain
 
 This strategy can drastically reduce the number of queries being made when you for example have several panels visualizing the same data.
 
-**To share data source queries with another panel**:
-
-1. [Add a panel to a dashboard]({{< relref "../working-with-panels/add-panel/" >}}).
+1. [Create a dashboard and add a panel]({{< relref "../../dashboards/add-organize-panels/#create-a-dashboard-and-add-a-panel" >}}).
 1. Change the title to "Source panel". You'll use this panel as a source for the other panels.
 1. Define the [query]({{< relref "add-a-query/" >}}) or queries that you want share.
 
diff --git a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md
index eec926894e4..42eb4d76b1f 100644
--- a/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md
+++ b/docs/sources/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression.md
@@ -12,12 +12,6 @@ If your data source supports them, then Grafana displays the **Expression** butt
 
 For more information about expressions, refer to [About expressions]({{< relref "about-expressions/" >}}).
 
-## Before you begin
-
-- [Add a panel]({{< relref "../../working-with-panels/add-panel/" >}}).
-
-**To write an expression**:
-
 1. Open the panel.
 1. Below the query, click **Expression**.
 1. In the **Operation** field, select the type of expression you want to write.
diff --git a/docs/sources/panels/working-with-panels/add-panel.md b/docs/sources/panels/working-with-panels/add-panel.md
deleted file mode 100644
index 5359473e3b4..00000000000
--- a/docs/sources/panels/working-with-panels/add-panel.md
+++ /dev/null
@@ -1,57 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/working-with-panels/add-panel/
-  - /docs/sources/panels/working-with-panels/add-panel/
-title: Add a panel to a dashboard
-weight: 20
----
-
-# Add a panel to a dashboard
-
-Panels allow you to show your data in visual form. Each panel needs at least one query to display a visualization.
-
-## Before you begin
-
-- Ensure that you have the proper permissions. For more information about permissions, refer to [About users and permissions]({{< relref "../../administration/manage-users-and-permissions/about-users-and-permissions/" >}}).
-- Identify the dashboard to which you want to add the panel.
-- Understand the query language of the target data source.
-- Ensure that data source for which you are writing a query has been added. For more information about adding a data source, refer to [Add a data source]({{< relref "../../datasources/add-a-data-source/" >}}) if you need instructions.
-
-**To add a panel to a dashboard**:
-
-1. Navigate to the dashboard to which you want to add a panel.
-1. Click the **Add panel** icon.
-
-   ![](/static/img/docs/panels/add-panel-icon-7-0.png)
-
-1. Click **Add an empty panel**.
-
-   Grafana creates an empty time-series panel and selects the default data source.
-
-1. In the first line of the **Query** tab, click the drop-down list and select a data source.
-
-1. Write or construct a query in the query language of your data source.
-
-   For more information about data sources, refer to [Data sources]({{< relref "../../datasources/" >}}) for specific guidelines.
-
-1. In the Visualization list, select a visualization type.
-
-   Grafana displays a preview of your query results with the visualization applied.
-
-   ![](/static/img/docs/panel-editor/select-visualization-8-0.png)
-
-   For more information about individual visualizations, refer to [Visualizations options]({{< relref "../../visualizations/" >}}).
-
-1. Refer to the following documentation for ways you adjust panel settings.
-
-   While not required, most visualizations need some adjustment before they properly display the information that you need.
-
-   - [Format data using value mapping]({{< relref "../format-data/about-value-mapping/" >}})
-   - [Visualization-specific options]({{< relref "../../visualizations/" >}})
-   - [Override field values]({{< relref "../override-field-values/about-field-overrides/" >}})
-   - [Configure thresholds]({{< relref "../configure-thresholds/" >}})
-   - [Apply color to series and fields]({{< relref "apply-color-to-series/" >}})
-
-1. Add a note to describe the visualization (or describe your changes) and then click **Save** in the upper-right corner of the page.
-
-   Notes can be helpful if you need to revert the dashboard to a previous version.
diff --git a/docs/sources/panels/working-with-panels/add-title-and-description.md b/docs/sources/panels/working-with-panels/add-title-and-description.md
index f6ca5e9f76d..e08e2010362 100644
--- a/docs/sources/panels/working-with-panels/add-title-and-description.md
+++ b/docs/sources/panels/working-with-panels/add-title-and-description.md
@@ -10,12 +10,6 @@ weight: 30
 
 Add a title and description to a panel to share with users any important information about the visualization. For example, use the description to document the purpose of the visualization.
 
-## Before you begin:
-
-- [Add a panel to a dashboard]({{< relref "add-panel/" >}}).
-
-**To add a title and description to a panel**:
-
 1. Open a panel.
 
 1. In the panel display options pane, locate the **Panel options** section.
diff --git a/docs/sources/panels/working-with-panels/apply-color-to-series.md b/docs/sources/panels/working-with-panels/apply-color-to-series.md
index ba03bd60105..26e30345905 100644
--- a/docs/sources/panels/working-with-panels/apply-color-to-series.md
+++ b/docs/sources/panels/working-with-panels/apply-color-to-series.md
@@ -13,12 +13,6 @@ In addition to specifying color based on thresholds, you can configure the color
 You can specify a single color, or select a continuous (gradient) color schemes, based on a value.
 Continuous color interpolates a color using the percentage of a value relative to min and max.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "add-panel/" >}}).
-
-**To apply color to series and fields**:
-
 1. In panel display options, scroll to the **Standard options** or **override** section.
 
 1. Click the **Standard options Color scheme** drop-down, and select one of the following palettes:
diff --git a/docs/sources/panels/working-with-panels/configure-legend.md b/docs/sources/panels/working-with-panels/configure-legend.md
index d34df9f4f81..008bd996556 100644
--- a/docs/sources/panels/working-with-panels/configure-legend.md
+++ b/docs/sources/panels/working-with-panels/configure-legend.md
@@ -16,12 +16,6 @@ Visualizations can often be visually complex, and include many data series. You
 
 When you apply your changes, the visualization changes appear to all users of the panel.
 
-### Before you begin
-
-- [Add a panel to a dashboard]({{< relref "add-panel/" >}}).
-
-**To isolate series data in a visualization**:
-
 1. Open the panel.
 
 1. In the legend, click the label of the series you want to isolate.
diff --git a/docs/sources/panels/working-with-panels/format-standard-fields.md b/docs/sources/panels/working-with-panels/format-standard-fields.md
index 6d83f8d9857..ee0404ac817 100644
--- a/docs/sources/panels/working-with-panels/format-standard-fields.md
+++ b/docs/sources/panels/working-with-panels/format-standard-fields.md
@@ -16,12 +16,6 @@ For a complete list of field formatting options, refer to [Standard field defini
 
 > You can apply standard options to most built-in Grafana panels. Some older panels and community panels that have not updated to the new panel and data model will be missing either all or some of these field options.
 
-## Before you begin
-
-- [Add a panel to a dashboard]({{< relref "add-panel/" >}}).
-
-**To format a standard field**:
-
 1. Open a dashboard, click the panel title, and click **Edit**.
 
 1. In the panel display options pane, locate the **Standard options** section.
diff --git a/docs/sources/panels/working-with-panels/navigate-panel-editor.md b/docs/sources/panels/working-with-panels/navigate-panel-editor.md
deleted file mode 100644
index 4fe5faadee2..00000000000
--- a/docs/sources/panels/working-with-panels/navigate-panel-editor.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-aliases:
-  - /docs/grafana/latest/panels/working-with-panels/navigate-panel-editor/
-  - /docs/sources/panels/working-with-panels/navigate-panel-editor/
-title: Navigate the Grafana panel editor
-weight: 10
----
-
-# Navigate the Grafana panel editor
-
-This page describes the parts of the Grafana panel editor.
-
-1. Panel header: The header section lists the dashboard in which the panel appears and the following controls:
-
-   - **Dashboard settings (gear) icon -** Click to access the dashboard settings.
-   - **Discard -** Discards changes you have made to the panel since you last saved the dashboard.
-   - **Save -** Saves changes you made to the panel.
-   - **Apply -** Applies changes you made and closes the panel editor, returning you to the dashboard. You will have to save the dashboard to persist the applied changes.
-
-2. Visualization preview: The visualization preview section contains the following options:
-
-   - **Table view -** Convert any visualization to a table so that you can see the data. Table views are useful for troubleshooting.
-   - **Fill -** The visualization preview fills the available space. If you change the width of the side pane or height of the bottom pane the visualization changes to fill the available space.
-   - **Actual -** The visualization preview will have the exact size as the size on the dashboard. If not enough space is available, the visualization will scale down preserving the aspect ratio.
-   - **Time range controls -** For more information, refer to [Time range controls]({{< relref "../../dashboards/time-range-controls/" >}}).
-
-3. Data section: The data section contains tabs where you enter queries, transform your data, and create alert rules (if applicable).
-
-   - **Query tab -** Select your data source and enter queries here. For more information, refer to [Add a query]({{< relref "../query-a-data-source/add-a-query/" >}}).
-
-   - **Transform tab -** Apply data transformations. For more information, refer to [Transform data]({{< relref "../transform-data/" >}}).
-   - **Alert tab -** Write alert rules. For more information, refer to [Overview of Grafana 8 alerting]({{< relref "../../alerting/" >}}).
-
-4. Panel display options: The display options section contains tabs where you configure almost every aspect of your data visualization, including:
-
-   - [Apply color to series and fields]({{< relref "apply-color-to-series/" >}})
-   - [Format a standard field]({{< relref "format-standard-fields/" >}})
-   - [Add a title and description to a panel]({{< relref "add-title-and-description/" >}})
-
-> Not all options are available for each visualization.
-
-{{< figure src="/static/img/docs/panel-editor/panel-editor-8-0.png" class="docs-image--no-shadow" max-width="1500px" >}}
diff --git a/docs/sources/panels/working-with-panels/view-json-model.md b/docs/sources/panels/working-with-panels/view-json-model.md
index be52a641d5b..9220c684720 100644
--- a/docs/sources/panels/working-with-panels/view-json-model.md
+++ b/docs/sources/panels/working-with-panels/view-json-model.md
@@ -10,12 +10,6 @@ weight: 100
 
 Explore and export panel, panel data, and data frame JSON models.
 
-## Before you begin:
-
-- [Add a panel to a dashboard]({{< relref "add-panel/" >}}).
-
-**To view a panel JSON model**:
-
 1. Open the panel inspector and then click the **JSON** tab or in the panel menu click **Inspect > Panel JSON**.
 
 1. In Select source, choose one of the following options:
diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md
index 6e3c5acd406..4033bfc3942 100644
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md
@@ -51,6 +51,7 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = true
+auth_style =
 ```
 
 Set `api_url` to the resource that returns [OpenID UserInfo](https://connect2id.com/products/server/docs/api/userinfo) compatible information.
@@ -63,6 +64,9 @@ You can also specify the SSL/TLS configuration used by the client.
 
 `tls_skip_verify_insecure` controls whether a client verifies the server's certificate chain and host name. If it is true, then SSL/TLS accepts any certificate presented by the server and any host name in that certificate. _You should only use this for testing_, because this mode leaves SSL/TLS susceptible to man-in-the-middle attacks.
 
+`auth_style` controls which [OAuth2 AuthStyle](https://pkg.go.dev/golang.org/x/oauth2#AuthStyle) is used when token is requested from OAuth provider. It determines how `client_id` and `client_secret` are sent to Oauth provider.
+Available values are `AutoDetect`, `InParams` and `InHeader`. By default, `AutoDetect` is used.
+
 Set `empty_scopes` to true to use an empty scope during authentication. By default, Grafana uses `user:email` as scope.
 
 ### Email address
diff --git a/docs/sources/visualizations/_index.md b/docs/sources/visualizations/_index.md
index 8a1f0bb7444..c44f3cfb368 100644
--- a/docs/sources/visualizations/_index.md
+++ b/docs/sources/visualizations/_index.md
@@ -10,7 +10,7 @@ weight: 75
 
 Grafana offers a variety of visualizations to support different use cases. This section of the documentation highlights the built-in panels, their options and typical usage.
 
-> **Note:** If you are unsure which visualization to pick, Grafana can provide visualization suggestions based on the panel query. When you select a visualization, Grafana will show a preview with that visualization applied. For more information, see the [add a panel]({{< relref "../panels/working-with-panels/add-panel/" >}}) documentation.
+> **Note:** If you are unsure which visualization to pick, Grafana can provide visualization suggestions based on the panel query. When you select a visualization, Grafana will show a preview with that visualization applied.
 
 - Graphs & charts
   - [Time series]({{< relref "time-series/" >}}) is the default and main Graph visualization.
diff --git a/docs/sources/visualizations/time-series/graph-time-series-as-bars.md b/docs/sources/visualizations/time-series/graph-time-series-as-bars.md
index 338c26dea6d..aeb0ea82af0 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-as-bars.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-as-bars.md
@@ -18,9 +18,7 @@ This section explains how to use Time series field options to visualize time ser
 
 For more information about the time series visualization, refer to [Time series]({{< relref "_index.md" >}}).
 
-## Create the panel
-
-1. [Add a panel]({{< relref "../../panels/working-with-panels/add-panel/" >}}).
+1. [Create a dashboard and add a panel]({{< relref "../../dashboards/add-organize-panels/#create-a-dashboard-and-add-a-panel" >}}).
 1. Select the **Time series** visualization.
 1. In the Panel editor side pane, click **Graph styles** to expand it.
 1. In Style, click **Bars**.
diff --git a/docs/sources/visualizations/time-series/graph-time-series-as-lines.md b/docs/sources/visualizations/time-series/graph-time-series-as-lines.md
index df3ff48e5a6..d35f40b3bb2 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-as-lines.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-as-lines.md
@@ -16,9 +16,8 @@ weight: 200
 
 This section explains how to use Time series field options to visualize time series data as lines and illustrates what the options do.
 
-## Create the panel
-
-1. [Add a panel]({{< relref "../../panels/working-with-panels/add-panel/" >}}). Select the [Time series]({{< relref "_index.md" >}}) visualization.
+1. [Create a dashboard and add a panel]({{< relref "../../dashboards/add-organize-panels/#create-a-dashboard-and-add-a-panel" >}}).
+1. Select the [Time series]({{< relref "_index.md" >}}) visualization.
 1. In the Panel editor side pane, click **Graph styles** to expand it.
 1. In Style, click **Lines**.
 
diff --git a/docs/sources/visualizations/time-series/graph-time-series-as-points.md b/docs/sources/visualizations/time-series/graph-time-series-as-points.md
index c59bc1f84bd..a3ecd032ada 100644
--- a/docs/sources/visualizations/time-series/graph-time-series-as-points.md
+++ b/docs/sources/visualizations/time-series/graph-time-series-as-points.md
@@ -16,9 +16,8 @@ weight: 300
 
 This section explains how to use Time series field options to visualize time series data as points and illustrates what the options do.
 
-## Create the panel
-
-1. [Add a panel]({{< relref "../../panels/working-with-panels/add-panel/" >}}). Select the [Time series]({{< relref "_index.md" >}}) visualization.
+1. [Create a dashboard and add a panel]({{< relref "../../dashboards/add-organize-panels/#create-a-dashboard-and-add-a-panel" >}}).
+1. Select the [Time series]({{< relref "_index.md" >}}) visualization.
 1. In the Panel editor side pane, click **Graph styles** to expand it.
 1. In Style, click **Points**.
 
diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md
index 21c1aa783f8..0e07db2ee76 100644
--- a/docs/sources/whatsnew/whats-new-in-v7-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v7-5.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v7.5
 weight: -32
 ---
 
-# What’s new in Grafana v7.5
+# What's new in Grafana v7.5
 
 This topic includes the release notes for Grafana v7.5. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-0.md b/docs/sources/whatsnew/whats-new-in-v8-0.md
index 1ab026e6fb7..41cbc4d84e8 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-0.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v8.0
 weight: -33
 ---
 
-# What’s new in Grafana v8.0
+# What's new in Grafana v8.0
 
 This topic includes the release notes for Grafana v8.0. For all details, read the full [CHANGELOG.md](https://github.com/grafana/grafana/blob/master/CHANGELOG.md).
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-1.md b/docs/sources/whatsnew/whats-new-in-v8-1.md
index 3e7327dbd33..3c8ba92d9f7 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-1.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-1.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v8.1
 weight: -33
 ---
 
-# What’s new in Grafana v8.1
+# What's new in Grafana v8.1
 
 > **Note:** This topic will be updated frequently between now and the final release.
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-2.md b/docs/sources/whatsnew/whats-new-in-v8-2.md
index 5717519ff30..c5f06327920 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-2.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-2.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v8.2
 weight: -33
 ---
 
-# What’s new in Grafana v8.2
+# What's new in Grafana v8.2
 
 Grafana 8.2 continues to build on the foundation of Grafana 8.0 & 8.1. Grafana 8.2 also marks the start of our work to bring Grafana closer to all users with a focus on increasing Grafana’s accessibility, part of its continuing mission to democratize metrics _for everyone_.
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-3.md b/docs/sources/whatsnew/whats-new-in-v8-3.md
index 31e86ab89b5..c609c24c4f0 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-3.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-3.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v8.3
 weight: -33
 ---
 
-# What’s new in Grafana v8.3
+# What's new in Grafana v8.3
 
 Grafana 8.3 is an exciting release for Grafana Labs. This release includes the new Candlestick Panel, a new visualization suggestions engine and, for enterprise users, Recorded Queries.
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-4.md b/docs/sources/whatsnew/whats-new-in-v8-4.md
index 45ba5fdbb4c..a1de0eef169 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-4.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-4.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v8.4
 weight: -33
 ---
 
-# What’s new in Grafana v8.4
+# What's new in Grafana v8.4
 
 We’re excited to announce Grafana v8.4, with a variety of improvements that focus on Grafana’s usability, performance, and security. Read on to learn about Alerting enhancements like a WeCom contact point, improved Alert panel and custom mute timings, as well as visualization improvements and details to help you share playlists more easily. In Grafana Enterprise, we’ve made caching more powerful to save you time and money while loading dashboards, boosted database encryption to keep secrets safe in your Grafana database, and made usability improvements to Recorded Queries, which allow you to track any data point over time.
 
diff --git a/docs/sources/whatsnew/whats-new-in-v8-5.md b/docs/sources/whatsnew/whats-new-in-v8-5.md
index 96b19a7deac..1d7fefd60f9 100644
--- a/docs/sources/whatsnew/whats-new-in-v8-5.md
+++ b/docs/sources/whatsnew/whats-new-in-v8-5.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v8.5
 weight: -33
 ---
 
-# What’s new in Grafana v8.5
+# What's new in Grafana v8.5
 
 We’re excited to announce Grafana v8.5, with a variety of improvements that focus on Grafana’s usability, performance, and security.
 
diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md
index 2b6a8a98dba..74b1017bdc7 100644
--- a/docs/sources/whatsnew/whats-new-in-v9-0.md
+++ b/docs/sources/whatsnew/whats-new-in-v9-0.md
@@ -15,7 +15,7 @@ title: What's new in Grafana v9.0
 weight: -33
 ---
 
-# What’s new in Grafana v9.0
+# What's new in Grafana v9.0
 
 As tradition goes, GrafanaCon — our yearly community event for Grafana open source users — is also where we launch the latest software release of Grafana. Keeping up with tradition, we are excited to be announcing Grafana v9.0: a release that elevates Grafana’s ease of use, discovery of data through new and improved visualizations and a default Grafana Alerting experience.
 
diff --git a/go.mod b/go.mod
index 6de92af8907..78270aecc63 100644
--- a/go.mod
+++ b/go.mod
@@ -34,6 +34,7 @@ require (
 	github.com/fatih/color v1.13.0
 	github.com/gchaincl/sqlhooks v1.3.0
 	github.com/getsentry/sentry-go v0.13.0
+	github.com/go-git/go-git/v5 v5.4.2
 	github.com/go-kit/kit v0.11.0
 	github.com/go-openapi/strfmt v0.20.2
 	github.com/go-redis/redis/v8 v8.11.4
@@ -41,7 +42,7 @@ require (
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/go-stack/stack v1.8.0
 	github.com/gobwas/glob v0.2.3
-	github.com/gofrs/uuid v4.0.0+incompatible
+	github.com/gofrs/uuid v4.0.0+incompatible // indirect
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/mock v1.6.0
 	github.com/golang/snappy v0.0.4
@@ -213,7 +214,7 @@ require (
 	github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
 	github.com/segmentio/encoding v0.3.2
 	github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
-	github.com/sergi/go-diff v1.0.0 // indirect
+	github.com/sergi/go-diff v1.1.0 // indirect
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
 	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
@@ -240,8 +241,7 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/azkeys v0.4.0
 	github.com/Azure/go-autorest/autorest/adal v0.9.17
 	github.com/armon/go-radix v1.0.0
-	github.com/blugelabs/bluge v0.2.1
-	github.com/blugelabs/bluge_segment_api v0.2.0
+	github.com/blugelabs/bluge v0.1.9
 	github.com/getkin/kin-openapi v0.94.0
 	github.com/golang-migrate/migrate/v4 v4.7.0
 	github.com/grafana/dskit v0.0.0-20211011144203-3a88ec0b675f
@@ -256,6 +256,7 @@ require (
 require (
 	cloud.google.com/go v0.100.2 // indirect
 	github.com/armon/go-metrics v0.3.10 // indirect
+	github.com/blugelabs/bluge_segment_api v0.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/gosimple/unidecode v1.0.1 // indirect
@@ -273,7 +274,9 @@ require (
 	github.com/Azure/azure-sdk-for-go/sdk/keyvault/internal v0.2.1 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v0.4.0 // indirect
 	github.com/Microsoft/go-winio v0.5.2 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
 	github.com/RoaringBitmap/roaring v0.9.4 // indirect
+	github.com/acomagu/bufpipe v1.0.3 // indirect
 	github.com/axiomhq/hyperloglog v0.0.0-20191112132149-a4c4c47bc57f // indirect
 	github.com/bits-and-blooms/bitset v1.2.0 // indirect
 	github.com/blevesearch/go-porterstemmer v1.0.3 // indirect
@@ -282,24 +285,29 @@ require (
 	github.com/blevesearch/snowballstem v0.9.0 // indirect
 	github.com/blevesearch/vellum v1.0.7 // indirect
 	github.com/blugelabs/ice v1.0.0 // indirect
-	github.com/blugelabs/ice/v2 v2.0.1 // indirect
 	github.com/caio/go-tdigest v3.1.0+incompatible // indirect
 	github.com/chromedp/cdproto v0.0.0-20220208224320-6efb837e6bc2 // indirect
 	github.com/containerd/containerd v1.6.6 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect
 	github.com/elazarl/goproxy v0.0.0-20220115173737-adb46da277ac // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
+	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-git/go-billy/v5 v5.3.1 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
+	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
 	github.com/klauspost/compress v1.15.2 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/labstack/echo/v4 v4.7.2 // indirect
 	github.com/labstack/gommon v0.3.1 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mschoch/smat v0.2.0 // indirect
 	github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect
@@ -308,11 +316,13 @@ require (
 	github.com/smartystreets/goconvey v1.7.2 // indirect
 	github.com/valyala/fasttemplate v1.2.1 // indirect
 	github.com/wk8/go-ordered-map v1.0.0
+	github.com/xanzy/ssh-agent v0.3.0 // indirect
 	github.com/xlab/treeprint v1.1.0 // indirect
 	github.com/yudai/pp v2.0.1+incompatible // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.3 // indirect
 	go.opentelemetry.io/proto/otlp v0.15.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	gopkg.in/warnings.v0 v0.1.2 // indirect
 	k8s.io/api v0.22.5 // indirect
 	k8s.io/apimachinery v0.22.5 // indirect
 	k8s.io/klog/v2 v2.30.0 // indirect
diff --git a/go.sum b/go.sum
index b4eb9f79648..df4a323117f 100644
--- a/go.sum
+++ b/go.sum
@@ -254,6 +254,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
 github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
+github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 h1:YoJbenK9C67SkzkDfmQuVln04ygHj3vjZfd9FL+GmQQ=
+github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
@@ -275,6 +277,8 @@ github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrU
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f h1:HR5nRmUQgXrwqZOwZ2DAc/aCi3Bu3xENpspW935vxu0=
 github.com/VividCortex/mysqlerr v0.0.0-20170204212430-6c6b55f8796f/go.mod h1:f3HiCrHjHBdcm6E83vGaXh1KomZMA2P6aeo3hKx/wg0=
+github.com/acomagu/bufpipe v1.0.3 h1:fxAGrHZTgQ9w5QqVItgzwj235/uYZYgbXitB+dLupOk=
+github.com/acomagu/bufpipe v1.0.3/go.mod h1:mxdxdup/WdsKVreO5GpW4+M/1CE2sMG4jeGJ2sYmHc4=
 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
 github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
@@ -294,6 +298,8 @@ github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/andybalholm/brotli v1.0.3 h1:fpcw+r1N1h0Poc1F/pHbW40cUm/lMEQslZtCkBQ0UnM=
 github.com/andybalholm/brotli v1.0.3/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/antonmedv/expr v1.8.9/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8=
@@ -316,6 +322,7 @@ github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
@@ -435,14 +442,13 @@ github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulN
 github.com/blevesearch/vellum v1.0.5/go.mod h1:atE0EH3fvk43zzS7t1YNdNC7DbmcC3uz+eMD5xZ2OyQ=
 github.com/blevesearch/vellum v1.0.7 h1:+vn8rfyCRHxKVRgDLeR0FAXej2+6mEb5Q15aQE/XESQ=
 github.com/blevesearch/vellum v1.0.7/go.mod h1:doBZpmRhwTsASB4QdUZANlJvqVAUdUyX0ZK7QJCTeBE=
-github.com/blugelabs/bluge v0.2.1 h1:lgd6IhAAIDoq6my9HQOwk3p6xqJBmR49+lpFmpeFHgU=
-github.com/blugelabs/bluge v0.2.1/go.mod h1:am1LU9jS8dZgWkRzkGLQN3757EgMs3upWrU2fdN9foE=
+github.com/blugelabs/bluge v0.1.9 h1:bPgXlcsWugrXNjzeoLdOnvfJpHsyODKpYaAndayl/SM=
+github.com/blugelabs/bluge v0.1.9/go.mod h1:5d7LktUkQgvbh5Bmi6tPWtvo4+6uRTm6gAwP+5z6FqQ=
 github.com/blugelabs/bluge_segment_api v0.2.0 h1:cCX1Y2y8v0LZ7+EEJ6gH7dW6TtVTW4RhG0vp3R+N2Lo=
 github.com/blugelabs/bluge_segment_api v0.2.0/go.mod h1:95XA+ZXfRj/IXADm7gZ+iTcWOJPg5jQTY1EReIzl3LA=
+github.com/blugelabs/ice v0.2.0/go.mod h1:7foiDf4V83FIYYnGh2LOoRWsbNoCqAAMNgKn879Iyu0=
 github.com/blugelabs/ice v1.0.0 h1:um7wf9e6jbkTVCrOyQq3tKK43fBMOvLUYxbj3Qtc4eo=
 github.com/blugelabs/ice v1.0.0/go.mod h1:gNfFPk5zM+yxJROhthxhVQYjpBO9amuxWXJQ2Lo+IbQ=
-github.com/blugelabs/ice/v2 v2.0.1 h1:mzHbntLjk2v7eDRgoXCgzOsPKN1Tenu9Svo6l9cTLS4=
-github.com/blugelabs/ice/v2 v2.0.1/go.mod h1:QxAWSPNwZwsIqS25c3lbIPFQrVvT1sphf5x5DfMLH5M=
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
@@ -784,6 +790,8 @@ github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT
 github.com/emicklei/proto v1.6.15/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
 github.com/emicklei/proto v1.10.0 h1:pDGyFRVV5RvV+nkBK9iy3q67FBy9Xa7vwrOTE+g5aGw=
 github.com/emicklei/proto v1.10.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -817,6 +825,7 @@ github.com/felixge/fgprof v0.9.1/go.mod h1:7/HK6JFtFaARhIljgP2IV8rJLIoHDoOYoUphs
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
 github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
@@ -852,6 +861,8 @@ github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ER
 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
+github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
+github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
@@ -864,6 +875,15 @@ github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
 github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
+github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4=
+github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E=
+github.com/go-git/go-billy/v5 v5.2.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-billy/v5 v5.3.1 h1:CPiOUAzKtMRvolEKw+bG1PLRpT7D3LIs3/3ey4Aiu34=
+github.com/go-git/go-billy/v5 v5.3.1/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0=
+github.com/go-git/go-git-fixtures/v4 v4.2.1 h1:n9gGL1Ct/yIw+nfsfr8s4+sbhT+Ncu2SubfXjIWgci8=
+github.com/go-git/go-git-fixtures/v4 v4.2.1/go.mod h1:K8zd3kDUAykwTdDCr+I0per6Y6vMiRR/nnVTBtavnB0=
+github.com/go-git/go-git/v5 v5.4.2 h1:BXyZu9t0VkbiHtqrsvdq39UDhGJTl1h55VW6CSC4aY4=
+github.com/go-git/go-git/v5 v5.4.2/go.mod h1:gQ1kArt6d+n+BGd+/B/I74HwRTLhth2+zti4ihgckDc=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -1558,6 +1578,8 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jaegertracing/jaeger v1.24.0/go.mod h1:mqdtFDA447va5j0UewDaAWyNlGreGQyhGxXVhbF58gQ=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
 github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
@@ -1619,6 +1641,8 @@ github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 h1:DowS9hvgyYSX4TO5NpyC606/Z4SxnNYbT+WX27or6Ck=
+github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -1730,6 +1754,7 @@ github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
+github.com/matryer/is v1.2.0/go.mod h1:2fLPjFQM9rhQ15aVEtbuwhJinnOqrmgXPNdZsdwlWXA=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
@@ -2227,8 +2252,9 @@ github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfP
 github.com/sercand/kuberesolver v2.1.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ=
 github.com/sercand/kuberesolver v2.4.0+incompatible h1:WE2OlRf6wjLxHwNkkFLQGaZcVLEXjMjBPjjEU5vksH8=
 github.com/sercand/kuberesolver v2.4.0+incompatible/go.mod h1:lWF3GL0xptCB/vCiJPl/ZshwPsX/n4Y7u0CW9E7aQIQ=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
+github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v3.21.6+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
@@ -2427,6 +2453,8 @@ github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr
 github.com/wk8/go-ordered-map v1.0.0 h1:BV7z+2PaK8LTSd/mWgY12HyMAo5CEgkHqbkVq2thqr8=
 github.com/wk8/go-ordered-map v1.0.0/go.mod h1:9ZIbRunKbuvfPKyBP1SIKLcXNlv74YCOZ3t3VTS6gRk=
 github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs=
+github.com/xanzy/ssh-agent v0.3.0 h1:wUMzuKtKilRgBAD1sUb8gOwwRr2FGoBVumcjoOACClI=
+github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6eAcqrDh0=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs=
 github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM=
@@ -2610,6 +2638,7 @@ golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -2645,6 +2674,7 @@ golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -2786,6 +2816,7 @@ golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
+golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
@@ -2985,6 +3016,7 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210502180810-71e4cd670f79/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210503080704-8803ae5d1324/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3460,6 +3492,7 @@ gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w
 gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/package.json b/package.json
index 91fdd0db85d..fc52866a763 100644
--- a/package.json
+++ b/package.json
@@ -217,7 +217,6 @@
     "mutationobserver-shim": "0.3.7",
     "ngtemplate-loader": "2.1.0",
     "node-notifier": "10.0.1",
-    "nodemon": "2.0.16",
     "postcss": "8.4.14",
     "postcss-loader": "7.0.0",
     "postcss-reporter": "7.0.5",
@@ -259,7 +258,7 @@
     "@grafana/e2e-selectors": "workspace:*",
     "@grafana/experimental": "^0.0.2-canary.32",
     "@grafana/google-sdk": "0.0.3",
-    "@grafana/lezer-logql": "^0.0.12",
+    "@grafana/lezer-logql": "^0.0.13",
     "@grafana/runtime": "workspace:*",
     "@grafana/schema": "workspace:*",
     "@grafana/slate-react": "0.22.10-grafana",
@@ -354,6 +353,7 @@
     "rc-time-picker": "3.7.3",
     "re-resizable": "6.9.9",
     "react": "17.0.2",
+    "react-awesome-query-builder": "^5.1.2",
     "react-beautiful-dnd": "13.1.0",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "17.0.2",
@@ -385,7 +385,6 @@
     "rst2html": "github:thoward/rst2html#990cb89f2a300cdd9151790be377c4c0840df809",
     "rxjs": "7.5.5",
     "sass": "link:./public/sass",
-    "search-query-parser": "1.6.0",
     "selecto": "1.16.2",
     "semver": "7.3.7",
     "slate": "0.47.8",
@@ -404,10 +403,10 @@
   "resolutions": {
     "underscore": "1.13.3",
     "@types/slate": "0.47.2",
-    "@microsoft/api-extractor-model": "7.20.3",
+    "@microsoft/api-extractor-model": "7.21.0",
     "@rushstack/node-core-library": "3.49.0",
     "@rushstack/rig-package": "0.3.11",
-    "@rushstack/ts-command-line": "4.11.0",
+    "@rushstack/ts-command-line": "4.12.1",
     "@storybook/react/webpack": "5.73.0",
     "node-fetch": "2.6.7"
   },
diff --git a/packages/grafana-data/src/transformations/transformers/histogram.ts b/packages/grafana-data/src/transformations/transformers/histogram.ts
index 9dc72bcfd31..58bc951d2e2 100644
--- a/packages/grafana-data/src/transformations/transformers/histogram.ts
+++ b/packages/grafana-data/src/transformations/transformers/histogram.ts
@@ -160,13 +160,13 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
     for (const frame of frames) {
       for (const field of frame.fields) {
         if (field.type === FieldType.number) {
-          allValues = allValues.concat(
-            field.values.toArray().map((val: number) => Number(val.toFixed(field.config.decimals ?? 0)))
-          );
+          allValues = allValues.concat(field.values.toArray());
         }
       }
     }
 
+    allValues = allValues.filter((v) => v != null);
+
     allValues.sort((a, b) => a - b);
 
     let smallestDelta = Infinity;
@@ -204,6 +204,9 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
 
   const getBucket = (v: number) => incrRoundDn(v - bucketOffset, bucketSize!) + bucketOffset;
 
+  // guess number of decimals
+  let bucketDecimals = (('' + bucketSize).match(/\.\d+$/) ?? ['.'])[0].length - 1;
+
   let histograms: AlignedData[] = [];
   let counts: Field[] = [];
   let config: FieldConfig | undefined = undefined;
@@ -220,7 +223,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
             unit: undefined,
           },
         });
-        if (!config && Object.keys(field.config).length) {
+        if (!config && field.config.unit) {
           config = field.config;
         }
       }
@@ -251,7 +254,13 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform
     values: new ArrayVector(joinedHists[0]),
     type: FieldType.number,
     state: undefined,
-    config: config ?? {},
+    config:
+      bucketDecimals === 0
+        ? config ?? {}
+        : {
+            ...config,
+            decimals: bucketDecimals,
+          },
   };
   const bucketMax = {
     ...bucketMin,
diff --git a/packages/grafana-data/src/types/datasource.ts b/packages/grafana-data/src/types/datasource.ts
index 3b118ec2efb..1be984a4dbd 100644
--- a/packages/grafana-data/src/types/datasource.ts
+++ b/packages/grafana-data/src/types/datasource.ts
@@ -483,7 +483,6 @@ export interface DataQueryRequest<TQuery extends DataQuery = DataQuery> {
   timeInfo?: string; // The query time description (blue text in the upper right)
   panelId?: number;
   dashboardId?: number;
-  // Temporary prop for public dashboards, to be replaced by publicAccessKey
   publicDashboardAccessToken?: string;
 
   // Request Timing
diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts
index ccf3e461d71..d28102166c2 100644
--- a/packages/grafana-data/src/types/featureToggles.gen.ts
+++ b/packages/grafana-data/src/types/featureToggles.gen.ts
@@ -56,6 +56,7 @@ export interface FeatureToggles {
   autoMigrateGraphPanels?: boolean;
   prometheusWideSeries?: boolean;
   canvasPanelNesting?: boolean;
+  scenes?: boolean;
   useLegacyHeatmapPanel?: boolean;
   cloudMonitoringExperimentalUI?: boolean;
   logRequestsInstrumentedAsUnknown?: boolean;
diff --git a/packages/grafana-data/src/types/navModel.ts b/packages/grafana-data/src/types/navModel.ts
index 58f79261528..453e1a1f572 100644
--- a/packages/grafana-data/src/types/navModel.ts
+++ b/packages/grafana-data/src/types/navModel.ts
@@ -56,10 +56,6 @@ export interface NavModel {
    *   This is the current active tab/navigation.
    */
   node: NavModelItem;
-  /**
-   *  Describes breadcrumbs that are used in places such as data source settings., folder page and plugins page.
-   */
-  breadcrumbs?: NavModelItem[];
 }
 
 export interface NavModelBreadcrumb {
diff --git a/packages/grafana-runtime/src/components/PanelRenderer.tsx b/packages/grafana-runtime/src/components/PanelRenderer.tsx
index 8c0619ba3ba..a16377052c8 100644
--- a/packages/grafana-runtime/src/components/PanelRenderer.tsx
+++ b/packages/grafana-runtime/src/components/PanelRenderer.tsx
@@ -11,7 +11,7 @@ import { AbsoluteTimeRange, FieldConfigSource, PanelData } from '@grafana/data';
  * @internal
  */
 export interface PanelRendererProps<P extends object = any, F extends object = any> {
-  data: PanelData;
+  data?: PanelData;
   pluginId: string;
   title: string;
   options?: Partial<P>;
diff --git a/packages/grafana-runtime/src/services/backendSrv.ts b/packages/grafana-runtime/src/services/backendSrv.ts
index b5bdd774a2f..27e743447dc 100644
--- a/packages/grafana-runtime/src/services/backendSrv.ts
+++ b/packages/grafana-runtime/src/services/backendSrv.ts
@@ -143,17 +143,17 @@ export function isFetchError(e: unknown): e is FetchError {
  * @public
  */
 export interface BackendSrv {
-  get(url: string, params?: any, requestId?: string): Promise<any>;
-  delete(url: string, data?: any): Promise<any>;
-  post(url: string, data?: any): Promise<any>;
-  patch(url: string, data?: any): Promise<any>;
-  put(url: string, data?: any): Promise<any>;
+  get<T = any>(url: string, params?: any, requestId?: string): Promise<T>;
+  delete<T = any>(url: string, data?: any): Promise<T>;
+  post<T = any>(url: string, data?: any): Promise<T>;
+  patch<T = any>(url: string, data?: any): Promise<T>;
+  put<T = any>(url: string, data?: any): Promise<T>;
 
   /**
    * @deprecated Use the fetch function instead. If you prefer to work with a promise
    * wrap the Observable returned by fetch with the lastValueFrom function.
    */
-  request(options: BackendSrvRequest): Promise<any>;
+  request<T = any>(options: BackendSrvRequest): Promise<T>;
 
   /**
    * Special function used to communicate with datasources that will emit core
diff --git a/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts b/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts
index c86ee702e7c..f72460483f8 100644
--- a/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts
+++ b/packages/grafana-runtime/src/utils/PublicDashboardDataSource.test.ts
@@ -1,9 +1,14 @@
 import { of } from 'rxjs';
 import { BackendSrv, BackendSrvRequest } from 'src/services';
 
-import { DataQueryRequest, DataSourceRef } from '@grafana/data';
+import { DataQueryRequest, DataSourceInstanceSettings, DataSourceRef } from '@grafana/data';
 
-import { PublicDashboardDataSource } from '../../../../public/app/features/dashboard/services/PublicDashboardDataSource';
+import {
+  PUBLIC_DATASOURCE,
+  PublicDashboardDataSource,
+} from '../../../../public/app/features/dashboard/services/PublicDashboardDataSource';
+
+import { DataSourceWithBackend } from './DataSourceWithBackend';
 
 const mockDatasourceRequest = jest.fn();
 
@@ -28,7 +33,7 @@ describe('PublicDashboardDatasource', () => {
     mockDatasourceRequest.mockReset();
     mockDatasourceRequest.mockReturnValue(Promise.resolve({}));
 
-    const ds = new PublicDashboardDataSource();
+    const ds = new PublicDashboardDataSource('public');
     const panelId = 1;
     const publicDashboardAccessToken = 'abc123';
 
@@ -47,4 +52,27 @@ describe('PublicDashboardDatasource', () => {
       `/api/public/dashboards/${publicDashboardAccessToken}/panels/${panelId}/query`
     );
   });
+
+  test('returns public datasource uid when datasource passed in is null', () => {
+    let ds = new PublicDashboardDataSource(null);
+    expect(ds.uid).toBe(PUBLIC_DATASOURCE);
+  });
+
+  test('returns datasource when datasource passed in is a string', () => {
+    let ds = new PublicDashboardDataSource('theDatasourceUid');
+    expect(ds.uid).toBe('theDatasourceUid');
+  });
+
+  test('returns datasource uid when datasource passed in is a DataSourceRef implementation', () => {
+    const datasource = { type: 'datasource', uid: 'abc123' };
+    let ds = new PublicDashboardDataSource(datasource);
+    expect(ds.uid).toBe('abc123');
+  });
+
+  test('returns datasource uid when datasource passed in is a DatasourceApi instance', () => {
+    const settings: DataSourceInstanceSettings = { id: 1, uid: 'abc123' } as DataSourceInstanceSettings;
+    const datasource = new DataSourceWithBackend(settings);
+    let ds = new PublicDashboardDataSource(datasource);
+    expect(ds.uid).toBe('abc123');
+  });
 });
diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
index e5120dc6eaa..b4aa39c685c 100755
--- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
+++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
@@ -41,7 +41,7 @@ chmod 755 /usr/local/bin/golangci-lint
 # Install code climate
 get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64" \
     "/usr/local/bin/cc-test-reporter" \
-    "9fbe34cd207924d8f51ac0f3ffa690df4169e055cd7134a2370f6650f5b356e1"
+    "9e6c3e628b1258aefbc6e3550438a691abb0d1924d63c038881031d3d343c7d0"
 chmod 755 /usr/local/bin/cc-test-reporter
 
 wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.9.27/grabpl"
diff --git a/packages/grafana-ui/src/components/Button/Button.tsx b/packages/grafana-ui/src/components/Button/Button.tsx
index 2479687518a..bce87b5a739 100644
--- a/packages/grafana-ui/src/components/Button/Button.tsx
+++ b/packages/grafana-ui/src/components/Button/Button.tsx
@@ -9,6 +9,7 @@ import { IconName } from '../../types/icon';
 import { ComponentSize } from '../../types/size';
 import { getPropertiesForButtonSize } from '../Forms/commonStyles';
 import { Icon } from '../Icon/Icon';
+import { PopoverContent, Tooltip, TooltipPlacement } from '../Tooltip';
 
 export type ButtonVariant = 'primary' | 'secondary' | 'destructive';
 export const allButtonVariants: ButtonVariant[] = ['primary', 'secondary', 'destructive'];
@@ -24,6 +25,10 @@ type CommonProps = {
   children?: React.ReactNode;
   fullWidth?: boolean;
   type?: string;
+  /** Tooltip content to display on hover */
+  tooltip?: PopoverContent;
+  /** Position of the tooltip */
+  tooltipPlacement?: TooltipPlacement;
 };
 
 export type ButtonProps = CommonProps & ButtonHTMLAttributes<HTMLButtonElement>;
@@ -79,6 +84,8 @@ export const LinkButton = React.forwardRef<HTMLAnchorElement, ButtonLinkProps>(
       onBlur,
       onFocus,
       disabled,
+      tooltip,
+      tooltipPlacement,
       ...otherProps
     },
     ref
@@ -103,12 +110,22 @@ export const LinkButton = React.forwardRef<HTMLAnchorElement, ButtonLinkProps>(
       className
     );
 
-    return (
+    const button = (
       <a className={linkButtonStyles} {...otherProps} tabIndex={disabled ? -1 : 0} ref={ref}>
         {icon && <Icon name={icon} size={size} className={styles.icon} />}
         {children && <span className={styles.content}>{children}</span>}
       </a>
     );
+
+    if (tooltip) {
+      return (
+        <Tooltip content={tooltip} placement={tooltipPlacement}>
+          {button}
+        </Tooltip>
+      );
+    }
+
+    return button;
   }
 );
 
diff --git a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
index 9524e497cad..bf91200c338 100644
--- a/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
+++ b/packages/grafana-ui/src/components/DataLinks/DataLinksContextMenu.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React from 'react';
+import React, { CSSProperties } from 'react';
 
 import { LinkModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
@@ -12,6 +12,7 @@ import { MenuItem } from '../Menu/MenuItem';
 interface DataLinksContextMenuProps {
   children: (props: DataLinksContextMenuApi) => JSX.Element;
   links: () => LinkModel[];
+  style?: CSSProperties;
 }
 
 export interface DataLinksContextMenuApi {
@@ -19,7 +20,7 @@ export interface DataLinksContextMenuApi {
   targetClassName?: string;
 }
 
-export const DataLinksContextMenu: React.FC<DataLinksContextMenuProps> = ({ children, links }) => {
+export const DataLinksContextMenu: React.FC<DataLinksContextMenuProps> = ({ children, links, style }) => {
   const itemsGroup: MenuItemsGroup[] = [{ items: linkModelToContextMenuItems(links), label: 'Data links' }];
   const linksCounter = itemsGroup[0].items.length;
   const renderMenuGroupItems = () => {
@@ -61,7 +62,7 @@ export const DataLinksContextMenu: React.FC<DataLinksContextMenuProps> = ({ chil
         onClick={linkModel.onClick}
         target={linkModel.target}
         title={linkModel.title}
-        style={{ display: 'flex', width: '100%' }}
+        style={style}
         aria-label={selectors.components.DataLinksContextMenu.singleLink}
       >
         {children({})}
diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
index b4985badef9..5accaec58c6 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker.tsx
@@ -118,7 +118,7 @@ export function UnthemedTimeRangePicker(props: TimeRangePickerProps): ReactEleme
         </ToolbarButton>
       </Tooltip>
       {isOpen && (
-        <FocusScope contain autoFocus restoreFocus>
+        <FocusScope contain autoFocus>
           <section ref={ref} {...overlayProps} {...dialogProps}>
             <TimePickerContent
               timeZone={timeZone}
diff --git a/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.mdx b/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.mdx
new file mode 100644
index 00000000000..508f1c0b739
--- /dev/null
+++ b/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.mdx
@@ -0,0 +1,43 @@
+import { Meta, Preview, Props } from '@storybook/addon-docs/blocks';
+import { PluginSignatureBadge } from './PluginSignatureBadge';
+
+<Meta title="MDX|PluginSignatureBadge" component={PluginSignatureBadge} />
+
+# Plugin Signature Badge
+
+The Plugin Signature Badge can be found in each information plugin card of the configuration plugins panel (Grafana menu > Configuration > Plugins).
+This is a security measure to make sure plugins haven't been tampered with. Upon loading, Grafana checks to see the plugin signature status.
+
+## Badges:
+
+1.- Core: this badge indicates that the plugin has been built into Grafana.
+
+<Preview>
+  <PluginSignatureBadge status="internal" />
+</Preview>
+
+2.- Signed: the plugin's signature was successfully verified.
+
+<Preview>
+  <PluginSignatureBadge status="valid" />
+</Preview>
+
+3.- Invalid signature: this plugin has a invalid signature.
+
+<Preview>
+  <PluginSignatureBadge status="invalid" />
+</Preview>
+
+4.- Modified signature: this plugin has changed since it was signed. This may indicate malicious intent.
+
+<Preview>
+  <PluginSignatureBadge status="modified" />
+</Preview>
+
+5.- Unsigned: the plugin is not signed. In this case, as upon loading Grafana checks the plugins signature, Grafana will not load or start it. Furthermore, it will write an error message to the server log.
+
+<Preview>
+  <PluginSignatureBadge status="unsigned" />
+</Preview>
+
+<Props of={PluginSignatureBadge} />
diff --git a/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx b/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx
index 0f35ecf1404..ed1d7d46c7a 100644
--- a/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx
+++ b/packages/grafana-ui/src/components/PluginSignatureBadge/PluginSignatureBadge.story.tsx
@@ -6,6 +6,8 @@ import { PluginSignatureBadge } from '@grafana/ui';
 
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
+import mdx from './PluginSignatureBadge.mdx';
+
 export default {
   title: 'Data Display/PluginSignatureBadge',
   decorators: [withCenteredStory],
@@ -24,6 +26,11 @@ export default {
       ],
     },
   },
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
 };
 
 export const Basic: Story = (args) => {
diff --git a/packages/grafana-ui/src/components/SecretInput/SecretInput.mdx b/packages/grafana-ui/src/components/SecretInput/SecretInput.mdx
new file mode 100644
index 00000000000..565b879e946
--- /dev/null
+++ b/packages/grafana-ui/src/components/SecretInput/SecretInput.mdx
@@ -0,0 +1,28 @@
+import { Props } from '@storybook/addon-docs/blocks';
+import { SecretInput } from './SecretInput';
+
+# Secret Input
+
+Used for secret/password input. It has 2 states: **_configured_** and **_not configured_**.
+
+- If configured it will disable the input and add a reset button that will
+  clear the input and make it accessible.
+- In non configured state it behaves like a normal password input.
+
+This is used for passwords or anything that is encrypted on the server and is
+later returned encrypted to the user (like datasource passwords).
+
+### Usage
+
+```tsx
+import {SecretInput} from '@grafana/ui';
+
+<SecretInput
+  value={...}
+  isConfigured={...}
+  onChange={...}
+  onReset={...}
+/>
+```
+
+<Props of={SecretInput} />
diff --git a/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx b/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx
index e19028188fc..57d94a2d70c 100644
--- a/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx
+++ b/packages/grafana-ui/src/components/SecretInput/SecretInput.story.tsx
@@ -4,12 +4,16 @@ import React, { useState, ChangeEvent } from 'react';
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
 import { SecretInput, Props } from './SecretInput';
+import mdx from './SecretInput.mdx';
 
-export default {
+const meta: Meta = {
   title: 'Forms/SecretInput',
   component: SecretInput,
   decorators: [withCenteredStory],
   parameters: {
+    docs: {
+      page: mdx,
+    },
     controls: {
       exclude: [
         'prefix',
@@ -32,7 +36,9 @@ export default {
   argTypes: {
     width: { control: { type: 'range', min: 10, max: 200, step: 10 } },
   },
-} as Meta;
+};
+
+export default meta;
 
 const Template: Story<Props> = (args) => {
   const [secret, setSecret] = useState('');
diff --git a/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx b/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
index 842a09ef47f..4e1c61f858e 100644
--- a/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
+++ b/packages/grafana-ui/src/components/Table/BarGaugeCell.tsx
@@ -50,7 +50,7 @@ export const BarGaugeCell: FC<TableCellProps> = (props) => {
     return field.getLinks({ valueRowIndex: row.index });
   };
 
-  const hasLinks = !!getLinks().length;
+  const hasLinks = Boolean(getLinks().length);
 
   const renderComponent = (menuProps: DataLinksContextMenuApi) => {
     const { openMenu, targetClassName } = menuProps;
@@ -76,7 +76,11 @@ export const BarGaugeCell: FC<TableCellProps> = (props) => {
 
   return (
     <div {...cellProps} className={tableStyles.cellContainer}>
-      {hasLinks && <DataLinksContextMenu links={getLinks}>{(api) => renderComponent(api)}</DataLinksContextMenu>}
+      {hasLinks && (
+        <DataLinksContextMenu links={getLinks} style={{ display: 'flex', width: '100%' }}>
+          {(api) => renderComponent(api)}
+        </DataLinksContextMenu>
+      )}
       {!hasLinks && (
         <BarGauge
           width={innerWidth}
diff --git a/packages/grafana-ui/src/components/Table/ImageCell.tsx b/packages/grafana-ui/src/components/Table/ImageCell.tsx
index 01f4454b680..9c90f009aae 100644
--- a/packages/grafana-ui/src/components/Table/ImageCell.tsx
+++ b/packages/grafana-ui/src/components/Table/ImageCell.tsx
@@ -11,7 +11,7 @@ export const ImageCell: FC<TableCellProps> = (props) => {
 
   const displayValue = field.display!(cell.value);
 
-  const hasLinks = getCellLinks(field, row)?.length;
+  const hasLinks = Boolean(getCellLinks(field, row)?.length);
 
   return (
     <div {...cellProps} className={tableStyles.cellContainer}>
diff --git a/packages/grafana-ui/src/components/Table/JSONViewCell.tsx b/packages/grafana-ui/src/components/Table/JSONViewCell.tsx
index 029dd2abd2d..70c73fce64e 100644
--- a/packages/grafana-ui/src/components/Table/JSONViewCell.tsx
+++ b/packages/grafana-ui/src/components/Table/JSONViewCell.tsx
@@ -27,7 +27,7 @@ export function JSONViewCell(props: TableCellProps): JSX.Element {
     displayValue = JSON.stringify(value, null, ' ');
   }
 
-  const hasLinks = getCellLinks(field, row)?.length;
+  const hasLinks = Boolean(getCellLinks(field, row)?.length);
 
   return (
     <div {...cellProps} className={inspectEnabled ? tableStyles.cellContainerNoOverflow : tableStyles.cellContainer}>
diff --git a/packages/grafana-ui/src/components/Table/styles.ts b/packages/grafana-ui/src/components/Table/styles.ts
index 7bb9d5b5b21..bc7261316c2 100644
--- a/packages/grafana-ui/src/components/Table/styles.ts
+++ b/packages/grafana-ui/src/components/Table/styles.ts
@@ -165,7 +165,6 @@ export const getTableStyles = (theme: GrafanaTheme2) => {
     imageCellLink: css`
       cursor: pointer;
       overflow: hidden;
-      width: 100%;
       height: 100%;
     `,
     headerFilter: css`
diff --git a/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx b/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx
new file mode 100644
index 00000000000..c1fdeccff2b
--- /dev/null
+++ b/packages/grafana-ui/src/components/Tabs/VerticalTab.tsx
@@ -0,0 +1,96 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { selectors } from '@grafana/e2e-selectors';
+
+import { useStyles2 } from '../../themes/ThemeContext';
+import { Icon } from '../Icon/Icon';
+
+import { Counter } from './Counter';
+import { TabProps } from './Tab';
+
+export const VerticalTab = React.forwardRef<HTMLAnchorElement, TabProps>(
+  ({ label, active, icon, counter, className, suffix: Suffix, onChangeTab, href, ...otherProps }, ref) => {
+    const tabsStyles = useStyles2(getTabStyles);
+    const content = () => (
+      <>
+        {icon && <Icon name={icon} />}
+        {label}
+        {typeof counter === 'number' && <Counter value={counter} />}
+        {Suffix && <Suffix className={tabsStyles.suffix} />}
+      </>
+    );
+
+    const linkClass = cx(tabsStyles.link, active && tabsStyles.activeStyle);
+
+    return (
+      <li className={tabsStyles.item}>
+        <a
+          href={href}
+          className={linkClass}
+          {...otherProps}
+          onClick={onChangeTab}
+          aria-label={otherProps['aria-label'] || selectors.components.Tab.title(label)}
+          role="tab"
+          aria-selected={active}
+          ref={ref}
+        >
+          {content()}
+        </a>
+      </li>
+    );
+  }
+);
+
+VerticalTab.displayName = 'Tab';
+
+const getTabStyles = (theme: GrafanaTheme2) => {
+  return {
+    item: css`
+      list-style: none;
+      margin-right: ${theme.spacing(2)};
+      position: relative;
+      display: block;
+      margin-bottom: 4px;
+    `,
+    link: css`
+      padding: 6px 12px;
+      display: block;
+      height: 100%;
+      cursor: pointer;
+
+      color: ${theme.colors.text.primary};
+
+      svg {
+        margin-right: ${theme.spacing(1)};
+      }
+
+      &:hover,
+      &:focus {
+        text-decoration: underline;
+      }
+    `,
+    activeStyle: css`
+      label: activeTabStyle;
+      color: ${theme.colors.text.maxContrast};
+      font-weight: 500;
+      overflow: hidden;
+
+      &::before {
+        display: block;
+        content: ' ';
+        position: absolute;
+        left: 0;
+        width: 4px;
+        bottom: 0;
+        top: 0;
+        border-radius: 2px;
+        background-image: linear-gradient(0deg, #f05a28 30%, #fbca0a 99%);
+      }
+    `,
+    suffix: css`
+      margin-left: ${theme.spacing(1)};
+    `,
+  };
+};
diff --git a/packages/grafana-ui/src/components/Tags/Tag.mdx b/packages/grafana-ui/src/components/Tags/Tag.mdx
index d7a1dd79371..a635ef2c88f 100644
--- a/packages/grafana-ui/src/components/Tags/Tag.mdx
+++ b/packages/grafana-ui/src/components/Tags/Tag.mdx
@@ -1,6 +1,8 @@
 import { Story, Preview, Props } from '@storybook/addon-docs/blocks';
 import { Tag } from './Tag';
 
+<Meta title="MDX|Tag" component={Tag} />
+
 # Tag
 
 Used for displaying metadata, for example to add more details to search results. Background and border colors are generated from the tag name.
diff --git a/packages/grafana-ui/src/components/Tags/Tag.story.tsx b/packages/grafana-ui/src/components/Tags/Tag.story.tsx
index 07222066547..5ddda1be408 100644
--- a/packages/grafana-ui/src/components/Tags/Tag.story.tsx
+++ b/packages/grafana-ui/src/components/Tags/Tag.story.tsx
@@ -1,10 +1,10 @@
 import { action } from '@storybook/addon-actions';
+import { Story } from '@storybook/react';
 import React from 'react';
 
-import { Tag } from '@grafana/ui';
-
 import { withCenteredStory } from '../../utils/storybook/withCenteredStory';
 
+import { Props as TagProps, Tag } from './Tag';
 import mdx from './Tag.mdx';
 
 export default {
@@ -15,9 +15,28 @@ export default {
     docs: {
       page: mdx,
     },
+    controls: {
+      exclude: ['onClick'],
+    },
+  },
+  args: {
+    name: 'Tag',
+    colorIndex: 0,
+    showIcon: false,
   },
 };
 
-export const single = () => {
-  return <Tag name="Tag" onClick={action('Tag clicked')} />;
+interface StoryProps extends TagProps {
+  showIcon?: boolean;
+}
+
+export const Single: Story<StoryProps> = (args) => {
+  return (
+    <Tag
+      name={args.name}
+      colorIndex={args.colorIndex}
+      onClick={action('Tag clicked')}
+      icon={args.showIcon ? args.icon : undefined}
+    />
+  );
 };
diff --git a/packages/grafana-ui/src/components/Tags/Tag.tsx b/packages/grafana-ui/src/components/Tags/Tag.tsx
index eee65fa0cd8..362fc04a26d 100644
--- a/packages/grafana-ui/src/components/Tags/Tag.tsx
+++ b/packages/grafana-ui/src/components/Tags/Tag.tsx
@@ -64,13 +64,15 @@ const getTagStyles = (theme: GrafanaTheme, name: string, colorIndex?: number) =>
       font-weight: ${theme.typography.weight.semibold};
       font-size: ${theme.typography.size.sm};
       line-height: ${theme.typography.lineHeight.xs};
-      vertical-align: baseline;
       background-color: ${colors.color};
       color: ${theme.palette.gray98};
       white-space: nowrap;
       text-shadow: none;
       padding: 3px 6px;
       border-radius: ${theme.border.radius.md};
+      display: flex;
+      align-items: center;
+      gap: 3px;
     `,
     hover: css`
       &:hover {
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 721d749c863..e9dd8b85ada 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -79,6 +79,7 @@ export { TableCellDisplayMode, TableSortByFieldState } from './Table/types';
 export { TableInputCSV } from './TableInputCSV/TableInputCSV';
 export { TabsBar } from './Tabs/TabsBar';
 export { Tab } from './Tabs/Tab';
+export { VerticalTab } from './Tabs/VerticalTab';
 export { TabContent } from './Tabs/TabContent';
 export { Counter } from './Tabs/Counter';
 
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js
index e584f83fcfe..f3768546bc7 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js
@@ -16,6 +16,8 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import { NONE, DURATION, TAG } from '../settings/SpanBarSettings';
+
 import SpanBarRow from './SpanBarRow';
 
 describe('<SpanBarRow>', () => {
@@ -43,11 +45,10 @@ describe('<SpanBarRow>', () => {
     showErrorIcon: false,
     getViewedBounds: () => ({ start: 0, end: 1 }),
     span: {
-      duration: 'test-duration',
+      duration: 9000,
       hasChildren: true,
       process: {
         serviceName: 'service-name',
-        tags: [],
       },
       spanID,
       logs: [],
@@ -181,4 +182,89 @@ describe('<SpanBarRow>', () => {
     );
     expect(screen.getAllByTestId('SpanLinksMenu')).toHaveLength(1);
   });
+
+  describe('render span bar label', () => {
+    it('with default value', () => {
+      render(<SpanBarRow {...props} />);
+      expect(screen.getByText('(9ms)')).toBeInTheDocument();
+    });
+
+    it('with none value', () => {
+      const testProps = Object.assign(
+        {
+          spanBarOptions: {
+            type: NONE,
+          },
+        },
+        props
+      );
+      render(<SpanBarRow {...testProps} />);
+      expect(screen.queryByText('(9ms)')).not.toBeInTheDocument();
+    });
+
+    it('with duration value', () => {
+      const testProps = Object.assign(
+        {
+          spanBarOptions: {
+            type: DURATION,
+          },
+        },
+        props
+      );
+      render(<SpanBarRow {...testProps} />);
+      expect(screen.getByText('(9ms)')).toBeInTheDocument();
+    });
+
+    it('with tag value', () => {
+      const testProps = Object.assign(
+        {
+          spanBarOptions: {
+            type: TAG,
+            tag: 'tag',
+          },
+        },
+        {
+          ...props,
+          span: {
+            process: {},
+            tags: [
+              {
+                key: 'tag',
+                value: 'tag-value',
+              },
+            ],
+          },
+        }
+      );
+      render(<SpanBarRow {...testProps} />);
+      expect(screen.getByText('(tag-value)')).toBeInTheDocument();
+    });
+
+    it('with process value', () => {
+      let testProps = Object.assign(
+        {
+          spanBarOptions: {
+            type: TAG,
+            tag: 'tag',
+          },
+        },
+        {
+          ...props,
+          span: {
+            process: {
+              tags: [
+                {
+                  key: 'tag',
+                  value: 'process-value',
+                },
+              ],
+            },
+            tags: [],
+          },
+        }
+      );
+      render(<SpanBarRow {...testProps} />);
+      expect(screen.getByText('(process-value)')).toBeInTheDocument();
+    });
+  });
 });
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx
index 7ace6c3f33d..8d6ee2d9808 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.tsx
@@ -18,11 +18,12 @@ import * as React from 'react';
 import IoAlert from 'react-icons/lib/io/alert';
 import IoArrowRightA from 'react-icons/lib/io/arrow-right-a';
 
-import { GrafanaTheme2 } from '@grafana/data';
+import { GrafanaTheme2, TraceKeyValuePair } from '@grafana/data';
 import { stylesFactory, withTheme2 } from '@grafana/ui';
 
 import { autoColor } from '../Theme';
-import { SpanLinkFunc, TNil } from '../types';
+import { DURATION, NONE, TAG } from '../settings/SpanBarSettings';
+import { SpanBarOptions, SpanLinkFunc, TNil } from '../types';
 import { SpanLinks } from '../types/links';
 import { TraceSpan } from '../types/trace';
 
@@ -290,6 +291,7 @@ type SpanBarRowProps = {
   className?: string;
   theme: GrafanaTheme2;
   color: string;
+  spanBarOptions: SpanBarOptions | undefined;
   columnDivision: number;
   isChildrenExpanded: boolean;
   isDetailExpanded: boolean;
@@ -352,6 +354,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
     const {
       className,
       color,
+      spanBarOptions,
       columnDivision,
       isChildrenExpanded,
       isDetailExpanded,
@@ -379,6 +382,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
       process: { serviceName },
     } = span;
     const label = formatDuration(duration);
+
     const viewBounds = getViewedBounds(span.startTime, span.startTime + span.duration);
     const viewStart = viewBounds.start;
     const viewEnd = viewBounds.end;
@@ -473,7 +477,7 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
                 )}
               </span>
               <small className={styles.endpointName}>{rpc ? rpc.operationName : operationName}</small>
-              <small className={styles.endpointName}> | {label}</small>
+              <small className={styles.endpointName}> {this.getSpanBarLabel(span, spanBarOptions, label)}</small>
             </a>
             {createSpanLink &&
               (() => {
@@ -542,6 +546,35 @@ export class UnthemedSpanBarRow extends React.PureComponent<SpanBarRowProps> {
       </TimelineRow>
     );
   }
+
+  getSpanBarLabel = (span: TraceSpan, spanBarOptions: SpanBarOptions | undefined, duration: string) => {
+    const type = spanBarOptions?.type ?? '';
+
+    if (type === NONE) {
+      return '';
+    } else if (type === '' || type === DURATION) {
+      return `(${duration})`;
+    } else if (type === TAG) {
+      const tagKey = spanBarOptions?.tag?.trim() ?? '';
+      if (tagKey !== '' && span.tags) {
+        const tag = span.tags?.find((tag: TraceKeyValuePair) => {
+          return tag.key === tagKey;
+        });
+        const process = span.process?.tags?.find((process: TraceKeyValuePair) => {
+          return process.key === tagKey;
+        });
+
+        if (tag) {
+          return `(${tag.value})`;
+        }
+        if (process) {
+          return `(${process.value})`;
+        }
+      }
+    }
+
+    return '';
+  };
 }
 
 export default withTheme2(UnthemedSpanBarRow);
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js
index 947a805b633..592af162af1 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js
@@ -56,7 +56,7 @@ describe('AccordianLogs tests', () => {
   it('shows the number of log entries', () => {
     setup();
 
-    expect(screen.getByRole('switch', { name: 'Logs (2)' })).toBeInTheDocument();
+    expect(screen.getByRole('switch', { name: 'Events (2)' })).toBeInTheDocument();
   });
 
   it('hides log entries when not expanded', () => {
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
index 268f617802b..065fda8cceb 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.tsx
@@ -90,7 +90,7 @@ export default function AccordianLogs(props: AccordianLogsProps) {
   return (
     <div className={styles.AccordianLogs}>
       <HeaderComponent className={styles.AccordianLogsHeader} {...headerProps}>
-        {arrow} <strong>Logs</strong> ({logs.length})
+        {arrow} <strong>Events</strong> ({logs.length})
       </HeaderComponent>
       {isOpen && (
         <div className={styles.AccordianLogsContent}>
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js
index e13a3550f97..b9423169915 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js
@@ -146,14 +146,14 @@ describe('<SpanDetail>', () => {
   });
 
   it('renders the span tags', () => {
-    const target = <AccordianKeyValues data={span.tags} label="Tags" isOpen={detailState.isTagsOpen} />;
+    const target = <AccordianKeyValues data={span.tags} label="Attributes" isOpen={detailState.isTagsOpen} />;
     expect(wrapper.containsMatchingElement(target)).toBe(true);
     wrapper.find({ data: span.tags }).simulate('toggle');
     expect(props.tagsToggle).toHaveBeenLastCalledWith(span.spanID);
   });
 
   it('renders the process tags', () => {
-    const target = <AccordianKeyValues data={span.process.tags} label="Process" isOpen={detailState.isProcessOpen} />;
+    const target = <AccordianKeyValues data={span.process.tags} label="Resource" isOpen={detailState.isProcessOpen} />;
     expect(wrapper.containsMatchingElement(target)).toBe(true);
     wrapper.find({ data: span.process.tags }).simulate('toggle');
     expect(props.processToggle).toHaveBeenLastCalledWith(span.spanID);
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx
index c337bf45a7d..5bb0ceacf17 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.tsx
@@ -195,7 +195,7 @@ export default function SpanDetail(props: SpanDetailProps) {
   const focusSpanLink = createFocusSpanLink(traceID, spanID);
 
   return (
-    <div>
+    <div data-testid="span-detail-component">
       <div className={styles.header}>
         <h2 className={cx(ubM0)}>{operationName}</h2>
         <div className={styles.listWrapper}>
@@ -213,7 +213,7 @@ export default function SpanDetail(props: SpanDetailProps) {
         <div>
           <AccordianKeyValues
             data={tags}
-            label="Tags"
+            label="Attributes"
             linksGetter={linksGetter}
             isOpen={isTagsOpen}
             onToggle={() => tagsToggle(spanID)}
@@ -222,7 +222,7 @@ export default function SpanDetail(props: SpanDetailProps) {
             <AccordianKeyValues
               className={ubMb1}
               data={process.tags}
-              label="Process"
+              label="Resource"
               linksGetter={linksGetter}
               isOpen={isProcessOpen}
               onToggle={() => processToggle(spanID)}
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js
index c06156dc950..282ea1851f0 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js
@@ -12,89 +12,69 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
 
 import { createTheme } from '@grafana/data';
 
-import SpanDetail from './SpanDetail';
 import DetailState from './SpanDetail/DetailState';
 import { UnthemedSpanDetailRow } from './SpanDetailRow';
-import SpanTreeOffset from './SpanTreeOffset';
 
-jest.mock('./SpanTreeOffset');
-
-describe('<SpanDetailRow>', () => {
-  const spanID = 'some-id';
+const testSpan = {
+  spanID: 'testSpanID',
+  traceID: 'testTraceID',
+  depth: 3,
+  process: {
+    serviceName: 'some-service',
+    tags: [{ key: 'tag-key', value: 'tag-value' }],
+  },
+};
+const setup = (propOverrides) => {
   const props = {
     color: 'some-color',
     columnDivision: 0.5,
     detailState: new DetailState(),
     onDetailToggled: jest.fn(),
-    linksGetter: jest.fn(),
     isFilteredOut: false,
     logItemToggle: jest.fn(),
     logsToggle: jest.fn(),
     processToggle: jest.fn(),
-    span: { spanID, depth: 3 },
+    createFocusSpanLink: jest.fn(),
+    hoverIndentGuideIds: new Map(),
+    span: testSpan,
     tagsToggle: jest.fn(),
     traceStartTime: 1000,
     theme: createTheme(),
+    ...propOverrides,
   };
+  return render(<UnthemedSpanDetailRow {...props} />);
+};
 
-  let wrapper;
-
-  beforeEach(() => {
-    props.onDetailToggled.mockReset();
-    props.linksGetter.mockReset();
-    props.logItemToggle.mockReset();
-    props.logsToggle.mockReset();
-    props.processToggle.mockReset();
-    props.tagsToggle.mockReset();
-    wrapper = shallow(<UnthemedSpanDetailRow {...props} />);
-  });
-
+describe('SpanDetailRow tests', () => {
   it('renders without exploding', () => {
-    expect(wrapper).toBeDefined();
+    expect(() => setup()).not.toThrow();
   });
 
-  it('escalates toggle detail', () => {
-    const calls = props.onDetailToggled.mock.calls;
-    expect(calls.length).toBe(0);
-    wrapper.find('[data-test-id="detail-row-expanded-accent"]').prop('onClick')();
-    expect(calls).toEqual([[spanID]]);
+  it('calls toggle on click', async () => {
+    const mockToggle = jest.fn();
+    setup({ onDetailToggled: mockToggle });
+    expect(mockToggle).not.toHaveBeenCalled();
+
+    const detailRow = screen.getByTestId('detail-row-expanded-accent');
+    await userEvent.click(detailRow);
+    expect(mockToggle).toHaveBeenCalled();
   });
 
   it('renders the span tree offset', () => {
-    const spanTreeOffset = <SpanTreeOffset span={props.span} showChildrenIcon={false} />;
-    expect(wrapper.contains(spanTreeOffset)).toBe(true);
+    setup();
+
+    expect(screen.getByTestId('SpanTreeOffset--indentGuide')).toBeInTheDocument();
   });
 
   it('renders the SpanDetail', () => {
-    const spanDetail = (
-      <SpanDetail
-        detailState={props.detailState}
-        linksGetter={wrapper.instance()._linksGetter}
-        logItemToggle={props.logItemToggle}
-        logsToggle={props.logsToggle}
-        processToggle={props.processToggle}
-        span={props.span}
-        tagsToggle={props.tagsToggle}
-        traceStartTime={props.traceStartTime}
-      />
-    );
-    expect(wrapper.contains(spanDetail)).toBe(true);
-  });
+    setup();
 
-  it('adds span when calling linksGetter', () => {
-    const spanDetail = wrapper.find(SpanDetail);
-    const linksGetter = spanDetail.prop('linksGetter');
-    const tags = [{ key: 'myKey', value: 'myValue' }];
-    const linksGetterResponse = {};
-    props.linksGetter.mockReturnValueOnce(linksGetterResponse);
-    const result = linksGetter(tags, 0);
-    expect(result).toBe(linksGetterResponse);
-    expect(props.linksGetter).toHaveBeenCalledTimes(1);
-    expect(props.linksGetter).toHaveBeenCalledWith(props.span, tags, 0);
+    expect(screen.getByTestId('span-detail-component')).toBeInTheDocument();
   });
 });
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx
index 8bd0944a9e3..16c34dcb12d 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.tsx
@@ -150,7 +150,7 @@ export class UnthemedSpanDetailRow extends React.PureComponent<SpanDetailRowProp
               onClick={this._detailToggle}
               role="switch"
               style={{ borderColor: color }}
-              data-test-id="detail-row-expanded-accent"
+              data-testid="detail-row-expanded-accent"
             />
           </span>
         </TimelineRow.Cell>
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx
index 728af808524..b8ebd36c4d5 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.tsx
@@ -23,7 +23,7 @@ import { stylesFactory, withTheme2, ToolbarButton } from '@grafana/ui';
 
 import { Accessors } from '../ScrollManager';
 import { PEER_SERVICE } from '../constants/tag-keys';
-import { SpanLinkFunc, TNil } from '../types';
+import { SpanBarOptions, SpanLinkFunc, TNil } from '../types';
 import TTraceTimeline from '../types/TTraceTimeline';
 import { TraceLog, TraceSpan, Trace, TraceKeyValuePair, TraceLink, TraceSpanReference } from '../types/trace';
 import { getColorByKey } from '../utils/color-generator';
@@ -89,6 +89,7 @@ type TVirtualizedTraceViewOwnProps = {
   scrollToFirstVisibleSpan: () => void;
   registerAccessors: (accesors: Accessors) => void;
   trace: Trace;
+  spanBarOptions: SpanBarOptions | undefined;
   linksGetter: (span: TraceSpan, items: TraceKeyValuePair[], itemIndex: number) => TraceLink[];
   childrenToggle: (spanID: string) => void;
   clearShouldScrollToFirstUiFindMatch: () => void;
@@ -387,6 +388,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
       findMatchesIDs,
       spanNameColumnWidth,
       trace,
+      spanBarOptions,
       hoverIndentGuideIds,
       addHoverIndentGuideId,
       removeHoverIndentGuideId,
@@ -440,6 +442,7 @@ export class UnthemedVirtualizedTraceView extends React.Component<VirtualizedTra
           clippingLeft={this.getClipping().left}
           clippingRight={this.getClipping().right}
           color={color}
+          spanBarOptions={spanBarOptions}
           columnDivision={spanNameColumnWidth}
           isChildrenExpanded={!isCollapsed}
           isDetailExpanded={isDetailExpanded}
diff --git a/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx b/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx
index e1f0b02d4b0..8b966c86155 100644
--- a/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx
+++ b/packages/jaeger-ui-components/src/TraceTimelineViewer/index.tsx
@@ -21,6 +21,7 @@ import { stylesFactory, withTheme2 } from '@grafana/ui';
 import { Accessors } from '../ScrollManager';
 import { autoColor } from '../Theme';
 import { merge as mergeShortcuts } from '../keyboard-shortcuts';
+import { SpanBarOptions } from '../settings/SpanBarSettings';
 import { SpanLinkFunc, TNil } from '../types';
 import TTraceTimeline from '../types/TTraceTimeline';
 import { TraceSpan, Trace, TraceLog, TraceKeyValuePair, TraceLink, TraceSpanReference } from '../types/trace';
@@ -75,6 +76,7 @@ type TProps = TExtractUiFindFromStateReturn & {
   scrollToFirstVisibleSpan: () => void;
   traceTimeline: TTraceTimeline;
   trace: Trace;
+  spanBarOptions: SpanBarOptions | undefined;
   updateNextViewRangeTime: (update: ViewRangeTimeUpdate) => void;
   updateViewRangeTime: TUpdateViewRangeTimeFunction;
   viewRange: ViewRange;
diff --git a/packages/jaeger-ui-components/src/index.ts b/packages/jaeger-ui-components/src/index.ts
index f5737eff1f5..bf4885b2b08 100644
--- a/packages/jaeger-ui-components/src/index.ts
+++ b/packages/jaeger-ui-components/src/index.ts
@@ -1,5 +1,6 @@
 export { default as TraceTimelineViewer } from './TraceTimelineViewer';
 export { default as TracePageHeader } from './TracePageHeader';
+export { default as SpanBarSettings } from './settings/SpanBarSettings';
 export * from './types';
 export * from './TraceTimelineViewer/types';
 export { default as DetailState } from './TraceTimelineViewer/SpanDetail/DetailState';
diff --git a/packages/jaeger-ui-components/src/settings/SpanBarSettings.tsx b/packages/jaeger-ui-components/src/settings/SpanBarSettings.tsx
new file mode 100644
index 00000000000..1de0c0e006d
--- /dev/null
+++ b/packages/jaeger-ui-components/src/settings/SpanBarSettings.tsx
@@ -0,0 +1,90 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import {
+  DataSourceJsonData,
+  DataSourcePluginOptionsEditorProps,
+  GrafanaTheme,
+  toOption,
+  updateDatasourcePluginJsonDataOption,
+} from '@grafana/data';
+import { InlineField, InlineFieldRow, Input, Select, useStyles } from '@grafana/ui';
+
+export interface SpanBarOptions {
+  type?: string;
+  tag?: string;
+}
+
+export interface SpanBarOptionsData extends DataSourceJsonData {
+  spanBar?: SpanBarOptions;
+}
+
+export const NONE = 'None';
+export const DURATION = 'Duration';
+export const TAG = 'Tag';
+
+interface Props extends DataSourcePluginOptionsEditorProps<SpanBarOptionsData> {}
+
+export default function SpanBarSettings({ options, onOptionsChange }: Props) {
+  const styles = useStyles(getStyles);
+  const selectOptions = [NONE, DURATION, TAG].map(toOption);
+
+  return (
+    <div className={css({ width: '100%' })}>
+      <h3 className="page-heading">Span bar label</h3>
+
+      <div className={styles.infoText}>Span bar label lets you add additional info to the span bar row.</div>
+
+      <InlineFieldRow className={styles.row}>
+        <InlineField label="Label" labelWidth={26} grow>
+          <Select
+            inputId="label"
+            options={selectOptions}
+            value={options.jsonData.spanBar?.type || ''}
+            onChange={(v) => {
+              updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'spanBar', {
+                ...options.jsonData.spanBar,
+                type: v?.value ?? '',
+              });
+            }}
+            placeholder="Duration"
+            isClearable
+            aria-label={'select-label-name'}
+            width={25}
+          />
+        </InlineField>
+      </InlineFieldRow>
+      {options.jsonData.spanBar?.type === TAG && (
+        <InlineFieldRow className={styles.row}>
+          <InlineField label="Tag key" labelWidth={26} tooltip="Tag key which will be used to get the tag value">
+            <Input
+              type="text"
+              placeholder="Enter tag key"
+              onChange={(v) =>
+                updateDatasourcePluginJsonDataOption({ onOptionsChange, options }, 'spanBar', {
+                  ...options.jsonData.spanBar,
+                  tag: v.currentTarget.value,
+                })
+              }
+              value={options.jsonData.spanBar?.tag || ''}
+              width={25}
+            />
+          </InlineField>
+        </InlineFieldRow>
+      )}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme) => ({
+  infoText: css`
+    label: infoText;
+    padding-bottom: ${theme.spacing.md};
+    color: ${theme.colors.textSemiWeak};
+  `,
+
+  row: css`
+    label: row;
+    align-items: baseline;
+  `,
+});
diff --git a/packages/jaeger-ui-components/src/types/index.tsx b/packages/jaeger-ui-components/src/types/index.tsx
index 9f1aa8d9115..a491bb9df8b 100644
--- a/packages/jaeger-ui-components/src/types/index.tsx
+++ b/packages/jaeger-ui-components/src/types/index.tsx
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 export { TraceSpan, TraceResponse, Trace, TraceProcess, TraceKeyValuePair, TraceLink } from './trace';
-export { SpanLinkFunc, SpanLinkDef } from './links';
+export { SpanBarOptions, SpanBarOptionsData } from '../settings/SpanBarSettings';
 export { default as TTraceTimeline } from './TTraceTimeline';
 export { default as TNil } from './TNil';
+export { SpanLinkFunc, SpanLinkDef } from './links';
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index b9efa36aeea..2b88967dec7 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -35,13 +35,13 @@ RUN apk add --no-cache openssl --repository=http://dl-cdn.alpinelinux.org/alpine
 RUN if [ `arch` = "x86_64" ]; then \
       apk add --no-cache libaio libnsl && \
       ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
-      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk \
-        -O /tmp/glibc-2.30-r0.apk && \
-      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-bin-2.30-r0.apk \
-        -O /tmp/glibc-bin-2.30-r0.apk && \
-      apk add --no-cache --allow-untrusted /tmp/glibc-2.30-r0.apk /tmp/glibc-bin-2.30-r0.apk && \
-      rm -f /tmp/glibc-2.30-r0.apk && \
-      rm -f /tmp/glibc-bin-2.30-r0.apk && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
+        -O /tmp/glibc-2.35-r0.apk && \
+      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
+        -O /tmp/glibc-bin-2.35-r0.apk && \
+      apk add --no-cache --allow-untrusted /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
+      rm -f /tmp/glibc-2.35-r0.apk && \
+      rm -f /tmp/glibc-bin-2.35-r0.apk && \
       rm -f /lib/ld-linux-x86-64.so.2 && \
       rm -f /etc/ld.so.cache; \
     fi
diff --git a/packaging/docker/README.md b/packaging/docker/README.md
index ea592592fce..d2b1a889262 100644
--- a/packaging/docker/README.md
+++ b/packaging/docker/README.md
@@ -16,6 +16,10 @@ Further documentation can be found at http://docs.grafana.org/installation/docke
 
 ## Changelog
 
+### v9.0.3
+
+- Upgraded glibc version to glibc [2.35](https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html) [#51107](https://github.com/grafana/grafana/pull/51107/files)
+
 ### v8.3.0-beta2
 
 - Our Alpine based images have been upgraded to Alpine [3.14.3](https://alpinelinux.org/posts/Alpine-3.14.3-released.html) [#41922](https://github.com/grafana/grafana/pull/41922) [@hairyhenderson](https://github.com/hairyhenderson)
diff --git a/pkg/api/accesscontrol.go b/pkg/api/accesscontrol.go
index f834d307068..b750ab71410 100644
--- a/pkg/api/accesscontrol.go
+++ b/pkg/api/accesscontrol.go
@@ -223,11 +223,12 @@ func (hs *HTTPServer) declareFixedRoles() error {
 		Role: ac.RoleDTO{
 			Name:        "fixed:teams:creator",
 			DisplayName: "Team creator",
-			Description: "Create teams and read organisation users (required to manage the created teams).",
+			Description: "Create teams and read organisation users and service accounts (required to manage the created teams).",
 			Group:       "Teams",
 			Permissions: []ac.Permission{
 				{Action: ac.ActionTeamsCreate},
 				{Action: ac.ActionOrgUsersRead, Scope: ac.ScopeUsersAll},
+				{Action: serviceaccounts.ActionRead, Scope: serviceaccounts.ScopeAll},
 			},
 		},
 		Grants: teamCreatorGrants,
diff --git a/pkg/api/annotations.go b/pkg/api/annotations.go
index 492b87af29b..894f4382ead 100644
--- a/pkg/api/annotations.go
+++ b/pkg/api/annotations.go
@@ -53,7 +53,7 @@ func (hs *HTTPServer) GetAnnotations(c *models.ReqContext) response.Response {
 				item.DashboardUID = val
 			} else {
 				query := models.GetDashboardQuery{Id: item.DashboardId, OrgId: c.OrgId}
-				err := hs.dashboardService.GetDashboard(c.Req.Context(), &query)
+				err := hs.DashboardService.GetDashboard(c.Req.Context(), &query)
 				if err == nil && query.Result != nil {
 					item.DashboardUID = &query.Result.Uid
 					dashboardCache[item.DashboardId] = &query.Result.Uid
@@ -82,7 +82,7 @@ func (hs *HTTPServer) PostAnnotation(c *models.ReqContext) response.Response {
 	// overwrite dashboardId when dashboardUID is not empty
 	if cmd.DashboardUID != "" {
 		query := models.GetDashboardQuery{OrgId: c.OrgId, Uid: cmd.DashboardUID}
-		err := hs.dashboardService.GetDashboard(c.Req.Context(), &query)
+		err := hs.DashboardService.GetDashboard(c.Req.Context(), &query)
 		if err == nil {
 			cmd.DashboardId = query.Result.Id
 		}
@@ -291,7 +291,7 @@ func (hs *HTTPServer) MassDeleteAnnotations(c *models.ReqContext) response.Respo
 
 	if cmd.DashboardUID != "" {
 		query := models.GetDashboardQuery{OrgId: c.OrgId, Uid: cmd.DashboardUID}
-		err := hs.dashboardService.GetDashboard(c.Req.Context(), &query)
+		err := hs.DashboardService.GetDashboard(c.Req.Context(), &query)
 		if err == nil {
 			cmd.DashboardId = query.Result.Id
 		}
diff --git a/pkg/api/annotations_test.go b/pkg/api/annotations_test.go
index 8b97423c59d..c2bbd3baaeb 100644
--- a/pkg/api/annotations_test.go
+++ b/pkg/api/annotations_test.go
@@ -343,7 +343,7 @@ func postAnnotationScenario(t *testing.T, desc string, url string, routePattern
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
 		hs := setupSimpleHTTPServer(nil)
 		hs.SQLStore = store
-		hs.dashboardService = dashSvc
+		hs.DashboardService = dashSvc
 
 		sc := setupScenarioContext(t, url)
 		sc.defaultHandler = routing.Wrap(func(c *models.ReqContext) response.Response {
@@ -428,7 +428,7 @@ func deleteAnnotationsScenario(t *testing.T, desc string, url string, routePatte
 	t.Run(fmt.Sprintf("%s %s", desc, url), func(t *testing.T) {
 		hs := setupSimpleHTTPServer(nil)
 		hs.SQLStore = store
-		hs.dashboardService = dashSvc
+		hs.DashboardService = dashSvc
 
 		sc := setupScenarioContext(t, url)
 		sc.defaultHandler = routing.Wrap(func(c *models.ReqContext) response.Response {
diff --git a/pkg/api/api.go b/pkg/api/api.go
index 88774b8ceba..a99d3af59e9 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	publicdashboardsapi "github.com/grafana/grafana/pkg/services/publicdashboards/api"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/web"
 )
@@ -28,7 +29,7 @@ func (hs *HTTPServer) registerRoutes() {
 	reqGrafanaAdmin := middleware.ReqGrafanaAdmin
 	reqEditorRole := middleware.ReqEditorRole
 	reqOrgAdmin := middleware.ReqOrgAdmin
-	reqOrgAdminFolderAdminOrTeamAdmin := middleware.OrgAdminFolderAdminOrTeamAdmin(hs.SQLStore, hs.dashboardService)
+	reqOrgAdminDashOrFolderAdminOrTeamAdmin := middleware.OrgAdminDashOrFolderAdminOrTeamAdmin(hs.SQLStore, hs.DashboardService)
 	reqCanAccessTeams := middleware.AdminOrEditorAndFeatureEnabled(hs.Cfg.EditorsCanAdmin)
 	reqSnapshotPublicModeOrSignedIn := middleware.SnapshotPublicModeOrSignedIn(hs.Cfg)
 	redirectFromLegacyPanelEditURL := middleware.RedirectFromLegacyPanelEditURL(hs.Cfg)
@@ -75,6 +76,7 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/admin/orgs", authorizeInOrg(reqGrafanaAdmin, ac.UseGlobalOrg, orgsAccessEvaluator), hs.Index)
 	r.Get("/admin/orgs/edit/:id", authorizeInOrg(reqGrafanaAdmin, ac.UseGlobalOrg, orgsAccessEvaluator), hs.Index)
 	r.Get("/admin/stats", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionServerStatsRead)), hs.Index)
+	r.Get("/admin/storage/*", reqGrafanaAdmin, hs.Index)
 	r.Get("/admin/ldap", authorize(reqGrafanaAdmin, ac.EvalPermission(ac.ActionLDAPStatusRead)), hs.Index)
 	r.Get("/styleguide", reqSignedIn, hs.Index)
 
@@ -102,6 +104,10 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/dashboards/*", reqSignedIn, hs.Index)
 	r.Get("/goto/:uid", reqSignedIn, hs.redirectFromShortURL, hs.Index)
 
+	if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
+		r.Get("/public-dashboards/:accessToken", publicdashboardsapi.SetPublicDashboardFlag(), hs.Index)
+	}
+
 	r.Get("/explore", authorize(func(c *models.ReqContext) {
 		if f, ok := reqSignedIn.(func(c *models.ReqContext)); ok {
 			f(c)
@@ -261,7 +267,7 @@ func (hs *HTTPServer) registerRoutes() {
 					ac.EvalPermission(dashboards.ActionDashboardsPermissionsWrite),
 				)
 			}
-			orgRoute.Get("/users/lookup", authorize(reqOrgAdminFolderAdminOrTeamAdmin, lookupEvaluator()), routing.Wrap(hs.GetOrgUsersForCurrentOrgLookup))
+			orgRoute.Get("/users/lookup", authorize(reqOrgAdminDashOrFolderAdminOrTeamAdmin, lookupEvaluator()), routing.Wrap(hs.GetOrgUsersForCurrentOrgLookup))
 		})
 
 		// create new org
@@ -332,10 +338,12 @@ func (hs *HTTPServer) registerRoutes() {
 		apiRoute.Any("/plugins/:pluginId/resources/*", hs.CallResource)
 		apiRoute.Get("/plugins/errors", routing.Wrap(hs.GetPluginErrorsList))
 
-		apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) {
-			pluginRoute.Post("/:pluginId/install", routing.Wrap(hs.InstallPlugin))
-			pluginRoute.Post("/:pluginId/uninstall", routing.Wrap(hs.UninstallPlugin))
-		}, reqGrafanaAdmin)
+		if hs.Cfg.PluginAdminEnabled && !hs.Cfg.PluginAdminExternalManageEnabled {
+			apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) {
+				pluginRoute.Post("/:pluginId/install", routing.Wrap(hs.InstallPlugin))
+				pluginRoute.Post("/:pluginId/uninstall", routing.Wrap(hs.UninstallPlugin))
+			}, reqGrafanaAdmin)
+		}
 
 		apiRoute.Group("/plugins", func(pluginRoute routing.RouteRegister) {
 			pluginRoute.Get("/:pluginId/dashboards/", routing.Wrap(hs.GetPluginDashboards))
@@ -393,11 +401,6 @@ func (hs *HTTPServer) registerRoutes() {
 			})
 
 			dashboardRoute.Group("/uid/:uid", func(dashUidRoute routing.RouteRegister) {
-				if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
-					dashUidRoute.Get("/public-config", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.GetPublicDashboardConfig))
-					dashUidRoute.Post("/public-config", authorize(reqSignedIn, ac.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(hs.SavePublicDashboardConfig))
-				}
-
 				if hs.ThumbService != nil {
 					dashUidRoute.Get("/img/:kind/:theme", hs.ThumbService.GetImage)
 					if hs.Features.IsEnabled(featuremgmt.FlagDashboardPreviewsAdmin) {
@@ -600,7 +603,7 @@ func (hs *HTTPServer) registerRoutes() {
 	// grafana.net proxy
 	r.Any("/api/gnet/*", reqSignedIn, hs.ProxyGnetRequest)
 
-	// Gravatar service.
+	// Gravatar service
 	r.Get("/avatar/:hash", hs.AvatarCacheServer.Handler)
 
 	// Snapshots
@@ -610,13 +613,6 @@ func (hs *HTTPServer) registerRoutes() {
 	r.Get("/api/snapshots-delete/:deleteKey", reqSnapshotPublicModeOrSignedIn, routing.Wrap(hs.DeleteDashboardSnapshotByDeleteKey))
 	r.Delete("/api/snapshots/:key", reqEditorRole, routing.Wrap(hs.DeleteDashboardSnapshot))
 
-	// Public API
-	if hs.Features.IsEnabled(featuremgmt.FlagPublicDashboards) {
-		r.Get("/public-dashboards/:accessToken", middleware.SetPublicDashboardFlag(), hs.Index)
-		r.Get("/api/public/dashboards/:accessToken", routing.Wrap(hs.GetPublicDashboard))
-		r.Post("/api/public/dashboards/:accessToken/panels/:panelId/query", routing.Wrap(hs.QueryPublicDashboard))
-	}
-
 	// Frontend logs
 	sourceMapStore := frontendlogging.NewSourceMapStore(hs.Cfg, hs.pluginStaticRouteResolver, frontendlogging.ReadSourceMapFromFS)
 	r.Post("/log", middleware.RateLimit(hs.Cfg.Sentry.EndpointRPS, hs.Cfg.Sentry.EndpointBurst, time.Now),
diff --git a/pkg/api/apierrors/dashboard.go b/pkg/api/apierrors/dashboard.go
index a4003646143..5ce72dabeab 100644
--- a/pkg/api/apierrors/dashboard.go
+++ b/pkg/api/apierrors/dashboard.go
@@ -7,15 +7,15 @@ import (
 	"net/http"
 
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/services/alerting"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/util"
 )
 
 // ToDashboardErrorResponse returns a different response status according to the dashboard error type
 func ToDashboardErrorResponse(ctx context.Context, pluginStore plugins.Store, err error) response.Response {
-	var dashboardErr models.DashboardErr
+	var dashboardErr dashboards.DashboardErr
 	if ok := errors.As(err, &dashboardErr); ok {
 		if body := dashboardErr.Body(); body != nil {
 			return response.JSON(dashboardErr.StatusCode, body)
@@ -26,7 +26,7 @@ func ToDashboardErrorResponse(ctx context.Context, pluginStore plugins.Store, er
 		return response.Error(dashboardErr.StatusCode, dashboardErr.Error(), nil)
 	}
 
-	if errors.Is(err, models.ErrFolderNotFound) {
+	if errors.Is(err, dashboards.ErrFolderNotFound) {
 		return response.Error(http.StatusBadRequest, err.Error(), nil)
 	}
 
@@ -35,7 +35,7 @@ func ToDashboardErrorResponse(ctx context.Context, pluginStore plugins.Store, er
 		return response.Error(http.StatusUnprocessableEntity, validationErr.Error(), err)
 	}
 
-	var pluginErr models.UpdatePluginDashboardError
+	var pluginErr dashboards.UpdatePluginDashboardError
 	if ok := errors.As(err, &pluginErr); ok {
 		message := fmt.Sprintf("The dashboard belongs to plugin %s.", pluginErr.PluginId)
 		// look up plugin name
diff --git a/pkg/api/apierrors/folder.go b/pkg/api/apierrors/folder.go
index da6fd4fa124..d6b8e84fc77 100644
--- a/pkg/api/apierrors/folder.go
+++ b/pkg/api/apierrors/folder.go
@@ -4,40 +4,40 @@ import (
 	"errors"
 
 	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/util"
 )
 
 // ToFolderErrorResponse returns a different response status according to the folder error type
 func ToFolderErrorResponse(err error) response.Response {
-	var dashboardErr models.DashboardErr
+	var dashboardErr dashboards.DashboardErr
 	if ok := errors.As(err, &dashboardErr); ok {
 		return response.Error(dashboardErr.StatusCode, err.Error(), err)
 	}
 
-	if errors.Is(err, models.ErrFolderTitleEmpty) ||
-		errors.Is(err, models.ErrDashboardTypeMismatch) ||
-		errors.Is(err, models.ErrDashboardInvalidUid) ||
-		errors.Is(err, models.ErrDashboardUidTooLong) ||
-		errors.Is(err, models.ErrFolderContainsAlertRules) {
+	if errors.Is(err, dashboards.ErrFolderTitleEmpty) ||
+		errors.Is(err, dashboards.ErrDashboardTypeMismatch) ||
+		errors.Is(err, dashboards.ErrDashboardInvalidUid) ||
+		errors.Is(err, dashboards.ErrDashboardUidTooLong) ||
+		errors.Is(err, dashboards.ErrFolderContainsAlertRules) {
 		return response.Error(400, err.Error(), nil)
 	}
 
-	if errors.Is(err, models.ErrFolderAccessDenied) {
+	if errors.Is(err, dashboards.ErrFolderAccessDenied) {
 		return response.Error(403, "Access denied", err)
 	}
 
-	if errors.Is(err, models.ErrFolderNotFound) {
-		return response.JSON(404, util.DynMap{"status": "not-found", "message": models.ErrFolderNotFound.Error()})
+	if errors.Is(err, dashboards.ErrFolderNotFound) {
+		return response.JSON(404, util.DynMap{"status": "not-found", "message": dashboards.ErrFolderNotFound.Error()})
 	}
 
-	if errors.Is(err, models.ErrFolderSameNameExists) ||
-		errors.Is(err, models.ErrFolderWithSameUIDExists) {
+	if errors.Is(err, dashboards.ErrFolderSameNameExists) ||
+		errors.Is(err, dashboards.ErrFolderWithSameUIDExists) {
 		return response.Error(409, err.Error(), nil)
 	}
 
-	if errors.Is(err, models.ErrFolderVersionMismatch) {
-		return response.JSON(412, util.DynMap{"status": "version-mismatch", "message": models.ErrFolderVersionMismatch.Error()})
+	if errors.Is(err, dashboards.ErrFolderVersionMismatch) {
+		return response.JSON(412, util.DynMap{"status": "version-mismatch", "message": dashboards.ErrFolderVersionMismatch.Error()})
 	}
 
 	return response.Error(500, "Folder API error", err)
diff --git a/pkg/api/common_test.go b/pkg/api/common_test.go
index e28a0758726..3111965b170 100644
--- a/pkg/api/common_test.go
+++ b/pkg/api/common_test.go
@@ -43,7 +43,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/searchusers"
 	"github.com/grafana/grafana/pkg/services/searchusers/filters"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/services/sqlstore/mockstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
 	"github.com/grafana/grafana/pkg/web/webtest"
@@ -341,15 +340,6 @@ func setupHTTPServerWithCfg(t *testing.T, useFakeAccessControl, enableAccessCont
 	return setupHTTPServerWithCfgDb(t, useFakeAccessControl, enableAccessControl, cfg, db, db, featuremgmt.WithFeatures())
 }
 
-func setupHTTPServerWithMockDb(t *testing.T, useFakeAccessControl, enableAccessControl bool, features *featuremgmt.FeatureManager) accessControlScenarioContext {
-	// Use a new conf
-	cfg := setting.NewCfg()
-	db := sqlstore.InitTestDB(t)
-	db.Cfg = setting.NewCfg()
-
-	return setupHTTPServerWithCfgDb(t, useFakeAccessControl, enableAccessControl, cfg, db, mockstore.NewSQLStoreMock(), features)
-}
-
 func setupHTTPServerWithCfgDb(t *testing.T, useFakeAccessControl, enableAccessControl bool, cfg *setting.Cfg, db *sqlstore.SQLStore, store sqlstore.Store, features *featuremgmt.FeatureManager) accessControlScenarioContext {
 	t.Helper()
 
@@ -396,7 +386,7 @@ func setupHTTPServerWithCfgDb(t *testing.T, useFakeAccessControl, enableAccessCo
 		AccessControl:          ac,
 		teamPermissionsService: teamPermissionService,
 		searchUsersService:     searchusers.ProvideUsersService(db, filters.ProvideOSSSearchUserFilter()),
-		dashboardService: dashboardservice.ProvideDashboardService(
+		DashboardService: dashboardservice.ProvideDashboardService(
 			cfg, dashboardsStore, nil, features,
 			accesscontrolmock.NewMockedPermissionsService(), accesscontrolmock.NewMockedPermissionsService(), ac,
 		),
diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 49d6f293f2a..95b88909641 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -144,8 +144,8 @@ func (hs *HTTPServer) GetDashboard(c *models.ReqContext) response.Response {
 	// lookup folder title
 	if dash.FolderId > 0 {
 		query := models.GetDashboardQuery{Id: dash.FolderId, OrgId: c.OrgId}
-		if err := hs.dashboardService.GetDashboard(c.Req.Context(), &query); err != nil {
-			if errors.Is(err, models.ErrFolderNotFound) {
+		if err := hs.DashboardService.GetDashboard(c.Req.Context(), &query); err != nil {
+			if errors.Is(err, dashboards.ErrFolderNotFound) {
 				return response.Error(404, "Folder not found", err)
 			}
 			return response.Error(500, "Dashboard folder could not be read", err)
@@ -235,7 +235,7 @@ func (hs *HTTPServer) getDashboardHelper(ctx context.Context, orgID int64, id in
 		query = models.GetDashboardQuery{Id: id, OrgId: orgID}
 	}
 
-	if err := hs.dashboardService.GetDashboard(ctx, &query); err != nil {
+	if err := hs.DashboardService.GetDashboard(ctx, &query); err != nil {
 		return nil, response.Error(404, "Dashboard not found", err)
 	}
 
@@ -262,11 +262,11 @@ func (hs *HTTPServer) deleteDashboard(c *models.ReqContext) response.Response {
 		hs.log.Error("Failed to disconnect library elements", "dashboard", dash.Id, "user", c.SignedInUser.UserId, "error", err)
 	}
 
-	err = hs.dashboardService.DeleteDashboard(c.Req.Context(), dash.Id, c.OrgId)
+	err = hs.DashboardService.DeleteDashboard(c.Req.Context(), dash.Id, c.OrgId)
 	if err != nil {
-		var dashboardErr models.DashboardErr
+		var dashboardErr dashboards.DashboardErr
 		if ok := errors.As(err, &dashboardErr); ok {
-			if errors.Is(err, models.ErrDashboardCannotDeleteProvisionedDashboard) {
+			if errors.Is(err, dashboards.ErrDashboardCannotDeleteProvisionedDashboard) {
 				return response.Error(dashboardErr.StatusCode, dashboardErr.Error(), err)
 			}
 		}
@@ -333,7 +333,7 @@ func (hs *HTTPServer) postDashboard(c *models.ReqContext, cmd models.SaveDashboa
 	if cmd.FolderUid != "" {
 		folder, err := hs.folderService.GetFolderByUID(ctx, c.SignedInUser, c.OrgId, cmd.FolderUid)
 		if err != nil {
-			if errors.Is(err, models.ErrFolderNotFound) {
+			if errors.Is(err, dashboards.ErrFolderNotFound) {
 				return response.Error(400, "Folder not found", err)
 			}
 			return response.Error(500, "Error while checking folder ID", err)
@@ -362,7 +362,7 @@ func (hs *HTTPServer) postDashboard(c *models.ReqContext, cmd models.SaveDashboa
 		provisioningData = data
 	} else if dash.Uid != "" {
 		data, err := hs.dashboardProvisioningService.GetProvisionedDashboardDataByDashboardUID(dash.OrgId, dash.Uid)
-		if err != nil && !errors.Is(err, models.ErrProvisionedDashboardNotFound) && !errors.Is(err, models.ErrDashboardNotFound) {
+		if err != nil && !errors.Is(err, dashboards.ErrProvisionedDashboardNotFound) && !errors.Is(err, dashboards.ErrDashboardNotFound) {
 			return response.Error(500, "Error while checking if dashboard is provisioned", err)
 		}
 		provisioningData = data
@@ -387,7 +387,7 @@ func (hs *HTTPServer) postDashboard(c *models.ReqContext, cmd models.SaveDashboa
 		Overwrite: cmd.Overwrite,
 	}
 
-	dashboard, err := hs.dashboardService.SaveDashboard(alerting.WithUAEnabled(ctx, hs.Cfg.UnifiedAlerting.IsEnabled()), dashItem, allowUiUpdate)
+	dashboard, err := hs.DashboardService.SaveDashboard(alerting.WithUAEnabled(ctx, hs.Cfg.UnifiedAlerting.IsEnabled()), dashItem, allowUiUpdate)
 
 	if dashboard != nil && hs.entityEventsService != nil {
 		if err := hs.entityEventsService.SaveEvent(ctx, store.SaveEventCmd{
@@ -460,7 +460,7 @@ func (hs *HTTPServer) GetHomeDashboard(c *models.ReqContext) response.Response {
 
 	if preference.HomeDashboardID != 0 {
 		slugQuery := models.GetDashboardRefByIdQuery{Id: preference.HomeDashboardID}
-		err := hs.dashboardService.GetDashboardUIDById(c.Req.Context(), &slugQuery)
+		err := hs.DashboardService.GetDashboardUIDById(c.Req.Context(), &slugQuery)
 		if err == nil {
 			url := models.GetDashboardUrl(slugQuery.Result.Uid, slugQuery.Result.Slug)
 			dashRedirect := dtos.DashboardRedirect{RedirectUri: url}
@@ -546,7 +546,7 @@ func (hs *HTTPServer) GetDashboardVersions(c *models.ReqContext) response.Respon
 			OrgId: c.SignedInUser.OrgId,
 			Uid:   dashUID,
 		}
-		if err := hs.dashboardService.GetDashboard(c.Req.Context(), &q); err != nil {
+		if err := hs.DashboardService.GetDashboard(c.Req.Context(), &q); err != nil {
 			return response.Error(http.StatusBadRequest, "failed to get dashboard by UID", err)
 		}
 		dashID = q.Result.Id
@@ -605,7 +605,7 @@ func (hs *HTTPServer) GetDashboardVersion(c *models.ReqContext) response.Respons
 			OrgId: c.SignedInUser.OrgId,
 			Uid:   dashUID,
 		}
-		if err := hs.dashboardService.GetDashboard(c.Req.Context(), &q); err != nil {
+		if err := hs.DashboardService.GetDashboard(c.Req.Context(), &q); err != nil {
 			return response.Error(http.StatusBadRequest, "failed to get dashboard by UID", err)
 		}
 		dashID = q.Result.Id
@@ -782,7 +782,7 @@ func (hs *HTTPServer) RestoreDashboardVersion(c *models.ReqContext) response.Res
 
 func (hs *HTTPServer) GetDashboardTags(c *models.ReqContext) {
 	query := models.GetDashboardTagsQuery{OrgId: c.OrgId}
-	err := hs.dashboardService.GetDashboardTags(c.Req.Context(), &query)
+	err := hs.DashboardService.GetDashboardTags(c.Req.Context(), &query)
 	if err != nil {
 		c.JsonApiErr(500, "Failed to get tags from database", err)
 		return
@@ -803,7 +803,7 @@ func (hs *HTTPServer) GetDashboardUIDs(c *models.ReqContext) {
 			continue
 		}
 		q.Id = id
-		err = hs.dashboardService.GetDashboardUIDById(c.Req.Context(), q)
+		err = hs.DashboardService.GetDashboardUIDById(c.Req.Context(), q)
 		if err != nil {
 			continue
 		}
diff --git a/pkg/api/dashboard_permission.go b/pkg/api/dashboard_permission.go
index 4ae1ce4d36e..6bbec530a18 100644
--- a/pkg/api/dashboard_permission.go
+++ b/pkg/api/dashboard_permission.go
@@ -143,7 +143,7 @@ func (hs *HTTPServer) UpdateDashboardPermissions(c *models.ReqContext) response.
 		return response.Success("Dashboard permissions updated")
 	}
 
-	if err := hs.dashboardService.UpdateDashboardACL(c.Req.Context(), dashID, items); err != nil {
+	if err := hs.DashboardService.UpdateDashboardACL(c.Req.Context(), dashID, items); err != nil {
 		if errors.Is(err, models.ErrDashboardAclInfoMissing) ||
 			errors.Is(err, models.ErrDashboardPermissionDashboardEmpty) {
 			return response.Error(409, err.Error(), err)
diff --git a/pkg/api/dashboard_permission_test.go b/pkg/api/dashboard_permission_test.go
index 14cc1abc5cf..0b15fee9012 100644
--- a/pkg/api/dashboard_permission_test.go
+++ b/pkg/api/dashboard_permission_test.go
@@ -39,7 +39,7 @@ func TestDashboardPermissionAPIEndpoint(t *testing.T) {
 			Cfg:      settings,
 			SQLStore: mockSQLStore,
 			Features: features,
-			dashboardService: dashboardservice.ProvideDashboardService(
+			DashboardService: dashboardservice.ProvideDashboardService(
 				settings, dashboardStore, nil, features, folderPermissions, dashboardPermissions, ac,
 			),
 			AccessControl: accesscontrolmock.New().WithDisabled(),
diff --git a/pkg/api/dashboard_public.go b/pkg/api/dashboard_public.go
deleted file mode 100644
index 5399f21a722..00000000000
--- a/pkg/api/dashboard_public.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package api
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/grafana/grafana/pkg/api/dtos"
-	"github.com/grafana/grafana/pkg/api/response"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	"github.com/grafana/grafana/pkg/web"
-)
-
-// gets public dashboard
-func (hs *HTTPServer) GetPublicDashboard(c *models.ReqContext) response.Response {
-	accessToken := web.Params(c.Req)[":accessToken"]
-
-	dash, err := hs.dashboardService.GetPublicDashboard(c.Req.Context(), accessToken)
-	if err != nil {
-		return handleDashboardErr(http.StatusInternalServerError, "Failed to get public dashboard", err)
-	}
-
-	meta := dtos.DashboardMeta{
-		Slug:                       dash.Slug,
-		Type:                       models.DashTypeDB,
-		CanStar:                    false,
-		CanSave:                    false,
-		CanEdit:                    false,
-		CanAdmin:                   false,
-		CanDelete:                  false,
-		Created:                    dash.Created,
-		Updated:                    dash.Updated,
-		Version:                    dash.Version,
-		IsFolder:                   false,
-		FolderId:                   dash.FolderId,
-		PublicDashboardAccessToken: accessToken,
-	}
-
-	dto := dtos.DashboardFullWithMeta{Meta: meta, Dashboard: dash.Data}
-
-	return response.JSON(http.StatusOK, dto)
-}
-
-// gets public dashboard configuration for dashboard
-func (hs *HTTPServer) GetPublicDashboardConfig(c *models.ReqContext) response.Response {
-	pdc, err := hs.dashboardService.GetPublicDashboardConfig(c.Req.Context(), c.OrgId, web.Params(c.Req)[":uid"])
-	if err != nil {
-		return handleDashboardErr(http.StatusInternalServerError, "Failed to get public dashboard config", err)
-	}
-	return response.JSON(http.StatusOK, pdc)
-}
-
-// sets public dashboard configuration for dashboard
-func (hs *HTTPServer) SavePublicDashboardConfig(c *models.ReqContext) response.Response {
-	pubdash := &models.PublicDashboard{}
-	if err := web.Bind(c.Req, pubdash); err != nil {
-		return response.Error(http.StatusBadRequest, "bad request data", err)
-	}
-
-	// Always set the org id to the current auth session orgId
-	pubdash.OrgId = c.OrgId
-
-	dto := dashboards.SavePublicDashboardConfigDTO{
-		OrgId:           c.OrgId,
-		DashboardUid:    web.Params(c.Req)[":uid"],
-		UserId:          c.UserId,
-		PublicDashboard: pubdash,
-	}
-
-	pubdash, err := hs.dashboardService.SavePublicDashboardConfig(c.Req.Context(), &dto)
-	if err != nil {
-		return handleDashboardErr(http.StatusInternalServerError, "Failed to save public dashboard configuration", err)
-	}
-
-	return response.JSON(http.StatusOK, pubdash)
-}
-
-// QueryPublicDashboard returns all results for a given panel on a public dashboard
-// POST /api/public/dashboard/:accessToken/panels/:panelId/query
-func (hs *HTTPServer) QueryPublicDashboard(c *models.ReqContext) response.Response {
-	panelId, err := strconv.ParseInt(web.Params(c.Req)[":panelId"], 10, 64)
-	if err != nil {
-		return response.Error(http.StatusBadRequest, "invalid panel ID", err)
-	}
-
-	dashboard, err := hs.dashboardService.GetPublicDashboard(c.Req.Context(), web.Params(c.Req)[":accessToken"])
-	if err != nil {
-		return response.Error(http.StatusInternalServerError, "could not fetch dashboard", err)
-	}
-
-	publicDashboard, err := hs.dashboardService.GetPublicDashboardConfig(c.Req.Context(), dashboard.OrgId, dashboard.Uid)
-	if err != nil {
-		return response.Error(http.StatusInternalServerError, "could not fetch public dashboard", err)
-	}
-
-	reqDTO, err := hs.dashboardService.BuildPublicDashboardMetricRequest(
-		c.Req.Context(),
-		dashboard,
-		publicDashboard,
-		panelId,
-	)
-	if err != nil {
-		return handleDashboardErr(http.StatusInternalServerError, "Failed to get queries for public dashboard", err)
-	}
-
-	// Get all needed datasource UIDs from queries
-	var uids []string
-	for _, query := range reqDTO.Queries {
-		uids = append(uids, query.Get("datasource").Get("uid").MustString())
-	}
-
-	// Create a temp user with read-only datasource permissions
-	anonymousUser := &models.SignedInUser{OrgId: dashboard.OrgId, Permissions: make(map[int64]map[string][]string)}
-	permissions := make(map[string][]string)
-	datasourceScope := fmt.Sprintf("datasources:uid:%s", strings.Join(uids, ","))
-	permissions[datasources.ActionQuery] = []string{datasourceScope}
-	permissions[datasources.ActionRead] = []string{datasourceScope}
-	anonymousUser.Permissions[dashboard.OrgId] = permissions
-
-	resp, err := hs.queryDataService.QueryDataMultipleSources(c.Req.Context(), anonymousUser, c.SkipCache, reqDTO, true)
-
-	if err != nil {
-		return hs.handleQueryMetricsError(err)
-	}
-	return hs.toJsonStreamingResponse(resp)
-}
-
-// util to help us unpack a dashboard err or use default http code and message
-func handleDashboardErr(defaultCode int, defaultMsg string, err error) response.Response {
-	var dashboardErr models.DashboardErr
-
-	if ok := errors.As(err, &dashboardErr); ok {
-		return response.Error(dashboardErr.StatusCode, dashboardErr.Error(), dashboardErr)
-	}
-
-	return response.Error(defaultCode, defaultMsg, err)
-}
diff --git a/pkg/api/dashboard_public_test.go b/pkg/api/dashboard_public_test.go
deleted file mode 100644
index 787e16f4813..00000000000
--- a/pkg/api/dashboard_public_test.go
+++ /dev/null
@@ -1,630 +0,0 @@
-package api
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/gofrs/uuid"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-
-	"github.com/grafana/grafana/pkg/api/dtos"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/localcache"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/datasources"
-	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
-	"github.com/grafana/grafana/pkg/services/datasources/service"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/query"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web/webtest"
-)
-
-func TestAPIGetPublicDashboard(t *testing.T) {
-	t.Run("It should 404 if featureflag is not enabled", func(t *testing.T) {
-		sc := setupHTTPServerWithMockDb(t, false, false, featuremgmt.WithFeatures())
-		dashSvc := dashboards.NewFakeDashboardService(t)
-		dashSvc.On("GetPublicDashboard", mock.Anything, mock.AnythingOfType("string")).
-			Return(&models.Dashboard{}, nil).Maybe()
-		sc.hs.dashboardService = dashSvc
-
-		setInitCtxSignedInViewer(sc.initCtx)
-		response := callAPI(
-			sc.server,
-			http.MethodGet,
-			"/api/public/dashboards",
-			nil,
-			t,
-		)
-		assert.Equal(t, http.StatusNotFound, response.Code)
-		response = callAPI(
-			sc.server,
-			http.MethodGet,
-			"/api/public/dashboards/asdf",
-			nil,
-			t,
-		)
-		assert.Equal(t, http.StatusNotFound, response.Code)
-	})
-
-	DashboardUid := "dashboard-abcd1234"
-	token, err := uuid.NewV4()
-	require.NoError(t, err)
-	accessToken := fmt.Sprintf("%x", token)
-
-	testCases := []struct {
-		Name                  string
-		AccessToken           string
-		ExpectedHttpResponse  int
-		publicDashboardResult *models.Dashboard
-		publicDashboardErr    error
-	}{
-		{
-			Name:                 "It gets a public dashboard",
-			AccessToken:          accessToken,
-			ExpectedHttpResponse: http.StatusOK,
-			publicDashboardResult: &models.Dashboard{
-				Data: simplejson.NewFromAny(map[string]interface{}{
-					"Uid": DashboardUid,
-				}),
-			},
-			publicDashboardErr: nil,
-		},
-		{
-			Name:                  "It should return 404 if isPublicDashboard is false",
-			AccessToken:           accessToken,
-			ExpectedHttpResponse:  http.StatusNotFound,
-			publicDashboardResult: nil,
-			publicDashboardErr:    models.ErrPublicDashboardNotFound,
-		},
-	}
-
-	for _, test := range testCases {
-		t.Run(test.Name, func(t *testing.T) {
-			sc := setupHTTPServerWithMockDb(t, false, false, featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards))
-			dashSvc := dashboards.NewFakeDashboardService(t)
-			dashSvc.On("GetPublicDashboard", mock.Anything, mock.AnythingOfType("string")).
-				Return(test.publicDashboardResult, test.publicDashboardErr)
-			sc.hs.dashboardService = dashSvc
-
-			setInitCtxSignedInViewer(sc.initCtx)
-			response := callAPI(
-				sc.server,
-				http.MethodGet,
-				fmt.Sprintf("/api/public/dashboards/%s", test.AccessToken),
-				nil,
-				t,
-			)
-
-			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
-
-			if test.publicDashboardErr == nil {
-				var dashResp dtos.DashboardFullWithMeta
-				err := json.Unmarshal(response.Body.Bytes(), &dashResp)
-				require.NoError(t, err)
-
-				assert.Equal(t, DashboardUid, dashResp.Dashboard.Get("Uid").MustString())
-				assert.Equal(t, false, dashResp.Meta.CanEdit)
-				assert.Equal(t, false, dashResp.Meta.CanDelete)
-				assert.Equal(t, false, dashResp.Meta.CanSave)
-			} else {
-				var errResp struct {
-					Error string `json:"error"`
-				}
-				err := json.Unmarshal(response.Body.Bytes(), &errResp)
-				require.NoError(t, err)
-				assert.Equal(t, test.publicDashboardErr.Error(), errResp.Error)
-			}
-		})
-	}
-}
-
-func TestAPIGetPublicDashboardConfig(t *testing.T) {
-	pubdash := &models.PublicDashboard{IsEnabled: true}
-
-	testCases := []struct {
-		Name                  string
-		DashboardUid          string
-		ExpectedHttpResponse  int
-		PublicDashboardResult *models.PublicDashboard
-		PublicDashboardError  error
-	}{
-		{
-			Name:                  "retrieves public dashboard config when dashboard is found",
-			DashboardUid:          "1",
-			ExpectedHttpResponse:  http.StatusOK,
-			PublicDashboardResult: pubdash,
-			PublicDashboardError:  nil,
-		},
-		{
-			Name:                  "returns 404 when dashboard not found",
-			DashboardUid:          "77777",
-			ExpectedHttpResponse:  http.StatusNotFound,
-			PublicDashboardResult: nil,
-			PublicDashboardError:  models.ErrDashboardNotFound,
-		},
-		{
-			Name:                  "returns 500 when internal server error",
-			DashboardUid:          "1",
-			ExpectedHttpResponse:  http.StatusInternalServerError,
-			PublicDashboardResult: nil,
-			PublicDashboardError:  errors.New("database broken"),
-		},
-	}
-
-	for _, test := range testCases {
-		t.Run(test.Name, func(t *testing.T) {
-			sc := setupHTTPServerWithMockDb(t, false, false, featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards))
-			dashSvc := dashboards.NewFakeDashboardService(t)
-			dashSvc.On("GetPublicDashboardConfig", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).
-				Return(test.PublicDashboardResult, test.PublicDashboardError)
-			sc.hs.dashboardService = dashSvc
-
-			setInitCtxSignedInViewer(sc.initCtx)
-			response := callAPI(
-				sc.server,
-				http.MethodGet,
-				"/api/dashboards/uid/1/public-config",
-				nil,
-				t,
-			)
-
-			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
-
-			if response.Code == http.StatusOK {
-				var pdcResp models.PublicDashboard
-				err := json.Unmarshal(response.Body.Bytes(), &pdcResp)
-				require.NoError(t, err)
-				assert.Equal(t, test.PublicDashboardResult, &pdcResp)
-			}
-		})
-	}
-}
-
-func TestApiSavePublicDashboardConfig(t *testing.T) {
-	testCases := []struct {
-		Name                  string
-		DashboardUid          string
-		publicDashboardConfig *models.PublicDashboard
-		ExpectedHttpResponse  int
-		saveDashboardError    error
-	}{
-		{
-			Name:                  "returns 200 when update persists",
-			DashboardUid:          "1",
-			publicDashboardConfig: &models.PublicDashboard{IsEnabled: true},
-			ExpectedHttpResponse:  http.StatusOK,
-			saveDashboardError:    nil,
-		},
-		{
-			Name:                  "returns 500 when not persisted",
-			ExpectedHttpResponse:  http.StatusInternalServerError,
-			publicDashboardConfig: &models.PublicDashboard{},
-			saveDashboardError:    errors.New("backend failed to save"),
-		},
-		{
-			Name:                  "returns 404 when dashboard not found",
-			ExpectedHttpResponse:  http.StatusNotFound,
-			publicDashboardConfig: &models.PublicDashboard{},
-			saveDashboardError:    models.ErrDashboardNotFound,
-		},
-	}
-
-	for _, test := range testCases {
-		t.Run(test.Name, func(t *testing.T) {
-			sc := setupHTTPServerWithMockDb(t, false, false, featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards))
-
-			dashSvc := dashboards.NewFakeDashboardService(t)
-			dashSvc.On("SavePublicDashboardConfig", mock.Anything, mock.AnythingOfType("*dashboards.SavePublicDashboardConfigDTO")).
-				Return(&models.PublicDashboard{IsEnabled: true}, test.saveDashboardError)
-			sc.hs.dashboardService = dashSvc
-
-			setInitCtxSignedInViewer(sc.initCtx)
-			response := callAPI(
-				sc.server,
-				http.MethodPost,
-				"/api/dashboards/uid/1/public-config",
-				strings.NewReader(`{ "isPublic": true }`),
-				t,
-			)
-
-			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
-
-			// check the result if it's a 200
-			if response.Code == http.StatusOK {
-				val, err := json.Marshal(test.publicDashboardConfig)
-				require.NoError(t, err)
-				assert.Equal(t, string(val), response.Body.String())
-			}
-		})
-	}
-}
-
-// `/public/dashboards/:uid/query`` endpoint test
-func TestAPIQueryPublicDashboard(t *testing.T) {
-	queryReturnsError := false
-
-	qds := query.ProvideService(
-		nil,
-		&fakeDatasources.FakeCacheService{
-			DataSources: []*datasources.DataSource{
-				{Uid: "mysqlds"},
-				{Uid: "promds"},
-				{Uid: "promds2"},
-			},
-		},
-		nil,
-		&fakePluginRequestValidator{},
-		&fakeDatasources.FakeDataSourceService{},
-		&fakePluginClient{
-			QueryDataHandlerFunc: func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-				if queryReturnsError {
-					return nil, errors.New("error")
-				}
-
-				resp := backend.Responses{}
-
-				for _, query := range req.Queries {
-					resp[query.RefID] = backend.DataResponse{
-						Frames: []*data.Frame{
-							{
-								RefID: query.RefID,
-								Name:  "query-" + query.RefID,
-							},
-						},
-					}
-				}
-				return &backend.QueryDataResponse{Responses: resp}, nil
-			},
-		},
-		&fakeOAuthTokenService{},
-	)
-
-	setup := func(enabled bool) (*webtest.Server, *dashboards.FakeDashboardService) {
-		fakeDashboardService := &dashboards.FakeDashboardService{}
-
-		return SetupAPITestServer(t, func(hs *HTTPServer) {
-			hs.queryDataService = qds
-			hs.Features = featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards, enabled)
-			hs.dashboardService = fakeDashboardService
-		}), fakeDashboardService
-	}
-
-	t.Run("Status code is 404 when feature toggle is disabled", func(t *testing.T) {
-		server, _ := setup(false)
-
-		req := server.NewPostRequest(
-			"/api/public/dashboards/abc123/panels/2/query",
-			strings.NewReader("{}"),
-		)
-		resp, err := server.SendJSON(req)
-		require.NoError(t, err)
-		require.NoError(t, resp.Body.Close())
-		require.Equal(t, http.StatusNotFound, resp.StatusCode)
-	})
-
-	t.Run("Status code is 400 when the panel ID is invalid", func(t *testing.T) {
-		server, _ := setup(true)
-
-		req := server.NewPostRequest(
-			"/api/public/dashboards/abc123/panels/notanumber/query",
-			strings.NewReader("{}"),
-		)
-		resp, err := server.SendJSON(req)
-		require.NoError(t, err)
-		require.NoError(t, resp.Body.Close())
-		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
-	})
-
-	t.Run("Returns query data when feature toggle is enabled", func(t *testing.T) {
-		server, fakeDashboardService := setup(true)
-
-		fakeDashboardService.On("GetPublicDashboard", mock.Anything, mock.Anything).Return(&models.Dashboard{}, nil)
-		fakeDashboardService.On("GetPublicDashboardConfig", mock.Anything, mock.Anything, mock.Anything).Return(&models.PublicDashboard{}, nil)
-
-		fakeDashboardService.On(
-			"BuildPublicDashboardMetricRequest",
-			mock.Anything,
-			mock.Anything,
-			mock.Anything,
-			int64(2),
-		).Return(dtos.MetricRequest{
-			Queries: []*simplejson.Json{
-				simplejson.MustJson([]byte(`
-					{
-					  "datasource": {
-						"type": "prometheus",
-						"uid": "promds"
-					  },
-					  "exemplar": true,
-					  "expr": "query_2_A",
-					  "interval": "",
-					  "legendFormat": "",
-					  "refId": "A"
-					}
-				`)),
-			},
-		}, nil)
-		req := server.NewPostRequest(
-			"/api/public/dashboards/abc123/panels/2/query",
-			strings.NewReader("{}"),
-		)
-		resp, err := server.SendJSON(req)
-		require.NoError(t, err)
-		bodyBytes, err := ioutil.ReadAll(resp.Body)
-		require.NoError(t, err)
-		require.JSONEq(
-			t,
-			`{
-				"results": {
-					"A": {
-						"frames": [
-							{
-								"data": {
-									"values": []
-								},
-								"schema": {
-									"fields": [],
-									"refId": "A",
-									"name": "query-A"
-								}
-							}
-						]
-					}
-				}
-			}`,
-			string(bodyBytes),
-		)
-		require.NoError(t, resp.Body.Close())
-		require.Equal(t, http.StatusOK, resp.StatusCode)
-	})
-
-	t.Run("Status code is 500 when the query fails", func(t *testing.T) {
-		server, fakeDashboardService := setup(true)
-
-		fakeDashboardService.On("GetPublicDashboard", mock.Anything, mock.Anything).Return(&models.Dashboard{}, nil)
-		fakeDashboardService.On("GetPublicDashboardConfig", mock.Anything, mock.Anything, mock.Anything).Return(&models.PublicDashboard{}, nil)
-		fakeDashboardService.On(
-			"BuildPublicDashboardMetricRequest",
-			mock.Anything,
-			mock.Anything,
-			mock.Anything,
-			int64(2),
-		).Return(dtos.MetricRequest{
-			Queries: []*simplejson.Json{
-				simplejson.MustJson([]byte(`
-					{
-					  "datasource": {
-						"type": "prometheus",
-						"uid": "promds"
-					  },
-					  "exemplar": true,
-					  "expr": "query_2_A",
-					  "interval": "",
-					  "legendFormat": "",
-					  "refId": "A"
-					}
-				`)),
-			},
-		}, nil)
-		req := server.NewPostRequest(
-			"/api/public/dashboards/abc123/panels/2/query",
-			strings.NewReader("{}"),
-		)
-		queryReturnsError = true
-		resp, err := server.SendJSON(req)
-		require.NoError(t, err)
-		require.NoError(t, resp.Body.Close())
-		require.Equal(t, http.StatusInternalServerError, resp.StatusCode)
-		queryReturnsError = false
-	})
-
-	t.Run("Status code is 200 when a panel has queries from multiple datasources", func(t *testing.T) {
-		server, fakeDashboardService := setup(true)
-
-		fakeDashboardService.On("GetPublicDashboard", mock.Anything, mock.Anything).Return(&models.Dashboard{}, nil)
-		fakeDashboardService.On("GetPublicDashboardConfig", mock.Anything, mock.Anything, mock.Anything).Return(&models.PublicDashboard{}, nil)
-		fakeDashboardService.On(
-			"BuildPublicDashboardMetricRequest",
-			mock.Anything,
-			mock.Anything,
-			mock.Anything,
-			int64(2),
-		).Return(dtos.MetricRequest{
-			Queries: []*simplejson.Json{
-				simplejson.MustJson([]byte(`
-					{
-					  "datasource": {
-						"type": "prometheus",
-						"uid": "promds"
-					  },
-					  "exemplar": true,
-					  "expr": "query_2_A",
-					  "interval": "",
-					  "legendFormat": "",
-					  "refId": "A"
-					}
-				`)),
-				simplejson.MustJson([]byte(`
-					{
-					  "datasource": {
-						"type": "prometheus",
-						"uid": "promds2"
-					  },
-					  "exemplar": true,
-					  "expr": "query_2_B",
-					  "interval": "",
-					  "legendFormat": "",
-					  "refId": "B"
-					}
-				`)),
-			},
-		}, nil)
-		req := server.NewPostRequest(
-			"/api/public/dashboards/abc123/panels/2/query",
-			strings.NewReader("{}"),
-		)
-		resp, err := server.SendJSON(req)
-		require.NoError(t, err)
-		bodyBytes, err := ioutil.ReadAll(resp.Body)
-		require.NoError(t, err)
-		require.JSONEq(
-			t,
-			`{
-				"results": {
-					"A": {
-						"frames": [
-							{
-								"data": {
-									"values": []
-								},
-								"schema": {
-									"fields": [],
-									"refId": "A",
-									"name": "query-A"
-								}
-							}
-						]
-					},
-					"B": {
-						"frames": [
-							{
-								"data": {
-									"values": []
-								},
-								"schema": {
-									"fields": [],
-									"refId": "B",
-									"name": "query-B"
-								}
-							}
-						]
-					}
-				}
-			}`,
-			string(bodyBytes),
-		)
-		require.NoError(t, resp.Body.Close())
-		require.Equal(t, http.StatusOK, resp.StatusCode)
-	})
-}
-
-func TestIntegrationUnauthenticatedUserCanGetPubdashPanelQueryData(t *testing.T) {
-	config := setting.NewCfg()
-	db := sqlstore.InitTestDB(t)
-	scenario := setupHTTPServerWithCfgDb(t, false, false, config, db, db, featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards))
-	scenario.initCtx.SkipCache = true
-	cacheService := service.ProvideCacheService(localcache.ProvideService(), db)
-	qds := query.ProvideService(
-		nil,
-		cacheService,
-		nil,
-		&fakePluginRequestValidator{},
-		&fakeDatasources.FakeDataSourceService{},
-		&fakePluginClient{
-			QueryDataHandlerFunc: func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
-				resp := backend.Responses{
-					"A": backend.DataResponse{
-						Frames: []*data.Frame{{}},
-					},
-				}
-				return &backend.QueryDataResponse{Responses: resp}, nil
-			},
-		},
-		&fakeOAuthTokenService{},
-	)
-	scenario.hs.queryDataService = qds
-
-	_ = db.AddDataSource(context.Background(), &datasources.AddDataSourceCommand{
-		Uid:      "ds1",
-		OrgId:    1,
-		Name:     "laban",
-		Type:     datasources.DS_MYSQL,
-		Access:   datasources.DS_ACCESS_DIRECT,
-		Url:      "http://test",
-		Database: "site",
-		ReadOnly: true,
-	})
-
-	// Create Dashboard
-	saveDashboardCmd := models.SaveDashboardCommand{
-		OrgId:    1,
-		FolderId: 1,
-		IsFolder: false,
-		Dashboard: simplejson.NewFromAny(map[string]interface{}{
-			"id":    nil,
-			"title": "test",
-			"panels": []map[string]interface{}{
-				{
-					"id": 1,
-					"targets": []map[string]interface{}{
-						{
-							"datasource": map[string]string{
-								"type": "mysql",
-								"uid":  "ds1",
-							},
-							"refId": "A",
-						},
-					},
-				},
-			},
-		}),
-	}
-	dashboard, _ := scenario.dashboardsStore.SaveDashboard(saveDashboardCmd)
-
-	// Create public dashboard
-	savePubDashboardCmd := &dashboards.SavePublicDashboardConfigDTO{
-		DashboardUid: dashboard.Uid,
-		OrgId:        dashboard.OrgId,
-		PublicDashboard: &models.PublicDashboard{
-			IsEnabled: true,
-		},
-	}
-
-	pubdash, err := scenario.hs.dashboardService.SavePublicDashboardConfig(context.Background(), savePubDashboardCmd)
-	require.NoError(t, err)
-
-	response := callAPI(
-		scenario.server,
-		http.MethodPost,
-		fmt.Sprintf("/api/public/dashboards/%s/panels/1/query", pubdash.AccessToken),
-		strings.NewReader(`{}`),
-		t,
-	)
-
-	require.Equal(t, http.StatusOK, response.Code)
-	bodyBytes, err := ioutil.ReadAll(response.Body)
-	require.NoError(t, err)
-	require.JSONEq(
-		t,
-		`{
-				"results": {
-					"A": {
-						"frames": [
-							{
-								"data": {
-									"values": []
-								},
-								"schema": {
-									"fields": []
-								}
-							}
-						]
-					}
-				}
-			}`,
-		string(bodyBytes),
-	)
-}
diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index 79ae82d3930..2c2ae051586 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -13,6 +13,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/metrics"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/setting"
@@ -267,24 +268,28 @@ func (hs *HTTPServer) DeleteDashboardSnapshot(c *models.ReqContext) response.Res
 		return response.Error(404, "Failed to get dashboard snapshot", nil)
 	}
 
-	dashboardID := query.Result.Dashboard.Get("id").MustInt64()
-
-	guardian := guardian.New(c.Req.Context(), dashboardID, c.OrgId, c.SignedInUser)
-	canEdit, err := guardian.CanEdit()
-	// check for permissions only if the dahboard is found
-	if err != nil && !errors.Is(err, models.ErrDashboardNotFound) {
-		return response.Error(500, "Error while checking permissions for snapshot", err)
-	}
-
-	if !canEdit && query.Result.UserId != c.SignedInUser.UserId && !errors.Is(err, models.ErrDashboardNotFound) {
-		return response.Error(403, "Access denied to this snapshot", nil)
-	}
-
 	if query.Result.External {
 		err := deleteExternalDashboardSnapshot(query.Result.ExternalDeleteUrl)
 		if err != nil {
 			return response.Error(500, "Failed to delete external dashboard", err)
 		}
+	} else {
+		// When creating an external snapshot, its dashboard content is empty. This means that the mustInt here returns a 0,
+		// which before RBAC would result in a dashboard which has no ACL. A dashboard without an ACL would fallback
+		// to the user’s org role, which for editors and admins would essentially always be allowed here. With RBAC,
+		// all permissions must be explicit, so the lack of a rule for dashboard 0 means the guardian will reject.
+		dashboardID := query.Result.Dashboard.Get("id").MustInt64()
+
+		guardian := guardian.New(c.Req.Context(), dashboardID, c.OrgId, c.SignedInUser)
+		canEdit, err := guardian.CanEdit()
+		// check for permissions only if the dahboard is found
+		if err != nil && !errors.Is(err, dashboards.ErrDashboardNotFound) {
+			return response.Error(500, "Error while checking permissions for snapshot", err)
+		}
+
+		if !canEdit && query.Result.UserId != c.SignedInUser.UserId && !errors.Is(err, dashboards.ErrDashboardNotFound) {
+			return response.Error(403, "Access denied to this snapshot", nil)
+		}
 	}
 
 	cmd := &dashboardsnapshots.DeleteDashboardSnapshotCommand{DeleteKey: query.Result.DeleteKey}
diff --git a/pkg/api/dashboard_snapshot_test.go b/pkg/api/dashboard_snapshot_test.go
index 5c09202cb09..43251646977 100644
--- a/pkg/api/dashboard_snapshot_test.go
+++ b/pkg/api/dashboard_snapshot_test.go
@@ -65,11 +65,7 @@ func TestDashboardSnapshotAPIEndpoint_singleSnapshot(t *testing.T) {
 	t.Run("When user has editor role and is not in the ACL", func(t *testing.T) {
 		loggedInUserScenarioWithRole(t, "Should not be able to delete snapshot when calling DELETE on",
 			"DELETE", "/api/snapshots/12345", "/api/snapshots/:key", models.ROLE_EDITOR, func(sc *scenarioContext) {
-				var externalRequest *http.Request
-				ts := setupRemoteServer(func(rw http.ResponseWriter, req *http.Request) {
-					externalRequest = req
-				})
-				hs := &HTTPServer{dashboardsnapshotsService: setUpSnapshotTest(t, 0, ts.URL)}
+				hs := &HTTPServer{dashboardsnapshotsService: setUpSnapshotTest(t, 0, "")}
 				sc.handlerFunc = hs.DeleteDashboardSnapshot
 
 				dashSvc := dashboards.NewFakeDashboardService(t)
@@ -79,7 +75,6 @@ func TestDashboardSnapshotAPIEndpoint_singleSnapshot(t *testing.T) {
 				sc.fakeReqWithParams("DELETE", sc.url, map[string]string{"key": "12345"}).exec()
 
 				assert.Equal(t, 403, sc.resp.Code)
-				require.Nil(t, externalRequest)
 			}, sqlmock)
 	})
 
diff --git a/pkg/api/dashboard_test.go b/pkg/api/dashboard_test.go
index d79fdbfab6f..d43a7383faf 100644
--- a/pkg/api/dashboard_test.go
+++ b/pkg/api/dashboard_test.go
@@ -9,7 +9,6 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/framework/coremodel/registry"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -18,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/framework/coremodel/registry"
 	"github.com/grafana/grafana/pkg/infra/usagestats"
 	"github.com/grafana/grafana/pkg/models"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
@@ -139,7 +139,7 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 			SQLStore:                mockSQLStore,
 			AccessControl:           accesscontrolmock.New(),
 			Features:                featuremgmt.WithFeatures(),
-			dashboardService:        dashboardService,
+			DashboardService:        dashboardService,
 			dashboardVersionService: fakeDashboardVersionService,
 		}
 		hs.CoremodelStaticRegistry, hs.CoremodelRegistry = setupDashboardCoremodel(t)
@@ -259,7 +259,7 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 			LibraryElementService:   &mockLibraryElementService{},
 			SQLStore:                mockSQLStore,
 			AccessControl:           accesscontrolmock.New(),
-			dashboardService:        dashboardService,
+			DashboardService:        dashboardService,
 			dashboardVersionService: fakeDashboardVersionService,
 		}
 		hs.CoremodelStaticRegistry, hs.CoremodelRegistry = setupDashboardCoremodel(t)
@@ -679,24 +679,24 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 				SaveError          error
 				ExpectedStatusCode int
 			}{
-				{SaveError: models.ErrDashboardNotFound, ExpectedStatusCode: 404},
-				{SaveError: models.ErrFolderNotFound, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardWithSameUIDExists, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardWithSameNameInFolderExists, ExpectedStatusCode: 412},
-				{SaveError: models.ErrDashboardVersionMismatch, ExpectedStatusCode: 412},
-				{SaveError: models.ErrDashboardTitleEmpty, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardFolderCannotHaveParent, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardNotFound, ExpectedStatusCode: 404},
+				{SaveError: dashboards.ErrFolderNotFound, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardWithSameUIDExists, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardWithSameNameInFolderExists, ExpectedStatusCode: 412},
+				{SaveError: dashboards.ErrDashboardVersionMismatch, ExpectedStatusCode: 412},
+				{SaveError: dashboards.ErrDashboardTitleEmpty, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardFolderCannotHaveParent, ExpectedStatusCode: 400},
 				{SaveError: alerting.ValidationError{Reason: "Mu"}, ExpectedStatusCode: 422},
-				{SaveError: models.ErrDashboardFailedGenerateUniqueUid, ExpectedStatusCode: 500},
-				{SaveError: models.ErrDashboardTypeMismatch, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardFolderWithSameNameAsDashboard, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardWithSameNameAsFolder, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardFolderNameExists, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardUpdateAccessDenied, ExpectedStatusCode: 403},
-				{SaveError: models.ErrDashboardInvalidUid, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardUidTooLong, ExpectedStatusCode: 400},
-				{SaveError: models.ErrDashboardCannotSaveProvisionedDashboard, ExpectedStatusCode: 400},
-				{SaveError: models.UpdatePluginDashboardError{PluginId: "plug"}, ExpectedStatusCode: 412},
+				{SaveError: dashboards.ErrDashboardFailedGenerateUniqueUid, ExpectedStatusCode: 500},
+				{SaveError: dashboards.ErrDashboardTypeMismatch, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardFolderWithSameNameAsDashboard, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardWithSameNameAsFolder, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardFolderNameExists, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardUpdateAccessDenied, ExpectedStatusCode: 403},
+				{SaveError: dashboards.ErrDashboardInvalidUid, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardUidTooLong, ExpectedStatusCode: 400},
+				{SaveError: dashboards.ErrDashboardCannotSaveProvisionedDashboard, ExpectedStatusCode: 400},
+				{SaveError: dashboards.UpdatePluginDashboardError{PluginId: "plug"}, ExpectedStatusCode: 412},
 			}
 
 			cmd := models.SaveDashboardCommand{
@@ -900,7 +900,7 @@ func TestDashboardAPIEndpoint(t *testing.T) {
 				dashboardProvisioningService: mockDashboardProvisioningService{},
 				SQLStore:                     mockSQLStore,
 				AccessControl:                accesscontrolmock.New(),
-				dashboardService:             dashboardService,
+				DashboardService:             dashboardService,
 			}
 			hs.CoremodelStaticRegistry, hs.CoremodelRegistry = setupDashboardCoremodel(t)
 			hs.callGetDashboard(sc)
@@ -954,7 +954,7 @@ func getDashboardShouldReturn200WithConfig(t *testing.T, sc *scenarioContext, pr
 			cfg, dashboardStore, nil, features,
 			folderPermissions, dashboardPermissions, ac,
 		),
-		dashboardService: dashboardService,
+		DashboardService: dashboardService,
 	}
 	hs.CoremodelStaticRegistry, hs.CoremodelRegistry = setupDashboardCoremodel(t)
 
@@ -986,7 +986,7 @@ func (hs *HTTPServer) callGetDashboardVersions(sc *scenarioContext) {
 
 func (hs *HTTPServer) callDeleteDashboardByUID(t *testing.T,
 	sc *scenarioContext, mockDashboard *dashboards.FakeDashboardService) {
-	hs.dashboardService = mockDashboard
+	hs.DashboardService = mockDashboard
 	sc.handlerFunc = hs.DeleteDashboardByUID
 	sc.fakeReqWithParams("DELETE", sc.url, map[string]string{}).exec()
 }
@@ -1018,7 +1018,7 @@ func postDashboardScenario(t *testing.T, desc string, url string, routePattern s
 			pluginStore:           &fakePluginStore{},
 			LibraryPanelService:   &mockLibraryPanelService{},
 			LibraryElementService: &mockLibraryElementService{},
-			dashboardService:      dashboardService,
+			DashboardService:      dashboardService,
 			folderService:         folderService,
 			Features:              featuremgmt.WithFeatures(),
 		}
@@ -1088,7 +1088,7 @@ func restoreDashboardVersionScenario(t *testing.T, desc string, url string, rout
 			QuotaService:            &quota.QuotaService{Cfg: cfg},
 			LibraryPanelService:     &mockLibraryPanelService{},
 			LibraryElementService:   &mockLibraryElementService{},
-			dashboardService:        mock,
+			DashboardService:        mock,
 			SQLStore:                sqlStore,
 			Features:                featuremgmt.WithFeatures(),
 			dashboardVersionService: fakeDashboardVersionService,
diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go
index c0fe84cb2dc..343b5f6c1b2 100644
--- a/pkg/api/dtos/models.go
+++ b/pkg/api/dtos/models.go
@@ -70,6 +70,8 @@ type MetricRequest struct {
 	// required: false
 	Debug bool `json:"debug"`
 
+	PublicDashboardAccessToken string `json:"publicDashboardAccessToken"`
+
 	HTTPRequest *http.Request `json:"-"`
 }
 
diff --git a/pkg/api/fakes.go b/pkg/api/fakes.go
index 23b5a89c52d..6b1eda6f2ff 100644
--- a/pkg/api/fakes.go
+++ b/pkg/api/fakes.go
@@ -6,6 +6,28 @@ import (
 	"github.com/grafana/grafana/pkg/plugins"
 )
 
+type fakePluginManager struct {
+	plugins map[string]fakePlugin
+}
+
+type fakePlugin struct {
+	pluginID string
+	version  string
+}
+
+func (pm *fakePluginManager) Add(_ context.Context, pluginID, version string) error {
+	pm.plugins[pluginID] = fakePlugin{
+		pluginID: pluginID,
+		version:  version,
+	}
+	return nil
+}
+
+func (pm *fakePluginManager) Remove(_ context.Context, pluginID string) error {
+	delete(pm.plugins, pluginID)
+	return nil
+}
+
 type fakePluginStore struct {
 	plugins.Store
 
diff --git a/pkg/api/folder_permission.go b/pkg/api/folder_permission.go
index edaff924528..892e9e043aa 100644
--- a/pkg/api/folder_permission.go
+++ b/pkg/api/folder_permission.go
@@ -9,6 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
@@ -24,7 +25,7 @@ func (hs *HTTPServer) GetFolderPermissionList(c *models.ReqContext) response.Res
 	g := guardian.New(c.Req.Context(), folder.Id, c.OrgId, c.SignedInUser)
 
 	if canAdmin, err := g.CanAdmin(); err != nil || !canAdmin {
-		return apierrors.ToFolderErrorResponse(models.ErrFolderAccessDenied)
+		return apierrors.ToFolderErrorResponse(dashboards.ErrFolderAccessDenied)
 	}
 
 	acl, err := g.GetAcl()
@@ -78,7 +79,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *models.ReqContext) response.Res
 	}
 
 	if !canAdmin {
-		return apierrors.ToFolderErrorResponse(models.ErrFolderAccessDenied)
+		return apierrors.ToFolderErrorResponse(dashboards.ErrFolderAccessDenied)
 	}
 
 	var items []*models.DashboardAcl
@@ -125,7 +126,7 @@ func (hs *HTTPServer) UpdateFolderPermissions(c *models.ReqContext) response.Res
 		return response.Success("Dashboard permissions updated")
 	}
 
-	if err := hs.dashboardService.UpdateDashboardACL(c.Req.Context(), folder.Id, items); err != nil {
+	if err := hs.DashboardService.UpdateDashboardACL(c.Req.Context(), folder.Id, items); err != nil {
 		if errors.Is(err, models.ErrDashboardAclInfoMissing) {
 			err = models.ErrFolderAclInfoMissing
 		}
diff --git a/pkg/api/folder_permission_test.go b/pkg/api/folder_permission_test.go
index 6ed7c2305ac..093522d2d9e 100644
--- a/pkg/api/folder_permission_test.go
+++ b/pkg/api/folder_permission_test.go
@@ -42,14 +42,14 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
 		folderService:               folderService,
 		folderPermissionsService:    folderPermissions,
 		dashboardPermissionsService: dashboardPermissions,
-		dashboardService: service.ProvideDashboardService(
+		DashboardService: service.ProvideDashboardService(
 			settings, dashboardStore, nil, features, folderPermissions, dashboardPermissions, ac,
 		),
 		AccessControl: accesscontrolmock.New().WithDisabled(),
 	}
 
 	t.Run("Given folder not exists", func(t *testing.T) {
-		folderService.On("GetFolderByUID", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, models.ErrFolderNotFound).Twice()
+		folderService.On("GetFolderByUID", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, dashboards.ErrFolderNotFound).Twice()
 		mockSQLStore := mockstore.NewSQLStoreMock()
 		loggedInUserScenarioWithRole(t, "When calling GET on", "GET", "/api/folders/uid/permissions", "/api/folders/:uid/permissions", models.ROLE_EDITOR, func(sc *scenarioContext) {
 			callGetFolderPermissions(sc, hs)
@@ -81,7 +81,7 @@ func TestFolderPermissionAPIEndpoint(t *testing.T) {
 		})
 
 		guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanAdminValue: false})
-		folderService.On("GetFolderByUID", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, models.ErrFolderAccessDenied).Twice()
+		folderService.On("GetFolderByUID", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil, dashboards.ErrFolderAccessDenied).Twice()
 		mockSQLStore := mockstore.NewSQLStoreMock()
 
 		loggedInUserScenarioWithRole(t, "When calling GET on", "GET", "/api/folders/uid/permissions", "/api/folders/:uid/permissions", models.ROLE_EDITOR, func(sc *scenarioContext) {
diff --git a/pkg/api/folder_test.go b/pkg/api/folder_test.go
index 24a448e451d..e321cd0e7ca 100644
--- a/pkg/api/folder_test.go
+++ b/pkg/api/folder_test.go
@@ -7,6 +7,10 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/api/routing"
@@ -19,9 +23,6 @@ import (
 	"github.com/grafana/grafana/pkg/services/sqlstore/mockstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web/webtest"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
 func TestFoldersAPIEndpoint(t *testing.T) {
@@ -55,15 +56,15 @@ func TestFoldersAPIEndpoint(t *testing.T) {
 			Error              error
 			ExpectedStatusCode int
 		}{
-			{Error: models.ErrFolderWithSameUIDExists, ExpectedStatusCode: 409},
-			{Error: models.ErrFolderTitleEmpty, ExpectedStatusCode: 400},
-			{Error: models.ErrFolderSameNameExists, ExpectedStatusCode: 409},
-			{Error: models.ErrDashboardInvalidUid, ExpectedStatusCode: 400},
-			{Error: models.ErrDashboardUidTooLong, ExpectedStatusCode: 400},
-			{Error: models.ErrFolderAccessDenied, ExpectedStatusCode: 403},
-			{Error: models.ErrFolderNotFound, ExpectedStatusCode: 404},
-			{Error: models.ErrFolderVersionMismatch, ExpectedStatusCode: 412},
-			{Error: models.ErrFolderFailedGenerateUniqueUid, ExpectedStatusCode: 500},
+			{Error: dashboards.ErrFolderWithSameUIDExists, ExpectedStatusCode: 409},
+			{Error: dashboards.ErrFolderTitleEmpty, ExpectedStatusCode: 400},
+			{Error: dashboards.ErrFolderSameNameExists, ExpectedStatusCode: 409},
+			{Error: dashboards.ErrDashboardInvalidUid, ExpectedStatusCode: 400},
+			{Error: dashboards.ErrDashboardUidTooLong, ExpectedStatusCode: 400},
+			{Error: dashboards.ErrFolderAccessDenied, ExpectedStatusCode: 403},
+			{Error: dashboards.ErrFolderNotFound, ExpectedStatusCode: 404},
+			{Error: dashboards.ErrFolderVersionMismatch, ExpectedStatusCode: 412},
+			{Error: dashboards.ErrFolderFailedGenerateUniqueUid, ExpectedStatusCode: 500},
 		}
 
 		cmd := models.CreateFolderCommand{
@@ -110,15 +111,15 @@ func TestFoldersAPIEndpoint(t *testing.T) {
 			Error              error
 			ExpectedStatusCode int
 		}{
-			{Error: models.ErrFolderWithSameUIDExists, ExpectedStatusCode: 409},
-			{Error: models.ErrFolderTitleEmpty, ExpectedStatusCode: 400},
-			{Error: models.ErrFolderSameNameExists, ExpectedStatusCode: 409},
-			{Error: models.ErrDashboardInvalidUid, ExpectedStatusCode: 400},
-			{Error: models.ErrDashboardUidTooLong, ExpectedStatusCode: 400},
-			{Error: models.ErrFolderAccessDenied, ExpectedStatusCode: 403},
-			{Error: models.ErrFolderNotFound, ExpectedStatusCode: 404},
-			{Error: models.ErrFolderVersionMismatch, ExpectedStatusCode: 412},
-			{Error: models.ErrFolderFailedGenerateUniqueUid, ExpectedStatusCode: 500},
+			{Error: dashboards.ErrFolderWithSameUIDExists, ExpectedStatusCode: 409},
+			{Error: dashboards.ErrFolderTitleEmpty, ExpectedStatusCode: 400},
+			{Error: dashboards.ErrFolderSameNameExists, ExpectedStatusCode: 409},
+			{Error: dashboards.ErrDashboardInvalidUid, ExpectedStatusCode: 400},
+			{Error: dashboards.ErrDashboardUidTooLong, ExpectedStatusCode: 400},
+			{Error: dashboards.ErrFolderAccessDenied, ExpectedStatusCode: 403},
+			{Error: dashboards.ErrFolderNotFound, ExpectedStatusCode: 404},
+			{Error: dashboards.ErrFolderVersionMismatch, ExpectedStatusCode: 412},
+			{Error: dashboards.ErrFolderFailedGenerateUniqueUid, ExpectedStatusCode: 500},
 		}
 
 		cmd := models.UpdateFolderCommand{
diff --git a/pkg/api/http_server.go b/pkg/api/http_server.go
index 5b285599d2e..ac80801de41 100644
--- a/pkg/api/http_server.go
+++ b/pkg/api/http_server.go
@@ -62,6 +62,8 @@ import (
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsettings/service"
 	pref "github.com/grafana/grafana/pkg/services/preference"
 	"github.com/grafana/grafana/pkg/services/provisioning"
+
+	publicdashboardsApi "github.com/grafana/grafana/pkg/services/publicdashboards/api"
 	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/services/queryhistory"
 	"github.com/grafana/grafana/pkg/services/quota"
@@ -148,7 +150,7 @@ type HTTPServer struct {
 	authenticator                loginpkg.Authenticator
 	teamPermissionsService       accesscontrol.TeamPermissionsService
 	NotificationService          *notifications.NotificationService
-	dashboardService             dashboards.DashboardService
+	DashboardService             dashboards.DashboardService
 	dashboardProvisioningService dashboards.DashboardProvisioningService
 	folderService                dashboards.FolderService
 	DatasourcePermissionsService permissions.DatasourcePermissionsService
@@ -163,10 +165,12 @@ type HTTPServer struct {
 	folderPermissionsService     accesscontrol.FolderPermissionsService
 	dashboardPermissionsService  accesscontrol.DashboardPermissionsService
 	dashboardVersionService      dashver.Service
+	PublicDashboardsApi          *publicdashboardsApi.Api
 	starService                  star.Service
 	CoremodelRegistry            *registry.Generic
 	CoremodelStaticRegistry      *registry.Static
 	kvStore                      kvstore.KVStore
+	secretsMigrator              secrets.Migrator
 }
 
 type ServerOptions struct {
@@ -201,7 +205,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 	teamsPermissionsService accesscontrol.TeamPermissionsService, folderPermissionsService accesscontrol.FolderPermissionsService,
 	dashboardPermissionsService accesscontrol.DashboardPermissionsService, dashboardVersionService dashver.Service,
 	starService star.Service, csrfService csrf.Service, coremodelRegistry *registry.Generic, coremodelStaticRegistry *registry.Static,
-	kvStore kvstore.KVStore, remoteSecretsCheck secretsKV.UseRemoteSecretsPluginCheck,
+	kvStore kvstore.KVStore, secretsMigrator secrets.Migrator, remoteSecretsCheck secretsKV.UseRemoteSecretsPluginCheck, publicDashboardsApi *publicdashboardsApi.Api,
 ) (*HTTPServer, error) {
 	web.Env = cfg.Env
 	m := web.New()
@@ -266,7 +270,7 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		authInfoService:              authInfoService,
 		authenticator:                authenticator,
 		NotificationService:          notificationService,
-		dashboardService:             dashboardService,
+		DashboardService:             dashboardService,
 		dashboardProvisioningService: dashboardProvisioningService,
 		folderService:                folderService,
 		DatasourcePermissionsService: datasourcePermissionsService,
@@ -286,6 +290,8 @@ func ProvideHTTPServer(opts ServerOptions, cfg *setting.Cfg, routeRegister routi
 		CoremodelRegistry:            coremodelRegistry,
 		CoremodelStaticRegistry:      coremodelStaticRegistry,
 		kvStore:                      kvStore,
+		PublicDashboardsApi:          publicDashboardsApi,
+		secretsMigrator:              secretsMigrator,
 	}
 	if hs.Listener != nil {
 		hs.log.Debug("Using provided listener")
diff --git a/pkg/api/index.go b/pkg/api/index.go
index aaca41afe05..00c375931c6 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -294,6 +294,7 @@ func (hs *HTTPServer) getNavTree(c *models.ReqContext, hasEditPerm bool, prefs *
 			Url:         hs.Cfg.AppSubURL + "/org/apikeys",
 		})
 	}
+
 	if enableServiceAccount(hs, c) {
 		configNodes = append(configNodes, &dtos.NavLink{
 			Text:        "Service accounts",
@@ -406,7 +407,7 @@ func (hs *HTTPServer) buildStarredItemsNavLinks(c *models.ReqContext, prefs *pre
 			Id:    dashboardId,
 			OrgId: c.OrgId,
 		}
-		err := hs.dashboardService.GetDashboard(c.Req.Context(), query)
+		err := hs.DashboardService.GetDashboard(c.Req.Context(), query)
 		if err == nil {
 			starredDashboards = append(starredDashboards, query.Result)
 		}
@@ -458,6 +459,15 @@ func (hs *HTTPServer) buildDashboardNavLinks(c *models.ReqContext, hasEditPerm b
 		})
 	}
 
+	if hs.Features.IsEnabled(featuremgmt.FlagScenes) {
+		dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{
+			Text: "Scenes",
+			Id:   "scenes",
+			Url:  hs.Cfg.AppSubURL + "/scenes",
+			Icon: "apps",
+		})
+	}
+
 	if hasEditPerm {
 		dashboardChildNavs = append(dashboardChildNavs, &dtos.NavLink{
 			Text: "Divider", Divider: true, Id: "divider", HideFromTabs: true,
@@ -646,6 +656,16 @@ func (hs *HTTPServer) buildAdminNavLinks(c *models.ReqContext) []*dtos.NavLink {
 		})
 	}
 
+	if hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionSettingsRead)) && hs.Features.IsEnabled(featuremgmt.FlagStorage) {
+		adminNavLinks = append(adminNavLinks, &dtos.NavLink{
+			Text:        "Storage",
+			Id:          "storage",
+			Description: "Manage file storage",
+			Icon:        "cube",
+			Url:         hs.Cfg.AppSubURL + "/admin/storage",
+		})
+	}
+
 	if hs.Cfg.LDAPEnabled && hasAccess(ac.ReqGrafanaAdmin, ac.EvalPermission(ac.ActionLDAPStatusRead)) {
 		adminNavLinks = append(adminNavLinks, &dtos.NavLink{
 			Text: "LDAP", Id: "ldap", Url: hs.Cfg.AppSubURL + "/admin/ldap", Icon: "book",
@@ -663,7 +683,7 @@ func (hs *HTTPServer) buildAdminNavLinks(c *models.ReqContext) []*dtos.NavLink {
 
 func (hs *HTTPServer) editorInAnyFolder(c *models.ReqContext) bool {
 	hasEditPermissionInFoldersQuery := models.HasEditPermissionInFoldersQuery{SignedInUser: c.SignedInUser}
-	if err := hs.dashboardService.HasEditPermissionInFolders(c.Req.Context(), &hasEditPermissionInFoldersQuery); err != nil {
+	if err := hs.DashboardService.HasEditPermissionInFolders(c.Req.Context(), &hasEditPermissionInFoldersQuery); err != nil {
 		return false
 	}
 	return hasEditPermissionInFoldersQuery.Result
diff --git a/pkg/api/org.go b/pkg/api/org.go
index 2512938837b..d5b5c308059 100644
--- a/pkg/api/org.go
+++ b/pkg/api/org.go
@@ -34,10 +34,10 @@ func (hs *HTTPServer) GetOrgByName(c *models.ReqContext) response.Response {
 	org, err := hs.SQLStore.GetOrgByName(web.Params(c.Req)[":name"])
 	if err != nil {
 		if errors.Is(err, models.ErrOrgNotFound) {
-			return response.Error(404, "Organization not found", err)
+			return response.Error(http.StatusNotFound, "Organization not found", err)
 		}
 
-		return response.Error(500, "Failed to get organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get organization", err)
 	}
 	result := models.OrgDetailsDTO{
 		Id:   org.Id,
@@ -60,9 +60,9 @@ func (hs *HTTPServer) getOrgHelper(ctx context.Context, orgID int64) response.Re
 
 	if err := hs.SQLStore.GetOrgById(ctx, &query); err != nil {
 		if errors.Is(err, models.ErrOrgNotFound) {
-			return response.Error(404, "Organization not found", err)
+			return response.Error(http.StatusNotFound, "Organization not found", err)
 		}
-		return response.Error(500, "Failed to get organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to get organization", err)
 	}
 
 	org := query.Result
@@ -90,15 +90,15 @@ func (hs *HTTPServer) CreateOrg(c *models.ReqContext) response.Response {
 	}
 	acEnabled := !hs.AccessControl.IsDisabled()
 	if !acEnabled && !(setting.AllowUserOrgCreate || c.IsGrafanaAdmin) {
-		return response.Error(403, "Access denied", nil)
+		return response.Error(http.StatusForbidden, "Access denied", nil)
 	}
 
 	cmd.UserId = c.UserId
 	if err := hs.SQLStore.CreateOrg(c.Req.Context(), &cmd); err != nil {
 		if errors.Is(err, models.ErrOrgNameTaken) {
-			return response.Error(409, "Organization name taken", err)
+			return response.Error(http.StatusConflict, "Organization name taken", err)
 		}
-		return response.Error(500, "Failed to create organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to create organization", err)
 	}
 
 	metrics.MApiOrgCreate.Inc()
@@ -135,9 +135,9 @@ func (hs *HTTPServer) updateOrgHelper(ctx context.Context, form dtos.UpdateOrgFo
 	cmd := models.UpdateOrgCommand{Name: form.Name, OrgId: orgID}
 	if err := hs.SQLStore.UpdateOrg(ctx, &cmd); err != nil {
 		if errors.Is(err, models.ErrOrgNameTaken) {
-			return response.Error(400, "Organization name taken", err)
+			return response.Error(http.StatusBadRequest, "Organization name taken", err)
 		}
-		return response.Error(500, "Failed to update organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update organization", err)
 	}
 
 	return response.Success("Organization updated")
@@ -179,7 +179,7 @@ func (hs *HTTPServer) updateOrgAddressHelper(ctx context.Context, form dtos.Upda
 	}
 
 	if err := hs.SQLStore.UpdateOrgAddress(ctx, &cmd); err != nil {
-		return response.Error(500, "Failed to update org address", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update org address", err)
 	}
 
 	return response.Success("Address updated")
@@ -193,14 +193,14 @@ func (hs *HTTPServer) DeleteOrgByID(c *models.ReqContext) response.Response {
 	}
 	// before deleting an org, check if user does not belong to the current org
 	if c.OrgId == orgID {
-		return response.Error(400, "Can not delete org for current user", nil)
+		return response.Error(http.StatusBadRequest, "Can not delete org for current user", nil)
 	}
 
 	if err := hs.SQLStore.DeleteOrg(c.Req.Context(), &models.DeleteOrgCommand{Id: orgID}); err != nil {
 		if errors.Is(err, models.ErrOrgNotFound) {
-			return response.Error(404, "Failed to delete organization. ID not found", nil)
+			return response.Error(http.StatusNotFound, "Failed to delete organization. ID not found", nil)
 		}
-		return response.Error(500, "Failed to update organization", err)
+		return response.Error(http.StatusInternalServerError, "Failed to update organization", err)
 	}
 	return response.Success("Organization deleted")
 }
@@ -221,7 +221,7 @@ func (hs *HTTPServer) SearchOrgs(c *models.ReqContext) response.Response {
 	}
 
 	if err := hs.SQLStore.SearchOrgs(c.Req.Context(), &query); err != nil {
-		return response.Error(500, "Failed to search orgs", err)
+		return response.Error(http.StatusInternalServerError, "Failed to search orgs", err)
 	}
 
 	return response.JSON(http.StatusOK, query.Result)
diff --git a/pkg/api/playlist_play.go b/pkg/api/playlist_play.go
index c75a550d579..035c4d402f4 100644
--- a/pkg/api/playlist_play.go
+++ b/pkg/api/playlist_play.go
@@ -16,7 +16,7 @@ func (hs *HTTPServer) populateDashboardsByID(ctx context.Context, dashboardByIDs
 
 	if len(dashboardByIDs) > 0 {
 		dashboardQuery := models.GetDashboardsQuery{DashboardIds: dashboardByIDs}
-		if err := hs.dashboardService.GetDashboards(ctx, &dashboardQuery); err != nil {
+		if err := hs.DashboardService.GetDashboards(ctx, &dashboardQuery); err != nil {
 			return result, err
 		}
 
diff --git a/pkg/api/plugins_test.go b/pkg/api/plugins_test.go
index 9e869285efd..8aefeac8e62 100644
--- a/pkg/api/plugins_test.go
+++ b/pkg/api/plugins_test.go
@@ -4,25 +4,96 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"
 
-	"github.com/grafana/grafana/pkg/infra/log/logtest"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web/webtest"
 )
 
+func Test_PluginsInstallAndUninstall(t *testing.T) {
+	type tc struct {
+		pluginAdminEnabled               bool
+		pluginAdminExternalManageEnabled bool
+		expectedHTTPStatus               int
+		expectedHTTPBody                 string
+	}
+	tcs := []tc{
+		{pluginAdminEnabled: true, pluginAdminExternalManageEnabled: true, expectedHTTPStatus: 404, expectedHTTPBody: "404 page not found\n"},
+		{pluginAdminEnabled: true, pluginAdminExternalManageEnabled: false, expectedHTTPStatus: 200, expectedHTTPBody: ""},
+		{pluginAdminEnabled: false, pluginAdminExternalManageEnabled: true, expectedHTTPStatus: 404, expectedHTTPBody: "404 page not found\n"},
+		{pluginAdminEnabled: false, pluginAdminExternalManageEnabled: false, expectedHTTPStatus: 404, expectedHTTPBody: "404 page not found\n"},
+	}
+
+	testName := func(action string, testCase tc) string {
+		return fmt.Sprintf("%s request returns %d when adminEnabled: %t and externalEnabled: %t",
+			action, testCase.expectedHTTPStatus, testCase.pluginAdminEnabled, testCase.pluginAdminExternalManageEnabled)
+	}
+
+	pm := &fakePluginManager{
+		plugins: make(map[string]fakePlugin),
+	}
+	for _, tc := range tcs {
+		srv := SetupAPITestServer(t, func(hs *HTTPServer) {
+			hs.Cfg = &setting.Cfg{
+				PluginAdminEnabled:               tc.pluginAdminEnabled,
+				PluginAdminExternalManageEnabled: tc.pluginAdminExternalManageEnabled,
+			}
+			hs.pluginManager = pm
+		})
+
+		t.Run(testName("Install", tc), func(t *testing.T) {
+			req := srv.NewPostRequest("/api/plugins/test/install", strings.NewReader("{ \"version\": \"1.0.2\" }"))
+			webtest.RequestWithSignedInUser(req, &models.SignedInUser{UserId: 1, OrgId: 1, OrgRole: models.ROLE_EDITOR, IsGrafanaAdmin: true})
+			resp, err := srv.SendJSON(req)
+			require.NoError(t, err)
+
+			body := new(strings.Builder)
+			_, err = io.Copy(body, resp.Body)
+			require.NoError(t, err)
+			require.Equal(t, tc.expectedHTTPBody, body.String())
+			require.NoError(t, resp.Body.Close())
+			require.Equal(t, tc.expectedHTTPStatus, resp.StatusCode)
+
+			if tc.expectedHTTPStatus == 200 {
+				require.Equal(t, fakePlugin{pluginID: "test", version: "1.0.2"}, pm.plugins["test"])
+			}
+		})
+
+		t.Run(testName("Uninstall", tc), func(t *testing.T) {
+			req := srv.NewPostRequest("/api/plugins/test/uninstall", strings.NewReader("{}"))
+			webtest.RequestWithSignedInUser(req, &models.SignedInUser{UserId: 1, OrgId: 1, OrgRole: models.ROLE_VIEWER, IsGrafanaAdmin: true})
+			resp, err := srv.SendJSON(req)
+			require.NoError(t, err)
+
+			body := new(strings.Builder)
+			_, err = io.Copy(body, resp.Body)
+			require.NoError(t, err)
+			require.Equal(t, tc.expectedHTTPBody, body.String())
+			require.NoError(t, resp.Body.Close())
+			require.Equal(t, tc.expectedHTTPStatus, resp.StatusCode)
+
+			if tc.expectedHTTPStatus == 200 {
+				require.Empty(t, pm.plugins)
+			}
+		})
+	}
+}
+
 func Test_GetPluginAssets(t *testing.T) {
 	pluginID := "test-plugin"
 	pluginDir := "."
diff --git a/pkg/api/preferences.go b/pkg/api/preferences.go
index e1acad29947..e13f6b07837 100644
--- a/pkg/api/preferences.go
+++ b/pkg/api/preferences.go
@@ -31,7 +31,7 @@ func (hs *HTTPServer) SetHomeDashboard(c *models.ReqContext) response.Response {
 	dashboardID := cmd.HomeDashboardID
 	if cmd.HomeDashboardUID != nil {
 		query := models.GetDashboardQuery{Uid: *cmd.HomeDashboardUID}
-		err := hs.dashboardService.GetDashboard(c.Req.Context(), &query)
+		err := hs.DashboardService.GetDashboard(c.Req.Context(), &query)
 		if err != nil {
 			return response.Error(404, "Dashboard not found", err)
 		}
@@ -65,7 +65,7 @@ func (hs *HTTPServer) getPreferencesFor(ctx context.Context, orgID, userID, team
 	// when homedashboardID is 0, that means it is the default home dashboard, no UID would be returned in the response
 	if preference.HomeDashboardID != 0 {
 		query := models.GetDashboardQuery{Id: preference.HomeDashboardID, OrgId: orgID}
-		err = hs.dashboardService.GetDashboard(ctx, &query)
+		err = hs.DashboardService.GetDashboard(ctx, &query)
 		if err == nil {
 			dashboardUID = query.Result.Uid
 		}
@@ -105,7 +105,7 @@ func (hs *HTTPServer) updatePreferencesFor(ctx context.Context, orgID, userID, t
 	dashboardID := dtoCmd.HomeDashboardID
 	if dtoCmd.HomeDashboardUID != nil {
 		query := models.GetDashboardQuery{Uid: *dtoCmd.HomeDashboardUID, OrgId: orgID}
-		err := hs.dashboardService.GetDashboard(ctx, &query)
+		err := hs.DashboardService.GetDashboard(ctx, &query)
 		if err != nil {
 			return response.Error(404, "Dashboard not found", err)
 		}
@@ -151,7 +151,7 @@ func (hs *HTTPServer) patchPreferencesFor(ctx context.Context, orgID, userID, te
 	dashboardID := dtoCmd.HomeDashboardID
 	if dtoCmd.HomeDashboardUID != nil {
 		query := models.GetDashboardQuery{Uid: *dtoCmd.HomeDashboardUID, OrgId: orgID}
-		err := hs.dashboardService.GetDashboard(ctx, &query)
+		err := hs.DashboardService.GetDashboard(ctx, &query)
 		if err != nil {
 			return response.Error(404, "Dashboard not found", err)
 		}
diff --git a/pkg/api/preferences_test.go b/pkg/api/preferences_test.go
index e62af23b504..5796ad1e867 100644
--- a/pkg/api/preferences_test.go
+++ b/pkg/api/preferences_test.go
@@ -40,7 +40,7 @@ func TestAPIEndpoint_GetCurrentOrgPreferences_LegacyAccessControl(t *testing.T)
 		q.Result = &models.Dashboard{Uid: "home", Id: 1}
 	}).Return(nil)
 
-	sc.hs.dashboardService = dashSvc
+	sc.hs.DashboardService = dashSvc
 
 	prefService := preftest.NewPreferenceServiceFake()
 	prefService.ExpectedPreference = &pref.Preference{HomeDashboardID: 1, Theme: "dark"}
@@ -169,7 +169,7 @@ func TestAPIEndpoint_PatchUserPreferences(t *testing.T) {
 		q := args.Get(1).(*models.GetDashboardQuery)
 		q.Result = &models.Dashboard{Uid: "home", Id: 1}
 	}).Return(nil)
-	sc.hs.dashboardService = dashSvc
+	sc.hs.DashboardService = dashSvc
 	t.Run("Returns 200 on success", func(t *testing.T) {
 		response := callAPI(sc.server, http.MethodPatch, patchUserPreferencesUrl, input, t)
 		assert.Equal(t, http.StatusOK, response.Code)
diff --git a/pkg/api/stars.go b/pkg/api/stars.go
index 73eeae19ab1..fb8e76114ac 100644
--- a/pkg/api/stars.go
+++ b/pkg/api/stars.go
@@ -26,7 +26,7 @@ func (hs *HTTPServer) GetStars(c *models.ReqContext) response.Response {
 			Id:    dashboardId,
 			OrgId: c.OrgId,
 		}
-		err := hs.dashboardService.GetDashboard(c.Req.Context(), query)
+		err := hs.DashboardService.GetDashboard(c.Req.Context(), query)
 
 		// Grafana admin users may have starred dashboards in multiple orgs.  This will avoid returning errors when the dashboard is in another org
 		if err == nil {
diff --git a/pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_deks.go b/pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_deks.go
deleted file mode 100644
index ae59e519259..00000000000
--- a/pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_deks.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package secretsmigrations
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-)
-
-func ReEncryptDEKS(_ utils.CommandLine, runner runner.Runner) error {
-	if runner.Features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
-		logger.Warn("Envelope encryption is not enabled, quitting...")
-		return nil
-	}
-
-	return runner.SecretsService.ReEncryptDataKeys(context.Background())
-}
diff --git a/pkg/cmd/grafana-cli/commands/secretsmigrations/secretsmigrations.go b/pkg/cmd/grafana-cli/commands/secretsmigrations/secretsmigrations.go
index fa12ec55ee0..d78d3b9a5bd 100644
--- a/pkg/cmd/grafana-cli/commands/secretsmigrations/secretsmigrations.go
+++ b/pkg/cmd/grafana-cli/commands/secretsmigrations/secretsmigrations.go
@@ -1,31 +1,39 @@
 package secretsmigrations
 
 import (
-	"encoding/base64"
-	"time"
+	"context"
 
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
+	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
 )
 
-type simpleSecret struct {
-	tableName  string
-	columnName string
-}
-
-type b64Secret struct {
-	simpleSecret
-	hasUpdatedColumn bool
-	encoding         *base64.Encoding
-}
-
-type jsonSecret struct {
-	tableName string
-}
-
-type alertingSecret struct{}
-
-func nowInUTC() string {
-	return time.Now().UTC().Format("2006-01-02 15:04:05")
-}
-
 var logger = log.New("secrets.migrations")
+
+func ReEncryptDEKS(_ utils.CommandLine, runner runner.Runner) error {
+	if runner.Features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
+		logger.Warn("Envelope encryption is not enabled, quitting...")
+		return nil
+	}
+
+	return runner.SecretsService.ReEncryptDataKeys(context.Background())
+}
+
+func ReEncryptSecrets(_ utils.CommandLine, runner runner.Runner) error {
+	if runner.Features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
+		logger.Warn("Envelope encryption is not enabled, quitting...")
+		return nil
+	}
+
+	return runner.SecretsMigrator.ReEncryptSecrets(context.Background())
+}
+
+func RollBackSecrets(_ utils.CommandLine, runner runner.Runner) error {
+	if runner.Features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
+		logger.Warn("Envelope encryption is not enabled, quitting...")
+		return nil
+	}
+
+	return runner.SecretsMigrator.RollBackSecrets(context.Background())
+}
diff --git a/pkg/cmd/grafana-cli/runner/runner.go b/pkg/cmd/grafana-cli/runner/runner.go
index d74b9668043..6fcb7f68ab0 100644
--- a/pkg/cmd/grafana-cli/runner/runner.go
+++ b/pkg/cmd/grafana-cli/runner/runner.go
@@ -3,6 +3,7 @@ package runner
 import (
 	"github.com/grafana/grafana/pkg/services/encryption"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
@@ -15,16 +16,20 @@ type Runner struct {
 	Features          featuremgmt.FeatureToggles
 	EncryptionService encryption.Internal
 	SecretsService    *manager.SecretsService
+	SecretsMigrator   secrets.Migrator
 }
 
 func New(cfg *setting.Cfg, sqlStore *sqlstore.SQLStore, settingsProvider setting.Provider,
-	encryptionService encryption.Internal, features featuremgmt.FeatureToggles, secretsService *manager.SecretsService) Runner {
+	encryptionService encryption.Internal, features featuremgmt.FeatureToggles,
+	secretsService *manager.SecretsService, secretsMigrator secrets.Migrator,
+) Runner {
 	return Runner{
 		Cfg:               cfg,
 		SQLStore:          sqlStore,
 		SettingsProvider:  settingsProvider,
 		EncryptionService: encryptionService,
 		SecretsService:    secretsService,
+		SecretsMigrator:   secretsMigrator,
 		Features:          features,
 	}
 }
diff --git a/pkg/cmd/grafana-cli/runner/wire.go b/pkg/cmd/grafana-cli/runner/wire.go
index 23807b31885..d23f46d6369 100644
--- a/pkg/cmd/grafana-cli/runner/wire.go
+++ b/pkg/cmd/grafana-cli/runner/wire.go
@@ -17,6 +17,7 @@ import (
 	"github.com/grafana/grafana/pkg/services/secrets"
 	secretsDatabase "github.com/grafana/grafana/pkg/services/secrets/database"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
+	secretsMigrator "github.com/grafana/grafana/pkg/services/secrets/migrator"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/web"
@@ -37,6 +38,8 @@ var wireSet = wire.NewSet(
 	wire.Bind(new(secrets.Store), new(*secretsDatabase.SecretsStoreImpl)),
 	secretsManager.ProvideSecretsService,
 	wire.Bind(new(secrets.Service), new(*secretsManager.SecretsService)),
+	secretsMigrator.ProvideSecretsMigrator,
+	wire.Bind(new(secrets.Migrator), new(*secretsMigrator.SecretsMigrator)),
 	hooks.ProvideService,
 )
 
diff --git a/pkg/extensions/main.go b/pkg/extensions/main.go
index c6195b78093..72371bdab40 100644
--- a/pkg/extensions/main.go
+++ b/pkg/extensions/main.go
@@ -8,6 +8,8 @@ import (
 	_ "github.com/Azure/go-autorest/autorest"
 	_ "github.com/Azure/go-autorest/autorest/adal"
 	_ "github.com/beevik/etree"
+	_ "github.com/blugelabs/bluge"
+	_ "github.com/blugelabs/bluge_segment_api"
 	_ "github.com/cortexproject/cortex/pkg/util"
 	_ "github.com/crewjam/saml"
 	_ "github.com/gobwas/glob"
diff --git a/pkg/infra/filestorage/api.go b/pkg/infra/filestorage/api.go
index 645ae462cf9..e298d6ce768 100644
--- a/pkg/infra/filestorage/api.go
+++ b/pkg/infra/filestorage/api.go
@@ -27,7 +27,7 @@ var (
 )
 
 func ValidatePath(path string) error {
-	if !filepath.IsAbs(path) {
+	if !strings.HasPrefix(path, Delimiter) {
 		return ErrRelativePath
 	}
 
@@ -39,7 +39,8 @@ func ValidatePath(path string) error {
 		return ErrPathEndsWithDelimiter
 	}
 
-	if filepath.Clean(path) != path {
+	// apply `ToSlash` to replace OS-specific separators introduced by the Clean() function
+	if filepath.ToSlash(filepath.Clean(path)) != path {
 		return ErrNonCanonicalPath
 	}
 
diff --git a/pkg/infra/filestorage/api_test.go b/pkg/infra/filestorage/api_test.go
index f22393bdd36..4cbf2906219 100644
--- a/pkg/infra/filestorage/api_test.go
+++ b/pkg/infra/filestorage/api_test.go
@@ -100,6 +100,9 @@ func TestFilestorageApi_ValidatePath(t *testing.T) {
 		{
 			path: "/myFile/file.jpg",
 		},
+		{
+			path: "/file.jpg",
+		},
 	}
 	for _, tt := range tests {
 		if tt.expectedError == nil {
diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go
index 603c19d022f..49acd8eb0e8 100644
--- a/pkg/infra/usagestats/statscollector/service.go
+++ b/pkg/infra/usagestats/statscollector/service.go
@@ -261,14 +261,12 @@ func (s *Service) collectElasticStats(ctx context.Context) (map[string]interface
 		s.log.Error("Failed to get elasticsearch json data", "error", err)
 		return nil, err
 	}
-
 	for _, data := range esDataSourcesQuery.Result {
-		esVersion, err := data.JsonData.Get("esVersion").Int()
+		esVersion, err := data.JsonData.Get("esVersion").String()
 		if err != nil {
 			continue
 		}
-
-		statName := fmt.Sprintf("stats.ds.elasticsearch.v%d.count", esVersion)
+		statName := fmt.Sprintf("stats.ds.elasticsearch.v%s.count", strings.ReplaceAll(esVersion, ".", "_"))
 
 		count, _ := m[statName].(int64)
 
diff --git a/pkg/infra/usagestats/statscollector/service_test.go b/pkg/infra/usagestats/statscollector/service_test.go
index 1550fb265a6..73e60b87b73 100644
--- a/pkg/infra/usagestats/statscollector/service_test.go
+++ b/pkg/infra/usagestats/statscollector/service_test.go
@@ -121,6 +121,24 @@ func TestFeatureUsageStats(t *testing.T) {
 
 func TestCollectingUsageStats(t *testing.T) {
 	sqlStore := mockstore.NewSQLStoreMock()
+	sqlStore.ExpectedDataSources = []*datasources.DataSource{
+		{
+			JsonData: simplejson.NewFromAny(map[string]interface{}{
+				"esVersion": "2.0.0",
+			}),
+		},
+		{
+			JsonData: simplejson.NewFromAny(map[string]interface{}{
+				"esVersion": "2.0.0",
+			}),
+		},
+		{
+			JsonData: simplejson.NewFromAny(map[string]interface{}{
+				"esVersion": "70.1.1",
+			}),
+		},
+	}
+
 	s := createService(t, &setting.Cfg{
 		ReportingEnabled:     true,
 		BuildVersion:         "5.0.0",
@@ -130,7 +148,8 @@ func TestCollectingUsageStats(t *testing.T) {
 		AuthProxyEnabled:     true,
 		Packaging:            "deb",
 		ReportingDistributor: "hosted-grafana",
-	}, sqlStore)
+	}, sqlStore,
+		withDatasources(mockDatasourceService{datasources: sqlStore.ExpectedDataSources}))
 
 	s.startTime = time.Now().Add(-1 * time.Minute)
 
@@ -182,6 +201,45 @@ func TestCollectingUsageStats(t *testing.T) {
 	assert.InDelta(t, int64(65), metrics["stats.uptime"], 6)
 }
 
+func TestElasticStats(t *testing.T) {
+	sqlStore := mockstore.NewSQLStoreMock()
+
+	s := createService(t, &setting.Cfg{
+		ReportingEnabled:     true,
+		BuildVersion:         "5.0.0",
+		AnonymousEnabled:     true,
+		BasicAuthEnabled:     true,
+		LDAPEnabled:          true,
+		AuthProxyEnabled:     true,
+		Packaging:            "deb",
+		ReportingDistributor: "hosted-grafana",
+	}, sqlStore,
+		withDatasources(mockDatasourceService{datasources: sqlStore.ExpectedDataSources}))
+
+	sqlStore.ExpectedDataSources = []*datasources.DataSource{
+		{
+			JsonData: simplejson.NewFromAny(map[string]interface{}{
+				"esVersion": "2.0.0",
+			}),
+		},
+		{
+			JsonData: simplejson.NewFromAny(map[string]interface{}{
+				"esVersion": "2.0.0",
+			}),
+		},
+		{
+			JsonData: simplejson.NewFromAny(map[string]interface{}{
+				"esVersion": "70.1.1",
+			}),
+		},
+	}
+
+	metrics, err := s.collectElasticStats(context.Background())
+	require.NoError(t, err)
+
+	assert.EqualValues(t, 2, metrics["stats.ds."+datasources.DS_ES+".v2_0_0.count"])
+	assert.EqualValues(t, 1, metrics["stats.ds."+datasources.DS_ES+".v70_1_1.count"])
+}
 func TestDatasourceStats(t *testing.T) {
 	sqlStore := mockstore.NewSQLStoreMock()
 	s := createService(t, &setting.Cfg{}, sqlStore)
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index b95a2c46f74..a4d903ef73b 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -192,18 +192,18 @@ func shouldForceLogin(c *models.ReqContext) bool {
 	return forceLogin
 }
 
-func OrgAdminFolderAdminOrTeamAdmin(ss sqlstore.Store, ds dashboards.DashboardService) func(c *models.ReqContext) {
+func OrgAdminDashOrFolderAdminOrTeamAdmin(ss sqlstore.Store, ds dashboards.DashboardService) func(c *models.ReqContext) {
 	return func(c *models.ReqContext) {
 		if c.OrgRole == models.ROLE_ADMIN {
 			return
 		}
 
-		hasAdminPermissionInFoldersQuery := models.HasAdminPermissionInFoldersQuery{SignedInUser: c.SignedInUser}
-		if err := ds.HasAdminPermissionInFolders(c.Req.Context(), &hasAdminPermissionInFoldersQuery); err != nil {
+		hasAdminPermissionInDashOrFoldersQuery := models.HasAdminPermissionInDashboardsOrFoldersQuery{SignedInUser: c.SignedInUser}
+		if err := ds.HasAdminPermissionInDashboardsOrFolders(c.Req.Context(), &hasAdminPermissionInDashOrFoldersQuery); err != nil {
 			c.JsonApiErr(500, "Failed to check if user is a folder admin", err)
 		}
 
-		if hasAdminPermissionInFoldersQuery.Result {
+		if hasAdminPermissionInDashOrFoldersQuery.Result {
 			return
 		}
 
diff --git a/pkg/models/dashboard_queries.go b/pkg/models/dashboard_queries.go
index 0490071b116..7f27011e73c 100644
--- a/pkg/models/dashboard_queries.go
+++ b/pkg/models/dashboard_queries.go
@@ -4,7 +4,23 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 )
 
-func GetQueriesFromDashboard(dashboard *simplejson.Json) map[int64][]*simplejson.Json {
+func GetUniqueDashboardDatasourceUids(dashboard *simplejson.Json) []string {
+	var datasourceUids []string
+	exists := map[string]bool{}
+
+	for _, panelObj := range dashboard.Get("panels").MustArray() {
+		panel := simplejson.NewFromAny(panelObj)
+		uid := panel.Get("datasource").Get("uid").MustString()
+		if _, ok := exists[uid]; !ok {
+			datasourceUids = append(datasourceUids, uid)
+			exists[uid] = true
+		}
+	}
+
+	return datasourceUids
+}
+
+func GroupQueriesByPanelId(dashboard *simplejson.Json) map[int64][]*simplejson.Json {
 	result := make(map[int64][]*simplejson.Json)
 
 	for _, panelObj := range dashboard.Get("panels").MustArray() {
diff --git a/pkg/models/dashboard_queries_test.go b/pkg/models/dashboard_queries_test.go
index 95daa3bae22..ed02d11c88b 100644
--- a/pkg/models/dashboard_queries_test.go
+++ b/pkg/models/dashboard_queries_test.go
@@ -56,6 +56,79 @@ const (
   "schemaVersion": 35
 }`
 
+	dashboardWithDuplicateDatasources = `
+{
+  "panels": [
+    {
+	  "datasource": {
+		"type": "prometheus",
+		"uid": "abc123"
+	  },
+      "id": 1,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "abc123"
+          },
+          "exemplar": true,
+          "expr": "go_goroutines{job=\"$job\"}",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "timeseries"
+    },
+    {
+	  "datasource": {
+		"type": "prometheus",
+		"uid": "_yxMP8Ynk"
+	  },
+      "id": 2,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "_yxMP8Ynk"
+          },
+          "exemplar": true,
+          "expr": "go_goroutines{job=\"$job\"}",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "timeseries"
+    },
+    {
+	  "datasource": {
+		"type": "prometheus",
+		"uid": "_yxMP8Ynk"
+	  },
+      "id": 3,
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "_yxMP8Ynk"
+          },
+          "exemplar": true,
+          "expr": "go_goroutines{job=\"$job\"}",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "timeseries"
+    }
+  ],
+  "schemaVersion": 35
+}`
+
 	oldStyleDashboard = `
 {
   "panels": [
@@ -79,12 +152,32 @@ const (
 }`
 )
 
-func TestGetQueriesFromDashboard(t *testing.T) {
+func TestGetUniqueDashboardDatasourceUids(t *testing.T) {
+	t.Run("can get unique datasource ids from dashboard", func(t *testing.T) {
+		json, err := simplejson.NewJson([]byte(dashboardWithDuplicateDatasources))
+		require.NoError(t, err)
+
+		uids := GetUniqueDashboardDatasourceUids(json)
+		require.Len(t, uids, 2)
+		require.Equal(t, "abc123", uids[0])
+		require.Equal(t, "_yxMP8Ynk", uids[1])
+	})
+
+	t.Run("can get no datasource uids from empty dashboard", func(t *testing.T) {
+		json, err := simplejson.NewJson([]byte(`{"panels": {}}`))
+		require.NoError(t, err)
+
+		uids := GetUniqueDashboardDatasourceUids(json)
+		require.Len(t, uids, 0)
+	})
+}
+
+func TestGroupQueriesByPanelId(t *testing.T) {
 	t.Run("can extract no queries from empty dashboard", func(t *testing.T) {
 		json, err := simplejson.NewJson([]byte(`{"panels": {}}`))
 		require.NoError(t, err)
 
-		queries := GetQueriesFromDashboard(json)
+		queries := GroupQueriesByPanelId(json)
 		require.Len(t, queries, 0)
 	})
 
@@ -92,7 +185,7 @@ func TestGetQueriesFromDashboard(t *testing.T) {
 		json, err := simplejson.NewJson([]byte(dashboardWithNoQueries))
 		require.NoError(t, err)
 
-		queries := GetQueriesFromDashboard(json)
+		queries := GroupQueriesByPanelId(json)
 		require.Len(t, queries, 1)
 		require.Contains(t, queries, int64(2))
 		require.Len(t, queries[2], 0)
@@ -102,7 +195,7 @@ func TestGetQueriesFromDashboard(t *testing.T) {
 		json, err := simplejson.NewJson([]byte(dashboardWithQueries))
 		require.NoError(t, err)
 
-		queries := GetQueriesFromDashboard(json)
+		queries := GroupQueriesByPanelId(json)
 		require.Len(t, queries, 1)
 		require.Contains(t, queries, int64(2))
 		require.Len(t, queries[2], 2)
@@ -138,7 +231,7 @@ func TestGetQueriesFromDashboard(t *testing.T) {
 		json, err := simplejson.NewJson([]byte(oldStyleDashboard))
 		require.NoError(t, err)
 
-		queries := GetQueriesFromDashboard(json)
+		queries := GroupQueriesByPanelId(json)
 		require.Len(t, queries, 1)
 		require.Contains(t, queries, int64(2))
 		require.Len(t, queries[2], 1)
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index c10fd39e22c..a289d2c9a72 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -10,173 +10,10 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/util"
 )
 
 const RootFolderName = "General"
 
-// Typed errors
-var (
-	ErrDashboardNotFound = DashboardErr{
-		Reason:     "Dashboard not found",
-		StatusCode: 404,
-		Status:     "not-found",
-	}
-	ErrDashboardCorrupt = DashboardErr{
-		Reason:     "Dashboard data is missing or corrupt",
-		StatusCode: 500,
-		Status:     "not-found",
-	}
-	ErrDashboardPanelNotFound = DashboardErr{
-		Reason:     "Dashboard panel not found",
-		StatusCode: 404,
-		Status:     "not-found",
-	}
-	ErrDashboardFolderNotFound = DashboardErr{
-		Reason:     "Folder not found",
-		StatusCode: 404,
-	}
-	ErrDashboardSnapshotNotFound = DashboardErr{
-		Reason:     "Dashboard snapshot not found",
-		StatusCode: 404,
-	}
-	ErrDashboardWithSameUIDExists = DashboardErr{
-		Reason:     "A dashboard with the same uid already exists",
-		StatusCode: 400,
-	}
-	ErrDashboardWithSameNameInFolderExists = DashboardErr{
-		Reason:     "A dashboard with the same name in the folder already exists",
-		StatusCode: 412,
-		Status:     "name-exists",
-	}
-	ErrDashboardVersionMismatch = DashboardErr{
-		Reason:     "The dashboard has been changed by someone else",
-		StatusCode: 412,
-		Status:     "version-mismatch",
-	}
-	ErrDashboardTitleEmpty = DashboardErr{
-		Reason:     "Dashboard title cannot be empty",
-		StatusCode: 400,
-		Status:     "empty-name",
-	}
-	ErrDashboardFolderCannotHaveParent = DashboardErr{
-		Reason:     "A Dashboard Folder cannot be added to another folder",
-		StatusCode: 400,
-	}
-	ErrDashboardsWithSameSlugExists = DashboardErr{
-		Reason:     "Multiple dashboards with the same slug exists",
-		StatusCode: 412,
-	}
-	ErrDashboardFailedGenerateUniqueUid = DashboardErr{
-		Reason:     "Failed to generate unique dashboard id",
-		StatusCode: 500,
-	}
-	ErrDashboardTypeMismatch = DashboardErr{
-		Reason:     "Dashboard cannot be changed to a folder",
-		StatusCode: 400,
-	}
-	ErrDashboardFolderWithSameNameAsDashboard = DashboardErr{
-		Reason:     "Folder name cannot be the same as one of its dashboards",
-		StatusCode: 400,
-	}
-	ErrDashboardWithSameNameAsFolder = DashboardErr{
-		Reason:     "Dashboard name cannot be the same as folder",
-		StatusCode: 400,
-		Status:     "name-match",
-	}
-	ErrDashboardFolderNameExists = DashboardErr{
-		Reason:     "A folder with that name already exists",
-		StatusCode: 400,
-	}
-	ErrDashboardUpdateAccessDenied = DashboardErr{
-		Reason:     "Access denied to save dashboard",
-		StatusCode: 403,
-	}
-	ErrDashboardInvalidUid = DashboardErr{
-		Reason:     "uid contains illegal characters",
-		StatusCode: 400,
-	}
-	ErrDashboardUidTooLong = DashboardErr{
-		Reason:     "uid too long, max 40 characters",
-		StatusCode: 400,
-	}
-	ErrDashboardCannotSaveProvisionedDashboard = DashboardErr{
-		Reason:     "Cannot save provisioned dashboard",
-		StatusCode: 400,
-	}
-	ErrDashboardRefreshIntervalTooShort = DashboardErr{
-		Reason:     "Dashboard refresh interval is too low",
-		StatusCode: 400,
-	}
-	ErrDashboardCannotDeleteProvisionedDashboard = DashboardErr{
-		Reason:     "provisioned dashboard cannot be deleted",
-		StatusCode: 400,
-	}
-	ErrDashboardIdentifierNotSet = DashboardErr{
-		Reason:     "Unique identifier needed to be able to get a dashboard",
-		StatusCode: 400,
-	}
-	ErrDashboardIdentifierInvalid = DashboardErr{
-		Reason:     "Dashboard ID not a number",
-		StatusCode: 400,
-	}
-	ErrDashboardPanelIdentifierInvalid = DashboardErr{
-		Reason:     "Dashboard panel ID not a number",
-		StatusCode: 400,
-	}
-	ErrDashboardOrPanelIdentifierNotSet = DashboardErr{
-		Reason:     "Unique identifier needed to be able to get a dashboard panel",
-		StatusCode: 400,
-	}
-	ErrProvisionedDashboardNotFound = DashboardErr{
-		Reason:     "Dashboard is not provisioned",
-		StatusCode: 404,
-		Status:     "not-found",
-	}
-	ErrDashboardThumbnailNotFound = DashboardErr{
-		Reason:     "Dashboard thumbnail not found",
-		StatusCode: 404,
-		Status:     "not-found",
-	}
-)
-
-// DashboardErr represents a dashboard error.
-type DashboardErr struct {
-	StatusCode int
-	Status     string
-	Reason     string
-}
-
-// Equal returns whether equal to another DashboardErr.
-func (e DashboardErr) Equal(o DashboardErr) bool {
-	return o.StatusCode == e.StatusCode && o.Status == e.Status && o.Reason == e.Reason
-}
-
-// Error returns the error message.
-func (e DashboardErr) Error() string {
-	if e.Reason != "" {
-		return e.Reason
-	}
-	return "Dashboard Error"
-}
-
-// Body returns the error's response body, if applicable.
-func (e DashboardErr) Body() util.DynMap {
-	if e.Status == "" {
-		return nil
-	}
-
-	return util.DynMap{"status": e.Status, "message": e.Error()}
-}
-
-type UpdatePluginDashboardError struct {
-	PluginId string
-}
-
-func (d UpdatePluginDashboardError) Error() string {
-	return "Dashboard belongs to plugin"
-}
-
 const (
 	DashTypeDB       = "db"
 	DashTypeSnapshot = "snapshot"
diff --git a/pkg/models/folders.go b/pkg/models/folders.go
index 895cfea2a5c..63ac8b58bcc 100644
--- a/pkg/models/folders.go
+++ b/pkg/models/folders.go
@@ -1,24 +1,10 @@
 package models
 
 import (
-	"errors"
 	"strings"
 	"time"
 )
 
-// Typed errors
-var (
-	ErrFolderNotFound                = errors.New("folder not found")
-	ErrFolderVersionMismatch         = errors.New("the folder has been changed by someone else")
-	ErrFolderTitleEmpty              = errors.New("folder title cannot be empty")
-	ErrFolderWithSameUIDExists       = errors.New("a folder/dashboard with the same uid already exists")
-	ErrFolderInvalidUID              = errors.New("invalid uid for folder provided")
-	ErrFolderSameNameExists          = errors.New("a folder or dashboard in the general folder with the same name already exists")
-	ErrFolderFailedGenerateUniqueUid = errors.New("failed to generate unique folder ID")
-	ErrFolderAccessDenied            = errors.New("access denied to folder")
-	ErrFolderContainsAlertRules      = errors.New("folder contains alert rules")
-)
-
 type Folder struct {
 	Id      int64
 	Uid     string
@@ -109,7 +95,7 @@ type HasEditPermissionInFoldersQuery struct {
 	Result       bool
 }
 
-type HasAdminPermissionInFoldersQuery struct {
+type HasAdminPermissionInDashboardsOrFoldersQuery struct {
 	SignedInUser *SignedInUser
 	Result       bool
 }
diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go
index 0b91f064956..b92a165dc78 100644
--- a/pkg/models/org_user.go
+++ b/pkg/models/org_user.go
@@ -102,6 +102,9 @@ type AddOrgUserCommand struct {
 
 	OrgId  int64 `json:"-"`
 	UserId int64 `json:"-"`
+
+	// internal use: avoid adding service accounts to orgs via user routes
+	AllowAddingServiceAccount bool `json:"-"`
 }
 
 type UpdateOrgUserCommand struct {
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/generate.sh b/pkg/plugins/backendplugin/pluginextensionv2/generate.sh
index dade69745c5..c7e2379cf79 100755
--- a/pkg/plugins/backendplugin/pluginextensionv2/generate.sh
+++ b/pkg/plugins/backendplugin/pluginextensionv2/generate.sh
@@ -13,4 +13,4 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 cd "$DIR"
 
-protoc -I ./ rendererv2.proto --go_out=plugins=grpc:./
\ No newline at end of file
+protoc -I ./ *.proto --go_out=plugins=grpc:./
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/renderer_grpc_plugin.go b/pkg/plugins/backendplugin/pluginextensionv2/renderer_grpc_plugin.go
index 6aef8a1ecd0..6dcc8e2e261 100644
--- a/pkg/plugins/backendplugin/pluginextensionv2/renderer_grpc_plugin.go
+++ b/pkg/plugins/backendplugin/pluginextensionv2/renderer_grpc_plugin.go
@@ -9,6 +9,7 @@ import (
 
 type RendererPlugin interface {
 	RendererClient
+	SanitizerClient
 }
 
 type RendererGRPCPlugin struct {
@@ -20,11 +21,16 @@ func (p *RendererGRPCPlugin) GRPCServer(broker *plugin.GRPCBroker, s *grpc.Serve
 }
 
 func (p *RendererGRPCPlugin) GRPCClient(ctx context.Context, broker *plugin.GRPCBroker, c *grpc.ClientConn) (interface{}, error) {
-	return &RendererGRPCClient{NewRendererClient(c)}, nil
+	return &RendererGRPCClient{NewRendererClient(c), NewSanitizerClient(c)}, nil
 }
 
 type RendererGRPCClient struct {
 	RendererClient
+	SanitizerClient
+}
+
+func (m *RendererGRPCClient) Sanitize(ctx context.Context, req *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error) {
+	return m.SanitizerClient.Sanitize(ctx, req, opts...)
 }
 
 func (m *RendererGRPCClient) Render(ctx context.Context, req *RenderRequest, opts ...grpc.CallOption) (*RenderResponse, error) {
@@ -32,4 +38,5 @@ func (m *RendererGRPCClient) Render(ctx context.Context, req *RenderRequest, opt
 }
 
 var _ RendererClient = &RendererGRPCClient{}
+var _ SanitizerClient = &RendererGRPCClient{}
 var _ plugin.GRPCPlugin = &RendererGRPCPlugin{}
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go
index 75e5f4e4a31..9194ea8dcb1 100644
--- a/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go
+++ b/pkg/plugins/backendplugin/pluginextensionv2/rendererv2.pb.go
@@ -1,21 +1,20 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.26.0
-// 	protoc        v3.15.8
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.19.4
 // source: rendererv2.proto
 
 package pluginextensionv2
 
 import (
 	context "context"
-	reflect "reflect"
-	sync "sync"
-
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
 const (
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go
new file mode 100644
index 00000000000..b4cd30b7ab1
--- /dev/null
+++ b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.pb.go
@@ -0,0 +1,337 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.28.0
+// 	protoc        v3.19.4
+// source: sanitizer.proto
+
+package pluginextensionv2
+
+import (
+	context "context"
+	grpc "google.golang.org/grpc"
+	codes "google.golang.org/grpc/codes"
+	status "google.golang.org/grpc/status"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type SanitizeRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Filename   string `protobuf:"bytes,1,opt,name=filename,proto3" json:"filename,omitempty"`
+	Content    []byte `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"`
+	ConfigType string `protobuf:"bytes,3,opt,name=configType,proto3" json:"configType,omitempty"` // DOMPurify, ...
+	Config     []byte `protobuf:"bytes,4,opt,name=config,proto3" json:"config,omitempty"`
+}
+
+func (x *SanitizeRequest) Reset() {
+	*x = SanitizeRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sanitizer_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SanitizeRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SanitizeRequest) ProtoMessage() {}
+
+func (x *SanitizeRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_sanitizer_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SanitizeRequest.ProtoReflect.Descriptor instead.
+func (*SanitizeRequest) Descriptor() ([]byte, []int) {
+	return file_sanitizer_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *SanitizeRequest) GetFilename() string {
+	if x != nil {
+		return x.Filename
+	}
+	return ""
+}
+
+func (x *SanitizeRequest) GetContent() []byte {
+	if x != nil {
+		return x.Content
+	}
+	return nil
+}
+
+func (x *SanitizeRequest) GetConfigType() string {
+	if x != nil {
+		return x.ConfigType
+	}
+	return ""
+}
+
+func (x *SanitizeRequest) GetConfig() []byte {
+	if x != nil {
+		return x.Config
+	}
+	return nil
+}
+
+type SanitizeResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Error     string `protobuf:"bytes,1,opt,name=error,proto3" json:"error,omitempty"`
+	Sanitized []byte `protobuf:"bytes,2,opt,name=sanitized,proto3" json:"sanitized,omitempty"`
+}
+
+func (x *SanitizeResponse) Reset() {
+	*x = SanitizeResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_sanitizer_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SanitizeResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SanitizeResponse) ProtoMessage() {}
+
+func (x *SanitizeResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_sanitizer_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SanitizeResponse.ProtoReflect.Descriptor instead.
+func (*SanitizeResponse) Descriptor() ([]byte, []int) {
+	return file_sanitizer_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *SanitizeResponse) GetError() string {
+	if x != nil {
+		return x.Error
+	}
+	return ""
+}
+
+func (x *SanitizeResponse) GetSanitized() []byte {
+	if x != nil {
+		return x.Sanitized
+	}
+	return nil
+}
+
+var File_sanitizer_proto protoreflect.FileDescriptor
+
+var file_sanitizer_proto_rawDesc = []byte{
+	0x0a, 0x0f, 0x73, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x12, 0x11, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x76, 0x32, 0x22, 0x7f, 0x0a, 0x0f, 0x53, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x6e,
+	0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1e, 0x0a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x46, 0x0a, 0x10, 0x53, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12,
+	0x1c, 0x0a, 0x09, 0x73, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x09, 0x73, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x64, 0x32, 0x60, 0x0a,
+	0x09, 0x53, 0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x72, 0x12, 0x53, 0x0a, 0x08, 0x53, 0x61,
+	0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x12, 0x22, 0x2e, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65,
+	0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x53, 0x61, 0x6e, 0x69, 0x74,
+	0x69, 0x7a, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x70, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x2e, 0x53,
+	0x61, 0x6e, 0x69, 0x74, 0x69, 0x7a, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42,
+	0x15, 0x5a, 0x13, 0x2e, 0x3b, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x65, 0x78, 0x74, 0x65, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x76, 0x32, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_sanitizer_proto_rawDescOnce sync.Once
+	file_sanitizer_proto_rawDescData = file_sanitizer_proto_rawDesc
+)
+
+func file_sanitizer_proto_rawDescGZIP() []byte {
+	file_sanitizer_proto_rawDescOnce.Do(func() {
+		file_sanitizer_proto_rawDescData = protoimpl.X.CompressGZIP(file_sanitizer_proto_rawDescData)
+	})
+	return file_sanitizer_proto_rawDescData
+}
+
+var file_sanitizer_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_sanitizer_proto_goTypes = []interface{}{
+	(*SanitizeRequest)(nil),  // 0: pluginextensionv2.SanitizeRequest
+	(*SanitizeResponse)(nil), // 1: pluginextensionv2.SanitizeResponse
+}
+var file_sanitizer_proto_depIdxs = []int32{
+	0, // 0: pluginextensionv2.Sanitizer.Sanitize:input_type -> pluginextensionv2.SanitizeRequest
+	1, // 1: pluginextensionv2.Sanitizer.Sanitize:output_type -> pluginextensionv2.SanitizeResponse
+	1, // [1:2] is the sub-list for method output_type
+	0, // [0:1] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_sanitizer_proto_init() }
+func file_sanitizer_proto_init() {
+	if File_sanitizer_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_sanitizer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SanitizeRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_sanitizer_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SanitizeResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_sanitizer_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_sanitizer_proto_goTypes,
+		DependencyIndexes: file_sanitizer_proto_depIdxs,
+		MessageInfos:      file_sanitizer_proto_msgTypes,
+	}.Build()
+	File_sanitizer_proto = out.File
+	file_sanitizer_proto_rawDesc = nil
+	file_sanitizer_proto_goTypes = nil
+	file_sanitizer_proto_depIdxs = nil
+}
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ context.Context
+var _ grpc.ClientConnInterface
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the grpc package it is being compiled against.
+const _ = grpc.SupportPackageIsVersion6
+
+// SanitizerClient is the client API for Sanitizer service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
+type SanitizerClient interface {
+	Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error)
+}
+
+type sanitizerClient struct {
+	cc grpc.ClientConnInterface
+}
+
+func NewSanitizerClient(cc grpc.ClientConnInterface) SanitizerClient {
+	return &sanitizerClient{cc}
+}
+
+func (c *sanitizerClient) Sanitize(ctx context.Context, in *SanitizeRequest, opts ...grpc.CallOption) (*SanitizeResponse, error) {
+	out := new(SanitizeResponse)
+	err := c.cc.Invoke(ctx, "/pluginextensionv2.Sanitizer/Sanitize", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// SanitizerServer is the server API for Sanitizer service.
+type SanitizerServer interface {
+	Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error)
+}
+
+// UnimplementedSanitizerServer can be embedded to have forward compatible implementations.
+type UnimplementedSanitizerServer struct {
+}
+
+func (*UnimplementedSanitizerServer) Sanitize(context.Context, *SanitizeRequest) (*SanitizeResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Sanitize not implemented")
+}
+
+func RegisterSanitizerServer(s *grpc.Server, srv SanitizerServer) {
+	s.RegisterService(&_Sanitizer_serviceDesc, srv)
+}
+
+func _Sanitizer_Sanitize_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SanitizeRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(SanitizerServer).Sanitize(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/pluginextensionv2.Sanitizer/Sanitize",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(SanitizerServer).Sanitize(ctx, req.(*SanitizeRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+var _Sanitizer_serviceDesc = grpc.ServiceDesc{
+	ServiceName: "pluginextensionv2.Sanitizer",
+	HandlerType: (*SanitizerServer)(nil),
+	Methods: []grpc.MethodDesc{
+		{
+			MethodName: "Sanitize",
+			Handler:    _Sanitizer_Sanitize_Handler,
+		},
+	},
+	Streams:  []grpc.StreamDesc{},
+	Metadata: "sanitizer.proto",
+}
diff --git a/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.proto b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.proto
new file mode 100644
index 00000000000..fc2606dab7c
--- /dev/null
+++ b/pkg/plugins/backendplugin/pluginextensionv2/sanitizer.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+package pluginextensionv2;
+
+option go_package = ".;pluginextensionv2";
+
+message SanitizeRequest {
+  string filename = 1;
+  bytes content = 2;
+  string configType = 3; // DOMPurify, ...
+  bytes config = 4;
+}
+
+message SanitizeResponse {
+  string error = 1;
+  bytes sanitized = 2;
+}
+
+service Sanitizer {
+  rpc Sanitize(SanitizeRequest) returns (SanitizeResponse);
+}
diff --git a/pkg/plugins/manager/loader/loader_test.go b/pkg/plugins/manager/loader/loader_test.go
index b7f399c06f3..76eca25cd26 100644
--- a/pkg/plugins/manager/loader/loader_test.go
+++ b/pkg/plugins/manager/loader/loader_test.go
@@ -531,8 +531,8 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 					},
 				},
 				pluginErrors: map[string]*plugins.Error{
-					"test": {
-						PluginID:  "test",
+					"test-panel": {
+						PluginID:  "test-panel",
 						ErrorCode: "signatureMissing",
 					},
 				},
@@ -556,6 +556,11 @@ func TestLoader_Load_MultiplePlugins(t *testing.T) {
 				if !cmp.Equal(got, tt.want, compareOpts) {
 					t.Fatalf("Result mismatch (-want +got):\n%s", cmp.Diff(got, tt.want, compareOpts))
 				}
+				pluginErrs := l.PluginErrors()
+				require.Equal(t, len(tt.pluginErrors), len(pluginErrs))
+				for _, pluginErr := range pluginErrs {
+					require.Equal(t, tt.pluginErrors[pluginErr.PluginID], pluginErr)
+				}
 			})
 		}
 	})
diff --git a/pkg/server/backgroundsvcs/background_services.go b/pkg/server/backgroundsvcs/background_services.go
index c6970da787b..9fa9558f050 100644
--- a/pkg/server/backgroundsvcs/background_services.go
+++ b/pkg/server/backgroundsvcs/background_services.go
@@ -25,6 +25,7 @@ import (
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/store"
+	"github.com/grafana/grafana/pkg/services/store/sanitizer"
 	"github.com/grafana/grafana/pkg/services/thumbs"
 	"github.com/grafana/grafana/pkg/services/updatechecker"
 )
@@ -41,7 +42,7 @@ func ProvideBackgroundServiceRegistry(
 	// Need to make sure these are initialized, is there a better place to put them?
 	_ dashboardsnapshots.Service, _ *alerting.AlertNotificationService,
 	_ serviceaccounts.Service, _ *guardian.Provider,
-	_ *plugindashboardsservice.DashboardUpdater,
+	_ *plugindashboardsservice.DashboardUpdater, _ *sanitizer.Provider,
 ) *BackgroundServiceRegistry {
 	return NewBackgroundServiceRegistry(
 		httpServer,
diff --git a/pkg/server/wire.go b/pkg/server/wire.go
index 6da86c06297..08ebbd15c0f 100644
--- a/pkg/server/wire.go
+++ b/pkg/server/wire.go
@@ -6,6 +6,7 @@ package server
 import (
 	"github.com/google/wire"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
+	"github.com/grafana/grafana/pkg/services/store/sanitizer"
 
 	"github.com/grafana/grafana/pkg/api"
 	"github.com/grafana/grafana/pkg/api/avatar"
@@ -77,6 +78,10 @@ import (
 	"github.com/grafana/grafana/pkg/services/pluginsettings"
 	pluginSettings "github.com/grafana/grafana/pkg/services/pluginsettings/service"
 	"github.com/grafana/grafana/pkg/services/preference/prefimpl"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	publicdashboardsApi "github.com/grafana/grafana/pkg/services/publicdashboards/api"
+	publicdashboardsStore "github.com/grafana/grafana/pkg/services/publicdashboards/database"
+	publicdashboardsService "github.com/grafana/grafana/pkg/services/publicdashboards/service"
 	"github.com/grafana/grafana/pkg/services/query"
 	"github.com/grafana/grafana/pkg/services/queryhistory"
 	"github.com/grafana/grafana/pkg/services/quota"
@@ -87,6 +92,7 @@ import (
 	secretsDatabase "github.com/grafana/grafana/pkg/services/secrets/database"
 	secretsStore "github.com/grafana/grafana/pkg/services/secrets/kvstore"
 	secretsManager "github.com/grafana/grafana/pkg/services/secrets/manager"
+	secretsMigrator "github.com/grafana/grafana/pkg/services/secrets/migrator"
 	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	serviceaccountsmanager "github.com/grafana/grafana/pkg/services/serviceaccounts/manager"
 	"github.com/grafana/grafana/pkg/services/shorturls"
@@ -220,6 +226,8 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(secrets.Service), new(*secretsManager.SecretsService)),
 	secretsDatabase.ProvideSecretsStore,
 	wire.Bind(new(secrets.Store), new(*secretsDatabase.SecretsStoreImpl)),
+	secretsMigrator.ProvideSecretsMigrator,
+	wire.Bind(new(secrets.Migrator), new(*secretsMigrator.SecretsMigrator)),
 	grafanads.ProvideService,
 	wire.Bind(new(dashboardsnapshots.Store), new(*dashsnapstore.DashboardSnapshotStore)),
 	dashsnapstore.ProvideStore,
@@ -256,6 +264,7 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(alerting.DashAlertExtractor), new(*alerting.DashAlertExtractorService)),
 	comments.ProvideService,
 	guardian.ProvideService,
+	sanitizer.ProvideService,
 	secretsStore.ProvideService,
 	avatar.ProvideAvatarCacheServer,
 	authproxy.ProvideAuthProxy,
@@ -272,6 +281,11 @@ var wireBasicSet = wire.NewSet(
 	wire.Bind(new(accesscontrol.DashboardPermissionsService), new(*ossaccesscontrol.DashboardPermissionsService)),
 	starimpl.ProvideService,
 	dashverimpl.ProvideService,
+	publicdashboardsService.ProvideService,
+	wire.Bind(new(publicdashboards.Service), new(*publicdashboardsService.PublicDashboardServiceImpl)),
+	publicdashboardsStore.ProvideStore,
+	wire.Bind(new(publicdashboards.Store), new(*publicdashboardsStore.PublicDashboardStoreImpl)),
+	publicdashboardsApi.ProvideApi,
 	userimpl.ProvideService,
 	orgimpl.ProvideService,
 )
diff --git a/pkg/services/accesscontrol/database/database.go b/pkg/services/accesscontrol/database/database.go
index c89b0801341..9e4d02f4b92 100644
--- a/pkg/services/accesscontrol/database/database.go
+++ b/pkg/services/accesscontrol/database/database.go
@@ -2,6 +2,7 @@ package database
 
 import (
 	"context"
+	"strconv"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
@@ -110,3 +111,46 @@ func deletePermissions(sess *sqlstore.DBSession, ids []int64) error {
 
 	return nil
 }
+
+func (s *AccessControlStore) DeleteUserPermissions(ctx context.Context, userID int64) error {
+	err := s.sql.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		// Delete user role assignments
+		if _, err := sess.Exec("DELETE FROM user_role WHERE user_id = ?", userID); err != nil {
+			return err
+		}
+
+		// Delete permissions that are scoped to user
+		if _, err := sess.Exec("DELETE FROM permission WHERE scope = ?", accesscontrol.Scope("users", "id", strconv.FormatInt(userID, 10))); err != nil {
+			return err
+		}
+
+		var roleIDs []int64
+		if err := sess.SQL("SELECT id FROM role WHERE name = ?", accesscontrol.ManagedUserRoleName(userID)).Find(&roleIDs); err != nil {
+			return err
+		}
+
+		if len(roleIDs) == 0 {
+			return nil
+		}
+
+		query := "DELETE FROM permission WHERE role_id IN(? " + strings.Repeat(",?", len(roleIDs)-1) + ")"
+		args := make([]interface{}, 0, len(roleIDs)+1)
+		args = append(args, query)
+		for _, id := range roleIDs {
+			args = append(args, id)
+		}
+
+		// Delete managed user permissions
+		if _, err := sess.Exec(args...); err != nil {
+			return err
+		}
+
+		// Delete managed user roles
+		if _, err := sess.Exec("DELETE FROM role WHERE name = ?", accesscontrol.ManagedUserRoleName(userID)); err != nil {
+			return err
+		}
+
+		return nil
+	})
+	return err
+}
diff --git a/pkg/services/accesscontrol/database/database_test.go b/pkg/services/accesscontrol/database/database_test.go
index 094f27fd01c..1531523dc67 100644
--- a/pkg/services/accesscontrol/database/database_test.go
+++ b/pkg/services/accesscontrol/database/database_test.go
@@ -131,6 +131,31 @@ func TestAccessControlStore_GetUserPermissions(t *testing.T) {
 	}
 }
 
+func TestAccessControlStore_DeleteUserPermissions(t *testing.T) {
+	store, sql := setupTestEnv(t)
+
+	user, _ := createUserAndTeam(t, sql, 1)
+
+	_, err := store.SetUserResourcePermission(context.Background(), 1, accesscontrol.User{ID: user.ID}, types.SetResourcePermissionCommand{
+		Actions:    []string{"dashboards:write"},
+		Resource:   "dashboards",
+		ResourceID: "1",
+	}, nil)
+	require.NoError(t, err)
+
+	err = store.DeleteUserPermissions(context.Background(), user.ID)
+	require.NoError(t, err)
+
+	permissions, err := store.GetUserPermissions(context.Background(), accesscontrol.GetUserPermissionsQuery{
+		OrgID:   1,
+		UserID:  user.ID,
+		Roles:   []string{"Admin"},
+		Actions: []string{"dashboards:write"},
+	})
+	require.NoError(t, err)
+	assert.Len(t, permissions, 0)
+}
+
 func createUserAndTeam(t *testing.T, sql *sqlstore.SQLStore, orgID int64) (*user.User, models.Team) {
 	t.Helper()
 
diff --git a/pkg/services/accesscontrol/database/resource_permissions.go b/pkg/services/accesscontrol/database/resource_permissions.go
index ab34e1c63f3..0a39bb2663a 100644
--- a/pkg/services/accesscontrol/database/resource_permissions.go
+++ b/pkg/services/accesscontrol/database/resource_permissions.go
@@ -9,23 +9,25 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/accesscontrol/resourcepermissions/types"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
 type flatResourcePermission struct {
-	ID          int64 `xorm:"id"`
-	RoleName    string
-	Action      string
-	Scope       string
-	UserId      int64
-	UserLogin   string
-	UserEmail   string
-	TeamId      int64
-	TeamEmail   string
-	Team        string
-	BuiltInRole string
-	Created     time.Time
-	Updated     time.Time
+	ID                   int64 `xorm:"id"`
+	RoleName             string
+	Action               string
+	Scope                string
+	UserId               int64
+	UserLogin            string
+	UserEmail            string
+	UserIsServiceAccount bool
+	TeamId               int64
+	TeamEmail            string
+	Team                 string
+	BuiltInRole          string
+	Created              time.Time
+	Updated              time.Time
 }
 
 func (p *flatResourcePermission) IsManaged(scope string) bool {
@@ -292,6 +294,7 @@ func (s *AccessControlStore) getResourcePermissions(sess *sqlstore.DBSession, or
 		ur.user_id AS user_id,
 		u.login AS user_login,
 		u.email AS user_email,
+		u.is_service_account AS user_is_service_account,
 		0 AS team_id,
 		'' AS team,
 		'' AS team_email,
@@ -302,6 +305,7 @@ func (s *AccessControlStore) getResourcePermissions(sess *sqlstore.DBSession, or
 		0 AS user_id,
 		'' AS user_login,
 		'' AS user_email,
+		false AS user_is_service_account,
 		tr.team_id AS team_id,
 		t.name AS team,
 		t.email AS team_email,
@@ -312,6 +316,7 @@ func (s *AccessControlStore) getResourcePermissions(sess *sqlstore.DBSession, or
 		0 AS user_id,
 		'' AS user_login,
 		'' AS user_email,
+		false AS user_is_service_account,
 		0 as team_id,
 		'' AS team,
 		'' AS team_email,
@@ -370,8 +375,13 @@ func (s *AccessControlStore) getResourcePermissions(sess *sqlstore.DBSession, or
 	if err != nil {
 		return nil, err
 	}
-	user := userSelect + userFrom + where + " AND " + userFilter.Where
+	serviceAccountFilter, err := accesscontrol.Filter(query.User, "u.id", "serviceaccounts:id:", serviceaccounts.ActionRead)
+	if err != nil {
+		return nil, err
+	}
+	user := userSelect + userFrom + where + " AND (" + userFilter.Where + " OR " + serviceAccountFilter.Where + ") "
 	args = append(args, userFilter.Args...)
+	args = append(args, serviceAccountFilter.Args...)
 
 	teamFilter, err := accesscontrol.Filter(query.User, "t.id", "teams:id:", accesscontrol.ActionTeamsRead)
 	if err != nil {
@@ -457,20 +467,21 @@ func flatPermissionsToResourcePermission(scope string, permissions []flatResourc
 
 	first := permissions[0]
 	return &accesscontrol.ResourcePermission{
-		ID:          first.ID,
-		RoleName:    first.RoleName,
-		Actions:     actions,
-		Scope:       first.Scope,
-		UserId:      first.UserId,
-		UserLogin:   first.UserLogin,
-		UserEmail:   first.UserEmail,
-		TeamId:      first.TeamId,
-		TeamEmail:   first.TeamEmail,
-		Team:        first.Team,
-		BuiltInRole: first.BuiltInRole,
-		Created:     first.Created,
-		Updated:     first.Updated,
-		IsManaged:   first.IsManaged(scope),
+		ID:                   first.ID,
+		RoleName:             first.RoleName,
+		Actions:              actions,
+		Scope:                first.Scope,
+		UserId:               first.UserId,
+		UserLogin:            first.UserLogin,
+		UserEmail:            first.UserEmail,
+		UserIsServiceAccount: first.UserIsServiceAccount,
+		TeamId:               first.TeamId,
+		TeamEmail:            first.TeamEmail,
+		Team:                 first.Team,
+		BuiltInRole:          first.BuiltInRole,
+		Created:              first.Created,
+		Updated:              first.Updated,
+		IsManaged:            first.IsManaged(scope),
 	}
 }
 
@@ -581,6 +592,7 @@ func (s *AccessControlStore) getResourcePermissionsByIds(sess *sqlstore.DBSessio
 		ur.user_id AS user_id,
 		u.login AS user_login,
 		u.email AS user_email,
+		u.is_service_account AS user_is_service_account,
 		tr.team_id AS team_id,
 		t.name AS team,
 		t.email AS team_email,
diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index 0317ea73b52..85ef4f1188b 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -222,20 +222,21 @@ type ScopeParams struct {
 // ResourcePermission is structure that holds all actions that either a team / user / builtin-role
 // can perform against specific resource.
 type ResourcePermission struct {
-	ID          int64
-	RoleName    string
-	Actions     []string
-	Scope       string
-	UserId      int64
-	UserLogin   string
-	UserEmail   string
-	TeamId      int64
-	TeamEmail   string
-	Team        string
-	BuiltInRole string
-	IsManaged   bool
-	Created     time.Time
-	Updated     time.Time
+	ID                   int64
+	RoleName             string
+	Actions              []string
+	Scope                string
+	UserId               int64
+	UserLogin            string
+	UserEmail            string
+	UserIsServiceAccount bool
+	TeamId               int64
+	TeamEmail            string
+	Team                 string
+	BuiltInRole          string
+	IsManaged            bool
+	Created              time.Time
+	Updated              time.Time
 }
 
 func (p *ResourcePermission) Contains(targetActions []string) bool {
diff --git a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
index a271c3bbd6f..de8da4c50b4 100644
--- a/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
+++ b/pkg/services/accesscontrol/ossaccesscontrol/permissions_services.go
@@ -58,9 +58,10 @@ func ProvideTeamPermissions(
 			return nil
 		},
 		Assignments: resourcepermissions.Assignments{
-			Users:        true,
-			Teams:        false,
-			BuiltInRoles: false,
+			Users:           true,
+			Teams:           false,
+			BuiltInRoles:    false,
+			ServiceAccounts: true,
 		},
 		PermissionsToActions: map[string][]string{
 			"Member": TeamMemberActions,
@@ -149,9 +150,10 @@ func ProvideDashboardPermissions(
 			return []string{}, nil
 		},
 		Assignments: resourcepermissions.Assignments{
-			Users:        true,
-			Teams:        true,
-			BuiltInRoles: true,
+			Users:           true,
+			Teams:           true,
+			BuiltInRoles:    true,
+			ServiceAccounts: false,
 		},
 		PermissionsToActions: map[string][]string{
 			"View":  DashboardViewActions,
@@ -206,9 +208,10 @@ func ProvideFolderPermissions(
 			return nil
 		},
 		Assignments: resourcepermissions.Assignments{
-			Users:        true,
-			Teams:        true,
-			BuiltInRoles: true,
+			Users:           true,
+			Teams:           true,
+			BuiltInRoles:    true,
+			ServiceAccounts: false,
 		},
 		PermissionsToActions: map[string][]string{
 			"View":  append(DashboardViewActions, FolderViewActions...),
diff --git a/pkg/services/accesscontrol/resourcepermissions/api.go b/pkg/services/accesscontrol/resourcepermissions/api.go
index a1892130cfd..c4d8d963ef8 100644
--- a/pkg/services/accesscontrol/resourcepermissions/api.go
+++ b/pkg/services/accesscontrol/resourcepermissions/api.go
@@ -40,7 +40,7 @@ func (a *api) registerEndpoints() {
 		scope := accesscontrol.Scope(a.service.options.Resource, a.service.options.ResourceAttribute, accesscontrol.Parameter(":resourceID"))
 		r.Get("/description", auth(disable, accesscontrol.EvalPermission(actionRead)), routing.Wrap(a.getDescription))
 		r.Get("/:resourceID", inheritanceSolver, auth(disable, accesscontrol.EvalPermission(actionRead, scope)), routing.Wrap(a.getPermissions))
-		if a.service.options.Assignments.Users {
+		if a.service.options.Assignments.Users || a.service.options.Assignments.ServiceAccounts {
 			r.Post("/:resourceID/users/:userID", inheritanceSolver, auth(disable, accesscontrol.EvalPermission(actionWrite, scope)), routing.Wrap(a.setUserPermission))
 		}
 		if a.service.options.Assignments.Teams {
@@ -53,9 +53,10 @@ func (a *api) registerEndpoints() {
 }
 
 type Assignments struct {
-	Users        bool `json:"users"`
-	Teams        bool `json:"teams"`
-	BuiltInRoles bool `json:"builtInRoles"`
+	Users           bool `json:"users"`
+	Teams           bool `json:"teams"`
+	BuiltInRoles    bool `json:"builtInRoles"`
+	ServiceAccounts bool `json:"serviceAccounts"`
 }
 
 type Description struct {
@@ -71,18 +72,19 @@ func (a *api) getDescription(c *models.ReqContext) response.Response {
 }
 
 type resourcePermissionDTO struct {
-	ID            int64    `json:"id"`
-	RoleName      string   `json:"roleName"`
-	IsManaged     bool     `json:"isManaged"`
-	UserID        int64    `json:"userId,omitempty"`
-	UserLogin     string   `json:"userLogin,omitempty"`
-	UserAvatarUrl string   `json:"userAvatarUrl,omitempty"`
-	Team          string   `json:"team,omitempty"`
-	TeamID        int64    `json:"teamId,omitempty"`
-	TeamAvatarUrl string   `json:"teamAvatarUrl,omitempty"`
-	BuiltInRole   string   `json:"builtInRole,omitempty"`
-	Actions       []string `json:"actions"`
-	Permission    string   `json:"permission"`
+	ID                   int64    `json:"id"`
+	RoleName             string   `json:"roleName"`
+	IsManaged            bool     `json:"isManaged"`
+	UserID               int64    `json:"userId,omitempty"`
+	UserLogin            string   `json:"userLogin,omitempty"`
+	UserAvatarUrl        string   `json:"userAvatarUrl,omitempty"`
+	UserIsServiceAccount bool     `json:"userIsServiceAccount,omitempty"`
+	Team                 string   `json:"team,omitempty"`
+	TeamID               int64    `json:"teamId,omitempty"`
+	TeamAvatarUrl        string   `json:"teamAvatarUrl,omitempty"`
+	BuiltInRole          string   `json:"builtInRole,omitempty"`
+	Actions              []string `json:"actions"`
+	Permission           string   `json:"permission"`
 }
 
 func (a *api) getPermissions(c *models.ReqContext) response.Response {
@@ -110,18 +112,19 @@ func (a *api) getPermissions(c *models.ReqContext) response.Response {
 			}
 
 			dto = append(dto, resourcePermissionDTO{
-				ID:            p.ID,
-				RoleName:      p.RoleName,
-				UserID:        p.UserId,
-				UserLogin:     p.UserLogin,
-				UserAvatarUrl: dtos.GetGravatarUrl(p.UserEmail),
-				Team:          p.Team,
-				TeamID:        p.TeamId,
-				TeamAvatarUrl: teamAvatarUrl,
-				BuiltInRole:   p.BuiltInRole,
-				Actions:       p.Actions,
-				Permission:    permission,
-				IsManaged:     p.IsManaged,
+				ID:                   p.ID,
+				RoleName:             p.RoleName,
+				UserID:               p.UserId,
+				UserLogin:            p.UserLogin,
+				UserAvatarUrl:        dtos.GetGravatarUrl(p.UserEmail),
+				UserIsServiceAccount: p.UserIsServiceAccount,
+				Team:                 p.Team,
+				TeamID:               p.TeamId,
+				TeamAvatarUrl:        teamAvatarUrl,
+				BuiltInRole:          p.BuiltInRole,
+				Actions:              p.Actions,
+				Permission:           permission,
+				IsManaged:            p.IsManaged,
 			})
 		}
 	}
diff --git a/pkg/services/accesscontrol/resourcepermissions/api_test.go b/pkg/services/accesscontrol/resourcepermissions/api_test.go
index 2f32ae41b81..2178aa8d0fe 100644
--- a/pkg/services/accesscontrol/resourcepermissions/api_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/api_test.go
@@ -18,6 +18,7 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
 	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
@@ -159,12 +160,12 @@ func TestApi_getPermissions(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			service, sql := setupTestEnvironment(t, tt.permissions, testOptions)
+			service, sql := setupTestEnvironment(t, tt.permissions, testOptionsDashboards)
 			server := setupTestServer(t, &models.SignedInUser{OrgId: 1, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}, service)
 
 			seedPermissions(t, tt.resourceID, sql, service)
 
-			permissions, recorder := getPermission(t, server, testOptions.Resource, tt.resourceID)
+			permissions, recorder := getPermission(t, server, testOptionsDashboards.Resource, tt.resourceID)
 			assert.Equal(t, tt.expectedStatus, recorder.Code)
 
 			if tt.expectedStatus == http.StatusOK {
@@ -236,14 +237,14 @@ func TestApi_setBuiltinRolePermission(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			service, _ := setupTestEnvironment(t, tt.permissions, testOptions)
+			service, _ := setupTestEnvironment(t, tt.permissions, testOptionsDashboards)
 			server := setupTestServer(t, &models.SignedInUser{OrgId: 1, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}, service)
 
-			recorder := setPermission(t, server, testOptions.Resource, tt.resourceID, tt.permission, "builtInRoles", tt.builtInRole)
+			recorder := setPermission(t, server, testOptionsDashboards.Resource, tt.resourceID, tt.permission, "builtInRoles", tt.builtInRole)
 			assert.Equal(t, tt.expectedStatus, recorder.Code)
 
 			if tt.expectedStatus == http.StatusOK {
-				permissions, _ := getPermission(t, server, testOptions.Resource, tt.resourceID)
+				permissions, _ := getPermission(t, server, testOptionsDashboards.Resource, tt.resourceID)
 				require.Len(t, permissions, 1)
 				assert.Equal(t, tt.permission, permissions[0].Permission)
 				assert.Equal(t, tt.builtInRole, permissions[0].BuiltInRole)
@@ -314,19 +315,19 @@ func TestApi_setTeamPermission(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			service, sql := setupTestEnvironment(t, tt.permissions, testOptions)
+			service, sql := setupTestEnvironment(t, tt.permissions, testOptionsDashboards)
 			server := setupTestServer(t, &models.SignedInUser{OrgId: 1, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}, service)
 
 			// seed team
 			_, err := sql.CreateTeam("test", "test@test.com", 1)
 			require.NoError(t, err)
 
-			recorder := setPermission(t, server, testOptions.Resource, tt.resourceID, tt.permission, "teams", strconv.Itoa(int(tt.teamID)))
+			recorder := setPermission(t, server, testOptionsDashboards.Resource, tt.resourceID, tt.permission, "teams", strconv.Itoa(int(tt.teamID)))
 			assert.Equal(t, tt.expectedStatus, recorder.Code)
 
 			assert.Equal(t, tt.expectedStatus, recorder.Code)
 			if tt.expectedStatus == http.StatusOK {
-				permissions, _ := getPermission(t, server, testOptions.Resource, tt.resourceID)
+				permissions, _ := getPermission(t, server, testOptionsDashboards.Resource, tt.resourceID)
 				require.Len(t, permissions, 1)
 				assert.Equal(t, tt.permission, permissions[0].Permission)
 				assert.Equal(t, tt.teamID, permissions[0].TeamID)
@@ -397,19 +398,18 @@ func TestApi_setUserPermission(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.desc, func(t *testing.T) {
-			service, sql := setupTestEnvironment(t, tt.permissions, testOptions)
+			service, sql := setupTestEnvironment(t, tt.permissions, testOptionsDashboards)
 			server := setupTestServer(t, &models.SignedInUser{OrgId: 1, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}, service)
 
 			// seed user
 			_, err := sql.CreateUser(context.Background(), user.CreateUserCommand{Login: "test", OrgID: 1})
 			require.NoError(t, err)
 
-			recorder := setPermission(t, server, testOptions.Resource, tt.resourceID, tt.permission, "users", strconv.Itoa(int(tt.userID)))
+			recorder := setPermission(t, server, testOptionsDashboards.Resource, tt.resourceID, tt.permission, "users", strconv.Itoa(int(tt.userID)))
 			assert.Equal(t, tt.expectedStatus, recorder.Code)
 
-			assert.Equal(t, tt.expectedStatus, recorder.Code)
 			if tt.expectedStatus == http.StatusOK {
-				permissions, _ := getPermission(t, server, testOptions.Resource, tt.resourceID)
+				permissions, _ := getPermission(t, server, testOptionsDashboards.Resource, tt.resourceID)
 				require.Len(t, permissions, 1)
 				assert.Equal(t, tt.permission, permissions[0].Permission)
 				assert.Equal(t, tt.userID, permissions[0].UserID)
@@ -418,6 +418,92 @@ func TestApi_setUserPermission(t *testing.T) {
 	}
 }
 
+type setServiceAccountPermissionTestCase struct {
+	desc             string
+	serviceaccountID int64
+	resourceID       string
+	expectedStatus   int
+	permission       string
+	permissions      []accesscontrol.Permission
+}
+
+func TestApi_setServiceAccountPermission(t *testing.T) {
+	tests := []setServiceAccountPermissionTestCase{
+		{
+			desc:             "should set Edit permission for serviceaccount 1",
+			serviceaccountID: 1,
+			resourceID:       "1",
+			expectedStatus:   200,
+			permission:       "Edit",
+			permissions: []accesscontrol.Permission{
+				{Action: "teams.permissions:read", Scope: "teams:id:1"},
+				{Action: "teams.permissions:write", Scope: "teams:id:1"},
+				{Action: accesscontrol.ActionTeamsRead, Scope: accesscontrol.ScopeTeamsAll},
+				{Action: serviceaccounts.ActionRead, Scope: serviceaccounts.ScopeAll},
+			},
+		},
+		{
+			desc:             "should set View permission for serviceaccount 1",
+			serviceaccountID: 1,
+			resourceID:       "1",
+			expectedStatus:   200,
+			permission:       "View",
+			permissions: []accesscontrol.Permission{
+				{Action: "teams.permissions:read", Scope: "teams:id:1"},
+				{Action: "teams.permissions:write", Scope: "teams:id:1"},
+				{Action: accesscontrol.ActionTeamsRead, Scope: accesscontrol.ScopeTeamsAll},
+				{Action: serviceaccounts.ActionRead, Scope: serviceaccounts.ScopeAll},
+			},
+		},
+		{
+			desc:             "should set return http 400 when serviceaccount does not exist",
+			serviceaccountID: 2,
+			resourceID:       "1",
+			expectedStatus:   http.StatusBadRequest,
+			permission:       "View",
+			permissions: []accesscontrol.Permission{
+				{Action: "teams.permissions:read", Scope: "teams:id:1"},
+				{Action: "teams.permissions:write", Scope: "teams:id:1"},
+				{Action: accesscontrol.ActionTeamsRead, Scope: accesscontrol.ScopeTeamsAll},
+				{Action: serviceaccounts.ActionRead, Scope: serviceaccounts.ScopeAll},
+			},
+		},
+		{
+			desc:             "should return http 403 when missing permissions",
+			serviceaccountID: 1,
+			resourceID:       "1",
+			expectedStatus:   http.StatusForbidden,
+			permission:       "View",
+			permissions: []accesscontrol.Permission{
+				{Action: "teams.permissions:read", Scope: "teams:id:1"},
+				{Action: accesscontrol.ActionTeamsRead, Scope: accesscontrol.ScopeTeamsAll},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.desc, func(t *testing.T) {
+			service, sql := setupTestEnvironment(t, tt.permissions, testOptionsTeams)
+			server := setupTestServer(t, &models.SignedInUser{OrgId: 1, Permissions: map[int64]map[string][]string{1: accesscontrol.GroupScopesByAction(tt.permissions)}}, service)
+
+			// seed serviceaccount
+			_, err := sql.CreateUser(context.Background(), user.CreateUserCommand{Login: "test", OrgID: 1, IsServiceAccount: true})
+			require.NoError(t, err)
+
+			recorder := setPermission(t, server, testOptionsTeams.Resource, tt.resourceID, tt.permission, "users", strconv.Itoa(int(tt.serviceaccountID)))
+			assert.Equal(t, tt.expectedStatus, recorder.Code)
+
+			if tt.expectedStatus == http.StatusOK {
+				permissions, _ := getPermission(t, server, testOptionsTeams.Resource, tt.resourceID)
+				require.Len(t, permissions, 1)
+				assert.Equal(t, tt.permission, permissions[0].Permission)
+				assert.Equal(t, tt.serviceaccountID, permissions[0].UserID)
+				assert.Equal(t, true, permissions[0].UserIsServiceAccount)
+			}
+		})
+	}
+}
+
 func setupTestServer(t *testing.T, user *models.SignedInUser, service *Service) *web.Mux {
 	server := web.New()
 	server.UseMiddleware(web.Renderer(path.Join(setting.StaticRootPath, "views"), "[[", "]]"))
@@ -444,13 +530,14 @@ func contextProvider(tc *testContext) web.Handler {
 	}
 }
 
-var testOptions = Options{
+var testOptionsDashboards = Options{
 	Resource:          "dashboards",
 	ResourceAttribute: "id",
 	Assignments: Assignments{
-		Users:        true,
-		Teams:        true,
-		BuiltInRoles: true,
+		Users:           true,
+		Teams:           true,
+		BuiltInRoles:    true,
+		ServiceAccounts: true,
 	},
 	PermissionsToActions: map[string][]string{
 		"View": {"dashboards:read"},
@@ -458,6 +545,21 @@ var testOptions = Options{
 	},
 }
 
+var testOptionsTeams = Options{
+	Resource:          "teams",
+	ResourceAttribute: "id",
+	Assignments: Assignments{
+		Users:           true,
+		Teams:           true,
+		BuiltInRoles:    true,
+		ServiceAccounts: true,
+	},
+	PermissionsToActions: map[string][]string{
+		"View": {"teams:read"},
+		"Edit": {"teams:read", "teams:write", "teams:delete"},
+	},
+}
+
 func getPermission(t *testing.T, server *web.Mux, resource, resourceID string) ([]resourcePermissionDTO, *httptest.ResponseRecorder) {
 	req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("/api/access-control/%s/%s", resource, resourceID), nil)
 	require.NoError(t, err)
diff --git a/pkg/services/accesscontrol/resourcepermissions/service.go b/pkg/services/accesscontrol/resourcepermissions/service.go
index d8ae4903963..2722dba149a 100644
--- a/pkg/services/accesscontrol/resourcepermissions/service.go
+++ b/pkg/services/accesscontrol/resourcepermissions/service.go
@@ -275,7 +275,7 @@ func (s *Service) validateResource(ctx context.Context, orgID int64, resourceID
 }
 
 func (s *Service) validateUser(ctx context.Context, orgID, userID int64) error {
-	if !s.options.Assignments.Users {
+	if !(s.options.Assignments.Users || s.options.Assignments.ServiceAccounts) {
 		return ErrInvalidAssignment
 	}
 
diff --git a/pkg/services/accesscontrol/resourcepermissions/service_test.go b/pkg/services/accesscontrol/resourcepermissions/service_test.go
index 8775502ab99..be8a18c5db8 100644
--- a/pkg/services/accesscontrol/resourcepermissions/service_test.go
+++ b/pkg/services/accesscontrol/resourcepermissions/service_test.go
@@ -38,7 +38,7 @@ func TestService_SetUserPermission(t *testing.T) {
 		t.Run(tt.desc, func(t *testing.T) {
 			service, sql := setupTestEnvironment(t, []accesscontrol.Permission{}, Options{
 				Resource:             "dashboards",
-				Assignments:          Assignments{Users: true},
+				Assignments:          Assignments{Users: true, ServiceAccounts: true},
 				PermissionsToActions: nil,
 			})
 
@@ -159,9 +159,10 @@ func TestService_SetPermissions(t *testing.T) {
 			options: Options{
 				Resource: "dashboards",
 				Assignments: Assignments{
-					Users:        true,
-					Teams:        true,
-					BuiltInRoles: true,
+					Users:           true,
+					Teams:           true,
+					BuiltInRoles:    true,
+					ServiceAccounts: true,
 				},
 				PermissionsToActions: map[string][]string{
 					"View": {"dashboards:read"},
@@ -178,9 +179,10 @@ func TestService_SetPermissions(t *testing.T) {
 			options: Options{
 				Resource: "dashboards",
 				Assignments: Assignments{
-					Users:        true,
-					Teams:        true,
-					BuiltInRoles: true,
+					Users:           true,
+					Teams:           true,
+					BuiltInRoles:    true,
+					ServiceAccounts: true,
 				},
 				PermissionsToActions: map[string][]string{
 					"View": {"dashboards:read"},
diff --git a/pkg/services/alerting/notifier_test.go b/pkg/services/alerting/notifier_test.go
index b55e15870cc..29858fb65fa 100644
--- a/pkg/services/alerting/notifier_test.go
+++ b/pkg/services/alerting/notifier_test.go
@@ -339,6 +339,10 @@ type testRenderService struct {
 	renderErrorImageProvider func(error error) (*rendering.RenderResult, error)
 }
 
+func (s *testRenderService) SanitizeSVG(ctx context.Context, req *rendering.SanitizeSVGRequest) (*rendering.SanitizeSVGResponse, error) {
+	return &rendering.SanitizeSVGResponse{Sanitized: req.Content}, nil
+}
+
 func (s *testRenderService) HasCapability(feature rendering.CapabilityName) (rendering.CapabilitySupportRequestResult, error) {
 	return rendering.CapabilitySupportRequestResult{}, nil
 }
diff --git a/pkg/services/dashboards/accesscontrol_test.go b/pkg/services/dashboards/accesscontrol_test.go
index dc8f2ba5589..d9e57e44657 100644
--- a/pkg/services/dashboards/accesscontrol_test.go
+++ b/pkg/services/dashboards/accesscontrol_test.go
@@ -64,12 +64,12 @@ func TestNewFolderNameScopeResolver(t *testing.T) {
 		_, resolver := NewFolderNameScopeResolver(dashboardStore)
 
 		orgId := rand.Int63()
-		dashboardStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything).Return(nil, models.ErrDashboardNotFound).Once()
+		dashboardStore.On("GetFolderByTitle", mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrDashboardNotFound).Once()
 
 		scope := "folders:name:" + util.GenerateShortUID()
 
 		resolvedScopes, err := resolver.Resolve(context.Background(), orgId, scope)
-		require.ErrorIs(t, err, models.ErrDashboardNotFound)
+		require.ErrorIs(t, err, ErrDashboardNotFound)
 		require.Nil(t, resolvedScopes)
 	})
 }
@@ -136,11 +136,11 @@ func TestNewFolderIDScopeResolver(t *testing.T) {
 		_, resolver := NewFolderIDScopeResolver(dashboardStore)
 
 		orgId := rand.Int63()
-		dashboardStore.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Return(nil, models.ErrDashboardNotFound).Once()
+		dashboardStore.On("GetFolderByID", mock.Anything, mock.Anything, mock.Anything).Return(nil, ErrDashboardNotFound).Once()
 
 		scope := "folders:id:10"
 		resolvedScopes, err := resolver.Resolve(context.Background(), orgId, scope)
-		require.ErrorIs(t, err, models.ErrDashboardNotFound)
+		require.ErrorIs(t, err, ErrDashboardNotFound)
 		require.Nil(t, resolvedScopes)
 	})
 }
diff --git a/pkg/services/dashboards/dashboard.go b/pkg/services/dashboards/dashboard.go
index 9ccdc716346..b3a1b3cffe3 100644
--- a/pkg/services/dashboards/dashboard.go
+++ b/pkg/services/dashboards/dashboard.go
@@ -3,14 +3,12 @@ package dashboards
 import (
 	"context"
 
-	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/models"
 )
 
 //go:generate mockery --name DashboardService --structname FakeDashboardService --inpackage --filename dashboard_service_mock.go
 // DashboardService is a service for operating on dashboards.
 type DashboardService interface {
-	BuildPublicDashboardMetricRequest(ctx context.Context, dashboard *models.Dashboard, publicDashboard *models.PublicDashboard, panelId int64) (dtos.MetricRequest, error)
 	BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, shouldValidateAlerts bool, validateProvisionedDashboard bool) (*models.SaveDashboardCommand, error)
 	DeleteDashboard(ctx context.Context, dashboardId int64, orgId int64) error
 	FindDashboards(ctx context.Context, query *models.FindPersistedDashboardsQuery) ([]DashboardSearchProjection, error)
@@ -19,14 +17,11 @@ type DashboardService interface {
 	GetDashboards(ctx context.Context, query *models.GetDashboardsQuery) error
 	GetDashboardTags(ctx context.Context, query *models.GetDashboardTagsQuery) error
 	GetDashboardUIDById(ctx context.Context, query *models.GetDashboardRefByIdQuery) error
-	GetPublicDashboard(ctx context.Context, accessToken string) (*models.Dashboard, error)
-	GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error)
-	HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error
+	HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error
 	HasEditPermissionInFolders(ctx context.Context, query *models.HasEditPermissionInFoldersQuery) error
 	ImportDashboard(ctx context.Context, dto *SaveDashboardDTO) (*models.Dashboard, error)
 	MakeUserAdmin(ctx context.Context, orgID int64, userID, dashboardID int64, setViewAndEditPermissions bool) error
 	SaveDashboard(ctx context.Context, dto *SaveDashboardDTO, allowUiUpdate bool) (*models.Dashboard, error)
-	SavePublicDashboardConfig(ctx context.Context, dto *SavePublicDashboardConfigDTO) (*models.PublicDashboard, error)
 	SearchDashboards(ctx context.Context, query *models.FindPersistedDashboardsQuery) error
 	UpdateDashboardACL(ctx context.Context, uid int64, items []*models.DashboardAcl) error
 }
@@ -65,18 +60,13 @@ type Store interface {
 	GetProvisionedDashboardData(name string) ([]*models.DashboardProvisioning, error)
 	GetProvisionedDataByDashboardID(dashboardID int64) (*models.DashboardProvisioning, error)
 	GetProvisionedDataByDashboardUID(orgID int64, dashboardUID string) (*models.DashboardProvisioning, error)
-	GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error)
-	GetPublicDashboard(ctx context.Context, accessToken string) (*models.PublicDashboard, *models.Dashboard, error)
-	GenerateNewPublicDashboardUid(ctx context.Context) (string, error)
-	HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error
+	HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error
 	HasEditPermissionInFolders(ctx context.Context, query *models.HasEditPermissionInFoldersQuery) error
 	// SaveAlerts saves dashboard alerts.
 	SaveAlerts(ctx context.Context, dashID int64, alerts []*models.Alert) error
 	SaveDashboard(cmd models.SaveDashboardCommand) (*models.Dashboard, error)
 	SaveProvisionedDashboard(cmd models.SaveDashboardCommand, provisioning *models.DashboardProvisioning) (*models.Dashboard, error)
-	SavePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) (*models.PublicDashboard, error)
 	UnprovisionDashboard(ctx context.Context, id int64) error
-	UpdatePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) error
 	UpdateDashboardACL(ctx context.Context, uid int64, items []*models.DashboardAcl) error
 	// ValidateDashboardBeforeSave validates a dashboard before save.
 	ValidateDashboardBeforeSave(dashboard *models.Dashboard, overwrite bool) (bool, error)
diff --git a/pkg/services/dashboards/dashboard_service_mock.go b/pkg/services/dashboards/dashboard_service_mock.go
index e486c1126d1..8e42d531998 100644
--- a/pkg/services/dashboards/dashboard_service_mock.go
+++ b/pkg/services/dashboards/dashboard_service_mock.go
@@ -1,14 +1,12 @@
-// Code generated by mockery v2.12.1. DO NOT EDIT.
+// Code generated by mockery v2.12.2. DO NOT EDIT.
 
 package dashboards
 
 import (
 	context "context"
 
-	dtos "github.com/grafana/grafana/pkg/api/dtos"
-	mock "github.com/stretchr/testify/mock"
-
 	models "github.com/grafana/grafana/pkg/models"
+	mock "github.com/stretchr/testify/mock"
 
 	testing "testing"
 )
@@ -18,27 +16,6 @@ type FakeDashboardService struct {
 	mock.Mock
 }
 
-// BuildPublicDashboardMetricRequest provides a mock function with given fields: ctx, dashboard, publicDashboard, panelId
-func (_m *FakeDashboardService) BuildPublicDashboardMetricRequest(ctx context.Context, dashboard *models.Dashboard, publicDashboard *models.PublicDashboard, panelId int64) (dtos.MetricRequest, error) {
-	ret := _m.Called(ctx, dashboard, publicDashboard, panelId)
-
-	var r0 dtos.MetricRequest
-	if rf, ok := ret.Get(0).(func(context.Context, *models.Dashboard, *models.PublicDashboard, int64) dtos.MetricRequest); ok {
-		r0 = rf(ctx, dashboard, publicDashboard, panelId)
-	} else {
-		r0 = ret.Get(0).(dtos.MetricRequest)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *models.Dashboard, *models.PublicDashboard, int64) error); ok {
-		r1 = rf(ctx, dashboard, publicDashboard, panelId)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // BuildSaveDashboardCommand provides a mock function with given fields: ctx, dto, shouldValidateAlerts, validateProvisionedDashboard
 func (_m *FakeDashboardService) BuildSaveDashboardCommand(ctx context.Context, dto *SaveDashboardDTO, shouldValidateAlerts bool, validateProvisionedDashboard bool) (*models.SaveDashboardCommand, error) {
 	ret := _m.Called(ctx, dto, shouldValidateAlerts, validateProvisionedDashboard)
@@ -169,58 +146,12 @@ func (_m *FakeDashboardService) GetDashboards(ctx context.Context, query *models
 	return r0
 }
 
-// GetPublicDashboard provides a mock function with given fields: ctx, accessToken
-func (_m *FakeDashboardService) GetPublicDashboard(ctx context.Context, accessToken string) (*models.Dashboard, error) {
-	ret := _m.Called(ctx, accessToken)
-
-	var r0 *models.Dashboard
-	if rf, ok := ret.Get(0).(func(context.Context, string) *models.Dashboard); ok {
-		r0 = rf(ctx, accessToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*models.Dashboard)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
-		r1 = rf(ctx, accessToken)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// GetPublicDashboardConfig provides a mock function with given fields: ctx, orgId, dashboardUid
-func (_m *FakeDashboardService) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error) {
-	ret := _m.Called(ctx, orgId, dashboardUid)
-
-	var r0 *models.PublicDashboard
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *models.PublicDashboard); ok {
-		r0 = rf(ctx, orgId, dashboardUid)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*models.PublicDashboard)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
-		r1 = rf(ctx, orgId, dashboardUid)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// HasAdminPermissionInFolders provides a mock function with given fields: ctx, query
-func (_m *FakeDashboardService) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+// HasAdminPermissionInDashboardsOrFolders provides a mock function with given fields: ctx, query
+func (_m *FakeDashboardService) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error {
 	ret := _m.Called(ctx, query)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.HasAdminPermissionInFoldersQuery) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.HasAdminPermissionInDashboardsOrFoldersQuery) error); ok {
 		r0 = rf(ctx, query)
 	} else {
 		r0 = ret.Error(0)
@@ -303,29 +234,6 @@ func (_m *FakeDashboardService) SaveDashboard(ctx context.Context, dto *SaveDash
 	return r0, r1
 }
 
-// SavePublicDashboardConfig provides a mock function with given fields: ctx, dto
-func (_m *FakeDashboardService) SavePublicDashboardConfig(ctx context.Context, dto *SavePublicDashboardConfigDTO) (*models.PublicDashboard, error) {
-	ret := _m.Called(ctx, dto)
-
-	var r0 *models.PublicDashboard
-	if rf, ok := ret.Get(0).(func(context.Context, *SavePublicDashboardConfigDTO) *models.PublicDashboard); ok {
-		r0 = rf(ctx, dto)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*models.PublicDashboard)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, *SavePublicDashboardConfigDTO) error); ok {
-		r1 = rf(ctx, dto)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // SearchDashboards provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardService) SearchDashboards(ctx context.Context, query *models.FindPersistedDashboardsQuery) error {
 	ret := _m.Called(ctx, query)
diff --git a/pkg/services/dashboards/database/acl.go b/pkg/services/dashboards/database/acl.go
index 940a2ab7aad..32f98bc6f6b 100644
--- a/pkg/services/dashboards/database/acl.go
+++ b/pkg/services/dashboards/database/acl.go
@@ -123,7 +123,7 @@ func (d *DashboardStore) HasEditPermissionInFolders(ctx context.Context, query *
 	})
 }
 
-func (d *DashboardStore) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+func (d *DashboardStore) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error {
 	return d.sqlStore.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
 		if query.SignedInUser.HasRole(models.ROLE_ADMIN) {
 			query.Result = true
@@ -131,7 +131,7 @@ func (d *DashboardStore) HasAdminPermissionInFolders(ctx context.Context, query
 		}
 
 		builder := &sqlstore.SQLBuilder{}
-		builder.Write("SELECT COUNT(dashboard.id) AS count FROM dashboard WHERE dashboard.org_id = ? AND dashboard.is_folder = ?", query.SignedInUser.OrgId, d.dialect.BooleanStr(true))
+		builder.Write("SELECT COUNT(dashboard.id) AS count FROM dashboard WHERE dashboard.org_id = ?", query.SignedInUser.OrgId)
 		builder.WriteDashboardPermissionFilter(query.SignedInUser, models.PERMISSION_ADMIN)
 
 		type folderCount struct {
diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go
index 847654c416c..41b3fb271bf 100644
--- a/pkg/services/dashboards/database/database.go
+++ b/pkg/services/dashboards/database/database.go
@@ -60,7 +60,7 @@ func (d *DashboardStore) ValidateDashboardBeforeSave(dashboard *models.Dashboard
 
 func (d *DashboardStore) GetFolderByTitle(ctx context.Context, orgID int64, title string) (*models.Folder, error) {
 	if title == "" {
-		return nil, models.ErrFolderTitleEmpty
+		return nil, dashboards.ErrFolderTitleEmpty
 	}
 
 	// there is a unique constraint on org_id, folder_id, title
@@ -72,7 +72,7 @@ func (d *DashboardStore) GetFolderByTitle(ctx context.Context, orgID int64, titl
 			return err
 		}
 		if !has {
-			return models.ErrFolderNotFound
+			return dashboards.ErrFolderNotFound
 		}
 		dashboard.SetId(dashboard.Id)
 		dashboard.SetUid(dashboard.Uid)
@@ -89,7 +89,7 @@ func (d *DashboardStore) GetFolderByID(ctx context.Context, orgID int64, id int6
 			return err
 		}
 		if !has {
-			return models.ErrFolderNotFound
+			return dashboards.ErrFolderNotFound
 		}
 		dashboard.SetId(dashboard.Id)
 		dashboard.SetUid(dashboard.Uid)
@@ -103,7 +103,7 @@ func (d *DashboardStore) GetFolderByID(ctx context.Context, orgID int64, id int6
 
 func (d *DashboardStore) GetFolderByUID(ctx context.Context, orgID int64, uid string) (*models.Folder, error) {
 	if uid == "" {
-		return nil, models.ErrDashboardIdentifierNotSet
+		return nil, dashboards.ErrDashboardIdentifierNotSet
 	}
 
 	dashboard := models.Dashboard{OrgId: orgID, FolderId: 0, Uid: uid}
@@ -113,7 +113,7 @@ func (d *DashboardStore) GetFolderByUID(ctx context.Context, orgID int64, uid st
 			return err
 		}
 		if !has {
-			return models.ErrFolderNotFound
+			return dashboards.ErrFolderNotFound
 		}
 		dashboard.SetId(dashboard.Id)
 		dashboard.SetUid(dashboard.Uid)
@@ -147,15 +147,14 @@ func (d *DashboardStore) GetProvisionedDataByDashboardUID(orgID int64, dashboard
 			return err
 		}
 		if !exists {
-			return models.
-				ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 		exists, err = sess.Where("dashboard_id = ?", dashboard.Id).Get(&provisionedDashboard)
 		if err != nil {
 			return err
 		}
 		if !exists {
-			return models.ErrProvisionedDashboardNotFound
+			return dashboards.ErrProvisionedDashboardNotFound
 		}
 		return nil
 	})
@@ -267,7 +266,7 @@ func (d *DashboardStore) DeleteOrphanedProvisionedDashboards(ctx context.Context
 
 		for _, deleteDashCommand := range result {
 			err := d.DeleteDashboard(ctx, &models.DeleteDashboardCommand{Id: deleteDashCommand.DashboardId})
-			if err != nil && !errors.Is(err, models.ErrDashboardNotFound) {
+			if err != nil && !errors.Is(err, dashboards.ErrDashboardNotFound) {
 				return err
 			}
 		}
@@ -289,7 +288,7 @@ func getExistingDashboardByIdOrUidForUpdate(sess *sqlstore.DBSession, dash *mode
 		}
 
 		if !dashWithIdExists {
-			return false, models.ErrDashboardNotFound
+			return false, dashboards.ErrDashboardNotFound
 		}
 
 		if dash.Uid == "" {
@@ -317,7 +316,7 @@ func getExistingDashboardByIdOrUidForUpdate(sess *sqlstore.DBSession, dash *mode
 		}
 
 		if !folderExists {
-			return false, models.ErrDashboardFolderNotFound
+			return false, dashboards.ErrDashboardFolderNotFound
 		}
 	}
 
@@ -326,7 +325,7 @@ func getExistingDashboardByIdOrUidForUpdate(sess *sqlstore.DBSession, dash *mode
 	}
 
 	if dashWithIdExists && dashWithUidExists && existingById.Id != existingByUid.Id {
-		return false, models.ErrDashboardWithSameUIDExists
+		return false, dashboards.ErrDashboardWithSameUIDExists
 	}
 
 	existing := existingById
@@ -339,7 +338,7 @@ func getExistingDashboardByIdOrUidForUpdate(sess *sqlstore.DBSession, dash *mode
 
 	if (existing.IsFolder && !dash.IsFolder) ||
 		(!existing.IsFolder && dash.IsFolder) {
-		return isParentFolderChanged, models.ErrDashboardTypeMismatch
+		return isParentFolderChanged, dashboards.ErrDashboardTypeMismatch
 	}
 
 	if !dash.IsFolder && dash.FolderId != existing.FolderId {
@@ -351,13 +350,13 @@ func getExistingDashboardByIdOrUidForUpdate(sess *sqlstore.DBSession, dash *mode
 		if overwrite {
 			dash.SetVersion(existing.Version)
 		} else {
-			return isParentFolderChanged, models.ErrDashboardVersionMismatch
+			return isParentFolderChanged, dashboards.ErrDashboardVersionMismatch
 		}
 	}
 
 	// do not allow plugin dashboard updates without overwrite flag
 	if existing.PluginId != "" && !overwrite {
-		return isParentFolderChanged, models.UpdatePluginDashboardError{PluginId: existing.PluginId}
+		return isParentFolderChanged, dashboards.UpdatePluginDashboardError{PluginId: existing.PluginId}
 	}
 
 	return isParentFolderChanged, nil
@@ -374,11 +373,11 @@ func getExistingDashboardByTitleAndFolder(sess *sqlstore.DBSession, dash *models
 
 	if exists && dash.Id != existing.Id {
 		if existing.IsFolder && !dash.IsFolder {
-			return isParentFolderChanged, models.ErrDashboardWithSameNameAsFolder
+			return isParentFolderChanged, dashboards.ErrDashboardWithSameNameAsFolder
 		}
 
 		if !existing.IsFolder && dash.IsFolder {
-			return isParentFolderChanged, models.ErrDashboardFolderWithSameNameAsDashboard
+			return isParentFolderChanged, dashboards.ErrDashboardFolderWithSameNameAsDashboard
 		}
 
 		if !dash.IsFolder && (dash.FolderId != existing.FolderId || dash.Id == 0) {
@@ -390,7 +389,7 @@ func getExistingDashboardByTitleAndFolder(sess *sqlstore.DBSession, dash *models
 			dash.SetUid(existing.Uid)
 			dash.SetVersion(existing.Version)
 		} else {
-			return isParentFolderChanged, models.ErrDashboardWithSameNameInFolderExists
+			return isParentFolderChanged, dashboards.ErrDashboardWithSameNameInFolderExists
 		}
 	}
 
@@ -413,7 +412,7 @@ func saveDashboard(sess *sqlstore.DBSession, cmd *models.SaveDashboardCommand) e
 			return err
 		}
 		if !dashWithIdExists {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		// check for is someone else has written in between
@@ -421,13 +420,13 @@ func saveDashboard(sess *sqlstore.DBSession, cmd *models.SaveDashboardCommand) e
 			if cmd.Overwrite {
 				dash.SetVersion(existing.Version)
 			} else {
-				return models.ErrDashboardVersionMismatch
+				return dashboards.ErrDashboardVersionMismatch
 			}
 		}
 
 		// do not allow plugin dashboard updates without overwrite flag
 		if existing.PluginId != "" && !cmd.Overwrite {
-			return models.UpdatePluginDashboardError{PluginId: existing.PluginId}
+			return dashboards.UpdatePluginDashboardError{PluginId: existing.PluginId}
 		}
 	}
 
@@ -470,7 +469,7 @@ func saveDashboard(sess *sqlstore.DBSession, cmd *models.SaveDashboardCommand) e
 	}
 
 	if affectedRows == 0 {
-		return models.ErrDashboardNotFound
+		return dashboards.ErrDashboardNotFound
 	}
 
 	dashVersion := &dashver.DashboardVersion{
@@ -488,7 +487,7 @@ func saveDashboard(sess *sqlstore.DBSession, cmd *models.SaveDashboardCommand) e
 	if affectedRows, err = sess.Insert(dashVersion); err != nil {
 		return err
 	} else if affectedRows == 0 {
-		return models.ErrDashboardNotFound
+		return dashboards.ErrDashboardNotFound
 	}
 
 	// delete existing tags
@@ -525,7 +524,7 @@ func generateNewDashboardUid(sess *sqlstore.DBSession, orgId int64) (string, err
 		}
 	}
 
-	return "", models.ErrDashboardFailedGenerateUniqueUid
+	return "", dashboards.ErrDashboardFailedGenerateUniqueUid
 }
 
 func saveProvisionedData(sess *sqlstore.DBSession, provisioning *models.DashboardProvisioning, dashboard *models.Dashboard) error {
@@ -709,7 +708,7 @@ func (d *DashboardStore) deleteDashboard(cmd *models.DeleteDashboardCommand, ses
 	if err != nil {
 		return err
 	} else if !has {
-		return models.ErrDashboardNotFound
+		return dashboards.ErrDashboardNotFound
 	}
 
 	deletes := []string{
@@ -779,7 +778,7 @@ func (d *DashboardStore) deleteDashboard(cmd *models.DeleteDashboardCommand, ses
 		}
 		if exists {
 			if !cmd.ForceDeleteFolderRules {
-				return fmt.Errorf("folder cannot be deleted: %w", models.ErrFolderContainsAlertRules)
+				return fmt.Errorf("folder cannot be deleted: %w", dashboards.ErrFolderContainsAlertRules)
 			}
 
 			// Delete all rules under this folder.
@@ -836,7 +835,7 @@ func (d *DashboardStore) deleteAlertDefinition(dashboardId int64, sess *sqlstore
 func (d *DashboardStore) GetDashboard(ctx context.Context, query *models.GetDashboardQuery) (*models.Dashboard, error) {
 	err := d.sqlStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
 		if query.Id == 0 && len(query.Slug) == 0 && len(query.Uid) == 0 {
-			return models.ErrDashboardIdentifierNotSet
+			return dashboards.ErrDashboardIdentifierNotSet
 		}
 
 		dashboard := models.Dashboard{Slug: query.Slug, OrgId: query.OrgId, Id: query.Id, Uid: query.Uid}
@@ -845,7 +844,7 @@ func (d *DashboardStore) GetDashboard(ctx context.Context, query *models.GetDash
 		if err != nil {
 			return err
 		} else if !has {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		dashboard.SetId(dashboard.Id)
@@ -865,7 +864,7 @@ func (d *DashboardStore) GetDashboardUIDById(ctx context.Context, query *models.
 		if err != nil {
 			return err
 		} else if !exists {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 		query.Result = us
 		return nil
diff --git a/pkg/services/dashboards/database/database_dashboard_public.go b/pkg/services/dashboards/database/database_dashboard_public.go
deleted file mode 100644
index 0c5ff91aa70..00000000000
--- a/pkg/services/dashboards/database/database_dashboard_public.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package database
-
-import (
-	"context"
-
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/util"
-)
-
-// retrieves public dashboard configuration
-func (d *DashboardStore) GetPublicDashboard(ctx context.Context, accessToken string) (*models.PublicDashboard, *models.Dashboard, error) {
-	if accessToken == "" {
-		return nil, nil, models.ErrPublicDashboardIdentifierNotSet
-	}
-
-	// get public dashboard
-	pdRes := &models.PublicDashboard{AccessToken: accessToken}
-	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		has, err := sess.Get(pdRes)
-		if err != nil {
-			return err
-		}
-		if !has {
-			return models.ErrPublicDashboardNotFound
-		}
-		return nil
-	})
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// find dashboard
-	dashRes := &models.Dashboard{OrgId: pdRes.OrgId, Uid: pdRes.DashboardUid}
-	err = d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		has, err := sess.Get(dashRes)
-		if err != nil {
-			return err
-		}
-		if !has {
-			return models.ErrPublicDashboardNotFound
-		}
-		return nil
-	})
-
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return pdRes, dashRes, err
-}
-
-// generates a new unique uid to retrieve a public dashboard
-func (d *DashboardStore) GenerateNewPublicDashboardUid(ctx context.Context) (string, error) {
-	var uid string
-
-	err := d.sqlStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		for i := 0; i < 3; i++ {
-			uid = util.GenerateShortUID()
-
-			exists, err := sess.Get(&models.PublicDashboard{Uid: uid})
-			if err != nil {
-				return err
-			}
-
-			if !exists {
-				return nil
-			}
-		}
-
-		return models.ErrPublicDashboardFailedGenerateUniqueUid
-	})
-
-	if err != nil {
-		return "", err
-	}
-
-	return uid, nil
-}
-
-// retrieves public dashboard configuration
-func (d *DashboardStore) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error) {
-	if dashboardUid == "" {
-		return nil, models.ErrDashboardIdentifierNotSet
-	}
-
-	pdRes := &models.PublicDashboard{OrgId: orgId, DashboardUid: dashboardUid}
-	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		// publicDashboard
-		_, err := sess.Get(pdRes)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return pdRes, err
-}
-
-// persists public dashboard configuration
-func (d *DashboardStore) SavePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) (*models.PublicDashboard, error) {
-	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		_, err := sess.UseBool("is_enabled").Insert(&cmd.PublicDashboard)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return &cmd.PublicDashboard, nil
-}
-
-// updates existing public dashboard configuration
-func (d *DashboardStore) UpdatePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) error {
-	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
-		_, err := sess.ID(cmd.PublicDashboard.Uid).UseBool("is_enabled").Update(&cmd.PublicDashboard)
-		if err != nil {
-			return err
-		}
-
-		return nil
-	})
-
-	return err
-}
diff --git a/pkg/services/dashboards/database/database_folder_test.go b/pkg/services/dashboards/database/database_folder_test.go
index 5d1378d65f1..a967863eec8 100644
--- a/pkg/services/dashboards/database/database_folder_test.go
+++ b/pkg/services/dashboards/database/database_folder_test.go
@@ -8,6 +8,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/user"
 )
@@ -321,10 +322,10 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 				})
 
 				t.Run("should have admin permission in folders", func(t *testing.T) {
-					query := &models.HasAdminPermissionInFoldersQuery{
+					query := &models.HasAdminPermissionInDashboardsOrFoldersQuery{
 						SignedInUser: &models.SignedInUser{UserId: adminUser.ID, OrgId: 1, OrgRole: models.ROLE_ADMIN},
 					}
-					err := dashboardStore.HasAdminPermissionInFolders(context.Background(), query)
+					err := dashboardStore.HasAdminPermissionInDashboardsOrFolders(context.Background(), query)
 					require.NoError(t, err)
 					require.True(t, query.Result)
 				})
@@ -369,10 +370,10 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 				})
 
 				t.Run("should not have admin permission in folders", func(t *testing.T) {
-					query := &models.HasAdminPermissionInFoldersQuery{
+					query := &models.HasAdminPermissionInDashboardsOrFoldersQuery{
 						SignedInUser: &models.SignedInUser{UserId: adminUser.ID, OrgId: 1, OrgRole: models.ROLE_EDITOR},
 					}
-					err := dashboardStore.HasAdminPermissionInFolders(context.Background(), query)
+					err := dashboardStore.HasAdminPermissionInDashboardsOrFolders(context.Background(), query)
 					require.NoError(t, err)
 					require.False(t, query.Result)
 				})
@@ -417,10 +418,10 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 				})
 
 				t.Run("should not have admin permission in folders", func(t *testing.T) {
-					query := &models.HasAdminPermissionInFoldersQuery{
+					query := &models.HasAdminPermissionInDashboardsOrFoldersQuery{
 						SignedInUser: &models.SignedInUser{UserId: adminUser.ID, OrgId: 1, OrgRole: models.ROLE_VIEWER},
 					}
-					err := dashboardStore.HasAdminPermissionInFolders(context.Background(), query)
+					err := dashboardStore.HasAdminPermissionInDashboardsOrFolders(context.Background(), query)
 					require.NoError(t, err)
 					require.False(t, query.Result)
 				})
@@ -492,12 +493,12 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 			t.Run("should not find dashboard", func(t *testing.T) {
 				d, err := dashboardStore.GetFolderByUID(context.Background(), orgId, dash.Uid)
 				require.Nil(t, d)
-				require.ErrorIs(t, err, models.ErrFolderNotFound)
+				require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
 			})
 			t.Run("should search in organization", func(t *testing.T) {
 				d, err := dashboardStore.GetFolderByUID(context.Background(), orgId+1, folder.Uid)
 				require.Nil(t, d)
-				require.ErrorIs(t, err, models.ErrFolderNotFound)
+				require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
 			})
 		})
 
@@ -516,12 +517,12 @@ func TestIntegrationDashboardFolderDataAccess(t *testing.T) {
 			t.Run("should not find dashboard", func(t *testing.T) {
 				d, err := dashboardStore.GetFolderByID(context.Background(), orgId, dash.Id)
 				require.Nil(t, d)
-				require.ErrorIs(t, err, models.ErrFolderNotFound)
+				require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
 			})
 			t.Run("should search in organization", func(t *testing.T) {
 				d, err := dashboardStore.GetFolderByID(context.Background(), orgId+1, folder.Id)
 				require.Nil(t, d)
-				require.ErrorIs(t, err, models.ErrFolderNotFound)
+				require.ErrorIs(t, err, dashboards.ErrFolderNotFound)
 			})
 		})
 	})
diff --git a/pkg/services/dashboards/database/database_test.go b/pkg/services/dashboards/database/database_test.go
index 3f692f26f45..d0332cebc99 100644
--- a/pkg/services/dashboards/database/database_test.go
+++ b/pkg/services/dashboards/database/database_test.go
@@ -124,7 +124,7 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		}
 
 		_, err := dashboardStore.GetDashboard(context.Background(), &query)
-		require.Equal(t, err, models.ErrDashboardIdentifierNotSet)
+		require.Equal(t, err, dashboards.ErrDashboardIdentifierNotSet)
 	})
 
 	t.Run("Should be able to get dashboards by IDs & UIDs", func(t *testing.T) {
@@ -227,7 +227,7 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		setup()
 		deleteCmd := &models.DeleteDashboardCommand{Id: savedFolder.Id, ForceDeleteFolderRules: false}
 		err := dashboardStore.DeleteDashboard(context.Background(), deleteCmd)
-		require.True(t, errors.Is(err, models.ErrFolderContainsAlertRules))
+		require.True(t, errors.Is(err, dashboards.ErrFolderContainsAlertRules))
 	})
 
 	t.Run("Should be able to delete a dashboard folder and its children if force delete rules is enabled", func(t *testing.T) {
@@ -274,7 +274,7 @@ func TestIntegrationDashboardDataAccess(t *testing.T) {
 		}
 
 		_, err := dashboardStore.SaveDashboard(cmd)
-		require.Equal(t, err, models.ErrDashboardNotFound)
+		require.Equal(t, err, dashboards.ErrDashboardNotFound)
 	})
 
 	t.Run("Should not return error if no dashboard is found for update when dashboard id is zero", func(t *testing.T) {
diff --git a/pkg/services/dashboards/errors.go b/pkg/services/dashboards/errors.go
new file mode 100644
index 00000000000..4ee627bcd74
--- /dev/null
+++ b/pkg/services/dashboards/errors.go
@@ -0,0 +1,197 @@
+package dashboards
+
+import (
+	"errors"
+
+	"github.com/grafana/grafana/pkg/util"
+)
+
+// Typed errors
+var (
+	ErrDashboardNotFound = DashboardErr{
+		Reason:     "Dashboard not found",
+		StatusCode: 404,
+		Status:     "not-found",
+	}
+	ErrDashboardCorrupt = DashboardErr{
+		Reason:     "Dashboard data is missing or corrupt",
+		StatusCode: 500,
+		Status:     "not-found",
+	}
+	ErrDashboardPanelNotFound = DashboardErr{
+		Reason:     "Dashboard panel not found",
+		StatusCode: 404,
+		Status:     "not-found",
+	}
+	ErrDashboardFolderNotFound = DashboardErr{
+		Reason:     "Folder not found",
+		StatusCode: 404,
+	}
+	ErrDashboardWithSameUIDExists = DashboardErr{
+		Reason:     "A dashboard with the same uid already exists",
+		StatusCode: 400,
+	}
+	ErrDashboardWithSameNameInFolderExists = DashboardErr{
+		Reason:     "A dashboard with the same name in the folder already exists",
+		StatusCode: 412,
+		Status:     "name-exists",
+	}
+	ErrDashboardVersionMismatch = DashboardErr{
+		Reason:     "The dashboard has been changed by someone else",
+		StatusCode: 412,
+		Status:     "version-mismatch",
+	}
+	ErrDashboardTitleEmpty = DashboardErr{
+		Reason:     "Dashboard title cannot be empty",
+		StatusCode: 400,
+		Status:     "empty-name",
+	}
+	ErrDashboardFolderCannotHaveParent = DashboardErr{
+		Reason:     "A Dashboard Folder cannot be added to another folder",
+		StatusCode: 400,
+	}
+	ErrDashboardsWithSameSlugExists = DashboardErr{
+		Reason:     "Multiple dashboards with the same slug exists",
+		StatusCode: 412,
+	}
+	ErrDashboardFailedGenerateUniqueUid = DashboardErr{
+		Reason:     "Failed to generate unique dashboard id",
+		StatusCode: 500,
+	}
+	ErrDashboardTypeMismatch = DashboardErr{
+		Reason:     "Dashboard cannot be changed to a folder",
+		StatusCode: 400,
+	}
+	ErrDashboardFolderWithSameNameAsDashboard = DashboardErr{
+		Reason:     "Folder name cannot be the same as one of its dashboards",
+		StatusCode: 400,
+	}
+	ErrDashboardWithSameNameAsFolder = DashboardErr{
+		Reason:     "Dashboard name cannot be the same as folder",
+		StatusCode: 400,
+		Status:     "name-match",
+	}
+	ErrDashboardFolderNameExists = DashboardErr{
+		Reason:     "A folder with that name already exists",
+		StatusCode: 400,
+	}
+	ErrDashboardUpdateAccessDenied = DashboardErr{
+		Reason:     "Access denied to save dashboard",
+		StatusCode: 403,
+	}
+	ErrDashboardInvalidUid = DashboardErr{
+		Reason:     "uid contains illegal characters",
+		StatusCode: 400,
+	}
+	ErrDashboardUidTooLong = DashboardErr{
+		Reason:     "uid too long, max 40 characters",
+		StatusCode: 400,
+	}
+	ErrDashboardCannotSaveProvisionedDashboard = DashboardErr{
+		Reason:     "Cannot save provisioned dashboard",
+		StatusCode: 400,
+	}
+	ErrDashboardRefreshIntervalTooShort = DashboardErr{
+		Reason:     "Dashboard refresh interval is too low",
+		StatusCode: 400,
+	}
+	ErrDashboardCannotDeleteProvisionedDashboard = DashboardErr{
+		Reason:     "provisioned dashboard cannot be deleted",
+		StatusCode: 400,
+	}
+	ErrDashboardIdentifierNotSet = DashboardErr{
+		Reason:     "Unique identifier needed to be able to get a dashboard",
+		StatusCode: 400,
+	}
+	ErrDashboardIdentifierInvalid = DashboardErr{
+		Reason:     "Dashboard ID not a number",
+		StatusCode: 400,
+	}
+	ErrDashboardPanelIdentifierInvalid = DashboardErr{
+		Reason:     "Dashboard panel ID not a number",
+		StatusCode: 400,
+	}
+	ErrDashboardOrPanelIdentifierNotSet = DashboardErr{
+		Reason:     "Unique identifier needed to be able to get a dashboard panel",
+		StatusCode: 400,
+	}
+	ErrProvisionedDashboardNotFound = DashboardErr{
+		Reason:     "Dashboard is not provisioned",
+		StatusCode: 404,
+		Status:     "not-found",
+	}
+	ErrDashboardThumbnailNotFound = DashboardErr{
+		Reason:     "Dashboard thumbnail not found",
+		StatusCode: 404,
+		Status:     "not-found",
+	}
+	ErrPublicDashboardFailedGenerateUniqueUid = DashboardErr{
+		Reason:     "Failed to generate unique public dashboard id",
+		StatusCode: 500,
+	}
+	ErrPublicDashboardFailedGenerateAccesstoken = DashboardErr{
+		Reason:     "Failed to public dashboard access token",
+		StatusCode: 500,
+	}
+	ErrPublicDashboardNotFound = DashboardErr{
+		Reason:     "Public dashboard not found",
+		StatusCode: 404,
+		Status:     "not-found",
+	}
+	ErrPublicDashboardPanelNotFound = DashboardErr{
+		Reason:     "Panel not found in dashboard",
+		StatusCode: 404,
+		Status:     "not-found",
+	}
+	ErrPublicDashboardIdentifierNotSet = DashboardErr{
+		Reason:     "No Uid for public dashboard specified",
+		StatusCode: 400,
+	}
+
+	ErrFolderNotFound                = errors.New("folder not found")
+	ErrFolderVersionMismatch         = errors.New("the folder has been changed by someone else")
+	ErrFolderTitleEmpty              = errors.New("folder title cannot be empty")
+	ErrFolderWithSameUIDExists       = errors.New("a folder/dashboard with the same uid already exists")
+	ErrFolderInvalidUID              = errors.New("invalid uid for folder provided")
+	ErrFolderSameNameExists          = errors.New("a folder or dashboard in the general folder with the same name already exists")
+	ErrFolderFailedGenerateUniqueUid = errors.New("failed to generate unique folder ID")
+	ErrFolderAccessDenied            = errors.New("access denied to folder")
+	ErrFolderContainsAlertRules      = errors.New("folder contains alert rules")
+)
+
+// DashboardErr represents a dashboard error.
+type DashboardErr struct {
+	StatusCode int
+	Status     string
+	Reason     string
+}
+
+// Equal returns whether equal to another DashboardErr.
+func (e DashboardErr) Equal(o DashboardErr) bool {
+	return o.StatusCode == e.StatusCode && o.Status == e.Status && o.Reason == e.Reason
+}
+
+// Error returns the error message.
+func (e DashboardErr) Error() string {
+	if e.Reason != "" {
+		return e.Reason
+	}
+	return "Dashboard Error"
+}
+
+// Body returns the error's response body, if applicable.
+func (e DashboardErr) Body() util.DynMap {
+	if e.Status == "" {
+		return nil
+	}
+
+	return util.DynMap{"status": e.Status, "message": e.Error()}
+}
+
+type UpdatePluginDashboardError struct {
+	PluginId string
+}
+
+func (d UpdatePluginDashboardError) Error() string {
+	return "Dashboard belongs to plugin"
+}
diff --git a/pkg/services/dashboards/models.go b/pkg/services/dashboards/models.go
index 2fedc4abf01..f2f3db9c2ac 100644
--- a/pkg/services/dashboards/models.go
+++ b/pkg/services/dashboards/models.go
@@ -15,13 +15,6 @@ type SaveDashboardDTO struct {
 	Dashboard *models.Dashboard
 }
 
-type SavePublicDashboardConfigDTO struct {
-	DashboardUid    string
-	OrgId           int64
-	UserId          int64
-	PublicDashboard *models.PublicDashboard
-}
-
 type DashboardSearchProjection struct {
 	ID          int64  `xorm:"id"`
 	UID         string `xorm:"uid"`
diff --git a/pkg/services/dashboards/service/dashboard_public.go b/pkg/services/dashboards/service/dashboard_public.go
deleted file mode 100644
index a0e5c790abe..00000000000
--- a/pkg/services/dashboards/service/dashboard_public.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package service
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/gofrs/uuid"
-	"github.com/grafana/grafana/pkg/api/dtos"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-)
-
-// Gets public dashboard via access token
-func (dr *DashboardServiceImpl) GetPublicDashboard(ctx context.Context, accessToken string) (*models.Dashboard, error) {
-	pubdash, d, err := dr.dashboardStore.GetPublicDashboard(ctx, accessToken)
-
-	if err != nil {
-		return nil, err
-	}
-
-	if pubdash == nil || d == nil {
-		return nil, models.ErrPublicDashboardNotFound
-	}
-
-	if !pubdash.IsEnabled {
-		return nil, models.ErrPublicDashboardNotFound
-	}
-
-	ts := pubdash.BuildTimeSettings(d)
-	d.Data.SetPath([]string{"time", "from"}, ts.From)
-	d.Data.SetPath([]string{"time", "to"}, ts.To)
-
-	return d, nil
-}
-
-// GetPublicDashboardConfig is a helper method to retrieve the public dashboard configuration for a given dashboard from the database
-func (dr *DashboardServiceImpl) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error) {
-	pdc, err := dr.dashboardStore.GetPublicDashboardConfig(ctx, orgId, dashboardUid)
-	if err != nil {
-		return nil, err
-	}
-
-	return pdc, nil
-}
-
-// SavePublicDashboardConfig is a helper method to persist the sharing config
-// to the database. It handles validations for sharing config and persistence
-func (dr *DashboardServiceImpl) SavePublicDashboardConfig(ctx context.Context, dto *dashboards.SavePublicDashboardConfigDTO) (*models.PublicDashboard, error) {
-	if len(dto.DashboardUid) == 0 {
-		return nil, models.ErrDashboardIdentifierNotSet
-	}
-
-	// set default value for time settings
-	if dto.PublicDashboard.TimeSettings == nil {
-		json, err := simplejson.NewJson([]byte("{}"))
-		if err != nil {
-			return nil, err
-		}
-		dto.PublicDashboard.TimeSettings = json
-	}
-
-	if dto.PublicDashboard.Uid == "" {
-		return dr.savePublicDashboardConfig(ctx, dto)
-	}
-
-	return dr.updatePublicDashboardConfig(ctx, dto)
-}
-
-func (dr *DashboardServiceImpl) savePublicDashboardConfig(ctx context.Context, dto *dashboards.SavePublicDashboardConfigDTO) (*models.PublicDashboard, error) {
-	uid, err := dr.dashboardStore.GenerateNewPublicDashboardUid(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	accessToken, err := GenerateAccessToken()
-	if err != nil {
-		return nil, err
-	}
-
-	cmd := models.SavePublicDashboardConfigCommand{
-		DashboardUid: dto.DashboardUid,
-		OrgId:        dto.OrgId,
-		PublicDashboard: models.PublicDashboard{
-			Uid:          uid,
-			DashboardUid: dto.DashboardUid,
-			OrgId:        dto.OrgId,
-			IsEnabled:    dto.PublicDashboard.IsEnabled,
-			TimeSettings: dto.PublicDashboard.TimeSettings,
-			CreatedBy:    dto.UserId,
-			CreatedAt:    time.Now(),
-			AccessToken:  accessToken,
-		},
-	}
-
-	return dr.dashboardStore.SavePublicDashboardConfig(ctx, cmd)
-}
-
-func (dr *DashboardServiceImpl) updatePublicDashboardConfig(ctx context.Context, dto *dashboards.SavePublicDashboardConfigDTO) (*models.PublicDashboard, error) {
-	cmd := models.SavePublicDashboardConfigCommand{
-		PublicDashboard: models.PublicDashboard{
-			Uid:          dto.PublicDashboard.Uid,
-			IsEnabled:    dto.PublicDashboard.IsEnabled,
-			TimeSettings: dto.PublicDashboard.TimeSettings,
-			UpdatedBy:    dto.UserId,
-			UpdatedAt:    time.Now(),
-		},
-	}
-
-	err := dr.dashboardStore.UpdatePublicDashboardConfig(ctx, cmd)
-	if err != nil {
-		return nil, err
-	}
-
-	publicDashboard, err := dr.dashboardStore.GetPublicDashboardConfig(ctx, dto.OrgId, dto.DashboardUid)
-	if err != nil {
-		return nil, err
-	}
-
-	return publicDashboard, nil
-}
-
-// BuildPublicDashboardMetricRequest merges public dashboard parameters with
-// dashboard and returns a metrics request to be sent to query backend
-func (dr *DashboardServiceImpl) BuildPublicDashboardMetricRequest(ctx context.Context, dashboard *models.Dashboard, publicDashboard *models.PublicDashboard, panelId int64) (dtos.MetricRequest, error) {
-	if !publicDashboard.IsEnabled {
-		return dtos.MetricRequest{}, models.ErrPublicDashboardNotFound
-	}
-
-	queriesByPanel := models.GetQueriesFromDashboard(dashboard.Data)
-
-	if _, ok := queriesByPanel[panelId]; !ok {
-		return dtos.MetricRequest{}, models.ErrPublicDashboardPanelNotFound
-	}
-
-	ts := publicDashboard.BuildTimeSettings(dashboard)
-
-	return dtos.MetricRequest{
-		From:    ts.From,
-		To:      ts.To,
-		Queries: queriesByPanel[panelId],
-	}, nil
-}
-
-// generates a uuid formatted without dashes to use as access token
-func GenerateAccessToken() (string, error) {
-	token, err := uuid.NewV4()
-	if err != nil {
-		return "", err
-	}
-
-	return fmt.Sprintf("%x", token), nil
-}
diff --git a/pkg/services/dashboards/service/dashboard_service.go b/pkg/services/dashboards/service/dashboard_service.go
index fc193ca4888..cda6ed922b0 100644
--- a/pkg/services/dashboards/service/dashboard_service.go
+++ b/pkg/services/dashboards/service/dashboard_service.go
@@ -83,21 +83,21 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 	dash.SetUid(strings.TrimSpace(dash.Uid))
 
 	if dash.Title == "" {
-		return nil, models.ErrDashboardTitleEmpty
+		return nil, dashboards.ErrDashboardTitleEmpty
 	}
 
 	if dash.IsFolder && dash.FolderId > 0 {
-		return nil, models.ErrDashboardFolderCannotHaveParent
+		return nil, dashboards.ErrDashboardFolderCannotHaveParent
 	}
 
 	if dash.IsFolder && strings.EqualFold(dash.Title, models.RootFolderName) {
-		return nil, models.ErrDashboardFolderNameExists
+		return nil, dashboards.ErrDashboardFolderNameExists
 	}
 
 	if !util.IsValidShortUID(dash.Uid) {
-		return nil, models.ErrDashboardInvalidUid
+		return nil, dashboards.ErrDashboardInvalidUid
 	} else if util.IsShortUIDTooLong(dash.Uid) {
-		return nil, models.ErrDashboardUidTooLong
+		return nil, dashboards.ErrDashboardUidTooLong
 	}
 
 	if err := validateDashboardRefreshInterval(dash); err != nil {
@@ -123,7 +123,7 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 			if err != nil {
 				return nil, err
 			}
-			return nil, models.ErrDashboardUpdateAccessDenied
+			return nil, dashboards.ErrDashboardUpdateAccessDenied
 		}
 	}
 
@@ -134,7 +134,7 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 		}
 
 		if provisionedData != nil {
-			return nil, models.ErrDashboardCannotSaveProvisionedDashboard
+			return nil, dashboards.ErrDashboardCannotSaveProvisionedDashboard
 		}
 	}
 
@@ -144,14 +144,14 @@ func (dr *DashboardServiceImpl) BuildSaveDashboardCommand(ctx context.Context, d
 			if err != nil {
 				return nil, err
 			}
-			return nil, models.ErrDashboardUpdateAccessDenied
+			return nil, dashboards.ErrDashboardUpdateAccessDenied
 		}
 	} else {
 		if canSave, err := guard.CanSave(); err != nil || !canSave {
 			if err != nil {
 				return nil, err
 			}
-			return nil, models.ErrDashboardUpdateAccessDenied
+			return nil, dashboards.ErrDashboardUpdateAccessDenied
 		}
 	}
 
@@ -202,7 +202,7 @@ func validateDashboardRefreshInterval(dash *models.Dashboard) error {
 	}
 
 	if d < minRefreshInterval {
-		return models.ErrDashboardRefreshIntervalTooShort
+		return dashboards.ErrDashboardRefreshIntervalTooShort
 	}
 
 	return nil
@@ -414,7 +414,7 @@ func (dr *DashboardServiceImpl) deleteDashboard(ctx context.Context, dashboardId
 		}
 
 		if provisionedData != nil {
-			return models.ErrDashboardCannotDeleteProvisionedDashboard
+			return dashboards.ErrDashboardCannotDeleteProvisionedDashboard
 		}
 	}
 	cmd := &models.DeleteDashboardCommand{OrgId: orgId, Id: dashboardId}
@@ -573,8 +573,8 @@ func (dr *DashboardServiceImpl) GetDashboardAclInfoList(ctx context.Context, que
 	return dr.dashboardStore.GetDashboardAclInfoList(ctx, query)
 }
 
-func (dr *DashboardServiceImpl) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
-	return dr.dashboardStore.HasAdminPermissionInFolders(ctx, query)
+func (dr *DashboardServiceImpl) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error {
+	return dr.dashboardStore.HasAdminPermissionInDashboardsOrFolders(ctx, query)
 }
 
 func (dr *DashboardServiceImpl) HasEditPermissionInFolders(ctx context.Context, query *models.HasEditPermissionInFoldersQuery) error {
diff --git a/pkg/services/dashboards/service/dashboard_service_integration_test.go b/pkg/services/dashboards/service/dashboard_service_integration_test.go
index 0cf92da3839..dad3576988e 100644
--- a/pkg/services/dashboards/service/dashboard_service_integration_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_integration_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/models"
 	accesscontrolmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
 	"github.com/grafana/grafana/pkg/services/alerting"
-	dashbboardservice "github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/dashboards/database"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/guardian"
@@ -39,7 +39,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 				}
 
 				err := callSaveWithError(cmd, sc.sqlStore)
-				assert.Equal(t, models.ErrDashboardNotFound, err)
+				assert.Equal(t, dashboards.ErrDashboardNotFound, err)
 			})
 
 		// Given other organization
@@ -59,7 +59,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					assert.Equal(t, models.ErrDashboardNotFound, err)
+					assert.Equal(t, dashboards.ErrDashboardNotFound, err)
 				})
 
 			permissionScenario(t, "When creating a dashboard with same uid as dashboard in organization A, it should create a new dashboard in org B",
@@ -101,7 +101,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sqlStore)
-					assert.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					assert.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, int64(0), sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -121,7 +121,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.otherSavedFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -141,7 +141,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -162,7 +162,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -183,7 +183,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					assert.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					assert.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInGeneralFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -204,7 +204,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -225,7 +225,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInGeneralFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -246,7 +246,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					assert.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					assert.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -267,7 +267,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInGeneralFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -288,7 +288,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 					}
 
 					err := callSaveWithError(cmd, sc.sqlStore)
-					require.Equal(t, models.ErrDashboardUpdateAccessDenied, err)
+					require.Equal(t, dashboards.ErrDashboardUpdateAccessDenied, err)
 
 					assert.Equal(t, sc.savedDashInFolder.Id, sc.dashboardGuardianMock.DashId)
 					assert.Equal(t, cmd.OrgId, sc.dashboardGuardianMock.OrgId)
@@ -429,7 +429,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardFolderNotFound, err)
+						assert.Equal(t, dashboards.ErrDashboardFolderNotFound, err)
 					})
 
 				permissionScenario(t, "When updating an existing dashboard by id without current version", canSave,
@@ -445,7 +445,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardVersionMismatch, err)
+						assert.Equal(t, dashboards.ErrDashboardVersionMismatch, err)
 					})
 
 				permissionScenario(t, "When updating an existing dashboard by id with current version", canSave,
@@ -485,7 +485,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardVersionMismatch, err)
+						assert.Equal(t, dashboards.ErrDashboardVersionMismatch, err)
 					})
 
 				permissionScenario(t, "When updating an existing dashboard by uid with current version", canSave,
@@ -524,7 +524,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardWithSameNameInFolderExists, err)
+						assert.Equal(t, dashboards.ErrDashboardWithSameNameInFolderExists, err)
 					})
 
 				permissionScenario(t, "When creating a dashboard with same name as dashboard in General folder",
@@ -540,7 +540,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardWithSameNameInFolderExists, err)
+						assert.Equal(t, dashboards.ErrDashboardWithSameNameInFolderExists, err)
 					})
 
 				permissionScenario(t, "When creating a folder with same name as existing folder", canSave,
@@ -556,7 +556,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardWithSameNameInFolderExists, err)
+						assert.Equal(t, dashboards.ErrDashboardWithSameNameInFolderExists, err)
 					})
 			})
 
@@ -644,7 +644,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardWithSameUIDExists, err)
+						assert.Equal(t, dashboards.ErrDashboardWithSameUIDExists, err)
 					})
 
 				permissionScenario(t, "When creating a dashboard with same name as dashboard in other folder", canSave,
@@ -708,7 +708,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardTypeMismatch, err)
+						assert.Equal(t, dashboards.ErrDashboardTypeMismatch, err)
 					})
 
 				permissionScenario(t, "When updating existing dashboard to a folder using id", canSave,
@@ -724,7 +724,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardTypeMismatch, err)
+						assert.Equal(t, dashboards.ErrDashboardTypeMismatch, err)
 					})
 
 				permissionScenario(t, "When updating existing folder to a dashboard using uid", canSave,
@@ -740,7 +740,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardTypeMismatch, err)
+						assert.Equal(t, dashboards.ErrDashboardTypeMismatch, err)
 					})
 
 				permissionScenario(t, "When updating existing dashboard to a folder using uid", canSave,
@@ -756,7 +756,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardTypeMismatch, err)
+						assert.Equal(t, dashboards.ErrDashboardTypeMismatch, err)
 					})
 
 				permissionScenario(t, "When updating existing folder to a dashboard using title", canSave,
@@ -771,7 +771,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardWithSameNameAsFolder, err)
+						assert.Equal(t, dashboards.ErrDashboardWithSameNameAsFolder, err)
 					})
 
 				permissionScenario(t, "When updating existing dashboard to a folder using title", canSave,
@@ -786,7 +786,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 						}
 
 						err := callSaveWithError(cmd, sc.sqlStore)
-						assert.Equal(t, models.ErrDashboardFolderWithSameNameAsDashboard, err)
+						assert.Equal(t, dashboards.ErrDashboardFolderWithSameNameAsDashboard, err)
 					})
 			})
 		})
@@ -796,7 +796,7 @@ func TestIntegrationIntegratedDashboardService(t *testing.T) {
 type permissionScenarioContext struct {
 	dashboardGuardianMock    *guardian.FakeDashboardGuardian
 	sqlStore                 *sqlstore.SQLStore
-	dashboardStore           dashbboardservice.Store
+	dashboardStore           dashboards.Store
 	savedFolder              *models.Dashboard
 	savedDashInFolder        *models.Dashboard
 	otherSavedFolder         *models.Dashboard
@@ -913,7 +913,7 @@ func saveTestDashboard(t *testing.T, title string, orgID, folderID int64, sqlSto
 		}),
 	}
 
-	dto := dashbboardservice.SaveDashboardDTO{
+	dto := dashboards.SaveDashboardDTO{
 		OrgId:     orgID,
 		Dashboard: cmd.GetDashboardModel(),
 		User: &models.SignedInUser{
@@ -950,7 +950,7 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore *sqlstore.
 		}),
 	}
 
-	dto := dashbboardservice.SaveDashboardDTO{
+	dto := dashboards.SaveDashboardDTO{
 		OrgId:     orgID,
 		Dashboard: cmd.GetDashboardModel(),
 		User: &models.SignedInUser{
@@ -975,10 +975,10 @@ func saveTestFolder(t *testing.T, title string, orgID int64, sqlStore *sqlstore.
 	return res
 }
 
-func toSaveDashboardDto(cmd models.SaveDashboardCommand) dashbboardservice.SaveDashboardDTO {
+func toSaveDashboardDto(cmd models.SaveDashboardCommand) dashboards.SaveDashboardDTO {
 	dash := (&cmd).GetDashboardModel()
 
-	return dashbboardservice.SaveDashboardDTO{
+	return dashboards.SaveDashboardDTO{
 		Dashboard: dash,
 		Message:   cmd.Message,
 		OrgId:     cmd.OrgId,
diff --git a/pkg/services/dashboards/service/dashboard_service_test.go b/pkg/services/dashboards/service/dashboard_service_test.go
index dc9dc3cfefc..652d245f823 100644
--- a/pkg/services/dashboards/service/dashboard_service_test.go
+++ b/pkg/services/dashboards/service/dashboard_service_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
-	m "github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/guardian"
 	"github.com/grafana/grafana/pkg/setting"
 )
@@ -21,7 +21,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 		t.Skip("skipping integration test")
 	}
 	t.Run("Dashboard service tests", func(t *testing.T) {
-		fakeStore := m.FakeDashboardStore{}
+		fakeStore := dashboards.FakeDashboardStore{}
 		defer fakeStore.AssertExpectations(t)
 		service := &DashboardServiceImpl{
 			log:                log.New("test.logger"),
@@ -34,7 +34,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 		guardian.MockDashboardGuardian(&guardian.FakeDashboardGuardian{CanSaveValue: true})
 
 		t.Run("Save dashboard validation", func(t *testing.T) {
-			dto := &m.SaveDashboardDTO{}
+			dto := &dashboards.SaveDashboardDTO{}
 
 			t.Run("When saving a dashboard with empty title it should return error", func(t *testing.T) {
 				titles := []string{"", " ", "   \t   "}
@@ -42,7 +42,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 				for _, title := range titles {
 					dto.Dashboard = models.NewDashboard(title)
 					_, err := service.SaveDashboard(context.Background(), dto, false)
-					require.Equal(t, err, models.ErrDashboardTitleEmpty)
+					require.Equal(t, err, dashboards.ErrDashboardTitleEmpty)
 				}
 			})
 
@@ -50,13 +50,13 @@ func TestIntegrationDashboardService(t *testing.T) {
 				dto.Dashboard = models.NewDashboardFolder("Folder")
 				dto.Dashboard.FolderId = 1
 				_, err := service.SaveDashboard(context.Background(), dto, false)
-				require.Equal(t, err, models.ErrDashboardFolderCannotHaveParent)
+				require.Equal(t, err, dashboards.ErrDashboardFolderCannotHaveParent)
 			})
 
 			t.Run("Should return validation error if folder is named General", func(t *testing.T) {
 				dto.Dashboard = models.NewDashboardFolder("General")
 				_, err := service.SaveDashboard(context.Background(), dto, false)
-				require.Equal(t, err, models.ErrDashboardFolderNameExists)
+				require.Equal(t, err, dashboards.ErrDashboardFolderNameExists)
 			})
 
 			t.Run("When saving a dashboard should validate uid", func(t *testing.T) {
@@ -68,9 +68,9 @@ func TestIntegrationDashboardService(t *testing.T) {
 					{Uid: "   ", Error: nil},
 					{Uid: "  \t  ", Error: nil},
 					{Uid: "asdf90_-", Error: nil},
-					{Uid: "asdf/90", Error: models.ErrDashboardInvalidUid},
+					{Uid: "asdf/90", Error: dashboards.ErrDashboardInvalidUid},
 					{Uid: "   asdfghjklqwertyuiopzxcvbnmasdfghjklqwer   ", Error: nil},
-					{Uid: "asdfghjklqwertyuiopzxcvbnmasdfghjklqwertyuiopzxcvbnmasdfghjklqwertyuiopzxcvbnm", Error: models.ErrDashboardUidTooLong},
+					{Uid: "asdfghjklqwertyuiopzxcvbnmasdfghjklqwertyuiopzxcvbnmasdfghjklqwertyuiopzxcvbnm", Error: dashboards.ErrDashboardUidTooLong},
 				}
 
 				for _, tc := range testCases {
@@ -94,7 +94,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 				dto.Dashboard.SetId(3)
 				dto.User = &models.SignedInUser{UserId: 1}
 				_, err := service.SaveDashboard(context.Background(), dto, false)
-				require.Equal(t, err, models.ErrDashboardCannotSaveProvisionedDashboard)
+				require.Equal(t, err, dashboards.ErrDashboardCannotSaveProvisionedDashboard)
 			})
 
 			t.Run("Should not return validation error if dashboard is provisioned but UI updates allowed", func(t *testing.T) {
@@ -123,7 +123,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 		})
 
 		t.Run("Save provisioned dashboard validation", func(t *testing.T) {
-			dto := &m.SaveDashboardDTO{}
+			dto := &dashboards.SaveDashboardDTO{}
 
 			t.Run("Should not return validation error if dashboard is provisioned", func(t *testing.T) {
 				fakeStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything).Return(true, nil).Once()
@@ -157,7 +157,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 		})
 
 		t.Run("Import dashboard validation", func(t *testing.T) {
-			dto := &m.SaveDashboardDTO{}
+			dto := &dashboards.SaveDashboardDTO{}
 
 			t.Run("Should return validation error if dashboard is provisioned", func(t *testing.T) {
 				fakeStore.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything).Return(true, nil).Once()
@@ -167,7 +167,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 				dto.Dashboard.SetId(3)
 				dto.User = &models.SignedInUser{UserId: 1}
 				_, err := service.ImportDashboard(context.Background(), dto)
-				require.Equal(t, err, models.ErrDashboardCannotSaveProvisionedDashboard)
+				require.Equal(t, err, dashboards.ErrDashboardCannotSaveProvisionedDashboard)
 			})
 		})
 
@@ -182,7 +182,7 @@ func TestIntegrationDashboardService(t *testing.T) {
 			t.Run("DeleteDashboard should fail to delete it when provisioning information is missing", func(t *testing.T) {
 				fakeStore.On("GetProvisionedDataByDashboardID", mock.Anything).Return(&models.DashboardProvisioning{}, nil).Once()
 				err := service.DeleteDashboard(context.Background(), 1, 1)
-				require.Equal(t, err, models.ErrDashboardCannotDeleteProvisionedDashboard)
+				require.Equal(t, err, dashboards.ErrDashboardCannotDeleteProvisionedDashboard)
 			})
 		})
 
diff --git a/pkg/services/dashboards/service/folder_service.go b/pkg/services/dashboards/service/folder_service.go
index c48c5bf7655..de4f3016821 100644
--- a/pkg/services/dashboards/service/folder_service.go
+++ b/pkg/services/dashboards/service/folder_service.go
@@ -94,7 +94,7 @@ func (f *FolderServiceImpl) GetFolderByID(ctx context.Context, user *models.Sign
 		if err != nil {
 			return nil, toFolderError(err)
 		}
-		return nil, models.ErrFolderAccessDenied
+		return nil, dashboards.ErrFolderAccessDenied
 	}
 
 	return dashFolder, nil
@@ -111,7 +111,7 @@ func (f *FolderServiceImpl) GetFolderByUID(ctx context.Context, user *models.Sig
 		if err != nil {
 			return nil, toFolderError(err)
 		}
-		return nil, models.ErrFolderAccessDenied
+		return nil, dashboards.ErrFolderAccessDenied
 	}
 
 	return dashFolder, nil
@@ -128,7 +128,7 @@ func (f *FolderServiceImpl) GetFolderByTitle(ctx context.Context, user *models.S
 		if err != nil {
 			return nil, toFolderError(err)
 		}
-		return nil, models.ErrFolderAccessDenied
+		return nil, dashboards.ErrFolderAccessDenied
 	}
 
 	return dashFolder, nil
@@ -140,7 +140,7 @@ func (f *FolderServiceImpl) CreateFolder(ctx context.Context, user *models.Signe
 
 	trimmedUID := strings.TrimSpace(uid)
 	if trimmedUID == accesscontrol.GeneralFolderUID {
-		return nil, models.ErrFolderInvalidUID
+		return nil, dashboards.ErrFolderInvalidUID
 	}
 
 	dashFolder.SetUid(trimmedUID)
@@ -201,7 +201,7 @@ func (f *FolderServiceImpl) UpdateFolder(ctx context.Context, user *models.Signe
 	dashFolder := query.Result
 
 	if !dashFolder.IsFolder {
-		return models.ErrFolderNotFound
+		return dashboards.ErrFolderNotFound
 	}
 
 	cmd.UpdateDashboardModel(dashFolder, orgID, user.UserId)
@@ -254,7 +254,7 @@ func (f *FolderServiceImpl) DeleteFolder(ctx context.Context, user *models.Signe
 		if err != nil {
 			return nil, toFolderError(err)
 		}
-		return nil, models.ErrFolderAccessDenied
+		return nil, dashboards.ErrFolderAccessDenied
 	}
 
 	deleteCmd := models.DeleteDashboardCommand{OrgId: orgID, Id: dashFolder.Id, ForceDeleteFolderRules: forceDeleteRules}
@@ -271,32 +271,32 @@ func (f *FolderServiceImpl) MakeUserAdmin(ctx context.Context, orgID int64, user
 }
 
 func toFolderError(err error) error {
-	if errors.Is(err, models.ErrDashboardTitleEmpty) {
-		return models.ErrFolderTitleEmpty
+	if errors.Is(err, dashboards.ErrDashboardTitleEmpty) {
+		return dashboards.ErrFolderTitleEmpty
 	}
 
-	if errors.Is(err, models.ErrDashboardUpdateAccessDenied) {
-		return models.ErrFolderAccessDenied
+	if errors.Is(err, dashboards.ErrDashboardUpdateAccessDenied) {
+		return dashboards.ErrFolderAccessDenied
 	}
 
-	if errors.Is(err, models.ErrDashboardWithSameNameInFolderExists) {
-		return models.ErrFolderSameNameExists
+	if errors.Is(err, dashboards.ErrDashboardWithSameNameInFolderExists) {
+		return dashboards.ErrFolderSameNameExists
 	}
 
-	if errors.Is(err, models.ErrDashboardWithSameUIDExists) {
-		return models.ErrFolderWithSameUIDExists
+	if errors.Is(err, dashboards.ErrDashboardWithSameUIDExists) {
+		return dashboards.ErrFolderWithSameUIDExists
 	}
 
-	if errors.Is(err, models.ErrDashboardVersionMismatch) {
-		return models.ErrFolderVersionMismatch
+	if errors.Is(err, dashboards.ErrDashboardVersionMismatch) {
+		return dashboards.ErrFolderVersionMismatch
 	}
 
-	if errors.Is(err, models.ErrDashboardNotFound) {
-		return models.ErrFolderNotFound
+	if errors.Is(err, dashboards.ErrDashboardNotFound) {
+		return dashboards.ErrFolderNotFound
 	}
 
-	if errors.Is(err, models.ErrDashboardFailedGenerateUniqueUid) {
-		err = models.ErrFolderFailedGenerateUniqueUid
+	if errors.Is(err, dashboards.ErrDashboardFailedGenerateUniqueUid) {
+		err = dashboards.ErrFolderFailedGenerateUniqueUid
 	}
 
 	return err
diff --git a/pkg/services/dashboards/service/folder_service_test.go b/pkg/services/dashboards/service/folder_service_test.go
index 99cf9168ab7..46c03f6830f 100644
--- a/pkg/services/dashboards/service/folder_service_test.go
+++ b/pkg/services/dashboards/service/folder_service_test.go
@@ -77,7 +77,7 @@ func TestIntegrationFolderService(t *testing.T) {
 
 			t.Run("When get folder by id should return access denied error", func(t *testing.T) {
 				_, err := service.GetFolderByID(context.Background(), user, folderId, orgID)
-				require.Equal(t, err, models.ErrFolderAccessDenied)
+				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
 			t.Run("When get folder by id, with id = 0 should return default folder", func(t *testing.T) {
@@ -88,13 +88,13 @@ func TestIntegrationFolderService(t *testing.T) {
 
 			t.Run("When get folder by uid should return access denied error", func(t *testing.T) {
 				_, err := service.GetFolderByUID(context.Background(), user, orgID, folderUID)
-				require.Equal(t, err, models.ErrFolderAccessDenied)
+				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
 			t.Run("When creating folder should return access denied error", func(t *testing.T) {
 				store.On("ValidateDashboardBeforeSave", mock.Anything, mock.Anything).Return(true, nil).Times(2)
 				_, err := service.CreateFolder(context.Background(), user, orgID, folder.Title, folderUID)
-				require.Equal(t, err, models.ErrFolderAccessDenied)
+				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
 			t.Run("When updating folder should return access denied error", func(t *testing.T) {
@@ -107,13 +107,13 @@ func TestIntegrationFolderService(t *testing.T) {
 					Uid:   folderUID,
 					Title: "Folder-TEST",
 				})
-				require.Equal(t, err, models.ErrFolderAccessDenied)
+				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
 			t.Run("When deleting folder by uid should return access denied error", func(t *testing.T) {
 				_, err := service.DeleteFolder(context.Background(), user, orgID, folderUID, false)
 				require.Error(t, err)
-				require.Equal(t, err, models.ErrFolderAccessDenied)
+				require.Equal(t, err, dashboards.ErrFolderAccessDenied)
 			})
 
 			t.Cleanup(func() {
@@ -144,7 +144,7 @@ func TestIntegrationFolderService(t *testing.T) {
 				dash.Id = rand.Int63()
 
 				_, err := service.CreateFolder(context.Background(), user, orgID, dash.Title, "general")
-				require.ErrorIs(t, err, models.ErrFolderInvalidUID)
+				require.ErrorIs(t, err, dashboards.ErrFolderInvalidUID)
 			})
 
 			t.Run("When updating folder should not return access denied error", func(t *testing.T) {
@@ -238,14 +238,14 @@ func TestIntegrationFolderService(t *testing.T) {
 				ActualError   error
 				ExpectedError error
 			}{
-				{ActualError: models.ErrDashboardTitleEmpty, ExpectedError: models.ErrFolderTitleEmpty},
-				{ActualError: models.ErrDashboardUpdateAccessDenied, ExpectedError: models.ErrFolderAccessDenied},
-				{ActualError: models.ErrDashboardWithSameNameInFolderExists, ExpectedError: models.ErrFolderSameNameExists},
-				{ActualError: models.ErrDashboardWithSameUIDExists, ExpectedError: models.ErrFolderWithSameUIDExists},
-				{ActualError: models.ErrDashboardVersionMismatch, ExpectedError: models.ErrFolderVersionMismatch},
-				{ActualError: models.ErrDashboardNotFound, ExpectedError: models.ErrFolderNotFound},
-				{ActualError: models.ErrDashboardFailedGenerateUniqueUid, ExpectedError: models.ErrFolderFailedGenerateUniqueUid},
-				{ActualError: models.ErrDashboardInvalidUid, ExpectedError: models.ErrDashboardInvalidUid},
+				{ActualError: dashboards.ErrDashboardTitleEmpty, ExpectedError: dashboards.ErrFolderTitleEmpty},
+				{ActualError: dashboards.ErrDashboardUpdateAccessDenied, ExpectedError: dashboards.ErrFolderAccessDenied},
+				{ActualError: dashboards.ErrDashboardWithSameNameInFolderExists, ExpectedError: dashboards.ErrFolderSameNameExists},
+				{ActualError: dashboards.ErrDashboardWithSameUIDExists, ExpectedError: dashboards.ErrFolderWithSameUIDExists},
+				{ActualError: dashboards.ErrDashboardVersionMismatch, ExpectedError: dashboards.ErrFolderVersionMismatch},
+				{ActualError: dashboards.ErrDashboardNotFound, ExpectedError: dashboards.ErrFolderNotFound},
+				{ActualError: dashboards.ErrDashboardFailedGenerateUniqueUid, ExpectedError: dashboards.ErrFolderFailedGenerateUniqueUid},
+				{ActualError: dashboards.ErrDashboardInvalidUid, ExpectedError: dashboards.ErrDashboardInvalidUid},
 			}
 
 			for _, tc := range testCases {
diff --git a/pkg/services/dashboards/store_mock.go b/pkg/services/dashboards/store_mock.go
index 20ce1c3e75d..ddf976aa679 100644
--- a/pkg/services/dashboards/store_mock.go
+++ b/pkg/services/dashboards/store_mock.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v2.12.1. DO NOT EDIT.
+// Code generated by mockery v2.12.2. DO NOT EDIT.
 
 package dashboards
 
@@ -67,27 +67,6 @@ func (_m *FakeDashboardStore) FindDashboards(ctx context.Context, query *models.
 	return r0, r1
 }
 
-// GenerateNewPublicDashboardUid provides a mock function with given fields: ctx
-func (_m *FakeDashboardStore) GenerateNewPublicDashboardUid(ctx context.Context) (string, error) {
-	ret := _m.Called(ctx)
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func(context.Context) string); ok {
-		r0 = rf(ctx)
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
-		r1 = rf(ctx)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // GetDashboard provides a mock function with given fields: ctx, query
 func (_m *FakeDashboardStore) GetDashboard(ctx context.Context, query *models.GetDashboardQuery) (*models.Dashboard, error) {
 	ret := _m.Called(ctx, query)
@@ -319,67 +298,12 @@ func (_m *FakeDashboardStore) GetProvisionedDataByDashboardUID(orgID int64, dash
 	return r0, r1
 }
 
-// GetPublicDashboard provides a mock function with given fields: ctx, accessToken
-func (_m *FakeDashboardStore) GetPublicDashboard(ctx context.Context, accessToken string) (*models.PublicDashboard, *models.Dashboard, error) {
-	ret := _m.Called(ctx, accessToken)
-
-	var r0 *models.PublicDashboard
-	if rf, ok := ret.Get(0).(func(context.Context, string) *models.PublicDashboard); ok {
-		r0 = rf(ctx, accessToken)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*models.PublicDashboard)
-		}
-	}
-
-	var r1 *models.Dashboard
-	if rf, ok := ret.Get(1).(func(context.Context, string) *models.Dashboard); ok {
-		r1 = rf(ctx, accessToken)
-	} else {
-		if ret.Get(1) != nil {
-			r1 = ret.Get(1).(*models.Dashboard)
-		}
-	}
-
-	var r2 error
-	if rf, ok := ret.Get(2).(func(context.Context, string) error); ok {
-		r2 = rf(ctx, accessToken)
-	} else {
-		r2 = ret.Error(2)
-	}
-
-	return r0, r1, r2
-}
-
-// GetPublicDashboardConfig provides a mock function with given fields: ctx, orgId, dashboardUid
-func (_m *FakeDashboardStore) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error) {
-	ret := _m.Called(ctx, orgId, dashboardUid)
-
-	var r0 *models.PublicDashboard
-	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *models.PublicDashboard); ok {
-		r0 = rf(ctx, orgId, dashboardUid)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*models.PublicDashboard)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
-		r1 = rf(ctx, orgId, dashboardUid)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// HasAdminPermissionInFolders provides a mock function with given fields: ctx, query
-func (_m *FakeDashboardStore) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+// HasAdminPermissionInDashboardsOrFolders provides a mock function with given fields: ctx, query
+func (_m *FakeDashboardStore) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error {
 	ret := _m.Called(ctx, query)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, *models.HasAdminPermissionInFoldersQuery) error); ok {
+	if rf, ok := ret.Get(0).(func(context.Context, *models.HasAdminPermissionInDashboardsOrFoldersQuery) error); ok {
 		r0 = rf(ctx, query)
 	} else {
 		r0 = ret.Error(0)
@@ -462,29 +386,6 @@ func (_m *FakeDashboardStore) SaveProvisionedDashboard(cmd models.SaveDashboardC
 	return r0, r1
 }
 
-// SavePublicDashboardConfig provides a mock function with given fields: ctx, cmd
-func (_m *FakeDashboardStore) SavePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) (*models.PublicDashboard, error) {
-	ret := _m.Called(ctx, cmd)
-
-	var r0 *models.PublicDashboard
-	if rf, ok := ret.Get(0).(func(context.Context, models.SavePublicDashboardConfigCommand) *models.PublicDashboard); ok {
-		r0 = rf(ctx, cmd)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*models.PublicDashboard)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(context.Context, models.SavePublicDashboardConfigCommand) error); ok {
-		r1 = rf(ctx, cmd)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // UnprovisionDashboard provides a mock function with given fields: ctx, id
 func (_m *FakeDashboardStore) UnprovisionDashboard(ctx context.Context, id int64) error {
 	ret := _m.Called(ctx, id)
@@ -513,20 +414,6 @@ func (_m *FakeDashboardStore) UpdateDashboardACL(ctx context.Context, uid int64,
 	return r0
 }
 
-// UpdatePublicDashboardConfig provides a mock function with given fields: ctx, cmd
-func (_m *FakeDashboardStore) UpdatePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) error {
-	ret := _m.Called(ctx, cmd)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, models.SavePublicDashboardConfigCommand) error); ok {
-		r0 = rf(ctx, cmd)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
 // ValidateDashboardBeforeSave provides a mock function with given fields: dashboard, overwrite
 func (_m *FakeDashboardStore) ValidateDashboardBeforeSave(dashboard *models.Dashboard, overwrite bool) (bool, error) {
 	ret := _m.Called(dashboard, overwrite)
diff --git a/pkg/services/dashboardsnapshots/database/database.go b/pkg/services/dashboardsnapshots/database/database.go
index 8732802d737..fc0b956ff9e 100644
--- a/pkg/services/dashboardsnapshots/database/database.go
+++ b/pkg/services/dashboardsnapshots/database/database.go
@@ -91,7 +91,7 @@ func (d *DashboardSnapshotStore) GetDashboardSnapshot(ctx context.Context, query
 		if err != nil {
 			return err
 		} else if !has {
-			return models.ErrDashboardSnapshotNotFound
+			return dashboardsnapshots.ErrDashboardSnapshotNotFound
 		}
 
 		query.Result = &snapshot
diff --git a/pkg/services/dashboardsnapshots/errors.go b/pkg/services/dashboardsnapshots/errors.go
new file mode 100644
index 00000000000..268532c833b
--- /dev/null
+++ b/pkg/services/dashboardsnapshots/errors.go
@@ -0,0 +1,8 @@
+package dashboardsnapshots
+
+import "github.com/grafana/grafana/pkg/services/dashboards"
+
+var ErrDashboardSnapshotNotFound = dashboards.DashboardErr{
+	Reason:     "Dashboard snapshot not found",
+	StatusCode: 404,
+}
diff --git a/pkg/services/dashboardversion/dashverimpl/store_test.go b/pkg/services/dashboardversion/dashverimpl/store_test.go
index de11a60ca8a..d696ef4e2a0 100644
--- a/pkg/services/dashboardversion/dashverimpl/store_test.go
+++ b/pkg/services/dashboardversion/dashverimpl/store_test.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/util"
@@ -134,7 +135,7 @@ func getDashboard(t *testing.T, sqlStore *sqlstore.SQLStore, dashboard *models.D
 		if err != nil {
 			return err
 		} else if !has {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		dashboard.SetId(dashboard.Id)
@@ -188,7 +189,7 @@ func insertTestDashboard(t *testing.T, sqlStore *sqlstore.SQLStore, title string
 		if affectedRows, err := sess.Insert(dashVersion); err != nil {
 			return err
 		} else if affectedRows == 0 {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		return nil
@@ -250,7 +251,7 @@ func updateTestDashboard(t *testing.T, sqlStore *sqlstore.SQLStore, dashboard *m
 		if affectedRows, err := sess.Insert(dashVersion); err != nil {
 			return err
 		} else if affectedRows == 0 {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		return nil
diff --git a/pkg/services/datasources/models.go b/pkg/services/datasources/models.go
index 9e6253b86ed..173fed2e7e9 100644
--- a/pkg/services/datasources/models.go
+++ b/pkg/services/datasources/models.go
@@ -47,9 +47,9 @@ type CorrelationDTO struct {
 }
 
 type DataSource struct {
-	Id      int64 `json:"id"`
-	OrgId   int64 `json:"orgId"`
-	Version int   `json:"version"`
+	Id      int64 `json:"id,omitempty"`
+	OrgId   int64 `json:"orgId,omitempty"`
+	Version int   `json:"version,omitempty"`
 
 	Name   string   `json:"name"`
 	Type   string   `json:"type"`
@@ -71,8 +71,8 @@ type DataSource struct {
 	ReadOnly          bool              `json:"readOnly"`
 	Uid               string            `json:"uid"`
 
-	Created time.Time `json:"created"`
-	Updated time.Time `json:"updated"`
+	Created time.Time `json:"created,omitempty"`
+	Updated time.Time `json:"updated,omitempty"`
 }
 
 // AllowedCookies parses the jsondata.keepCookies and returns a list of
diff --git a/pkg/services/export/commit_helper.go b/pkg/services/export/commit_helper.go
new file mode 100644
index 00000000000..b19749c6a03
--- /dev/null
+++ b/pkg/services/export/commit_helper.go
@@ -0,0 +1,153 @@
+package export
+
+import (
+	"context"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path"
+	"strings"
+	"time"
+
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	jsoniter "github.com/json-iterator/go"
+)
+
+type commitHelper struct {
+	ctx     context.Context
+	repo    *git.Repository
+	work    *git.Worktree
+	orgDir  string // includes the orgID
+	workDir string // same as the worktree root
+	orgID   int64
+	users   map[int64]*userInfo
+}
+
+type commitBody struct {
+	fpath string // absolute
+	body  []byte
+	frame *data.Frame
+}
+
+type commitOptions struct {
+	body    []commitBody
+	when    time.Time
+	userID  int64
+	comment string
+}
+
+func (ch *commitHelper) initOrg(sql *sqlstore.SQLStore, orgID int64) error {
+	return sql.WithDbSession(ch.ctx, func(sess *sqlstore.DBSession) error {
+		sess.Table("user").
+			Join("inner", "org_user", "user.id = org_user.user_id").
+			Cols("user.*", "org_user.role").
+			Where("org_user.org_id = ?", orgID).
+			Asc("user.id")
+
+		rows := make([]*userInfo, 0)
+		err := sess.Find(&rows)
+		if err != nil {
+			return err
+		}
+
+		lookup := make(map[int64]*userInfo, len(rows))
+		for _, row := range rows {
+			lookup[row.ID] = row
+		}
+		ch.users = lookup
+		ch.orgID = orgID
+		return err
+	})
+}
+
+func (ch *commitHelper) add(opts commitOptions) error {
+	for _, b := range opts.body {
+		if !strings.HasPrefix(b.fpath, ch.orgDir) {
+			return fmt.Errorf("invalid path, must be within the root folder")
+		}
+
+		// make sure the parent exists
+		err := os.MkdirAll(path.Dir(b.fpath), 0750)
+		if err != nil {
+			return err
+		}
+
+		body := b.body
+		if b.frame != nil {
+			body, err = jsoniter.ConfigCompatibleWithStandardLibrary.MarshalIndent(b.frame, "", "  ")
+			if err != nil {
+				return err
+			}
+		}
+
+		err = ioutil.WriteFile(b.fpath, body, 0644)
+		if err != nil {
+			return err
+		}
+
+		sub := b.fpath[len(ch.workDir)+1:]
+		_, err = ch.work.Add(sub)
+		if err != nil {
+			status, e2 := ch.work.Status()
+			if e2 != nil {
+				return fmt.Errorf("error adding: %s (invalud work status: %s)", sub, e2.Error())
+			}
+			fmt.Printf("STATUS: %+v\n", status)
+			return fmt.Errorf("unable to add file: %s (%d)", sub, len(b.body))
+		}
+	}
+
+	user, ok := ch.users[opts.userID]
+	if !ok {
+		user = &userInfo{
+			Name:  "admin",
+			Email: "admin@unknown.org",
+		}
+	}
+	sig := user.getAuthor()
+	if opts.when.Unix() > 10 {
+		sig.When = opts.when
+	}
+
+	copts := &git.CommitOptions{
+		Author: &sig,
+	}
+
+	_, err := ch.work.Commit(opts.comment, copts)
+	return err
+}
+
+type userInfo struct {
+	ID               int64     `json:"-" xorm:"id"`
+	Login            string    `json:"login"`
+	Email            string    `json:"email"`
+	Name             string    `json:"name"`
+	Password         string    `json:"password"`
+	Salt             string    `json:"salt"`
+	Role             string    `json:"org_role"` // org role
+	Theme            string    `json:"-"`        // managed in preferences
+	Created          time.Time `json:"-"`        // managed in git or external source
+	Updated          time.Time `json:"-"`        // managed in git or external source
+	IsDisabled       bool      `json:"disabled" xorm:"is_disabled"`
+	IsServiceAccount bool      `json:"serviceAccount" xorm:"is_service_account"`
+	LastSeenAt       time.Time `json:"-" xorm:"last_seen_at"`
+}
+
+func (u *userInfo) getAuthor() object.Signature {
+	return object.Signature{
+		Name:  firstRealStringX(u.Name, u.Login, u.Email, "?"),
+		Email: firstRealStringX(u.Email, u.Login, u.Name, "?"),
+	}
+}
+
+func firstRealStringX(vals ...string) string {
+	for _, v := range vals {
+		if v != "" {
+			return v
+		}
+	}
+	return "?"
+}
diff --git a/pkg/services/export/dummy_job.go b/pkg/services/export/dummy_job.go
index 029bc8edabb..f892b1cea6b 100644
--- a/pkg/services/export/dummy_job.go
+++ b/pkg/services/export/dummy_job.go
@@ -1,7 +1,6 @@
 package export
 
 import (
-	"errors"
 	"fmt"
 	"math"
 	"math/rand"
@@ -23,10 +22,6 @@ type dummyExportJob struct {
 }
 
 func startDummyExportJob(cfg ExportConfig, broadcaster statusBroadcaster) (Job, error) {
-	if cfg.Format != "git" {
-		return nil, errors.New("only git format is supported")
-	}
-
 	job := &dummyExportJob{
 		logger:      log.New("dummy_export_job"),
 		cfg:         cfg,
diff --git a/pkg/services/export/export_anno.go b/pkg/services/export/export_anno.go
new file mode 100644
index 00000000000..4f3d0f96684
--- /dev/null
+++ b/pkg/services/export/export_anno.go
@@ -0,0 +1,129 @@
+package export
+
+import (
+	"encoding/json"
+	"fmt"
+	"path/filepath"
+	"time"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	jsoniter "github.com/json-iterator/go"
+)
+
+func exportAnnotations(helper *commitHelper, job *gitExportJob) error {
+	return job.sql.WithDbSession(helper.ctx, func(sess *sqlstore.DBSession) error {
+		type annoResult struct {
+			ID          int64  `xorm:"id"`
+			DashboardID int64  `xorm:"dashboard_id"`
+			PanelID     int64  `xorm:"panel_id"`
+			UserID      int64  `xorm:"user_id"`
+			Text        string `xorm:"text"`
+			Epoch       int64  `xorm:"epoch"`
+			EpochEnd    int64  `xorm:"epoch_end"`
+			Created     int64  `xorm:"created"` // not used
+			Tags        string `xorm:"tags"`    // JSON Array
+		}
+
+		type annoEvent struct {
+			PanelID  int64  `json:"panel"`
+			Text     string `json:"text"`
+			Epoch    int64  `json:"epoch"` // dashboard/start+end is really the UID
+			EpochEnd int64  `json:"epoch_end,omitempty"`
+			Tags     []string
+		}
+
+		rows := make([]*annoResult, 0)
+
+		sess.Table("annotation").
+			Where("org_id = ? AND alert_id = 0", helper.orgID).Asc("epoch")
+
+		err := sess.Find(&rows)
+		if err != nil {
+			return err
+		}
+
+		count := len(rows)
+		f_ID := data.NewFieldFromFieldType(data.FieldTypeInt64, count)
+		f_DashboardID := data.NewFieldFromFieldType(data.FieldTypeInt64, count)
+		f_PanelID := data.NewFieldFromFieldType(data.FieldTypeInt64, count)
+		f_Epoch := data.NewFieldFromFieldType(data.FieldTypeTime, count)
+		f_EpochEnd := data.NewFieldFromFieldType(data.FieldTypeNullableTime, count)
+		f_Text := data.NewFieldFromFieldType(data.FieldTypeString, count)
+		f_Tags := data.NewFieldFromFieldType(data.FieldTypeJSON, count)
+
+		f_ID.Name = "ID"
+		f_DashboardID.Name = "DashboardID"
+		f_PanelID.Name = "PanelID"
+		f_Epoch.Name = "Epoch"
+		f_EpochEnd.Name = "EpochEnd"
+		f_Text.Name = "Text"
+		f_Tags.Name = "Tags"
+
+		for id, row := range rows {
+			f_ID.Set(id, row.ID)
+			f_DashboardID.Set(id, row.DashboardID)
+			f_PanelID.Set(id, row.PanelID)
+			f_Epoch.Set(id, time.UnixMilli(row.Epoch))
+			if row.Epoch != row.EpochEnd {
+				f_EpochEnd.SetConcrete(id, time.UnixMilli(row.EpochEnd))
+			}
+			f_Text.Set(id, row.Text)
+			f_Tags.Set(id, json.RawMessage(row.Tags))
+
+			// Save a file for each
+			event := &annoEvent{
+				PanelID: row.PanelID,
+				Text:    row.Text,
+			}
+			err = json.Unmarshal([]byte(row.Tags), &event.Tags)
+			if err != nil {
+				return err
+			}
+			fname := fmt.Sprintf("%d", row.Epoch)
+			if row.Epoch != row.EpochEnd {
+				fname += "-" + fmt.Sprintf("%d", row.EpochEnd)
+			}
+
+			err = helper.add(commitOptions{
+				body: []commitBody{
+					{
+						fpath: filepath.Join(helper.orgDir,
+							"annotations",
+							"dashboard",
+							fmt.Sprintf("id-%d", row.DashboardID),
+							fname+".json"),
+						body: prettyJSON(event),
+					},
+				},
+				when:    time.UnixMilli(row.Epoch),
+				comment: fmt.Sprintf("Added annotation (%d)", row.ID),
+				userID:  row.UserID,
+			})
+			if err != nil {
+				return err
+			}
+		}
+
+		frame := data.NewFrame("", f_ID, f_DashboardID, f_PanelID, f_Epoch, f_EpochEnd, f_Text, f_Tags)
+		js, err := jsoniter.ConfigCompatibleWithStandardLibrary.MarshalIndent(frame, "", "  ")
+		if err != nil {
+			return err
+		}
+
+		err = helper.add(commitOptions{
+			body: []commitBody{
+				{
+					fpath: filepath.Join(helper.orgDir, "annotations", "annotations.json"),
+					body:  js, // TODO, pretty?
+				},
+			},
+			when:    time.Now(),
+			comment: "Exported annotations",
+		})
+		if err != nil {
+			return err
+		}
+		return err
+	})
+}
diff --git a/pkg/services/export/export_auth.go b/pkg/services/export/export_auth.go
new file mode 100644
index 00000000000..37da1a92d63
--- /dev/null
+++ b/pkg/services/export/export_auth.go
@@ -0,0 +1,73 @@
+package export
+
+import (
+	"fmt"
+	"path"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+func dumpAuthTables(helper *commitHelper, job *gitExportJob) error {
+	return job.sql.WithDbSession(helper.ctx, func(sess *sqlstore.DBSession) error {
+		commit := commitOptions{
+			comment: "auth tables dump",
+		}
+
+		tables := []string{
+			"user", // joined with "org_user" to get the role
+			"user_role",
+			"builtin_role",
+			"api_key",
+			"team", "team_group", "team_role", "team_member",
+			"role",
+			"temp_user",
+			"user_auth_token", // no org_id... is it temporary?
+			"permission",
+		}
+
+		for _, table := range tables {
+			switch table {
+			case "permission":
+				sess.Table(table).
+					Join("left", "role", "permission.role_id = role.id").
+					Cols("permission.*").
+					Where("org_id = ?", helper.orgID).
+					Asc("permission.id")
+			case "user":
+				sess.Table(table).
+					Join("inner", "org_user", "user.id = org_user.user_id").
+					Cols("user.*", "org_user.role").
+					Where("org_user.org_id = ?", helper.orgID).
+					Asc("user.id")
+			case "user_auth_token":
+				sess.Table(table).
+					Join("inner", "org_user", "user_auth_token.id = org_user.user_id").
+					Cols("user_auth_token.*").
+					Where("org_user.org_id = ?", helper.orgID).
+					Asc("user_auth_token.id")
+			default:
+				sess.Table(table).Where("org_id = ?", helper.orgID).Asc("id")
+			}
+
+			raw, err := sess.QueryInterface()
+			if err != nil {
+				return fmt.Errorf("unable to read: %s // %s", table, err.Error())
+			}
+			if len(raw) < 1 {
+				continue // don't write empty files
+			}
+			frame, err := queryResultToDataFrame(raw, frameOpts{
+				skip: []string{"org_id", "version", "help_flags1", "theme"},
+			})
+			if err != nil {
+				return err
+			}
+			frame.Name = table
+			commit.body = append(commit.body, commitBody{
+				fpath: path.Join(helper.orgDir, "auth", "sql.dump", table+".json"),
+				frame: frame,
+			})
+		}
+		return helper.add(commit)
+	})
+}
diff --git a/pkg/services/export/export_dashboards.go b/pkg/services/export/export_dashboards.go
new file mode 100644
index 00000000000..212c31c1a38
--- /dev/null
+++ b/pkg/services/export/export_dashboards.go
@@ -0,0 +1,229 @@
+package export
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"path"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/grafana/grafana/pkg/infra/filestorage"
+	"github.com/grafana/grafana/pkg/services/searchV2/extract"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+func exportDashboards(helper *commitHelper, job *gitExportJob, lookup dsLookup) error {
+	alias := make(map[string]string, 100)
+	ids := make(map[int64]string, 100)
+	folders := make(map[int64]string, 100)
+
+	// Should root files be at the root or in a subfolder called "general"?
+	if true {
+		folders[0] = "general"
+	}
+
+	rootDir := path.Join(helper.orgDir, "root")
+	folderStructure := commitOptions{
+		when:    time.Now(),
+		comment: "Exported folder structure",
+	}
+
+	err := job.sql.WithDbSession(helper.ctx, func(sess *sqlstore.DBSession) error {
+		type dashDataQueryResult struct {
+			Id       int64
+			UID      string `xorm:"uid"`
+			IsFolder bool   `xorm:"is_folder"`
+			FolderID int64  `xorm:"folder_id"`
+			Slug     string `xorm:"slug"`
+			Data     []byte
+			Created  time.Time
+			Updated  time.Time
+		}
+
+		rows := make([]*dashDataQueryResult, 0)
+
+		sess.Table("dashboard").
+			Where("org_id = ?", helper.orgID).
+			Cols("id", "is_folder", "folder_id", "data", "slug", "created", "updated", "uid")
+
+		err := sess.Find(&rows)
+		if err != nil {
+			return err
+		}
+
+		// Process all folders
+		for _, row := range rows {
+			if !row.IsFolder {
+				continue
+			}
+			dash, err := extract.ReadDashboard(bytes.NewReader(row.Data), lookup)
+			if err != nil {
+				return err
+			}
+
+			dash.UID = row.UID
+			slug := cleanFileName(dash.Title)
+			folder := map[string]string{
+				"title": dash.Title,
+			}
+
+			folderStructure.body = append(folderStructure.body, commitBody{
+				fpath: path.Join(rootDir, slug, "__folder.json"),
+				body:  prettyJSON(folder),
+			})
+
+			alias[dash.UID] = slug
+			folders[row.Id] = slug
+
+			if row.Created.Before(folderStructure.when) {
+				folderStructure.when = row.Created
+			}
+		}
+
+		// Now process the dashboards in each folder
+		for _, row := range rows {
+			if row.IsFolder {
+				continue
+			}
+			fname := row.Slug + "-dash.json"
+			fpath, ok := folders[row.FolderID]
+			if ok {
+				fpath = path.Join(fpath, fname)
+			} else {
+				fpath = fname
+			}
+
+			alias[row.UID] = fpath
+			ids[row.Id] = fpath
+		}
+
+		return err
+	})
+	if err != nil {
+		return err
+	}
+
+	err = helper.add(folderStructure)
+	if err != nil {
+		return err
+	}
+
+	err = helper.add(commitOptions{
+		body: []commitBody{
+			{
+				fpath: filepath.Join(helper.orgDir, "root-alias.json"),
+				body:  prettyJSON(alias),
+			},
+			{
+				fpath: filepath.Join(helper.orgDir, "root-ids.json"),
+				body:  prettyJSON(ids),
+			},
+		},
+		when:    folderStructure.when,
+		comment: "adding UID alias structure",
+	})
+	if err != nil {
+		return err
+	}
+
+	// Now walk the history
+	err = job.sql.WithDbSession(helper.ctx, func(sess *sqlstore.DBSession) error {
+		type dashVersionResult struct {
+			DashId    int64     `xorm:"dashboard_id"`
+			Version   int64     `xorm:"version"`
+			Created   time.Time `xorm:"created"`
+			CreatedBy int64     `xorm:"created_by"`
+			Message   string    `xorm:"message"`
+			Data      []byte
+		}
+
+		rows := make([]*dashVersionResult, 0, len(ids))
+
+		sess.Table("dashboard_version").
+			Join("INNER", "dashboard", "dashboard.id = dashboard_version.dashboard_id").
+			Where("org_id = ?", job.orgID).
+			Cols("dashboard_version.dashboard_id",
+				"dashboard_version.version",
+				"dashboard_version.created",
+				"dashboard_version.created_by",
+				"dashboard_version.message",
+				"dashboard_version.data").
+			Asc("dashboard_version.created")
+
+		err := sess.Find(&rows)
+		if err != nil {
+			return err
+		}
+
+		count := int64(0)
+
+		// Process all folders (only one level deep!!!)
+		for _, row := range rows {
+			fpath, ok := ids[row.DashId]
+			if !ok {
+				continue
+			}
+
+			msg := row.Message
+			if msg == "" {
+				msg = fmt.Sprintf("Version: %d", row.Version)
+			}
+
+			err = helper.add(commitOptions{
+				body: []commitBody{
+					{
+						fpath: filepath.Join(rootDir, fpath),
+						body:  cleanDashboardJSON(row.Data),
+					},
+				},
+				userID:  row.CreatedBy,
+				when:    row.Created,
+				comment: msg,
+			})
+			if err != nil {
+				return err
+			}
+
+			count++
+			fmt.Printf("COMMIT: %d // %s (%d)\n", count, fpath, row.Version)
+
+			job.status.Current = count
+			job.status.Last = fpath
+			job.status.Changed = time.Now().UnixMilli()
+			job.broadcaster(job.status)
+		}
+
+		return nil
+	})
+
+	return err
+}
+
+func cleanDashboardJSON(data []byte) []byte {
+	var dash map[string]interface{}
+	err := json.Unmarshal(data, &dash)
+	if err != nil {
+		return nil
+	}
+	delete(dash, "id")
+	delete(dash, "uid")
+	delete(dash, "version")
+
+	clean, _ := json.MarshalIndent(dash, "", "  ")
+	return clean
+}
+
+// replace any unsafe file name characters... TODO, but be a standard way to do this cleanly!!!
+func cleanFileName(name string) string {
+	name = strings.ReplaceAll(name, "/", "-")
+	name = strings.ReplaceAll(name, "\\", "-")
+	name = strings.ReplaceAll(name, ":", "-")
+	if err := filestorage.ValidatePath(filestorage.Delimiter + name); err != nil {
+		randomName, _ := uuid.NewRandom()
+		return randomName.String()
+	}
+	return name
+}
diff --git a/pkg/services/export/export_ds.go b/pkg/services/export/export_ds.go
new file mode 100644
index 00000000000..4dbe53c5553
--- /dev/null
+++ b/pkg/services/export/export_ds.go
@@ -0,0 +1,72 @@
+package export
+
+import (
+	"fmt"
+	"path/filepath"
+	"sort"
+
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/searchV2/extract"
+)
+
+type dsLookup func(ref *extract.DataSourceRef) *extract.DataSourceRef
+
+func exportDataSources(helper *commitHelper, job *gitExportJob) (dsLookup, error) {
+	cmd := &datasources.GetDataSourcesQuery{
+		OrgId: job.orgID,
+	}
+	err := job.sql.GetDataSources(helper.ctx, cmd)
+	if err != nil {
+		return nil, err
+	}
+
+	sort.SliceStable(cmd.Result, func(i, j int) bool {
+		return cmd.Result[i].Created.After(cmd.Result[j].Created)
+	})
+
+	byUID := make(map[string]*extract.DataSourceRef, len(cmd.Result))
+	byName := make(map[string]*extract.DataSourceRef, len(cmd.Result))
+	for _, ds := range cmd.Result {
+		ref := &extract.DataSourceRef{
+			UID:  ds.Uid,
+			Type: ds.Type,
+		}
+		byUID[ds.Uid] = ref
+		byName[ds.Name] = ref
+		ds.OrgId = 0
+		ds.Version = 0
+
+		err := helper.add(commitOptions{
+			body: []commitBody{
+				{
+					fpath: filepath.Join(helper.orgDir, "datasources", fmt.Sprintf("%s-ds.json", ds.Uid)),
+					body:  prettyJSON(ds),
+				},
+			},
+			when:    ds.Created,
+			comment: fmt.Sprintf("Add datasource: %s", ds.Name),
+		})
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// Return the lookup function
+	return func(ref *extract.DataSourceRef) *extract.DataSourceRef {
+		if ref == nil || ref.UID == "" {
+			return &extract.DataSourceRef{
+				UID:  "default.uid",
+				Type: "default.type",
+			}
+		}
+		v, ok := byUID[ref.UID]
+		if ok {
+			return v
+		}
+		v, ok = byName[ref.UID]
+		if ok {
+			return v
+		}
+		return nil
+	}, nil
+}
diff --git a/pkg/services/export/export_snapshots.go b/pkg/services/export/export_snapshots.go
new file mode 100644
index 00000000000..e9390cc8b79
--- /dev/null
+++ b/pkg/services/export/export_snapshots.go
@@ -0,0 +1,43 @@
+package export
+
+import (
+	"fmt"
+	"path/filepath"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+)
+
+func exportSnapshots(helper *commitHelper, job *gitExportJob) error {
+	cmd := &dashboardsnapshots.GetDashboardSnapshotsQuery{
+		OrgId:        job.orgID,
+		Limit:        500000,
+		SignedInUser: nil,
+	}
+	if cmd.SignedInUser == nil {
+		return fmt.Errorf("snapshots requires an admin user")
+	}
+
+	err := job.dashboardsnapshotsService.SearchDashboardSnapshots(helper.ctx, cmd)
+	if err != nil {
+		return err
+	}
+
+	if len(cmd.Result) < 1 {
+		return nil // nothing
+	}
+
+	gitcmd := commitOptions{
+		when:    time.Now(),
+		comment: "Export playlists",
+	}
+
+	for _, snapshot := range cmd.Result {
+		gitcmd.body = append(gitcmd.body, commitBody{
+			fpath: filepath.Join(helper.orgDir, "snapshot", fmt.Sprintf("%d-snapshot.json", snapshot.Id)),
+			body:  prettyJSON(snapshot),
+		})
+	}
+
+	return helper.add(gitcmd)
+}
diff --git a/pkg/services/export/export_sys_playlists.go b/pkg/services/export/export_sys_playlists.go
new file mode 100644
index 00000000000..83943db9563
--- /dev/null
+++ b/pkg/services/export/export_sys_playlists.go
@@ -0,0 +1,40 @@
+package export
+
+import (
+	"fmt"
+	"path/filepath"
+	"time"
+
+	"github.com/grafana/grafana/pkg/models"
+)
+
+func exportSystemPlaylists(helper *commitHelper, job *gitExportJob) error {
+	cmd := &models.GetPlaylistsQuery{
+		OrgId: job.orgID,
+		Limit: 500000,
+	}
+	err := job.sql.SearchPlaylists(helper.ctx, cmd)
+	if err != nil {
+		return err
+	}
+
+	if len(cmd.Result) < 1 {
+		return nil // nothing
+	}
+
+	gitcmd := commitOptions{
+		when:    time.Now(),
+		comment: "Export playlists",
+	}
+
+	for _, playlist := range cmd.Result {
+		// TODO: fix the playlist API so it returns the json we need :)
+
+		gitcmd.body = append(gitcmd.body, commitBody{
+			fpath: filepath.Join(helper.orgDir, "system", "playlists", fmt.Sprintf("%s-playlist.json", playlist.UID)),
+			body:  prettyJSON(playlist),
+		})
+	}
+
+	return helper.add(gitcmd)
+}
diff --git a/pkg/services/export/export_sys_preferences.go b/pkg/services/export/export_sys_preferences.go
new file mode 100644
index 00000000000..926240acc04
--- /dev/null
+++ b/pkg/services/export/export_sys_preferences.go
@@ -0,0 +1,128 @@
+package export
+
+import (
+	"fmt"
+	"path"
+	"path/filepath"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+func exportSystemPreferences(helper *commitHelper, job *gitExportJob) error {
+	type preferences struct {
+		UserID          int64                  `json:"-" xorm:"user_id"`
+		TeamID          int64                  `json:"-" xorm:"team_id"`
+		HomeDashboardID int64                  `json:"-" xorm:"home_dashboard_id"`
+		Updated         time.Time              `json:"-" xorm:"updated"`
+		JSONData        map[string]interface{} `json:"-" xorm:"json_data"`
+
+		Theme         string      `json:"theme"`
+		Locale        string      `json:"locale"`
+		Timezone      string      `json:"timezone"`
+		WeekStart     string      `json:"week_start,omitempty"`
+		HomeDashboard string      `json:"home,omitempty" xorm:"uid"` // dashboard
+		NavBar        interface{} `json:"navbar,omitempty"`
+		QueryHistory  interface{} `json:"queryHistory,omitempty"`
+	}
+
+	prefsDir := path.Join(helper.orgDir, "system", "preferences")
+	users := make(map[int64]*userInfo, len(helper.users))
+	for _, user := range helper.users {
+		users[user.ID] = user
+	}
+
+	return job.sql.WithDbSession(helper.ctx, func(sess *sqlstore.DBSession) error {
+		rows := make([]*preferences, 0)
+
+		sess.Table("preferences").
+			Join("LEFT", "dashboard", "dashboard.id = preferences.home_dashboard_id").
+			Cols("preferences.*", "dashboard.uid").
+			Where("preferences.org_id = ?", helper.orgID)
+
+		err := sess.Find(&rows)
+		if err != nil {
+			return err
+		}
+
+		var comment string
+		var fpath string
+		for _, row := range rows {
+			if row.TeamID > 0 {
+				fpath = filepath.Join(prefsDir, "team", fmt.Sprintf("%d.json", row.TeamID))
+				comment = fmt.Sprintf("Team preferences: %d", row.TeamID)
+			} else if row.UserID == 0 {
+				fpath = filepath.Join(prefsDir, "default.json")
+				comment = "Default preferences"
+			} else {
+				user, ok := users[row.UserID]
+				if ok {
+					delete(users, row.UserID)
+				} else {
+					user = &userInfo{
+						Login: fmt.Sprintf("__%d__", row.UserID),
+					}
+				}
+				fpath = filepath.Join(prefsDir, "user", fmt.Sprintf("%s.json", user.Login))
+				comment = fmt.Sprintf("User preferences: %s", user.getAuthor().Name)
+			}
+
+			if row.JSONData != nil {
+				v, ok := row.JSONData["locale"]
+				if ok && row.Locale == "" {
+					s, ok := v.(string)
+					if ok {
+						row.Locale = s
+					}
+				}
+
+				v, ok = row.JSONData["navbar"]
+				if ok && row.NavBar == nil {
+					row.NavBar = v
+				}
+
+				v, ok = row.JSONData["queryHistory"]
+				if ok && row.QueryHistory == nil {
+					row.QueryHistory = v
+				}
+			}
+
+			err := helper.add(commitOptions{
+				body: []commitBody{
+					{
+						fpath: fpath,
+						body:  prettyJSON(row),
+					},
+				},
+				when:    row.Updated,
+				comment: comment,
+				userID:  row.UserID,
+			})
+			if err != nil {
+				return err
+			}
+		}
+
+		// add a file for all useres that may not be in the system
+		for _, user := range users {
+			row := preferences{
+				Theme: user.Theme, // never set?
+			}
+			err := helper.add(commitOptions{
+				body: []commitBody{
+					{
+						fpath: filepath.Join(prefsDir, "user", fmt.Sprintf("%s.json", user.Login)),
+						body:  prettyJSON(row),
+					},
+				},
+				when:    user.Updated,
+				comment: "user preferences",
+				userID:  row.UserID,
+			})
+			if err != nil {
+				return err
+			}
+		}
+		return err
+	})
+}
diff --git a/pkg/services/export/export_sys_stars.go b/pkg/services/export/export_sys_stars.go
new file mode 100644
index 00000000000..53fd6fea0b9
--- /dev/null
+++ b/pkg/services/export/export_sys_stars.go
@@ -0,0 +1,65 @@
+package export
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+func exportSystemStars(helper *commitHelper, job *gitExportJob) error {
+	byUser := make(map[int64][]string, 50)
+
+	err := job.sql.WithDbSession(helper.ctx, func(sess *sqlstore.DBSession) error {
+		type starResult struct {
+			User int64  `xorm:"user_id"`
+			UID  string `xorm:"uid"`
+		}
+
+		rows := make([]*starResult, 0)
+
+		sess.Table("star").
+			Join("INNER", "dashboard", "dashboard.id = star.dashboard_id").
+			Cols("star.user_id", "dashboard.uid").
+			Where("dashboard.org_id = ?", helper.orgID)
+
+		err := sess.Find(&rows)
+		if err != nil {
+			return err
+		}
+
+		for _, row := range rows {
+			stars := append(byUser[row.User], fmt.Sprintf("dashboard/%s", row.UID))
+			byUser[row.User] = stars
+		}
+		return err
+	})
+	if err != nil {
+		return err
+	}
+
+	for userID, stars := range byUser {
+		user, ok := helper.users[userID]
+		if !ok {
+			user = &userInfo{
+				Login: fmt.Sprintf("__unknown_%d", userID),
+			}
+		}
+
+		err := helper.add(commitOptions{
+			body: []commitBody{
+				{
+					fpath: filepath.Join(helper.orgDir, "system", "stars", fmt.Sprintf("%s.json", user.Login)),
+					body:  prettyJSON(stars),
+				},
+			},
+			when:    user.Updated,
+			comment: "user preferences",
+			userID:  userID,
+		})
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/pkg/services/export/frame_helper.go b/pkg/services/export/frame_helper.go
new file mode 100644
index 00000000000..1f7a291d8e5
--- /dev/null
+++ b/pkg/services/export/frame_helper.go
@@ -0,0 +1,138 @@
+package export
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+)
+
+type fieldInfo struct {
+	Name string
+	Conv data.FieldConverter
+}
+
+type frameOpts struct {
+	schema []fieldInfo
+	skip   []string
+}
+
+func prettyJSON(v interface{}) []byte {
+	b, _ := json.MarshalIndent(v, "", "  ")
+	return b
+}
+
+func queryResultToDataFrame(rows []map[string]interface{}, opts frameOpts) (*data.Frame, error) {
+	count := len(rows)
+	if count < 1 {
+		return nil, nil // empty frame
+	}
+
+	schema := opts.schema
+	if len(schema) < 1 {
+		skip := make(map[string]bool, len(opts.skip))
+		for _, k := range opts.skip {
+			skip[k] = true
+		}
+
+		for k, v := range rows[0] {
+			if skip[k] {
+				continue
+			}
+			field := fieldInfo{
+				Name: k,
+				Conv: data.FieldConverter{
+					OutputFieldType: data.FieldTypeFor(v),
+				},
+			}
+			if field.Conv.OutputFieldType == data.FieldTypeUnknown {
+				fmt.Printf("UNKNOWN type: %s / %v\n", k, v)
+				continue
+			}
+
+			// Don't write passwords to disk for now!!!!
+			if k == "password" || k == "salt" {
+				field.Conv.Converter = func(v interface{}) (interface{}, error) {
+					return fmt.Sprintf("<%s>", k), nil
+				}
+			}
+
+			schema = append(schema, field)
+		}
+	}
+
+	fields := make([]*data.Field, len(schema))
+	for i, s := range schema {
+		fields[i] = data.NewFieldFromFieldType(s.Conv.OutputFieldType, count)
+		fields[i].Name = s.Name
+	}
+
+	var err error
+	for i, row := range rows {
+		for j, s := range schema {
+			v, ok := row[s.Name]
+			if ok && v != nil {
+				if s.Conv.Converter != nil {
+					v, err = s.Conv.Converter(v)
+					if err != nil {
+						return nil, fmt.Errorf("converting field: %s // %s", s.Name, err.Error())
+					}
+				}
+				fields[j].Set(i, v)
+			}
+		}
+	}
+
+	// Fields are in random order
+	if len(opts.schema) < 1 {
+		last := []*data.Field{}
+		frame := data.NewFrame("")
+		lookup := make(map[string]*data.Field, len(fields))
+		for _, f := range fields {
+			if f.Name == "id" {
+				frame.Fields = append(frame.Fields, f) // first
+				continue
+			}
+			lookup[f.Name] = f
+		}
+
+		// First items
+		for _, name := range []string{"name", "login", "email", "role", "description", "uid"} {
+			f, ok := lookup[name]
+			if ok {
+				frame.Fields = append(frame.Fields, f) // first
+				delete(lookup, name)
+			}
+		}
+
+		// IDs
+		for k, f := range lookup {
+			if strings.HasSuffix(k, "_id") {
+				frame.Fields = append(frame.Fields, f) // first
+				delete(lookup, k)
+			} else if strings.HasPrefix(k, "is_") {
+				last = append(last, f) // first
+				delete(lookup, k)
+			}
+		}
+
+		// Last items
+		for _, name := range []string{"created", "updated"} {
+			f, ok := lookup[name]
+			if ok {
+				last = append(last, f) // first
+				delete(lookup, name)
+			}
+		}
+
+		// Rest
+		for _, f := range lookup {
+			frame.Fields = append(frame.Fields, f)
+		}
+
+		frame.Fields = append(frame.Fields, last...)
+		return frame, nil
+	}
+	return data.NewFrame("", fields...), nil
+}
diff --git a/pkg/services/export/git_export_job.go b/pkg/services/export/git_export_job.go
new file mode 100644
index 00000000000..21243e05c52
--- /dev/null
+++ b/pkg/services/export/git_export_job.go
@@ -0,0 +1,205 @@
+package export
+
+import (
+	"context"
+	"fmt"
+	"path"
+	"sync"
+	"time"
+
+	"github.com/go-git/go-git/v5"
+	"github.com/go-git/go-git/v5/plumbing"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+)
+
+var _ Job = new(gitExportJob)
+
+type gitExportJob struct {
+	logger                    log.Logger
+	sql                       *sqlstore.SQLStore
+	dashboardsnapshotsService dashboardsnapshots.Service
+	orgID                     int64
+	rootDir                   string
+
+	statusMu    sync.Mutex
+	status      ExportStatus
+	cfg         ExportConfig
+	broadcaster statusBroadcaster
+}
+
+type simpleExporter = func(helper *commitHelper, job *gitExportJob) error
+
+func startGitExportJob(cfg ExportConfig, sql *sqlstore.SQLStore, dashboardsnapshotsService dashboardsnapshots.Service, rootDir string, orgID int64, broadcaster statusBroadcaster) (Job, error) {
+	job := &gitExportJob{
+		logger:                    log.New("git_export_job"),
+		cfg:                       cfg,
+		sql:                       sql,
+		dashboardsnapshotsService: dashboardsnapshotsService,
+		orgID:                     orgID,
+		rootDir:                   rootDir,
+		broadcaster:               broadcaster,
+		status: ExportStatus{
+			Running: true,
+			Target:  "git export",
+			Started: time.Now().UnixMilli(),
+			Current: 0,
+		},
+	}
+
+	broadcaster(job.status)
+	go job.start()
+	return job, nil
+}
+
+func (e *gitExportJob) getStatus() ExportStatus {
+	e.statusMu.Lock()
+	defer e.statusMu.Unlock()
+
+	return e.status
+}
+
+func (e *gitExportJob) getConfig() ExportConfig {
+	e.statusMu.Lock()
+	defer e.statusMu.Unlock()
+
+	return e.cfg
+}
+
+// Utility function to export dashboards
+func (e *gitExportJob) start() {
+	defer func() {
+		e.logger.Info("Finished git export job")
+
+		e.statusMu.Lock()
+		defer e.statusMu.Unlock()
+		s := e.status
+		if err := recover(); err != nil {
+			e.logger.Error("export panic", "error", err)
+			s.Status = fmt.Sprintf("ERROR: %v", err)
+		}
+		// Make sure it finishes OK
+		if s.Finished < 10 {
+			s.Finished = time.Now().UnixMilli()
+		}
+		s.Running = false
+		if s.Status == "" {
+			s.Status = "done"
+		}
+		s.Target = e.rootDir
+		e.status = s
+		e.broadcaster(s)
+	}()
+
+	err := e.doExportWithHistory()
+	if err != nil {
+		e.logger.Error("ERROR", "e", err)
+		e.status.Status = "ERROR"
+		e.status.Last = err.Error()
+		e.broadcaster(e.status)
+	}
+}
+
+func (e *gitExportJob) doExportWithHistory() error {
+	r, err := git.PlainInit(e.rootDir, false)
+	if err != nil {
+		return err
+	}
+	// default to "main" branch
+	h := plumbing.NewSymbolicReference(plumbing.HEAD, plumbing.ReferenceName("refs/heads/main"))
+	err = r.Storer.SetReference(h)
+	if err != nil {
+		return err
+	}
+
+	w, err := r.Worktree()
+	if err != nil {
+		return err
+	}
+	helper := &commitHelper{
+		repo:    r,
+		work:    w,
+		ctx:     context.Background(),
+		workDir: e.rootDir,
+		orgDir:  e.rootDir,
+	}
+
+	cmd := &models.SearchOrgsQuery{}
+	err = e.sql.SearchOrgs(helper.ctx, cmd)
+	if err != nil {
+		return err
+	}
+
+	// Export each org
+	for _, org := range cmd.Result {
+		if len(cmd.Result) > 1 {
+			helper.orgDir = path.Join(e.rootDir, fmt.Sprintf("org_%d", org.Id))
+		}
+		err = helper.initOrg(e.sql, org.Id)
+		if err != nil {
+			return err
+		}
+
+		err = e.doOrgExportWithHistory(helper)
+		if err != nil {
+			return err
+		}
+	}
+
+	// cleanup the folder
+	e.status.Target = "pruning..."
+	e.broadcaster(e.status)
+	err = r.Prune(git.PruneOptions{})
+
+	// TODO
+	// git gc --prune=now --aggressive
+
+	return err
+}
+
+func (e *gitExportJob) doOrgExportWithHistory(helper *commitHelper) error {
+	lookup, err := exportDataSources(helper, e)
+	if err != nil {
+		return err
+	}
+
+	if true {
+		err = exportDashboards(helper, e, lookup)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Run all the simple exporters
+	exporters := []simpleExporter{
+		dumpAuthTables,
+		exportSystemPreferences,
+		exportSystemStars,
+		exportSystemPlaylists,
+		exportAnnotations,
+	}
+
+	// This needs a real admin user to use the interfaces (and decrypt)
+	if false {
+		exporters = append(exporters, exportSnapshots)
+	}
+
+	for _, fn := range exporters {
+		err = fn(helper, e)
+		if err != nil {
+			return err
+		}
+	}
+	return err
+}
+
+/**
+
+git remote add origin git@github.com:ryantxu/test-dash-repo.git
+git branch -M main
+git push -u origin main
+
+**/
diff --git a/pkg/services/export/service.go b/pkg/services/export/service.go
index ee4f1b040ea..6551775a065 100644
--- a/pkg/services/export/service.go
+++ b/pkg/services/export/service.go
@@ -2,15 +2,21 @@ package export
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
+	"os"
+	"path/filepath"
 	"sync"
+	"time"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
 )
 
 type ExportService interface {
@@ -22,25 +28,31 @@ type ExportService interface {
 }
 
 type StandardExport struct {
-	logger log.Logger
-	sql    *sqlstore.SQLStore
-	glive  *live.GrafanaLive
-	mutex  sync.Mutex
+	logger  log.Logger
+	glive   *live.GrafanaLive
+	mutex   sync.Mutex
+	dataDir string
+
+	// Services
+	sql                       *sqlstore.SQLStore
+	dashboardsnapshotsService dashboardsnapshots.Service
 
 	// updated with mutex
 	exportJob Job
 }
 
-func ProvideService(sql *sqlstore.SQLStore, features featuremgmt.FeatureToggles, gl *live.GrafanaLive) ExportService {
+func ProvideService(sql *sqlstore.SQLStore, features featuremgmt.FeatureToggles, gl *live.GrafanaLive, cfg *setting.Cfg, dashboardsnapshotsService dashboardsnapshots.Service) ExportService {
 	if !features.IsEnabled(featuremgmt.FlagExport) {
 		return &StubExport{}
 	}
 
 	return &StandardExport{
-		sql:       sql,
-		glive:     gl,
-		logger:    log.New("export_service"),
-		exportJob: &stoppedJob{},
+		sql:                       sql,
+		glive:                     gl,
+		logger:                    log.New("export_service"),
+		dashboardsnapshotsService: dashboardsnapshotsService,
+		exportJob:                 &stoppedJob{},
+		dataDir:                   cfg.DataPath,
 	}
 }
 
@@ -67,9 +79,23 @@ func (ex *StandardExport) HandleRequestExport(c *models.ReqContext) response.Res
 		return response.Error(http.StatusLocked, "export already running", nil)
 	}
 
-	job, err := startDummyExportJob(cfg, func(s ExportStatus) {
+	var job Job
+	broadcast := func(s ExportStatus) {
 		ex.broadcastStatus(c.OrgId, s)
-	})
+	}
+	switch cfg.Format {
+	case "dummy":
+		job, err = startDummyExportJob(cfg, broadcast)
+	case "git":
+		dir := filepath.Join(ex.dataDir, "export_git", fmt.Sprintf("git_%d", time.Now().Unix()))
+		if err := os.MkdirAll(dir, os.ModePerm); err != nil {
+			return response.Error(http.StatusBadRequest, "Error creating export folder", nil)
+		}
+		job, err = startGitExportJob(cfg, ex.sql, ex.dashboardsnapshotsService, dir, c.OrgId, broadcast)
+	default:
+		return response.Error(http.StatusBadRequest, "Unsupported job format", nil)
+	}
+
 	if err != nil {
 		ex.logger.Error("failed to start export job", "err", err)
 		return response.Error(http.StatusBadRequest, "failed to start export job", err)
diff --git a/pkg/services/featuremgmt/manager.go b/pkg/services/featuremgmt/manager.go
index 8593e6635cf..8c3ff596e06 100644
--- a/pkg/services/featuremgmt/manager.go
+++ b/pkg/services/featuremgmt/manager.go
@@ -162,7 +162,8 @@ func (fm *FeatureManager) HandleGetSettings(c *models.ReqContext) {
 }
 
 // WithFeatures is used to define feature toggles for testing.
-// The arguments are a list of strings that are optionally followed by a boolean value
+// The arguments are a list of strings that are optionally followed by a boolean value for example:
+// WithFeatures([]interface{}{"my_feature", "other_feature"}) or WithFeatures([]interface{}{"my_feature", true})
 func WithFeatures(spec ...interface{}) *FeatureManager {
 	count := len(spec)
 	enabled := make(map[string]bool, count)
diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go
index 153383c3cc3..81c39c2bace 100644
--- a/pkg/services/featuremgmt/registry.go
+++ b/pkg/services/featuremgmt/registry.go
@@ -97,10 +97,9 @@ var (
 			RequiresDevMode: true,
 		},
 		{
-			Name:            "publicDashboards",
-			Description:     "enables public access to dashboards",
-			State:           FeatureStateAlpha,
-			RequiresDevMode: true,
+			Name:        "publicDashboards",
+			Description: "enables public access to dashboards",
+			State:       FeatureStateAlpha,
 		},
 		{
 			Name:        "lokiLive",
@@ -228,6 +227,12 @@ var (
 			State:        FeatureStateAlpha,
 			FrontendOnly: true,
 		},
+		{
+			Name:         "scenes",
+			Description:  "Experimental framework to build interactive dashboards",
+			State:        FeatureStateAlpha,
+			FrontendOnly: true,
+		},
 		{
 			Name:        "useLegacyHeatmapPanel",
 			Description: "Continue to use the angular/flot based heatmap panel",
diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go
index d9ff3c122ae..d95e7241994 100644
--- a/pkg/services/featuremgmt/toggles_gen.go
+++ b/pkg/services/featuremgmt/toggles_gen.go
@@ -167,6 +167,10 @@ const (
 	// Allow elements nesting
 	FlagCanvasPanelNesting = "canvasPanelNesting"
 
+	// FlagScenes
+	// Experimental framework to build interactive dashboards
+	FlagScenes = "scenes"
+
 	// FlagUseLegacyHeatmapPanel
 	// Continue to use the angular/flot based heatmap panel
 	FlagUseLegacyHeatmapPanel = "useLegacyHeatmapPanel"
diff --git a/pkg/services/kmsproviders/osskmsproviders/osskmsproviders.go b/pkg/services/kmsproviders/osskmsproviders/osskmsproviders.go
index 4292ed16a58..511e7dc7091 100644
--- a/pkg/services/kmsproviders/osskmsproviders/osskmsproviders.go
+++ b/pkg/services/kmsproviders/osskmsproviders/osskmsproviders.go
@@ -24,10 +24,6 @@ func ProvideService(enc encryption.Internal, settings setting.Provider, features
 }
 
 func (s Service) Provide() (map[secrets.ProviderID]secrets.Provider, error) {
-	if s.features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
-		return nil, nil
-	}
-
 	return map[secrets.ProviderID]secrets.Provider{
 		kmsproviders.Default: grafana.New(s.settings, s.enc),
 	}, nil
diff --git a/pkg/services/libraryelements/api.go b/pkg/services/libraryelements/api.go
index d78cc817fb3..8781d0cd0b6 100644
--- a/pkg/services/libraryelements/api.go
+++ b/pkg/services/libraryelements/api.go
@@ -8,6 +8,7 @@ import (
 	"github.com/grafana/grafana/pkg/api/routing"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -173,11 +174,11 @@ func toLibraryElementError(err error, message string) response.Response {
 	if errors.Is(err, errLibraryElementVersionMismatch) {
 		return response.Error(412, errLibraryElementVersionMismatch.Error(), err)
 	}
-	if errors.Is(err, models.ErrFolderNotFound) {
-		return response.Error(404, models.ErrFolderNotFound.Error(), err)
+	if errors.Is(err, dashboards.ErrFolderNotFound) {
+		return response.Error(404, dashboards.ErrFolderNotFound.Error(), err)
 	}
-	if errors.Is(err, models.ErrFolderAccessDenied) {
-		return response.Error(403, models.ErrFolderAccessDenied.Error(), err)
+	if errors.Is(err, dashboards.ErrFolderAccessDenied) {
+		return response.Error(403, dashboards.ErrFolderAccessDenied.Error(), err)
 	}
 	if errors.Is(err, errLibraryElementHasConnections) {
 		return response.Error(403, errLibraryElementHasConnections.Error(), err)
diff --git a/pkg/services/libraryelements/database.go b/pkg/services/libraryelements/database.go
index e5b0cb5c1c2..674799c0e4a 100644
--- a/pkg/services/libraryelements/database.go
+++ b/pkg/services/libraryelements/database.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/search"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
@@ -707,7 +708,7 @@ func (l *LibraryElementService) deleteLibraryElementsInFolderUID(c context.Conte
 		}
 
 		if len(folderUIDs) == 0 {
-			return models.ErrFolderNotFound
+			return dashboards.ErrFolderNotFound
 		}
 
 		if len(folderUIDs) != 1 {
diff --git a/pkg/services/libraryelements/guard.go b/pkg/services/libraryelements/guard.go
index 3f7d776f6f7..7795a5f58cf 100644
--- a/pkg/services/libraryelements/guard.go
+++ b/pkg/services/libraryelements/guard.go
@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/guardian"
 )
 
@@ -29,7 +30,7 @@ func (l *LibraryElementService) requireEditPermissionsOnFolder(ctx context.Conte
 	}
 
 	if isGeneralFolder(folderID) && user.HasRole(models.ROLE_VIEWER) {
-		return models.ErrFolderAccessDenied
+		return dashboards.ErrFolderAccessDenied
 	}
 	folder, err := l.folderService.GetFolderByID(ctx, user, folderID, user.OrgId)
 	if err != nil {
@@ -43,7 +44,7 @@ func (l *LibraryElementService) requireEditPermissionsOnFolder(ctx context.Conte
 		return err
 	}
 	if !canEdit {
-		return models.ErrFolderAccessDenied
+		return dashboards.ErrFolderAccessDenied
 	}
 
 	return nil
@@ -66,7 +67,7 @@ func (l *LibraryElementService) requireViewPermissionsOnFolder(ctx context.Conte
 		return err
 	}
 	if !canView {
-		return models.ErrFolderAccessDenied
+		return dashboards.ErrFolderAccessDenied
 	}
 
 	return nil
@@ -80,7 +81,7 @@ func (l *LibraryElementService) requireEditPermissionsOnDashboard(ctx context.Co
 		return err
 	}
 	if !canEdit {
-		return models.ErrDashboardUpdateAccessDenied
+		return dashboards.ErrDashboardUpdateAccessDenied
 	}
 
 	return nil
diff --git a/pkg/services/libraryelements/libraryelements_test.go b/pkg/services/libraryelements/libraryelements_test.go
index d0463b59da7..00753e31fed 100644
--- a/pkg/services/libraryelements/libraryelements_test.go
+++ b/pkg/services/libraryelements/libraryelements_test.go
@@ -77,7 +77,7 @@ func TestDeleteLibraryPanelsInFolder(t *testing.T) {
 	scenarioWithPanel(t, "When an admin tries to delete a folder uid that doesn't exist, it should fail",
 		func(t *testing.T, sc scenarioContext) {
 			err := sc.service.DeleteLibraryElementsInFolder(sc.reqContext.Req.Context(), sc.reqContext.SignedInUser, sc.folder.Uid+"xxxx")
-			require.EqualError(t, err, models.ErrFolderNotFound.Error())
+			require.EqualError(t, err, dashboards.ErrFolderNotFound.Error())
 		})
 
 	scenarioWithPanel(t, "When an admin tries to delete a folder that contains disconnected elements, it should delete all disconnected elements too",
diff --git a/pkg/services/ngalert/api/api_provisioning.go b/pkg/services/ngalert/api/api_provisioning.go
index d1a6a1f1d59..2569d256b9f 100644
--- a/pkg/services/ngalert/api/api_provisioning.go
+++ b/pkg/services/ngalert/api/api_provisioning.go
@@ -54,6 +54,7 @@ type AlertRuleService interface {
 	CreateAlertRule(ctx context.Context, rule alerting_models.AlertRule, provenance alerting_models.Provenance) (alerting_models.AlertRule, error)
 	UpdateAlertRule(ctx context.Context, rule alerting_models.AlertRule, provenance alerting_models.Provenance) (alerting_models.AlertRule, error)
 	DeleteAlertRule(ctx context.Context, orgID int64, ruleUID string, provenance alerting_models.Provenance) error
+	GetRuleGroup(ctx context.Context, orgID int64, folder, group string) (definitions.AlertRuleGroup, error)
 	UpdateRuleGroup(ctx context.Context, orgID int64, folderUID, rulegroup string, interval int64) error
 }
 
@@ -284,7 +285,18 @@ func (srv *ProvisioningSrv) RouteDeleteAlertRule(c *models.ReqContext, UID strin
 	return response.JSON(http.StatusNoContent, "")
 }
 
-func (srv *ProvisioningSrv) RoutePutAlertRuleGroup(c *models.ReqContext, ag definitions.AlertRuleGroup, folderUID string, group string) response.Response {
+func (srv *ProvisioningSrv) RouteGetAlertRuleGroup(c *models.ReqContext, folder string, group string) response.Response {
+	g, err := srv.alertRules.GetRuleGroup(c.Req.Context(), c.OrgId, folder, group)
+	if err != nil {
+		if errors.Is(err, store.ErrAlertRuleGroupNotFound) {
+			return ErrResp(http.StatusNotFound, err, "")
+		}
+		return ErrResp(http.StatusInternalServerError, err, "")
+	}
+	return response.JSON(http.StatusOK, g)
+}
+
+func (srv *ProvisioningSrv) RoutePutAlertRuleGroup(c *models.ReqContext, ag definitions.AlertRuleGroupMetadata, folderUID string, group string) response.Response {
 	err := srv.alertRules.UpdateRuleGroup(c.Req.Context(), c.OrgId, folderUID, group, ag.Interval)
 	if err != nil {
 		if errors.Is(err, store.ErrOptimisticLock) {
diff --git a/pkg/services/ngalert/api/api_provisioning_test.go b/pkg/services/ngalert/api/api_provisioning_test.go
index 118dd0edb27..88574902f5f 100644
--- a/pkg/services/ngalert/api/api_provisioning_test.go
+++ b/pkg/services/ngalert/api/api_provisioning_test.go
@@ -239,6 +239,28 @@ func TestProvisioningApi(t *testing.T) {
 			require.Equal(t, 404, response.Status())
 		})
 	})
+
+	t.Run("alert rule groups", func(t *testing.T) {
+		t.Run("are present, GET returns 200", func(t *testing.T) {
+			sut := createProvisioningSrvSut(t)
+			rc := createTestRequestCtx()
+			insertRule(t, sut, createTestAlertRule("rule", 1))
+
+			response := sut.RouteGetAlertRuleGroup(&rc, "folder-uid", "my-cool-group")
+
+			require.Equal(t, 200, response.Status())
+		})
+
+		t.Run("are missing, GET returns 404", func(t *testing.T) {
+			sut := createProvisioningSrvSut(t)
+			rc := createTestRequestCtx()
+			insertRule(t, sut, createTestAlertRule("rule", 1))
+
+			response := sut.RouteGetAlertRuleGroup(&rc, "folder-uid", "does not exist")
+
+			require.Equal(t, 404, response.Status())
+		})
+	})
 }
 
 func createProvisioningSrvSut(t *testing.T) ProvisioningSrv {
@@ -382,6 +404,7 @@ func createTestAlertRule(title string, orgID int64) definitions.AlertRule {
 			},
 		},
 		RuleGroup:    "my-cool-group",
+		FolderUID:    "folder-uid",
 		For:          time.Second * 60,
 		NoDataState:  models.OK,
 		ExecErrState: models.OkErrState,
diff --git a/pkg/services/ngalert/api/api_ruler.go b/pkg/services/ngalert/api/api_ruler.go
index 6dd093c66d4..acf6ebf16a7 100644
--- a/pkg/services/ngalert/api/api_ruler.go
+++ b/pkg/services/ngalert/api/api_ruler.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/datasources"
 	"github.com/grafana/grafana/pkg/services/ngalert/provisioning"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
@@ -483,8 +484,9 @@ func toGettableExtendedRuleNode(r ngmodels.AlertRule, namespaceID int64, provena
 			Provenance:      provenance,
 		},
 	}
+	forDuration := model.Duration(r.For)
 	gettableExtendedRuleNode.ApiRuleNode = &apimodels.ApiRuleNode{
-		For:         model.Duration(r.For),
+		For:         &forDuration,
 		Annotations: r.Annotations,
 		Labels:      r.Labels,
 	}
@@ -495,7 +497,7 @@ func toNamespaceErrorResponse(err error) response.Response {
 	if errors.Is(err, ngmodels.ErrCannotEditNamespace) {
 		return ErrResp(http.StatusForbidden, err, err.Error())
 	}
-	if errors.Is(err, models.ErrDashboardIdentifierNotSet) {
+	if errors.Is(err, dashboards.ErrDashboardIdentifierNotSet) {
 		return ErrResp(http.StatusBadRequest, err, err.Error())
 	}
 	return apierrors.ToFolderErrorResponse(err)
diff --git a/pkg/services/ngalert/api/api_ruler_validation.go b/pkg/services/ngalert/api/api_ruler_validation.go
index 0ba65ee2bd1..1c69a8d16a2 100644
--- a/pkg/services/ngalert/api/api_ruler_validation.go
+++ b/pkg/services/ngalert/api/api_ruler_validation.go
@@ -110,8 +110,13 @@ func validateRuleNode(
 		ExecErrState:    errorState,
 	}
 
+	var err error
+	newAlertRule.For, err = validateForInterval(ruleNode)
+	if err != nil {
+		return nil, err
+	}
+
 	if ruleNode.ApiRuleNode != nil {
-		newAlertRule.For = time.Duration(ruleNode.ApiRuleNode.For)
 		newAlertRule.Annotations = ruleNode.ApiRuleNode.Annotations
 		newAlertRule.Labels = ruleNode.ApiRuleNode.Labels
 
@@ -131,10 +136,24 @@ func validateRuleNode(
 			newAlertRule.PanelID = &panelIDValue
 		}
 	}
-
 	return &newAlertRule, nil
 }
 
+// validateForInterval validates ApiRuleNode.For and converts it to time.Duration. If the field is not specified returns 0 if GrafanaManagedAlert.UID is empty and -1 if it is not.
+func validateForInterval(ruleNode *apimodels.PostableExtendedRuleNode) (time.Duration, error) {
+	if ruleNode.ApiRuleNode == nil || ruleNode.ApiRuleNode.For == nil {
+		if ruleNode.GrafanaManagedAlert.UID != "" {
+			return -1, nil // will be patched later with the real value of the current version of the rule
+		}
+		return 0, nil // if it's a new rule, use the 0 as the default
+	}
+	duration := time.Duration(*ruleNode.ApiRuleNode.For)
+	if duration < 0 {
+		return 0, fmt.Errorf("field `for` cannot be negative [%v]. 0 or any positive duration are allowed", *ruleNode.ApiRuleNode.For)
+	}
+	return duration, nil
+}
+
 // validateRuleGroup validates API model (definitions.PostableRuleGroupConfig) and converts it to a collection of models.AlertRule.
 // Returns a slice that contains all rules described by API model or error if either group specification or an alert definition is not valid.
 func validateRuleGroup(
diff --git a/pkg/services/ngalert/api/api_ruler_validation_test.go b/pkg/services/ngalert/api/api_ruler_validation_test.go
index b2fe8116509..9bf26b8fcda 100644
--- a/pkg/services/ngalert/api/api_ruler_validation_test.go
+++ b/pkg/services/ngalert/api/api_ruler_validation_test.go
@@ -42,9 +42,10 @@ func config(t *testing.T) *setting.UnifiedAlertingSettings {
 }
 
 func validRule() apimodels.PostableExtendedRuleNode {
+	forDuration := model.Duration(rand.Int63n(1000))
 	return apimodels.PostableExtendedRuleNode{
 		ApiRuleNode: &apimodels.ApiRuleNode{
-			For: model.Duration(rand.Int63n(1000)),
+			For: &forDuration,
 			Labels: map[string]string{
 				"test-label": "data",
 			},
@@ -240,7 +241,7 @@ func TestValidateRuleNode_NoUID(t *testing.T) {
 				require.Equal(t, name, alert.RuleGroup)
 				require.Equal(t, models.NoDataState(api.GrafanaManagedAlert.NoDataState), alert.NoDataState)
 				require.Equal(t, models.ExecutionErrorState(api.GrafanaManagedAlert.ExecErrState), alert.ExecErrState)
-				require.Equal(t, time.Duration(api.ApiRuleNode.For), alert.For)
+				require.Equal(t, time.Duration(*api.ApiRuleNode.For), alert.For)
 				require.Equal(t, api.ApiRuleNode.Annotations, alert.Annotations)
 				require.Equal(t, api.ApiRuleNode.Labels, alert.Labels)
 			},
diff --git a/pkg/services/ngalert/api/authorization.go b/pkg/services/ngalert/api/authorization.go
index a2ebca1fb1f..49f2ad16cd2 100644
--- a/pkg/services/ngalert/api/authorization.go
+++ b/pkg/services/ngalert/api/authorization.go
@@ -185,7 +185,8 @@ func (api *API) authorize(method, path string) web.Handler {
 		http.MethodGet + "/api/v1/provisioning/templates/{name}",
 		http.MethodGet + "/api/v1/provisioning/mute-timings",
 		http.MethodGet + "/api/v1/provisioning/mute-timings/{name}",
-		http.MethodGet + "/api/v1/provisioning/alert-rules/{UID}":
+		http.MethodGet + "/api/v1/provisioning/alert-rules/{UID}",
+		http.MethodGet + "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}":
 		fallback = middleware.ReqOrgAdmin
 		eval = ac.EvalPermission(ac.ActionAlertingProvisioningRead) // organization scope
 
diff --git a/pkg/services/ngalert/api/forked_provisioning.go b/pkg/services/ngalert/api/forked_provisioning.go
index 6446ef47bb5..3339ab10d1f 100644
--- a/pkg/services/ngalert/api/forked_provisioning.go
+++ b/pkg/services/ngalert/api/forked_provisioning.go
@@ -95,6 +95,10 @@ func (f *ForkedProvisioningApi) forkRouteDeleteAlertRule(ctx *models.ReqContext,
 	return f.svc.RouteDeleteAlertRule(ctx, UID)
 }
 
-func (f *ForkedProvisioningApi) forkRoutePutAlertRuleGroup(ctx *models.ReqContext, ag apimodels.AlertRuleGroup, folder, group string) response.Response {
+func (f *ForkedProvisioningApi) forkRouteGetAlertRuleGroup(ctx *models.ReqContext, folder, group string) response.Response {
+	return f.svc.RouteGetAlertRuleGroup(ctx, folder, group)
+}
+
+func (f *ForkedProvisioningApi) forkRoutePutAlertRuleGroup(ctx *models.ReqContext, ag apimodels.AlertRuleGroupMetadata, folder, group string) response.Response {
 	return f.svc.RoutePutAlertRuleGroup(ctx, ag, folder, group)
 }
diff --git a/pkg/services/ngalert/api/generated_base_api_provisioning.go b/pkg/services/ngalert/api/generated_base_api_provisioning.go
index b449a168658..8fb66c89cc1 100644
--- a/pkg/services/ngalert/api/generated_base_api_provisioning.go
+++ b/pkg/services/ngalert/api/generated_base_api_provisioning.go
@@ -24,6 +24,7 @@ type ProvisioningApiForkingService interface {
 	RouteDeleteMuteTiming(*models.ReqContext) response.Response
 	RouteDeleteTemplate(*models.ReqContext) response.Response
 	RouteGetAlertRule(*models.ReqContext) response.Response
+	RouteGetAlertRuleGroup(*models.ReqContext) response.Response
 	RouteGetContactpoints(*models.ReqContext) response.Response
 	RouteGetMuteTiming(*models.ReqContext) response.Response
 	RouteGetMuteTimings(*models.ReqContext) response.Response
@@ -61,6 +62,11 @@ func (f *ForkedProvisioningApi) RouteGetAlertRule(ctx *models.ReqContext) respon
 	uIDParam := web.Params(ctx.Req)[":UID"]
 	return f.forkRouteGetAlertRule(ctx, uIDParam)
 }
+func (f *ForkedProvisioningApi) RouteGetAlertRuleGroup(ctx *models.ReqContext) response.Response {
+	folderUIDParam := web.Params(ctx.Req)[":FolderUID"]
+	groupParam := web.Params(ctx.Req)[":Group"]
+	return f.forkRouteGetAlertRuleGroup(ctx, folderUIDParam, groupParam)
+}
 func (f *ForkedProvisioningApi) RouteGetContactpoints(ctx *models.ReqContext) response.Response {
 	return f.forkRouteGetContactpoints(ctx)
 }
@@ -113,7 +119,7 @@ func (f *ForkedProvisioningApi) RoutePutAlertRule(ctx *models.ReqContext) respon
 func (f *ForkedProvisioningApi) RoutePutAlertRuleGroup(ctx *models.ReqContext) response.Response {
 	folderUIDParam := web.Params(ctx.Req)[":FolderUID"]
 	groupParam := web.Params(ctx.Req)[":Group"]
-	conf := apimodels.AlertRuleGroup{}
+	conf := apimodels.AlertRuleGroupMetadata{}
 	if err := web.Bind(ctx.Req, &conf); err != nil {
 		return response.Error(http.StatusBadRequest, "bad request data", err)
 	}
@@ -203,6 +209,16 @@ func (api *API) RegisterProvisioningApiEndpoints(srv ProvisioningApiForkingServi
 				m,
 			),
 		)
+		group.Get(
+			toMacaronPath("/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}"),
+			api.authorize(http.MethodGet, "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}"),
+			metrics.Instrument(
+				http.MethodGet,
+				"/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}",
+				srv.RouteGetAlertRuleGroup,
+				m,
+			),
+		)
 		group.Get(
 			toMacaronPath("/api/v1/provisioning/contact-points"),
 			api.authorize(http.MethodGet, "/api/v1/provisioning/contact-points"),
diff --git a/pkg/services/ngalert/api/tooling/api.json b/pkg/services/ngalert/api/tooling/api.json
index e976a0da3fd..60645a449f3 100644
--- a/pkg/services/ngalert/api/tooling/api.json
+++ b/pkg/services/ngalert/api/tooling/api.json
@@ -308,7 +308,7 @@
    ],
    "type": "object"
   },
-  "AlertRuleGroup": {
+  "AlertRuleGroupMetadata": {
    "properties": {
     "interval": {
      "format": "int64",
@@ -470,30 +470,6 @@
    },
    "type": "array"
   },
-  "DashboardAclUpdateItem": {
-   "properties": {
-    "permission": {
-     "$ref": "#/definitions/PermissionType"
-    },
-    "role": {
-     "enum": [
-      "Viewer",
-      "Editor",
-      "Admin"
-     ],
-     "type": "string"
-    },
-    "teamId": {
-     "format": "int64",
-     "type": "integer"
-    },
-    "userId": {
-     "format": "int64",
-     "type": "integer"
-    }
-   },
-   "type": "object"
-  },
   "DateTime": {
    "description": "DateTime is a time but it serializes to ISO8601 format with millis\nIt knows how to read 3 different variations of a RFC3339 date time.\nMost APIs we encounter want either millisecond or second precision times.\nThis just tries to make it worry-free.",
    "format": "date-time",
@@ -1336,48 +1312,6 @@
    },
    "type": "array"
   },
-  "MetricRequest": {
-   "properties": {
-    "debug": {
-     "type": "boolean"
-    },
-    "from": {
-     "description": "From Start time in epoch timestamps in milliseconds or relative using Grafana time units.",
-     "example": "now-1h",
-     "type": "string"
-    },
-    "queries": {
-     "description": "queries.refId – Specifies an identifier of the query. Is optional and default to “A”.\nqueries.datasourceId – Specifies the data source to be queried. Each query in the request must have an unique datasourceId.\nqueries.maxDataPoints - Species maximum amount of data points that dashboard panel can render. Is optional and default to 100.\nqueries.intervalMs - Specifies the time interval in milliseconds of time series. Is optional and defaults to 1000.",
-     "example": [
-      {
-       "datasource": {
-        "uid": "PD8C576611E62080A"
-       },
-       "format": "table",
-       "intervalMs": 86400000,
-       "maxDataPoints": 1092,
-       "rawSql": "SELECT 1 as valueOne, 2 as valueTwo",
-       "refId": "A"
-      }
-     ],
-     "items": {
-      "$ref": "#/definitions/Json"
-     },
-     "type": "array"
-    },
-    "to": {
-     "description": "To End time in epoch timestamps in milliseconds or relative using Grafana time units.",
-     "example": "now",
-     "type": "string"
-    }
-   },
-   "required": [
-    "from",
-    "to",
-    "queries"
-   ],
-   "type": "object"
-  },
   "MonthRange": {
    "properties": {
     "Begin": {
@@ -1425,34 +1359,6 @@
    },
    "type": "object"
   },
-  "NavLink": {
-   "properties": {
-    "id": {
-     "type": "string"
-    },
-    "target": {
-     "type": "string"
-    },
-    "text": {
-     "type": "string"
-    },
-    "url": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
-  "NavbarPreference": {
-   "properties": {
-    "savedItems": {
-     "items": {
-      "$ref": "#/definitions/NavLink"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
   "NotFound": {
    "type": "object"
   },
@@ -1668,53 +1574,9 @@
    },
    "type": "object"
   },
-  "PatchPrefsCmd": {
-   "properties": {
-    "homeDashboardId": {
-     "default": 0,
-     "description": "The numerical :id of a favorited dashboard",
-     "format": "int64",
-     "type": "integer"
-    },
-    "homeDashboardUID": {
-     "type": "string"
-    },
-    "locale": {
-     "type": "string"
-    },
-    "navbar": {
-     "$ref": "#/definitions/NavbarPreference"
-    },
-    "queryHistory": {
-     "$ref": "#/definitions/QueryHistoryPreference"
-    },
-    "theme": {
-     "enum": [
-      "light",
-      "dark"
-     ],
-     "type": "string"
-    },
-    "timezone": {
-     "enum": [
-      "utc",
-      "browser"
-     ],
-     "type": "string"
-    },
-    "weekStart": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "PermissionDenied": {
    "type": "object"
   },
-  "PermissionType": {
-   "format": "int64",
-   "type": "integer"
-  },
   "Point": {
    "properties": {
     "T": {
@@ -2036,14 +1898,6 @@
    },
    "type": "object"
   },
-  "QueryHistoryPreference": {
-   "properties": {
-    "homeTab": {
-     "type": "string"
-    }
-   },
-   "type": "object"
-  },
   "Receiver": {
    "properties": {
     "email_configs": {
@@ -2738,6 +2592,7 @@
    "type": "object"
   },
   "URL": {
+   "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
    "properties": {
     "ForceQuery": {
      "type": "boolean"
@@ -2770,58 +2625,7 @@
      "$ref": "#/definitions/Userinfo"
     }
    },
-   "title": "URL is a custom URL type that allows validation at configuration load time.",
-   "type": "object"
-  },
-  "UpdateDashboardAclCommand": {
-   "properties": {
-    "items": {
-     "items": {
-      "$ref": "#/definitions/DashboardAclUpdateItem"
-     },
-     "type": "array"
-    }
-   },
-   "type": "object"
-  },
-  "UpdatePrefsCmd": {
-   "properties": {
-    "homeDashboardId": {
-     "default": 0,
-     "description": "The numerical :id of a favorited dashboard",
-     "format": "int64",
-     "type": "integer"
-    },
-    "homeDashboardUID": {
-     "type": "string"
-    },
-    "locale": {
-     "type": "string"
-    },
-    "navbar": {
-     "$ref": "#/definitions/NavbarPreference"
-    },
-    "queryHistory": {
-     "$ref": "#/definitions/QueryHistoryPreference"
-    },
-    "theme": {
-     "enum": [
-      "light",
-      "dark"
-     ],
-     "type": "string"
-    },
-    "timezone": {
-     "enum": [
-      "utc",
-      "browser"
-     ],
-     "type": "string"
-    },
-    "weekStart": {
-     "type": "string"
-    }
-   },
+   "title": "A URL represents a parsed URL (technically, a URI reference).",
    "type": "object"
   },
   "Userinfo": {
@@ -2991,7 +2795,6 @@
    "type": "object"
   },
   "alertGroup": {
-   "description": "AlertGroup alert group",
    "properties": {
     "alerts": {
      "description": "alerts",
@@ -3015,7 +2818,6 @@
    "type": "object"
   },
   "alertGroups": {
-   "description": "AlertGroups alert groups",
    "items": {
     "$ref": "#/definitions/alertGroup"
    },
@@ -3123,6 +2925,7 @@
    "$ref": "#/definitions/Duration"
   },
   "gettableAlert": {
+   "description": "GettableAlert gettable alert",
    "properties": {
     "annotations": {
      "$ref": "#/definitions/labelSet"
@@ -3184,7 +2987,6 @@
    "type": "array"
   },
   "gettableSilence": {
-   "description": "GettableSilence gettable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3344,7 +3146,6 @@
    "type": "array"
   },
   "postableSilence": {
-   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3382,6 +3183,7 @@
    "type": "object"
   },
   "receiver": {
+   "description": "Receiver receiver",
    "properties": {
     "name": {
      "description": "name",
@@ -3730,6 +3532,35 @@
    }
   },
   "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+   "get": {
+    "operationId": "RouteGetAlertRuleGroup",
+    "parameters": [
+     {
+      "in": "path",
+      "name": "FolderUID",
+      "required": true,
+      "type": "string"
+     },
+     {
+      "in": "path",
+      "name": "Group",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "responses": {
+     "200": {
+      "$ref": "#/responses/AlertRuleGroup"
+     },
+     "404": {
+      "description": " Not found."
+     }
+    },
+    "summary": "Get a rule group.",
+    "tags": [
+     "provisioning"
+    ]
+   },
    "put": {
     "consumes": [
      "application/json"
@@ -3752,15 +3583,15 @@
       "in": "body",
       "name": "Body",
       "schema": {
-       "$ref": "#/definitions/AlertRuleGroup"
+       "$ref": "#/definitions/AlertRuleGroupMetadata"
       }
      }
     ],
     "responses": {
      "200": {
-      "description": "AlertRuleGroup",
+      "description": "AlertRuleGroupMetadata",
       "schema": {
-       "$ref": "#/definitions/AlertRuleGroup"
+       "$ref": "#/definitions/AlertRuleGroupMetadata"
       }
      },
      "400": {
diff --git a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
index 5b6365ea412..20338b4fc5a 100644
--- a/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
+++ b/pkg/services/ngalert/api/tooling/definitions/alertmanager_validation.go
@@ -101,6 +101,34 @@ func (r *Route) Validate() error {
 	return r.validateChild()
 }
 
+func (r *Route) ValidateReceivers(receivers map[string]struct{}) error {
+	if _, exists := receivers[r.Receiver]; !exists {
+		return fmt.Errorf("receiver '%s' does not exist", r.Receiver)
+	}
+	for _, children := range r.Routes {
+		err := children.ValidateReceivers(receivers)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (r *Route) ValidateMuteTimes(muteTimes map[string]struct{}) error {
+	for _, name := range r.MuteTimeIntervals {
+		if _, exists := muteTimes[name]; !exists {
+			return fmt.Errorf("mute time interval '%s' does not exist", name)
+		}
+	}
+	for _, child := range r.Routes {
+		err := child.ValidateMuteTimes(muteTimes)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 func (mt *MuteTimeInterval) Validate() error {
 	s, err := yaml.Marshal(mt.MuteTimeInterval)
 	if err != nil {
diff --git a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
index 3c93ef4f635..8cdd3e1ae1d 100644
--- a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
+++ b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler.go
@@ -257,7 +257,7 @@ type ApiRuleNode struct {
 	Record      string            `yaml:"record,omitempty" json:"record,omitempty"`
 	Alert       string            `yaml:"alert,omitempty" json:"alert,omitempty"`
 	Expr        string            `yaml:"expr" json:"expr"`
-	For         model.Duration    `yaml:"for,omitempty" json:"for,omitempty"`
+	For         *model.Duration   `yaml:"for,omitempty" json:"for,omitempty"`
 	Labels      map[string]string `yaml:"labels,omitempty" json:"labels,omitempty"`
 	Annotations map[string]string `yaml:"annotations,omitempty" json:"annotations,omitempty"`
 }
diff --git a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler_test.go b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler_test.go
index 364e36a5997..781d02dc8b1 100644
--- a/pkg/services/ngalert/api/tooling/definitions/cortex-ruler_test.go
+++ b/pkg/services/ngalert/api/tooling/definitions/cortex-ruler_test.go
@@ -50,7 +50,7 @@ func Test_Rule_Marshaling(t *testing.T) {
 			desc: "grafana with for, annotation and label properties",
 			input: PostableExtendedRuleNode{
 				ApiRuleNode: &ApiRuleNode{
-					For:         dur,
+					For:         &dur,
 					Annotations: map[string]string{"foo": "bar"},
 					Labels:      map[string]string{"label1": "val1"}},
 				GrafanaManagedAlert: &PostableGrafanaRule{},
@@ -136,7 +136,7 @@ func Test_Rule_Group_Marshaling(t *testing.T) {
 				Rules: []PostableExtendedRuleNode{
 					{
 						ApiRuleNode: &ApiRuleNode{
-							For:         dur,
+							For:         &dur,
 							Annotations: map[string]string{"foo": "bar"},
 							Labels:      map[string]string{"label1": "val1"},
 						},
diff --git a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
index 44a7df7491e..d54f27090bd 100644
--- a/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
+++ b/pkg/services/ngalert/api/tooling/definitions/provisioning_alert_rules.go
@@ -135,6 +135,14 @@ func NewAlertRule(rule models.AlertRule, provenance models.Provenance) AlertRule
 	}
 }
 
+// swagger:route GET /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RouteGetAlertRuleGroup
+//
+// Get a rule group.
+//
+//     Responses:
+//       200: AlertRuleGroup
+//       404: description: Not found.
+
 // swagger:route PUT /api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group} provisioning stable RoutePutAlertRuleGroup
 //
 // Update the interval of a rule group.
@@ -143,16 +151,16 @@ func NewAlertRule(rule models.AlertRule, provenance models.Provenance) AlertRule
 //     - application/json
 //
 //     Responses:
-//       200: AlertRuleGroup
+//       200: AlertRuleGroupMetadata
 //       400: ValidationError
 
-// swagger:parameters RoutePutAlertRuleGroup
+// swagger:parameters RouteGetAlertRuleGroup RoutePutAlertRuleGroup
 type FolderUIDPathParam struct {
 	// in:path
 	FolderUID string `json:"FolderUID"`
 }
 
-// swagger:parameters RoutePutAlertRuleGroup
+// swagger:parameters RouteGetAlertRuleGroup RoutePutAlertRuleGroup
 type RuleGroupPathParam struct {
 	// in:path
 	Group string `json:"Group"`
@@ -161,9 +169,16 @@ type RuleGroupPathParam struct {
 // swagger:parameters RoutePutAlertRuleGroup
 type AlertRuleGroupPayload struct {
 	// in:body
-	Body AlertRuleGroup
+	Body AlertRuleGroupMetadata
+}
+
+type AlertRuleGroupMetadata struct {
+	Interval int64 `json:"interval"`
 }
 
 type AlertRuleGroup struct {
-	Interval int64 `json:"interval"`
+	Title     string             `json:"title"`
+	FolderUID string             `json:"folderUid"`
+	Interval  int64              `json:"interval"`
+	Rules     []models.AlertRule `json:"rules"`
 }
diff --git a/pkg/services/ngalert/api/tooling/post.json b/pkg/services/ngalert/api/tooling/post.json
index 5f1dc277dda..05c7dbeb931 100644
--- a/pkg/services/ngalert/api/tooling/post.json
+++ b/pkg/services/ngalert/api/tooling/post.json
@@ -308,7 +308,7 @@
    ],
    "type": "object"
   },
-  "AlertRuleGroup": {
+  "AlertRuleGroupMetadata": {
    "properties": {
     "interval": {
      "format": "int64",
@@ -2592,6 +2592,7 @@
    "type": "object"
   },
   "URL": {
+   "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
    "properties": {
     "ForceQuery": {
      "type": "boolean"
@@ -2624,7 +2625,7 @@
      "$ref": "#/definitions/Userinfo"
     }
    },
-   "title": "URL is a custom URL type that allows validation at configuration load time.",
+   "title": "A URL represents a parsed URL (technically, a URI reference).",
    "type": "object"
   },
   "Userinfo": {
@@ -2794,6 +2795,7 @@
    "type": "object"
   },
   "alertGroup": {
+   "description": "AlertGroup alert group",
    "properties": {
     "alerts": {
      "description": "alerts",
@@ -2988,6 +2990,7 @@
    "type": "array"
   },
   "gettableSilence": {
+   "description": "GettableSilence gettable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -3146,6 +3149,7 @@
    "type": "array"
   },
   "postableSilence": {
+   "description": "PostableSilence postable silence",
    "properties": {
     "comment": {
      "description": "comment",
@@ -5157,6 +5161,35 @@
    }
   },
   "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+   "get": {
+    "operationId": "RouteGetAlertRuleGroup",
+    "parameters": [
+     {
+      "in": "path",
+      "name": "FolderUID",
+      "required": true,
+      "type": "string"
+     },
+     {
+      "in": "path",
+      "name": "Group",
+      "required": true,
+      "type": "string"
+     }
+    ],
+    "responses": {
+     "200": {
+      "$ref": "#/responses/AlertRuleGroup"
+     },
+     "404": {
+      "description": " Not found."
+     }
+    },
+    "summary": "Get a rule group.",
+    "tags": [
+     "provisioning"
+    ]
+   },
    "put": {
     "consumes": [
      "application/json"
@@ -5179,15 +5212,15 @@
       "in": "body",
       "name": "Body",
       "schema": {
-       "$ref": "#/definitions/AlertRuleGroup"
+       "$ref": "#/definitions/AlertRuleGroupMetadata"
       }
      }
     ],
     "responses": {
      "200": {
-      "description": "AlertRuleGroup",
+      "description": "AlertRuleGroupMetadata",
       "schema": {
-       "$ref": "#/definitions/AlertRuleGroup"
+       "$ref": "#/definitions/AlertRuleGroupMetadata"
       }
      },
      "400": {
diff --git a/pkg/services/ngalert/api/tooling/spec.json b/pkg/services/ngalert/api/tooling/spec.json
index 61d42c493db..6878508f9b7 100644
--- a/pkg/services/ngalert/api/tooling/spec.json
+++ b/pkg/services/ngalert/api/tooling/spec.json
@@ -1893,6 +1893,36 @@
       }
     },
     "/api/v1/provisioning/folder/{FolderUID}/rule-groups/{Group}": {
+      "get": {
+        "tags": [
+          "provisioning",
+          "stable"
+        ],
+        "summary": "Get a rule group.",
+        "operationId": "RouteGetAlertRuleGroup",
+        "parameters": [
+          {
+            "type": "string",
+            "name": "FolderUID",
+            "in": "path",
+            "required": true
+          },
+          {
+            "type": "string",
+            "name": "Group",
+            "in": "path",
+            "required": true
+          }
+        ],
+        "responses": {
+          "200": {
+            "$ref": "#/responses/AlertRuleGroup"
+          },
+          "404": {
+            "description": " Not found."
+          }
+        }
+      },
       "put": {
         "consumes": [
           "application/json"
@@ -1920,15 +1950,15 @@
             "name": "Body",
             "in": "body",
             "schema": {
-              "$ref": "#/definitions/AlertRuleGroup"
+              "$ref": "#/definitions/AlertRuleGroupMetadata"
             }
           }
         ],
         "responses": {
           "200": {
-            "description": "AlertRuleGroup",
+            "description": "AlertRuleGroupMetadata",
             "schema": {
-              "$ref": "#/definitions/AlertRuleGroup"
+              "$ref": "#/definitions/AlertRuleGroupMetadata"
             }
           },
           "400": {
@@ -2629,7 +2659,7 @@
         }
       }
     },
-    "AlertRuleGroup": {
+    "AlertRuleGroupMetadata": {
       "type": "object",
       "properties": {
         "interval": {
@@ -4917,8 +4947,9 @@
       }
     },
     "URL": {
+      "description": "The general form represented is:\n\n[scheme:][//[userinfo@]host][/]path[?query][#fragment]\n\nURLs that do not start with a slash after the scheme are interpreted as:\n\nscheme:opaque[?query][#fragment]\n\nNote that the Path field is stored in decoded form: /%47%6f%2f becomes /Go/.\nA consequence is that it is impossible to tell which slashes in the Path were\nslashes in the raw URL and which were %2f. This distinction is rarely important,\nbut when it is, the code should use RawPath, an optional field which only gets\nset if the default encoding is different from Path.\n\nURL's String method uses the EscapedPath method to obtain the path. See the\nEscapedPath method for more details.",
       "type": "object",
-      "title": "URL is a custom URL type that allows validation at configuration load time.",
+      "title": "A URL represents a parsed URL (technically, a URI reference).",
       "properties": {
         "ForceQuery": {
           "type": "boolean"
@@ -5119,6 +5150,7 @@
       }
     },
     "alertGroup": {
+      "description": "AlertGroup alert group",
       "type": "object",
       "required": [
         "alerts",
@@ -5143,7 +5175,6 @@
       "$ref": "#/definitions/alertGroup"
     },
     "alertGroups": {
-      "description": "AlertGroups alert groups",
       "type": "array",
       "items": {
         "$ref": "#/definitions/alertGroup"
@@ -5252,7 +5283,6 @@
       "$ref": "#/definitions/Duration"
     },
     "gettableAlert": {
-      "description": "GettableAlert gettable alert",
       "type": "object",
       "required": [
         "labels",
@@ -5309,7 +5339,6 @@
       "$ref": "#/definitions/gettableAlert"
     },
     "gettableAlerts": {
-      "description": "GettableAlerts gettable alerts",
       "type": "array",
       "items": {
         "$ref": "#/definitions/gettableAlert"
@@ -5515,6 +5544,7 @@
       "$ref": "#/definitions/postableSilence"
     },
     "receiver": {
+      "description": "Receiver receiver",
       "type": "object",
       "required": [
         "name"
diff --git a/pkg/services/ngalert/image/service.go b/pkg/services/ngalert/image/service.go
index 68111528372..0d5b656086a 100644
--- a/pkg/services/ngalert/image/service.go
+++ b/pkg/services/ngalert/image/service.go
@@ -9,7 +9,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/grafana/grafana/pkg/components/imguploader"
-	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	ngmodels "github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
@@ -66,8 +65,8 @@ func NewScreenshotImageServiceFromCfg(cfg *setting.Cfg, metrics prometheus.Regis
 		}, nil
 	}
 
-	s := screenshot.NewBrowserScreenshotService(ds, rs)
 	// Image uploading is an optional feature of screenshots
+	s := screenshot.NewRemoteRenderScreenshotService(ds, rs)
 	if cfg.UnifiedAlerting.Screenshots.UploadExternalImageStorage {
 		u, err := imguploader.NewImageUploader()
 		if err != nil {
@@ -111,7 +110,7 @@ func (s *ScreenshotImageService) NewImage(ctx context.Context, r *ngmodels.Alert
 	if err != nil {
 		// TODO: Check for screenshot upload failures. These images should still be
 		// stored because we have a local disk path that could be useful.
-		if errors.Is(err, models.ErrDashboardNotFound) {
+		if errors.Is(err, dashboards.ErrDashboardNotFound) {
 			return nil, ErrNoDashboard
 		}
 		return nil, err
diff --git a/pkg/services/ngalert/models/alert_query.go b/pkg/services/ngalert/models/alert_query.go
index a57ceff1737..503f349362d 100644
--- a/pkg/services/ngalert/models/alert_query.go
+++ b/pkg/services/ngalert/models/alert_query.go
@@ -40,11 +40,29 @@ func (d *Duration) UnmarshalJSON(b []byte) error {
 	}
 }
 
+func (d Duration) MarshalYAML() (interface{}, error) {
+	return time.Duration(d).Seconds(), nil
+}
+
+func (d *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error {
+	var v interface{}
+	if err := unmarshal(&v); err != nil {
+		return err
+	}
+	switch value := v.(type) {
+	case int:
+		*d = Duration(time.Duration(value) * time.Second)
+		return nil
+	default:
+		return fmt.Errorf("invalid duration %v", v)
+	}
+}
+
 // RelativeTimeRange is the per query start and end time
 // for requests.
 type RelativeTimeRange struct {
-	From Duration `json:"from"`
-	To   Duration `json:"to"`
+	From Duration `json:"from" yaml:"from"`
+	To   Duration `json:"to" yaml:"to"`
 }
 
 // isValid checks that From duration is greater than To duration.
diff --git a/pkg/services/ngalert/models/alert_rule.go b/pkg/services/ngalert/models/alert_rule.go
index c3161282602..92d02b1a0e6 100644
--- a/pkg/services/ngalert/models/alert_rule.go
+++ b/pkg/services/ngalert/models/alert_rule.go
@@ -87,7 +87,7 @@ const (
 
 	// This isn't a hard-coded secret token, hence the nolint.
 	//nolint:gosec
-	ScreenshotTokenAnnotation = "__alertScreenshotToken__"
+	ImageTokenAnnotation = "__alertImageToken__"
 
 	// GrafanaReservedLabelPrefix contains the prefix for Grafana reserved labels. These differ from "__<label>__" labels
 	// in that they are not meant for internal-use only and will be passed-through to AMs and available to users in the same
@@ -105,9 +105,9 @@ var (
 		NamespaceUIDLabel: {},
 	}
 	InternalAnnotationNameSet = map[string]struct{}{
-		DashboardUIDAnnotation:    {},
-		PanelIDAnnotation:         {},
-		ScreenshotTokenAnnotation: {},
+		DashboardUIDAnnotation: {},
+		PanelIDAnnotation:      {},
+		ImageTokenAnnotation:   {},
 	}
 )
 
@@ -388,7 +388,7 @@ func PatchPartialAlertRule(existingRule *AlertRule, ruleToPatch *AlertRule) {
 	if ruleToPatch.NoDataState == "" {
 		ruleToPatch.NoDataState = existingRule.NoDataState
 	}
-	if ruleToPatch.For == 0 {
+	if ruleToPatch.For == -1 {
 		ruleToPatch.For = existingRule.For
 	}
 }
diff --git a/pkg/services/ngalert/models/alert_rule_test.go b/pkg/services/ngalert/models/alert_rule_test.go
index fdfd58cfa0d..b15ab5bcb2e 100644
--- a/pkg/services/ngalert/models/alert_rule_test.go
+++ b/pkg/services/ngalert/models/alert_rule_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/yaml.v3"
 
 	"github.com/grafana/grafana/pkg/util"
 )
@@ -113,9 +114,9 @@ func TestPatchPartialAlertRule(t *testing.T) {
 				},
 			},
 			{
-				name: "For is 0",
+				name: "For is -1",
 				mutator: func(r *AlertRule) {
-					r.For = 0
+					r.For = -1
 				},
 			},
 		}
@@ -582,3 +583,17 @@ func TestSortByGroupIndex(t *testing.T) {
 		}))
 	})
 }
+
+func TestTimeRangeYAML(t *testing.T) {
+	yamlRaw := "from: 600\nto: 0\n"
+	var rtr RelativeTimeRange
+	err := yaml.Unmarshal([]byte(yamlRaw), &rtr)
+	require.NoError(t, err)
+	// nanoseconds
+	require.Equal(t, Duration(600000000000), rtr.From)
+	require.Equal(t, Duration(0), rtr.To)
+
+	serialized, err := yaml.Marshal(rtr)
+	require.NoError(t, err)
+	require.Equal(t, yamlRaw, string(serialized))
+}
diff --git a/pkg/services/ngalert/notifier/available_channels.go b/pkg/services/ngalert/notifier/available_channels.go
index 948a70102b1..48c82c7bc7d 100644
--- a/pkg/services/ngalert/notifier/available_channels.go
+++ b/pkg/services/ngalert/notifier/available_channels.go
@@ -696,6 +696,14 @@ func GetAvailableNotifiers() []*alerting.NotifierPlugin {
 					Placeholder:  `{{ template "default.message" . }}`,
 					PropertyName: "message",
 				},
+				{ // New in 9.1.
+					Label:        "Title",
+					Element:      alerting.ElementTypeInput,
+					InputType:    alerting.InputTypeText,
+					Description:  "Templated title of the message",
+					PropertyName: "title",
+					Placeholder:  `{{ template "default.title" . }}`,
+				},
 			},
 		},
 		{
diff --git a/pkg/services/ngalert/notifier/channels/alertmanager.go b/pkg/services/ngalert/notifier/channels/alertmanager.go
index b7405dafb5d..9357b14a578 100644
--- a/pkg/services/ngalert/notifier/channels/alertmanager.go
+++ b/pkg/services/ngalert/notifier/channels/alertmanager.go
@@ -102,10 +102,10 @@ func (n *AlertmanagerNotifier) Notify(ctx context.Context, as ...*types.Alert) (
 	}
 
 	_ = withStoredImages(ctx, n.logger, n.images,
-		func(index int, image *ngmodels.Image) error {
+		func(index int, image ngmodels.Image) error {
 			// If there is an image for this alert and the image has been uploaded
 			// to a public URL then include it as an annotation
-			if image != nil && image.URL != "" {
+			if image.URL != "" {
 				as[index].Annotations["image"] = model.LabelValue(image.URL)
 			}
 			return nil
diff --git a/pkg/services/ngalert/notifier/channels/alertmanager_test.go b/pkg/services/ngalert/notifier/channels/alertmanager_test.go
index bfa808253f9..17b9f59b3dd 100644
--- a/pkg/services/ngalert/notifier/channels/alertmanager_test.go
+++ b/pkg/services/ngalert/notifier/channels/alertmanager_test.go
@@ -108,7 +108,7 @@ func TestAlertmanagerNotifier_Notify(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1"},
-						Annotations: model.LabelSet{"__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"__alertImageToken__": "test-image-1"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/discord.go b/pkg/services/ngalert/notifier/channels/discord.go
index 48fac488c71..a6296b5a96f 100644
--- a/pkg/services/ngalert/notifier/channels/discord.go
+++ b/pkg/services/ngalert/notifier/channels/discord.go
@@ -199,15 +199,11 @@ func (d DiscordNotifier) constructAttachments(ctx context.Context, as []*types.A
 	attachments := make([]discordAttachment, 0)
 
 	_ = withStoredImages(ctx, d.log, d.images,
-		func(index int, image *ngmodels.Image) error {
+		func(index int, image ngmodels.Image) error {
 			if embedQuota < 1 {
 				return ErrImagesDone
 			}
 
-			if image == nil {
-				return nil
-			}
-
 			if len(image.URL) > 0 {
 				attachments = append(attachments, discordAttachment{
 					url:       image.URL,
diff --git a/pkg/services/ngalert/notifier/channels/email.go b/pkg/services/ngalert/notifier/channels/email.go
index ebf7dac61b8..b33ab8dff6b 100644
--- a/pkg/services/ngalert/notifier/channels/email.go
+++ b/pkg/services/ngalert/notifier/channels/email.go
@@ -110,18 +110,16 @@ func (en *EmailNotifier) Notify(ctx context.Context, alerts ...*types.Alert) (bo
 	// Extend alerts data with images, if available.
 	var embeddedFiles []string
 	_ = withStoredImages(ctx, en.log, en.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil {
-				if len(image.URL) != 0 {
-					data.Alerts[index].ImageURL = image.URL
-				} else if len(image.Path) != 0 {
-					_, err := os.Stat(image.Path)
-					if err == nil {
-						data.Alerts[index].EmbeddedImage = path.Base(image.Path)
-						embeddedFiles = append(embeddedFiles, image.Path)
-					} else {
-						en.log.Warn("failed to get image file for email attachment", "file", image.Path, "err", err)
-					}
+		func(index int, image ngmodels.Image) error {
+			if len(image.URL) != 0 {
+				data.Alerts[index].ImageURL = image.URL
+			} else if len(image.Path) != 0 {
+				_, err := os.Stat(image.Path)
+				if err == nil {
+					data.Alerts[index].EmbeddedImage = path.Base(image.Path)
+					embeddedFiles = append(embeddedFiles, image.Path)
+				} else {
+					en.log.Warn("failed to get image file for email attachment", "file", image.Path, "err", err)
 				}
 			}
 			return nil
diff --git a/pkg/services/ngalert/notifier/channels/googlechat.go b/pkg/services/ngalert/notifier/channels/googlechat.go
index a18498f2fdc..b213f9c4147 100644
--- a/pkg/services/ngalert/notifier/channels/googlechat.go
+++ b/pkg/services/ngalert/notifier/channels/googlechat.go
@@ -206,8 +206,8 @@ func (gcn *GoogleChatNotifier) buildScreenshotCard(ctx context.Context, alerts [
 	}
 
 	_ = withStoredImages(ctx, gcn.log, gcn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image == nil || len(image.URL) == 0 {
+		func(index int, image ngmodels.Image) error {
+			if len(image.URL) == 0 {
 				return nil
 			}
 
diff --git a/pkg/services/ngalert/notifier/channels/kafka.go b/pkg/services/ngalert/notifier/channels/kafka.go
index b812fe2cc49..e97c0173662 100644
--- a/pkg/services/ngalert/notifier/channels/kafka.go
+++ b/pkg/services/ngalert/notifier/channels/kafka.go
@@ -107,8 +107,8 @@ func (kn *KafkaNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 
 	var contexts []interface{}
 	_ = withStoredImages(ctx, kn.log, kn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil && image.URL != "" {
+		func(_ int, image ngmodels.Image) error {
+			if image.URL != "" {
 				imageJSON := simplejson.New()
 				imageJSON.Set("type", "image")
 				imageJSON.Set("src", image.URL)
diff --git a/pkg/services/ngalert/notifier/channels/kafka_test.go b/pkg/services/ngalert/notifier/channels/kafka_test.go
index 4532083e1ee..5dd9b21879f 100644
--- a/pkg/services/ngalert/notifier/channels/kafka_test.go
+++ b/pkg/services/ngalert/notifier/channels/kafka_test.go
@@ -40,7 +40,7 @@ func TestKafkaNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
 					},
 				},
 			},
@@ -71,12 +71,12 @@ func TestKafkaNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
 					},
 				}, {
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
-						Annotations: model.LabelSet{"ann1": "annv2", "__alertScreenshotToken__": "test-image-2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/opsgenie.go b/pkg/services/ngalert/notifier/channels/opsgenie.go
index b0737161b14..1e55b66b158 100644
--- a/pkg/services/ngalert/notifier/channels/opsgenie.go
+++ b/pkg/services/ngalert/notifier/channels/opsgenie.go
@@ -242,8 +242,8 @@ func (on *OpsgenieNotifier) buildOpsgenieMessage(ctx context.Context, alerts mod
 
 		images := []string{}
 		_ = withStoredImages(ctx, on.log, on.images,
-			func(index int, image *ngmodels.Image) error {
-				if image == nil || len(image.URL) == 0 {
+			func(_ int, image ngmodels.Image) error {
+				if len(image.URL) == 0 {
 					return nil
 				}
 				images = append(images, image.URL)
diff --git a/pkg/services/ngalert/notifier/channels/pagerduty.go b/pkg/services/ngalert/notifier/channels/pagerduty.go
index ec50c3f37ff..5e9491409e5 100644
--- a/pkg/services/ngalert/notifier/channels/pagerduty.go
+++ b/pkg/services/ngalert/notifier/channels/pagerduty.go
@@ -189,8 +189,8 @@ func (pn *PagerdutyNotifier) buildPagerdutyMessage(ctx context.Context, alerts m
 	}
 
 	_ = withStoredImages(ctx, pn.log, pn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil && len(image.URL) != 0 {
+		func(_ int, image ngmodels.Image) error {
+			if len(image.URL) != 0 {
 				msg.Images = append(msg.Images, pagerDutyImage{Src: image.URL})
 			}
 
diff --git a/pkg/services/ngalert/notifier/channels/pushover.go b/pkg/services/ngalert/notifier/channels/pushover.go
index 0f6fb170ec4..43c107e8216 100644
--- a/pkg/services/ngalert/notifier/channels/pushover.go
+++ b/pkg/services/ngalert/notifier/channels/pushover.go
@@ -233,39 +233,36 @@ func (pn *PushoverNotifier) genPushoverBody(ctx context.Context, as ...*types.Al
 
 	// Pushover supports at most one image attachment with a maximum size of pushoverMaxFileSize.
 	// If the image is larger than pushoverMaxFileSize then return an error.
-	_ = withStoredImages(ctx, pn.log, pn.images, func(index int, image *ngmodels.Image) error {
-		if image != nil {
-			f, err := os.Open(image.Path)
-			if err != nil {
-				return fmt.Errorf("failed to open the image: %w", err)
-			}
-			defer func() {
-				if err := f.Close(); err != nil {
-					pn.log.Error("failed to close the image", "file", image.Path)
-				}
-			}()
-
-			fileInfo, err := f.Stat()
-			if err != nil {
-				return fmt.Errorf("failed to stat the image: %w", err)
-			}
-
-			if fileInfo.Size() > pushoverMaxFileSize {
-				return fmt.Errorf("image would exceeded maximum file size: %d", fileInfo.Size())
-			}
-
-			fw, err := w.CreateFormFile("attachment", image.Path)
-			if err != nil {
-				return fmt.Errorf("failed to create form file for the image: %w", err)
-			}
-
-			if _, err = io.Copy(fw, f); err != nil {
-				return fmt.Errorf("failed to copy the image to the form file: %w", err)
-			}
-
-			return ErrImagesDone
+	_ = withStoredImages(ctx, pn.log, pn.images, func(index int, image ngmodels.Image) error {
+		f, err := os.Open(image.Path)
+		if err != nil {
+			return fmt.Errorf("failed to open the image: %w", err)
 		}
-		return nil
+		defer func() {
+			if err := f.Close(); err != nil {
+				pn.log.Error("failed to close the image", "file", image.Path)
+			}
+		}()
+
+		fileInfo, err := f.Stat()
+		if err != nil {
+			return fmt.Errorf("failed to stat the image: %w", err)
+		}
+
+		if fileInfo.Size() > pushoverMaxFileSize {
+			return fmt.Errorf("image would exceeded maximum file size: %d", fileInfo.Size())
+		}
+
+		fw, err := w.CreateFormFile("attachment", image.Path)
+		if err != nil {
+			return fmt.Errorf("failed to create form file for the image: %w", err)
+		}
+
+		if _, err = io.Copy(fw, f); err != nil {
+			return fmt.Errorf("failed to copy the image to the form file: %w", err)
+		}
+
+		return ErrImagesDone
 	}, as...)
 
 	var sound string
diff --git a/pkg/services/ngalert/notifier/channels/pushover_test.go b/pkg/services/ngalert/notifier/channels/pushover_test.go
index 2d69076a3b1..ae8cd654dd5 100644
--- a/pkg/services/ngalert/notifier/channels/pushover_test.go
+++ b/pkg/services/ngalert/notifier/channels/pushover_test.go
@@ -49,7 +49,7 @@ func TestPushoverNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
 					},
 				},
 			},
@@ -85,12 +85,12 @@ func TestPushoverNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
 					},
 				}, {
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
-						Annotations: model.LabelSet{"ann1": "annv2", "__alertScreenshotToken__": "test-image-2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/sensugo.go b/pkg/services/ngalert/notifier/channels/sensugo.go
index 35726d3ab8c..2407e340c3e 100644
--- a/pkg/services/ngalert/notifier/channels/sensugo.go
+++ b/pkg/services/ngalert/notifier/channels/sensugo.go
@@ -139,21 +139,17 @@ func (sn *SensuGoNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 
 	labels := make(map[string]string)
 
-	var imageURL string
 	_ = withStoredImages(ctx, sn.log, sn.images,
-		func(index int, image *ngmodels.Image) error {
+		func(_ int, image ngmodels.Image) error {
 			// If there is an image for this alert and the image has been uploaded
 			// to a public URL then add it to the request. We cannot add more than
 			// one image per request.
-			if image != nil && image.URL != "" && imageURL == "" {
-				imageURL = image.URL
+			if image.URL != "" {
+				labels["imageURL"] = image.URL
 				return ErrImagesDone
 			}
 			return nil
 		}, as...)
-	if imageURL != "" {
-		labels["imageURL"] = imageURL
-	}
 
 	ruleURL := joinUrlPath(sn.tmpl.ExternalURL.String(), "/alerting/list", sn.log)
 	labels["ruleURL"] = ruleURL
diff --git a/pkg/services/ngalert/notifier/channels/sensugo_test.go b/pkg/services/ngalert/notifier/channels/sensugo_test.go
index 85156d5c496..ea0a8a9a863 100644
--- a/pkg/services/ngalert/notifier/channels/sensugo_test.go
+++ b/pkg/services/ngalert/notifier/channels/sensugo_test.go
@@ -44,7 +44,7 @@ func TestSensuGoNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
 					},
 				},
 			},
@@ -87,12 +87,12 @@ func TestSensuGoNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"__alert_rule_uid__": "rule uid", "alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
 					},
 				}, {
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
-						Annotations: model.LabelSet{"ann1": "annv2", "__alertScreenshotToken__": "test-image-2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/slack.go b/pkg/services/ngalert/notifier/channels/slack.go
index 282e4f73857..741fde200cc 100644
--- a/pkg/services/ngalert/notifier/channels/slack.go
+++ b/pkg/services/ngalert/notifier/channels/slack.go
@@ -319,15 +319,10 @@ func (sn *SlackNotifier) buildSlackMessage(ctx context.Context, alrts []*types.A
 		},
 	}
 
-	_ = withStoredImage(ctx, sn.log, sn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil {
-				req.Attachments[0].ImageURL = image.URL
-				return ErrImagesDone
-			}
-			return nil
-		},
-		0, alrts...)
+	_ = withStoredImages(ctx, sn.log, sn.images, func(index int, image ngmodels.Image) error {
+		req.Attachments[0].ImageURL = image.URL
+		return ErrImagesDone
+	}, alrts...)
 
 	if tmplErr != nil {
 		sn.log.Warn("failed to template Slack message", "err", tmplErr.Error())
diff --git a/pkg/services/ngalert/notifier/channels/slack_test.go b/pkg/services/ngalert/notifier/channels/slack_test.go
index e76bd0b15b0..b95467f7b09 100644
--- a/pkg/services/ngalert/notifier/channels/slack_test.go
+++ b/pkg/services/ngalert/notifier/channels/slack_test.go
@@ -128,7 +128,7 @@ func TestSlackNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-with-url"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-with-url"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/teams.go b/pkg/services/ngalert/notifier/channels/teams.go
index f08f68c15b4..fd45764a5c5 100644
--- a/pkg/services/ngalert/notifier/channels/teams.go
+++ b/pkg/services/ngalert/notifier/channels/teams.go
@@ -95,8 +95,8 @@ func (tn *TeamsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool,
 
 	images := []teamsImage{}
 	_ = withStoredImages(ctx, tn.log, tn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil && len(image.URL) != 0 {
+		func(_ int, image ngmodels.Image) error {
+			if len(image.URL) != 0 {
 				images = append(images, teamsImage{Image: image.URL})
 			}
 			return nil
diff --git a/pkg/services/ngalert/notifier/channels/telegram.go b/pkg/services/ngalert/notifier/channels/telegram.go
index 030b7b301d2..650a390c0da 100644
--- a/pkg/services/ngalert/notifier/channels/telegram.go
+++ b/pkg/services/ngalert/notifier/channels/telegram.go
@@ -117,33 +117,31 @@ func (tn *TelegramNotifier) Notify(ctx context.Context, as ...*types.Alert) (boo
 	}
 
 	// Create the cmd to upload each image
-	_ = withStoredImages(ctx, tn.log, tn.images, func(index int, image *ngmodels.Image) error {
-		if image != nil {
-			cmd, err = tn.newWebhookSyncCmd("sendPhoto", func(w *multipart.Writer) error {
-				f, err := os.Open(image.Path)
-				if err != nil {
-					return fmt.Errorf("failed to open image: %w", err)
-				}
-				defer func() {
-					if err := f.Close(); err != nil {
-						tn.log.Warn("failed to close image", "err", err)
-					}
-				}()
-				fw, err := w.CreateFormFile("photo", image.Path)
-				if err != nil {
-					return fmt.Errorf("failed to create form file: %w", err)
-				}
-				if _, err := io.Copy(fw, f); err != nil {
-					return fmt.Errorf("failed to write to form file: %w", err)
-				}
-				return nil
-			})
+	_ = withStoredImages(ctx, tn.log, tn.images, func(index int, image ngmodels.Image) error {
+		cmd, err = tn.newWebhookSyncCmd("sendPhoto", func(w *multipart.Writer) error {
+			f, err := os.Open(image.Path)
 			if err != nil {
-				return fmt.Errorf("failed to create image: %w", err)
+				return fmt.Errorf("failed to open image: %w", err)
 			}
-			if err := tn.ns.SendWebhookSync(ctx, cmd); err != nil {
-				return fmt.Errorf("failed to upload image to telegram: %w", err)
+			defer func() {
+				if err := f.Close(); err != nil {
+					tn.log.Warn("failed to close image", "err", err)
+				}
+			}()
+			fw, err := w.CreateFormFile("photo", image.Path)
+			if err != nil {
+				return fmt.Errorf("failed to create form file: %w", err)
 			}
+			if _, err := io.Copy(fw, f); err != nil {
+				return fmt.Errorf("failed to write to form file: %w", err)
+			}
+			return nil
+		})
+		if err != nil {
+			return fmt.Errorf("failed to create image: %w", err)
+		}
+		if err := tn.ns.SendWebhookSync(ctx, cmd); err != nil {
+			return fmt.Errorf("failed to upload image to telegram: %w", err)
 		}
 		return nil
 	}, as...)
diff --git a/pkg/services/ngalert/notifier/channels/telegram_test.go b/pkg/services/ngalert/notifier/channels/telegram_test.go
index 448d5ac3fd6..7d92125dcf2 100644
--- a/pkg/services/ngalert/notifier/channels/telegram_test.go
+++ b/pkg/services/ngalert/notifier/channels/telegram_test.go
@@ -40,7 +40,7 @@ func TestTelegramNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:       model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations:  model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-image-1"},
+						Annotations:  model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
 						GeneratorURL: "a URL",
 					},
 				},
@@ -61,13 +61,13 @@ func TestTelegramNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:       model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations:  model.LabelSet{"ann1": "annv1", "__alertScreenshotToken__": "test-image-1"},
+						Annotations:  model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
 						GeneratorURL: "a URL",
 					},
 				}, {
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
-						Annotations: model.LabelSet{"ann1": "annv2", "__alertScreenshotToken__": "test-image-2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/threema.go b/pkg/services/ngalert/notifier/channels/threema.go
index c75f5e99193..81f53290bb5 100644
--- a/pkg/services/ngalert/notifier/channels/threema.go
+++ b/pkg/services/ngalert/notifier/channels/threema.go
@@ -132,8 +132,8 @@ func (tn *ThreemaNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 	)
 
 	_ = withStoredImages(ctx, tn.log, tn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil && image.URL != "" {
+		func(_ int, image ngmodels.Image) error {
+			if image.URL != "" {
 				message += fmt.Sprintf("*Image:* %s\n", image.URL)
 			}
 			return nil
diff --git a/pkg/services/ngalert/notifier/channels/threema_test.go b/pkg/services/ngalert/notifier/channels/threema_test.go
index f9f34e779a2..7c1e1cf77db 100644
--- a/pkg/services/ngalert/notifier/channels/threema_test.go
+++ b/pkg/services/ngalert/notifier/channels/threema_test.go
@@ -43,7 +43,7 @@ func TestThreemaNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
 					},
 				},
 			},
@@ -60,12 +60,12 @@ func TestThreemaNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
 					},
 				}, {
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
-						Annotations: model.LabelSet{"ann1": "annv2", "__alertScreenshotToken__": "test-image-2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/util.go b/pkg/services/ngalert/notifier/channels/util.go
index ab9ef83bc18..226e540f4a6 100644
--- a/pkg/services/ngalert/notifier/channels/util.go
+++ b/pkg/services/ngalert/notifier/channels/util.go
@@ -46,57 +46,51 @@ var (
 	ErrImagesUnavailable = errors.New("alert screenshots are unavailable")
 )
 
-// For each alert, attempts to load the models.Image for an image token
-// associated with the alert, then calls forEachFunc with the index of the
-// alert and the retrieved image struct. If there is no image token, or the
-// image does not exist, forEachFunc will be called with a nil value for the
-// image. If forEachFunc returns an error, withStoredImages will return
-// immediately. If there is a runtime error retrieving images from the image
-// store, withStoredImages will attempt to continue executing, after logging
-// a warning.
-func withStoredImages(ctx context.Context, l log.Logger, imageStore ImageStore, forEachFunc func(index int, image *models.Image) error, alerts ...*types.Alert) error {
-	for i := range alerts {
-		err := withStoredImage(ctx, l, imageStore, forEachFunc, i, alerts...)
-		if err != nil {
-			// Stop iteration as forEachFunc has found the intended image or
-			// iterated the maximum number of images
-			if errors.Is(err, ErrImagesDone) {
-				return nil
-			}
-			return err
-		}
+type forEachImageFunc func(index int, image models.Image) error
+
+// getImage returns the image for the alert or an error. It returns a nil
+// image if the alert does not have an image token or the image does not exist.
+func getImage(ctx context.Context, l log.Logger, imageStore ImageStore, alert types.Alert) (*models.Image, error) {
+	token := getTokenFromAnnotations(alert.Annotations)
+	if token == "" {
+		return nil, nil
+	}
+
+	ctx, cancelFunc := context.WithTimeout(ctx, ImageStoreTimeout)
+	defer cancelFunc()
+
+	img, err := imageStore.GetImage(ctx, token)
+	if errors.Is(err, models.ErrImageNotFound) || errors.Is(err, ErrImagesUnavailable) {
+		return nil, nil
+	} else if err != nil {
+		l.Warn("failed to get image with token", "token", token, "err", err)
+		return nil, err
+	} else {
+		return img, nil
 	}
-	return nil
 }
 
-func withStoredImage(ctx context.Context, l log.Logger, imageStore ImageStore, imageFunc func(index int, image *models.Image) error, index int, alerts ...*types.Alert) error {
-	imgToken := getTokenFromAnnotations(alerts[index].Annotations)
-	if len(imgToken) == 0 {
-		err := imageFunc(index, nil)
+// withStoredImages retrieves the image for each alert and then calls forEachFunc
+// with the index of the alert and the retrieved image struct. If the alert does
+// not have an image token, or the image does not exist then forEachFunc will not be
+// called for that alert. If forEachFunc returns an error, withStoredImages will return
+// the error and not iterate the remaining alerts. A forEachFunc can return ErrImagesDone
+// to stop the iteration of remaining alerts if the intended image or maximum number of
+// images have been found.
+func withStoredImages(ctx context.Context, l log.Logger, imageStore ImageStore, forEachFunc forEachImageFunc, alerts ...*types.Alert) error {
+	for index, alert := range alerts {
+		img, err := getImage(ctx, l, imageStore, *alert)
 		if err != nil {
 			return err
+		} else if img != nil {
+			if err := forEachFunc(index, *img); err != nil {
+				if errors.Is(err, ErrImagesDone) {
+					return nil
+				}
+				return err
+			}
 		}
 	}
-
-	timeoutCtx, cancel := context.WithTimeout(ctx, ImageStoreTimeout)
-	img, err := imageStore.GetImage(timeoutCtx, imgToken)
-	cancel()
-
-	if errors.Is(err, models.ErrImageNotFound) || errors.Is(err, ErrImagesUnavailable) {
-		err := imageFunc(index, nil)
-		if err != nil {
-			return err
-		}
-	} else if err != nil {
-		// Ignore errors. Don't log "ImageUnavailable", which means the storage doesn't exist.
-		l.Warn("failed to retrieve image url from store", "err", err)
-	}
-
-	err = imageFunc(index, img)
-	if err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -119,7 +113,7 @@ func openImage(path string) (io.ReadCloser, error) {
 }
 
 func getTokenFromAnnotations(annotations model.LabelSet) string {
-	if value, ok := annotations[models.ScreenshotTokenAnnotation]; ok {
+	if value, ok := annotations[models.ImageTokenAnnotation]; ok {
 		return string(value)
 	}
 	return ""
diff --git a/pkg/services/ngalert/notifier/channels/util_test.go b/pkg/services/ngalert/notifier/channels/util_test.go
index beec5dc848f..08ae8c19c9a 100644
--- a/pkg/services/ngalert/notifier/channels/util_test.go
+++ b/pkg/services/ngalert/notifier/channels/util_test.go
@@ -19,13 +19,13 @@ func TestWithStoredImages(t *testing.T) {
 	alerts := []*types.Alert{{
 		Alert: model.Alert{
 			Annotations: model.LabelSet{
-				models.ScreenshotTokenAnnotation: "test-image-1",
+				models.ImageTokenAnnotation: "test-image-1",
 			},
 		},
 	}, {
 		Alert: model.Alert{
 			Annotations: model.LabelSet{
-				models.ScreenshotTokenAnnotation: "test-image-2",
+				models.ImageTokenAnnotation: "test-image-2",
 			},
 		},
 	}}
@@ -45,7 +45,7 @@ func TestWithStoredImages(t *testing.T) {
 	)
 
 	// should iterate all images
-	err = withStoredImages(ctx, log.New(ctx), imageStore, func(index int, image *models.Image) error {
+	err = withStoredImages(ctx, log.New(ctx), imageStore, func(index int, image models.Image) error {
 		i += 1
 		return nil
 	}, alerts...)
@@ -54,7 +54,7 @@ func TestWithStoredImages(t *testing.T) {
 
 	// should iterate just the first image
 	i = 0
-	err = withStoredImages(ctx, log.New(ctx), imageStore, func(index int, image *models.Image) error {
+	err = withStoredImages(ctx, log.New(ctx), imageStore, func(index int, image models.Image) error {
 		i += 1
 		return ErrImagesDone
 	}, alerts...)
diff --git a/pkg/services/ngalert/notifier/channels/victorops.go b/pkg/services/ngalert/notifier/channels/victorops.go
index 072ce92d5e3..cfd66db7b97 100644
--- a/pkg/services/ngalert/notifier/channels/victorops.go
+++ b/pkg/services/ngalert/notifier/channels/victorops.go
@@ -119,8 +119,8 @@ func (vn *VictoropsNotifier) Notify(ctx context.Context, as ...*types.Alert) (bo
 	bodyJSON.Set("monitoring_tool", "Grafana v"+setting.BuildVersion)
 
 	_ = withStoredImages(ctx, vn.log, vn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil && image.URL != "" {
+		func(index int, image ngmodels.Image) error {
+			if image.URL != "" {
 				bodyJSON.Set("image_url", image.URL)
 				return ErrImagesDone
 			}
diff --git a/pkg/services/ngalert/notifier/channels/victorops_test.go b/pkg/services/ngalert/notifier/channels/victorops_test.go
index 1c27e3d4f7b..251618bac8c 100644
--- a/pkg/services/ngalert/notifier/channels/victorops_test.go
+++ b/pkg/services/ngalert/notifier/channels/victorops_test.go
@@ -39,7 +39,7 @@ func TestVictoropsNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__dashboardUid__": "abcd", "__panelId__": "efgh", "__alertImageToken__": "test-image-1"},
 					},
 				},
 			},
@@ -60,12 +60,12 @@ func TestVictoropsNotifier(t *testing.T) {
 				{
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
-						Annotations: model.LabelSet{"ann1": "annv1", "__alertScreenshotToken__": "test-image-1"},
+						Annotations: model.LabelSet{"ann1": "annv1", "__alertImageToken__": "test-image-1"},
 					},
 				}, {
 					Alert: model.Alert{
 						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
-						Annotations: model.LabelSet{"ann1": "annv2", "__alertScreenshotToken__": "test-image-2"},
+						Annotations: model.LabelSet{"ann1": "annv2", "__alertImageToken__": "test-image-2"},
 					},
 				},
 			},
diff --git a/pkg/services/ngalert/notifier/channels/webhook.go b/pkg/services/ngalert/notifier/channels/webhook.go
index b88723277dd..4e92444cfed 100644
--- a/pkg/services/ngalert/notifier/channels/webhook.go
+++ b/pkg/services/ngalert/notifier/channels/webhook.go
@@ -120,8 +120,8 @@ func (wn *WebhookNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool
 
 	// Augment our Alert data with ImageURLs if available.
 	_ = withStoredImages(ctx, wn.log, wn.images,
-		func(index int, image *ngmodels.Image) error {
-			if image != nil && len(image.URL) != 0 {
+		func(index int, image ngmodels.Image) error {
+			if len(image.URL) != 0 {
 				data.Alerts[index].ImageURL = image.URL
 			}
 			return nil
diff --git a/pkg/services/ngalert/notifier/channels/wecom.go b/pkg/services/ngalert/notifier/channels/wecom.go
index 12fb42ced1e..4d25c1b8eff 100644
--- a/pkg/services/ngalert/notifier/channels/wecom.go
+++ b/pkg/services/ngalert/notifier/channels/wecom.go
@@ -18,6 +18,7 @@ type WeComConfig struct {
 	*NotificationChannelConfig
 	URL     string
 	Message string
+	Title   string
 }
 
 func WeComFactory(fc FactoryConfig) (NotificationChannel, error) {
@@ -40,6 +41,7 @@ func NewWeComConfig(config *NotificationChannelConfig, decryptFunc GetDecryptedV
 		NotificationChannelConfig: config,
 		URL:                       url,
 		Message:                   config.Settings.Get("message").MustString(`{{ template "default.message" .}}`),
+		Title:                     config.Settings.Get("title").MustString(DefaultMessageTitleEmbed),
 	}, nil
 }
 
@@ -55,6 +57,7 @@ func NewWeComNotifier(config *WeComConfig, ns notifications.WebhookSender, t *te
 		}),
 		URL:     config.URL,
 		Message: config.Message,
+		Title:   config.Title,
 		log:     log.New("alerting.notifier.wecom"),
 		ns:      ns,
 		tmpl:    t,
@@ -66,6 +69,7 @@ type WeComNotifier struct {
 	*Base
 	URL     string
 	Message string
+	Title   string
 	tmpl    *template.Template
 	log     log.Logger
 	ns      notifications.WebhookSender
@@ -82,7 +86,7 @@ func (w *WeComNotifier) Notify(ctx context.Context, as ...*types.Alert) (bool, e
 		"msgtype": "markdown",
 	}
 	content := fmt.Sprintf("# %s\n%s\n",
-		tmpl(DefaultMessageTitleEmbed),
+		tmpl(w.Title),
 		tmpl(w.Message),
 	)
 
diff --git a/pkg/services/ngalert/notifier/channels/wecom_test.go b/pkg/services/ngalert/notifier/channels/wecom_test.go
index 4c7bfd2b49f..d5343f360b6 100644
--- a/pkg/services/ngalert/notifier/channels/wecom_test.go
+++ b/pkg/services/ngalert/notifier/channels/wecom_test.go
@@ -76,6 +76,33 @@ func TestWeComNotifier(t *testing.T) {
 				"msgtype": "markdown",
 			},
 			expMsgError: nil,
+		}, {
+			name: "Custom title and message with multiple alerts",
+			settings: `{
+				"url": "http://localhost",
+				"message": "{{ len .Alerts.Firing }} alerts are firing, {{ len .Alerts.Resolved }} are resolved",
+				"title": "This notification is {{ .Status }}!"
+			}`,
+			alerts: []*types.Alert{
+				{
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val1"},
+						Annotations: model.LabelSet{"ann1": "annv1"},
+					},
+				}, {
+					Alert: model.Alert{
+						Labels:      model.LabelSet{"alertname": "alert1", "lbl1": "val2"},
+						Annotations: model.LabelSet{"ann1": "annv2"},
+					},
+				},
+			},
+			expMsg: map[string]interface{}{
+				"markdown": map[string]interface{}{
+					"content": "# This notification is firing!\n2 alerts are firing, 0 are resolved\n",
+				},
+				"msgtype": "markdown",
+			},
+			expMsgError: nil,
 		}, {
 			name:         "Error in initing",
 			settings:     `{}`,
diff --git a/pkg/services/ngalert/provisioning/alert_rules.go b/pkg/services/ngalert/provisioning/alert_rules.go
index 04e4e9a8987..5d618317eda 100644
--- a/pkg/services/ngalert/provisioning/alert_rules.go
+++ b/pkg/services/ngalert/provisioning/alert_rules.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
 	"github.com/grafana/grafana/pkg/services/ngalert/store"
 	"github.com/grafana/grafana/pkg/util"
@@ -89,6 +90,32 @@ func (service *AlertRuleService) CreateAlertRule(ctx context.Context, rule model
 	return rule, nil
 }
 
+func (service *AlertRuleService) GetRuleGroup(ctx context.Context, orgID int64, folder, group string) (definitions.AlertRuleGroup, error) {
+	q := models.ListAlertRulesQuery{
+		OrgID:         orgID,
+		NamespaceUIDs: []string{folder},
+		RuleGroup:     group,
+	}
+	if err := service.ruleStore.ListAlertRules(ctx, &q); err != nil {
+		return definitions.AlertRuleGroup{}, err
+	}
+	if len(q.Result) == 0 {
+		return definitions.AlertRuleGroup{}, store.ErrAlertRuleGroupNotFound
+	}
+	res := definitions.AlertRuleGroup{
+		Title:     q.Result[0].RuleGroup,
+		FolderUID: q.Result[0].NamespaceUID,
+		Interval:  q.Result[0].IntervalSeconds,
+		Rules:     []models.AlertRule{},
+	}
+	for _, r := range q.Result {
+		if r != nil {
+			res.Rules = append(res.Rules, *r)
+		}
+	}
+	return res, nil
+}
+
 // UpdateRuleGroup will update the interval for all rules in the group.
 func (service *AlertRuleService) UpdateRuleGroup(ctx context.Context, orgID int64, namespaceUID string, ruleGroup string, interval int64) error {
 	if err := models.ValidateRuleGroupInterval(interval, service.baseIntervalSeconds); err != nil {
diff --git a/pkg/services/ngalert/provisioning/notification_policies.go b/pkg/services/ngalert/provisioning/notification_policies.go
index f03611fc86d..8597360fa03 100644
--- a/pkg/services/ngalert/provisioning/notification_policies.go
+++ b/pkg/services/ngalert/provisioning/notification_policies.go
@@ -16,7 +16,8 @@ type NotificationPolicyService struct {
 	log             log.Logger
 }
 
-func NewNotificationPolicyService(am AMConfigStore, prov ProvisioningStore, xact TransactionManager, log log.Logger) *NotificationPolicyService {
+func NewNotificationPolicyService(am AMConfigStore, prov ProvisioningStore,
+	xact TransactionManager, log log.Logger) *NotificationPolicyService {
 	return &NotificationPolicyService{
 		amStore:         am,
 		provenanceStore: prov,
@@ -63,11 +64,27 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 	if err != nil {
 		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
 	}
+
 	revision, err := getLastConfiguration(ctx, orgID, nps.amStore)
 	if err != nil {
 		return err
 	}
 
+	receivers, err := nps.receiversToMap(revision.cfg.AlertmanagerConfig.Receivers)
+	err = tree.ValidateReceivers(receivers)
+	if err != nil {
+		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
+	}
+
+	muteTimes := map[string]struct{}{}
+	for _, mt := range revision.cfg.AlertmanagerConfig.MuteTimeIntervals {
+		muteTimes[mt.Name] = struct{}{}
+	}
+	err = tree.ValidateMuteTimes(muteTimes)
+	if err != nil {
+		return fmt.Errorf("%w: %s", ErrValidation, err.Error())
+	}
+
 	revision.cfg.AlertmanagerConfig.Config.Route = &tree
 
 	serialized, err := serializeAlertmanagerConfig(*revision.cfg)
@@ -98,3 +115,11 @@ func (nps *NotificationPolicyService) UpdatePolicyTree(ctx context.Context, orgI
 
 	return nil
 }
+
+func (nps *NotificationPolicyService) receiversToMap(records []*definitions.PostableApiReceiver) (map[string]struct{}, error) {
+	receivers := map[string]struct{}{}
+	for _, receiver := range records {
+		receivers[receiver.Name] = struct{}{}
+	}
+	return receivers, nil
+}
diff --git a/pkg/services/ngalert/provisioning/notification_policies_test.go b/pkg/services/ngalert/provisioning/notification_policies_test.go
index df98eb4f7c6..cff09e8899a 100644
--- a/pkg/services/ngalert/provisioning/notification_policies_test.go
+++ b/pkg/services/ngalert/provisioning/notification_policies_test.go
@@ -7,7 +7,10 @@ import (
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
+	"github.com/prometheus/alertmanager/config"
+	"github.com/prometheus/alertmanager/timeinterval"
 	"github.com/prometheus/common/model"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,8 +24,85 @@ func TestNotificationPolicyService(t *testing.T) {
 		require.Equal(t, "grafana-default-email", tree.Receiver)
 	})
 
+	t.Run("error if referenced mute time interval is not existing", func(t *testing.T) {
+		sut := createNotificationPolicyServiceSut()
+		sut.amStore = &MockAMConfigStore{}
+		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+			Return(
+				func(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) error {
+					cfg, _ := deserializeAlertmanagerConfig([]byte(defaultConfig))
+					mti := config.MuteTimeInterval{
+						Name:          "not-the-one-we-need",
+						TimeIntervals: []timeinterval.TimeInterval{},
+					}
+					cfg.AlertmanagerConfig.MuteTimeIntervals = append(cfg.AlertmanagerConfig.MuteTimeIntervals, mti)
+					cfg.AlertmanagerConfig.Receivers = append(cfg.AlertmanagerConfig.Receivers,
+						&definitions.PostableApiReceiver{
+							Receiver: config.Receiver{
+								// default one from createTestRoutingTree()
+								Name: "a new receiver",
+							},
+						})
+					data, _ := serializeAlertmanagerConfig(*cfg)
+					query.Result = &models.AlertConfiguration{
+						AlertmanagerConfiguration: string(data),
+					}
+					return nil
+				})
+		sut.amStore.(*MockAMConfigStore).EXPECT().
+			UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
+			Return(nil)
+		newRoute := createTestRoutingTree()
+		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
+			Receiver:          "a new receiver",
+			MuteTimeIntervals: []string{"not-existing"},
+		})
+
+		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
+		require.Error(t, err)
+	})
+
+	t.Run("pass if referenced mute time interval is existing", func(t *testing.T) {
+		sut := createNotificationPolicyServiceSut()
+		sut.amStore = &MockAMConfigStore{}
+		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+			Return(
+				func(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) error {
+					cfg, _ := deserializeAlertmanagerConfig([]byte(defaultConfig))
+					mti := config.MuteTimeInterval{
+						Name:          "existing",
+						TimeIntervals: []timeinterval.TimeInterval{},
+					}
+					cfg.AlertmanagerConfig.MuteTimeIntervals = append(cfg.AlertmanagerConfig.MuteTimeIntervals, mti)
+					cfg.AlertmanagerConfig.Receivers = append(cfg.AlertmanagerConfig.Receivers,
+						&definitions.PostableApiReceiver{
+							Receiver: config.Receiver{
+								// default one from createTestRoutingTree()
+								Name: "a new receiver",
+							},
+						})
+					data, _ := serializeAlertmanagerConfig(*cfg)
+					query.Result = &models.AlertConfiguration{
+						AlertmanagerConfiguration: string(data),
+					}
+					return nil
+				})
+		sut.amStore.(*MockAMConfigStore).EXPECT().
+			UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
+			Return(nil)
+		newRoute := createTestRoutingTree()
+		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
+			Receiver:          "a new receiver",
+			MuteTimeIntervals: []string{"existing"},
+		})
+
+		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
+		require.NoError(t, err)
+	})
+
 	t.Run("service stitches policy tree into org's AM config", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
+
 		newRoute := createTestRoutingTree()
 
 		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
@@ -33,6 +113,56 @@ func TestNotificationPolicyService(t *testing.T) {
 		require.Equal(t, "a new receiver", updated.Receiver)
 	})
 
+	t.Run("not existing receiver reference will error", func(t *testing.T) {
+		sut := createNotificationPolicyServiceSut()
+
+		newRoute := createTestRoutingTree()
+		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
+			Receiver: "not-existing",
+		})
+
+		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
+		require.Error(t, err)
+	})
+
+	t.Run("existing receiver reference will pass", func(t *testing.T) {
+		sut := createNotificationPolicyServiceSut()
+		sut.amStore = &MockAMConfigStore{}
+		sut.amStore.(*MockAMConfigStore).On("GetLatestAlertmanagerConfiguration", mock.Anything, mock.Anything).
+			Return(
+				func(ctx context.Context, query *models.GetLatestAlertmanagerConfigurationQuery) error {
+					cfg, _ := deserializeAlertmanagerConfig([]byte(defaultConfig))
+					cfg.AlertmanagerConfig.Receivers = append(cfg.AlertmanagerConfig.Receivers,
+						&definitions.PostableApiReceiver{
+							Receiver: config.Receiver{
+								// default one from createTestRoutingTree()
+								Name: "a new receiver",
+							},
+						})
+					cfg.AlertmanagerConfig.Receivers = append(cfg.AlertmanagerConfig.Receivers,
+						&definitions.PostableApiReceiver{
+							Receiver: config.Receiver{
+								Name: "existing",
+							},
+						})
+					data, _ := serializeAlertmanagerConfig(*cfg)
+					query.Result = &models.AlertConfiguration{
+						AlertmanagerConfiguration: string(data),
+					}
+					return nil
+				})
+		sut.amStore.(*MockAMConfigStore).EXPECT().
+			UpdateAlertmanagerConfiguration(mock.Anything, mock.Anything).
+			Return(nil)
+		newRoute := createTestRoutingTree()
+		newRoute.Routes = append(newRoute.Routes, &definitions.Route{
+			Receiver: "existing",
+		})
+
+		err := sut.UpdatePolicyTree(context.Background(), 1, newRoute, models.ProvenanceNone)
+		require.NoError(t, err)
+	})
+
 	t.Run("default provenance of records is none", func(t *testing.T) {
 		sut := createNotificationPolicyServiceSut()
 
diff --git a/pkg/services/ngalert/schedule/compat.go b/pkg/services/ngalert/schedule/compat.go
index 0c0890a1976..42870988b20 100644
--- a/pkg/services/ngalert/schedule/compat.go
+++ b/pkg/services/ngalert/schedule/compat.go
@@ -40,7 +40,7 @@ func stateToPostableAlert(alertState *state.State, appURL *url.URL) *models.Post
 	}
 
 	if alertState.Image != nil {
-		nA[ngModels.ScreenshotTokenAnnotation] = alertState.Image.Token
+		nA[ngModels.ImageTokenAnnotation] = alertState.Image.Token
 	}
 
 	var urlStr string
diff --git a/pkg/services/ngalert/schedule/compat_test.go b/pkg/services/ngalert/schedule/compat_test.go
index b94d6e07e56..ff7a2218610 100644
--- a/pkg/services/ngalert/schedule/compat_test.go
+++ b/pkg/services/ngalert/schedule/compat_test.go
@@ -118,7 +118,7 @@ func Test_stateToPostableAlert(t *testing.T) {
 					require.Equal(t, expected, result.Annotations)
 				})
 
-				t.Run("add __alertScreenshotToken__ if there is an image token", func(t *testing.T) {
+				t.Run("add __alertImageToken__ if there is an image token", func(t *testing.T) {
 					alertState := randomState(tc.state)
 					alertState.Annotations = randomMapOfStrings()
 					alertState.Image = &ngModels.Image{Token: "test_token"}
@@ -129,7 +129,7 @@ func Test_stateToPostableAlert(t *testing.T) {
 					for k, v := range alertState.Annotations {
 						expected[k] = v
 					}
-					expected["__alertScreenshotToken__"] = alertState.Image.Token
+					expected["__alertImageToken__"] = alertState.Image.Token
 
 					require.Equal(t, expected, result.Annotations)
 				})
diff --git a/pkg/services/ngalert/store/alert_rule.go b/pkg/services/ngalert/store/alert_rule.go
index c490ae8ae09..f63ff11bcef 100644
--- a/pkg/services/ngalert/store/alert_rule.go
+++ b/pkg/services/ngalert/store/alert_rule.go
@@ -479,5 +479,8 @@ func (st DBstore) validateAlertRule(alertRule ngmodels.AlertRule) error {
 		return err
 	}
 
+	if alertRule.For < 0 {
+		return fmt.Errorf("%w: field `for` cannot be negative", ngmodels.ErrAlertRuleFailedValidation)
+	}
 	return nil
 }
diff --git a/pkg/services/provisioning/dashboards/file_reader.go b/pkg/services/provisioning/dashboards/file_reader.go
index 827a941a87a..35e16e870ea 100644
--- a/pkg/services/provisioning/dashboards/file_reader.go
+++ b/pkg/services/provisioning/dashboards/file_reader.go
@@ -302,12 +302,12 @@ func (fr *FileReader) getOrCreateFolderID(ctx context.Context, cfg *config, serv
 	cmd := &models.GetDashboardQuery{Slug: models.SlugifyTitle(folderName), OrgId: cfg.OrgID}
 	err := fr.dashboardStore.GetDashboard(ctx, cmd)
 
-	if err != nil && !errors.Is(err, models.ErrDashboardNotFound) {
+	if err != nil && !errors.Is(err, dashboards.ErrDashboardNotFound) {
 		return 0, err
 	}
 
 	// dashboard folder not found. create one.
-	if errors.Is(err, models.ErrDashboardNotFound) {
+	if errors.Is(err, dashboards.ErrDashboardNotFound) {
 		dash := &dashboards.SaveDashboardDTO{}
 		dash.Dashboard = models.NewDashboardFolder(folderName)
 		dash.Dashboard.IsFolder = true
@@ -315,7 +315,7 @@ func (fr *FileReader) getOrCreateFolderID(ctx context.Context, cfg *config, serv
 		dash.OrgId = cfg.OrgID
 		// set dashboard folderUid if given
 		if cfg.FolderUID == accesscontrol.GeneralFolderUID {
-			return 0, models.ErrFolderInvalidUID
+			return 0, dashboards.ErrFolderInvalidUID
 		}
 		dash.Dashboard.SetUid(cfg.FolderUID)
 		dbDash, err := service.SaveFolderForProvisionedDashboards(ctx, dash)
diff --git a/pkg/services/provisioning/dashboards/file_reader_test.go b/pkg/services/provisioning/dashboards/file_reader_test.go
index 627ed6041b8..30eb32e0dca 100644
--- a/pkg/services/provisioning/dashboards/file_reader_test.go
+++ b/pkg/services/provisioning/dashboards/file_reader_test.go
@@ -8,13 +8,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/util"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -405,7 +406,7 @@ func TestDashboardFileReader(t *testing.T) {
 		require.NoError(t, err)
 
 		_, err = r.getOrCreateFolderID(context.Background(), cfg, fakeService, cfg.Folder)
-		require.ErrorIs(t, err, models.ErrFolderInvalidUID)
+		require.ErrorIs(t, err, dashboards.ErrFolderInvalidUID)
 	})
 
 	t.Run("Walking the folder with dashboards", func(t *testing.T) {
@@ -513,5 +514,5 @@ func (ffi FakeFileInfo) Sys() interface{} {
 type fakeDashboardStore struct{}
 
 func (fds *fakeDashboardStore) GetDashboard(_ context.Context, _ *models.GetDashboardQuery) error {
-	return models.ErrDashboardNotFound
+	return dashboards.ErrDashboardNotFound
 }
diff --git a/pkg/services/provisioning/dashboards/types.go b/pkg/services/provisioning/dashboards/types.go
index 51133a2bf58..b565085dceb 100644
--- a/pkg/services/provisioning/dashboards/types.go
+++ b/pkg/services/provisioning/dashboards/types.go
@@ -67,7 +67,7 @@ func createDashboardJSON(data *simplejson.Json, lastModified time.Time, cfg *con
 	dash.Dashboard.FolderId = folderID
 
 	if dash.Dashboard.Title == "" {
-		return nil, models.ErrDashboardTitleEmpty
+		return nil, dashboards.ErrDashboardTitleEmpty
 	}
 
 	return dash, nil
diff --git a/pkg/services/publicdashboards/api/api.go b/pkg/services/publicdashboards/api/api.go
new file mode 100644
index 00000000000..65d87fc6568
--- /dev/null
+++ b/pkg/services/publicdashboards/api/api.go
@@ -0,0 +1,234 @@
+package api
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/api/response"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/middleware"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/plugins/backendplugin"
+	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/query"
+	"github.com/grafana/grafana/pkg/util"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+type Api struct {
+	PublicDashboardService publicdashboards.Service
+	RouteRegister          routing.RouteRegister
+	AccessControl          accesscontrol.AccessControl
+	QueryDataService       *query.Service
+	Features               *featuremgmt.FeatureManager
+}
+
+func ProvideApi(
+	pd publicdashboards.Service,
+	rr routing.RouteRegister,
+	ac accesscontrol.AccessControl,
+	qds *query.Service,
+	features *featuremgmt.FeatureManager,
+) *Api {
+	api := &Api{
+		PublicDashboardService: pd,
+		RouteRegister:          rr,
+		AccessControl:          ac,
+		QueryDataService:       qds,
+		Features:               features,
+	}
+
+	// attach api if PublicDashboards feature flag is enabled
+	if features.IsEnabled(featuremgmt.FlagPublicDashboards) {
+		api.RegisterAPIEndpoints()
+	}
+
+	return api
+}
+
+func (api *Api) RegisterAPIEndpoints() {
+	auth := accesscontrol.Middleware(api.AccessControl)
+	reqSignedIn := middleware.ReqSignedIn
+
+	// Anonymous access to public dashboard route is configured in pkg/api/api.go
+	// because it is deeply dependent on the HTTPServer.Index() method and would result in a
+	// circular dependency
+
+	api.RouteRegister.Get("/api/public/dashboards/:accessToken", routing.Wrap(api.GetPublicDashboard))
+	api.RouteRegister.Post("/api/public/dashboards/:accessToken/panels/:panelId/query", routing.Wrap(api.QueryPublicDashboard))
+
+	// Create/Update Public Dashboard
+	api.RouteRegister.Get("/api/dashboards/uid/:uid/public-config", auth(reqSignedIn, accesscontrol.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(api.GetPublicDashboardConfig))
+	api.RouteRegister.Post("/api/dashboards/uid/:uid/public-config", auth(reqSignedIn, accesscontrol.EvalPermission(dashboards.ActionDashboardsWrite)), routing.Wrap(api.SavePublicDashboardConfig))
+}
+
+// gets public dashboard
+func (api *Api) GetPublicDashboard(c *models.ReqContext) response.Response {
+	accessToken := web.Params(c.Req)[":accessToken"]
+
+	dash, err := api.PublicDashboardService.GetPublicDashboard(c.Req.Context(), accessToken)
+	if err != nil {
+		return handleDashboardErr(http.StatusInternalServerError, "Failed to get public dashboard", err)
+	}
+
+	meta := dtos.DashboardMeta{
+		Slug:                       dash.Slug,
+		Type:                       models.DashTypeDB,
+		CanStar:                    false,
+		CanSave:                    false,
+		CanEdit:                    false,
+		CanAdmin:                   false,
+		CanDelete:                  false,
+		Created:                    dash.Created,
+		Updated:                    dash.Updated,
+		Version:                    dash.Version,
+		IsFolder:                   false,
+		FolderId:                   dash.FolderId,
+		PublicDashboardAccessToken: accessToken,
+	}
+
+	dto := dtos.DashboardFullWithMeta{Meta: meta, Dashboard: dash.Data}
+
+	return response.JSON(http.StatusOK, dto)
+}
+
+// gets public dashboard configuration for dashboard
+func (api *Api) GetPublicDashboardConfig(c *models.ReqContext) response.Response {
+	pdc, err := api.PublicDashboardService.GetPublicDashboardConfig(c.Req.Context(), c.OrgId, web.Params(c.Req)[":uid"])
+	if err != nil {
+		return handleDashboardErr(http.StatusInternalServerError, "Failed to get public dashboard config", err)
+	}
+	return response.JSON(http.StatusOK, pdc)
+}
+
+// sets public dashboard configuration for dashboard
+func (api *Api) SavePublicDashboardConfig(c *models.ReqContext) response.Response {
+	pubdash := &PublicDashboard{}
+	if err := web.Bind(c.Req, pubdash); err != nil {
+		return response.Error(http.StatusBadRequest, "bad request data", err)
+	}
+
+	// Always set the org id to the current auth session orgId
+	pubdash.OrgId = c.OrgId
+
+	dto := SavePublicDashboardConfigDTO{
+		OrgId:           c.OrgId,
+		DashboardUid:    web.Params(c.Req)[":uid"],
+		UserId:          c.UserId,
+		PublicDashboard: pubdash,
+	}
+
+	pubdash, err := api.PublicDashboardService.SavePublicDashboardConfig(c.Req.Context(), &dto)
+	if err != nil {
+		return handleDashboardErr(http.StatusInternalServerError, "Failed to save public dashboard configuration", err)
+	}
+
+	return response.JSON(http.StatusOK, pubdash)
+}
+
+// QueryPublicDashboard returns all results for a given panel on a public dashboard
+// POST /api/public/dashboard/:accessToken/panels/:panelId/query
+func (api *Api) QueryPublicDashboard(c *models.ReqContext) response.Response {
+	panelId, err := strconv.ParseInt(web.Params(c.Req)[":panelId"], 10, 64)
+	if err != nil {
+		return response.Error(http.StatusBadRequest, "invalid panel ID", err)
+	}
+
+	dashboard, err := api.PublicDashboardService.GetPublicDashboard(c.Req.Context(), web.Params(c.Req)[":accessToken"])
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "could not fetch dashboard", err)
+	}
+
+	publicDashboard, err := api.PublicDashboardService.GetPublicDashboardConfig(c.Req.Context(), dashboard.OrgId, dashboard.Uid)
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "could not fetch public dashboard", err)
+	}
+
+	reqDTO, err := api.PublicDashboardService.BuildPublicDashboardMetricRequest(
+		c.Req.Context(),
+		dashboard,
+		publicDashboard,
+		panelId,
+	)
+	if err != nil {
+		return handleDashboardErr(http.StatusInternalServerError, "Failed to get queries for public dashboard", err)
+	}
+
+	anonymousUser, err := api.PublicDashboardService.BuildAnonymousUser(c.Req.Context(), dashboard)
+
+	if err != nil {
+		return response.Error(http.StatusInternalServerError, "could not create anonymous user", err)
+	}
+
+	resp, err := api.QueryDataService.QueryDataMultipleSources(c.Req.Context(), anonymousUser, c.SkipCache, reqDTO, true)
+
+	if err != nil {
+		return handleQueryMetricsError(err)
+	}
+	return toJsonStreamingResponse(api.Features, resp)
+}
+
+// util to help us unpack dashboard and publicdashboard errors or use default http code and message
+// we should look to do some future refactoring of these errors as publicdashboard err is the same as a dashboarderr, just defined in a
+// different package.
+func handleDashboardErr(defaultCode int, defaultMsg string, err error) response.Response {
+	var publicDashboardErr PublicDashboardErr
+
+	// handle public dashboard er
+	if ok := errors.As(err, &publicDashboardErr); ok {
+		return response.Error(publicDashboardErr.StatusCode, publicDashboardErr.Error(), publicDashboardErr)
+	}
+
+	// handle dashboard errors as well
+	var dashboardErr dashboards.DashboardErr
+	if ok := errors.As(err, &dashboardErr); ok {
+		return response.Error(dashboardErr.StatusCode, dashboardErr.Error(), dashboardErr)
+	}
+
+	return response.Error(defaultCode, defaultMsg, err)
+}
+
+// Copied from pkg/api/metrics.go
+func handleQueryMetricsError(err error) *response.NormalResponse {
+	if errors.Is(err, datasources.ErrDataSourceAccessDenied) {
+		return response.Error(http.StatusForbidden, "Access denied to data source", err)
+	}
+	if errors.Is(err, datasources.ErrDataSourceNotFound) {
+		return response.Error(http.StatusNotFound, "Data source not found", err)
+	}
+	var badQuery *query.ErrBadQuery
+	if errors.As(err, &badQuery) {
+		return response.Error(http.StatusBadRequest, util.Capitalize(badQuery.Message), err)
+	}
+
+	if errors.Is(err, backendplugin.ErrPluginNotRegistered) {
+		return response.Error(http.StatusNotFound, "Plugin not found", err)
+	}
+
+	return response.Error(http.StatusInternalServerError, "Query data error", err)
+}
+
+// Copied from pkg/api/metrics.go
+func toJsonStreamingResponse(features *featuremgmt.FeatureManager, qdr *backend.QueryDataResponse) response.Response {
+	statusWhenError := http.StatusBadRequest
+	if features.IsEnabled(featuremgmt.FlagDatasourceQueryMultiStatus) {
+		statusWhenError = http.StatusMultiStatus
+	}
+
+	statusCode := http.StatusOK
+	for _, res := range qdr.Responses {
+		if res.Error != nil {
+			statusCode = statusWhenError
+		}
+	}
+
+	return response.JSONStreaming(statusCode, qdr)
+}
diff --git a/pkg/services/publicdashboards/api/api_test.go b/pkg/services/publicdashboards/api/api_test.go
new file mode 100644
index 00000000000..4eb0ea1ad4e
--- /dev/null
+++ b/pkg/services/publicdashboards/api/api_test.go
@@ -0,0 +1,589 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+	"strings"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/localcache"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	dashboardStore "github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	"github.com/grafana/grafana/pkg/services/datasources/service"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	publicdashboardsStore "github.com/grafana/grafana/pkg/services/publicdashboards/database"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	publicdashboardsService "github.com/grafana/grafana/pkg/services/publicdashboards/service"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web"
+)
+
+func TestAPIGetPublicDashboard(t *testing.T) {
+	t.Run("It should 404 if featureflag is not enabled", func(t *testing.T) {
+		cfg := setting.NewCfg()
+		qs := buildQueryDataService(t, nil, nil, nil)
+		service := publicdashboards.NewFakePublicDashboardService(t)
+		service.On("GetPublicDashboard", mock.Anything, mock.AnythingOfType("string")).
+			Return(&models.Dashboard{}, nil).Maybe()
+
+		testServer := setupTestServer(t, cfg, qs, featuremgmt.WithFeatures(), service, nil)
+
+		response := callAPI(testServer, http.MethodGet, "/api/public/dashboards", nil, t)
+		assert.Equal(t, http.StatusNotFound, response.Code)
+
+		response = callAPI(testServer, http.MethodGet, "/api/public/dashboards/asdf", nil, t)
+		assert.Equal(t, http.StatusNotFound, response.Code)
+
+		// control set. make sure routes are mounted
+		testServer = setupTestServer(t, cfg, qs, featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards), service, nil)
+		response = callAPI(testServer, http.MethodGet, "/api/public/dashboards/asdf", nil, t)
+		assert.NotEqual(t, http.StatusNotFound, response.Code)
+	})
+
+	DashboardUid := "dashboard-abcd1234"
+	token, err := uuid.NewRandom()
+	require.NoError(t, err)
+	accessToken := fmt.Sprintf("%x", token)
+
+	testCases := []struct {
+		Name                  string
+		AccessToken           string
+		ExpectedHttpResponse  int
+		PublicDashboardResult *models.Dashboard
+		PublicDashboardErr    error
+	}{
+		{
+			Name:                 "It gets a public dashboard",
+			AccessToken:          accessToken,
+			ExpectedHttpResponse: http.StatusOK,
+			PublicDashboardResult: &models.Dashboard{
+				Data: simplejson.NewFromAny(map[string]interface{}{
+					"Uid": DashboardUid,
+				}),
+			},
+			PublicDashboardErr: nil,
+		},
+		{
+			Name:                  "It should return 404 if no public dashboard",
+			AccessToken:           accessToken,
+			ExpectedHttpResponse:  http.StatusNotFound,
+			PublicDashboardResult: nil,
+			PublicDashboardErr:    ErrPublicDashboardNotFound,
+		},
+	}
+
+	for _, test := range testCases {
+		t.Run(test.Name, func(t *testing.T) {
+			service := publicdashboards.NewFakePublicDashboardService(t)
+			service.On("GetPublicDashboard", mock.Anything, mock.AnythingOfType("string")).
+				Return(test.PublicDashboardResult, test.PublicDashboardErr).Maybe()
+
+			testServer := setupTestServer(
+				t,
+				setting.NewCfg(),
+				buildQueryDataService(t, nil, nil, nil),
+				featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
+				service,
+				nil,
+			)
+
+			response := callAPI(testServer, http.MethodGet,
+				fmt.Sprintf("/api/public/dashboards/%s", test.AccessToken),
+				nil,
+				t,
+			)
+
+			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
+
+			if test.PublicDashboardErr == nil {
+				var dashResp dtos.DashboardFullWithMeta
+				err := json.Unmarshal(response.Body.Bytes(), &dashResp)
+				require.NoError(t, err)
+
+				assert.Equal(t, DashboardUid, dashResp.Dashboard.Get("Uid").MustString())
+				assert.Equal(t, false, dashResp.Meta.CanEdit)
+				assert.Equal(t, false, dashResp.Meta.CanDelete)
+				assert.Equal(t, false, dashResp.Meta.CanSave)
+			} else {
+				var errResp struct {
+					Error string `json:"error"`
+				}
+				err := json.Unmarshal(response.Body.Bytes(), &errResp)
+				require.NoError(t, err)
+				assert.Equal(t, test.PublicDashboardErr.Error(), errResp.Error)
+			}
+		})
+	}
+}
+
+func TestAPIGetPublicDashboardConfig(t *testing.T) {
+	pubdash := &PublicDashboard{IsEnabled: true}
+
+	testCases := []struct {
+		Name                  string
+		DashboardUid          string
+		ExpectedHttpResponse  int
+		PublicDashboardResult *PublicDashboard
+		PublicDashboardErr    error
+	}{
+		{
+			Name:                  "retrieves public dashboard config when dashboard is found",
+			DashboardUid:          "1",
+			ExpectedHttpResponse:  http.StatusOK,
+			PublicDashboardResult: pubdash,
+			PublicDashboardErr:    nil,
+		},
+		{
+			Name:                  "returns 404 when dashboard not found",
+			DashboardUid:          "77777",
+			ExpectedHttpResponse:  http.StatusNotFound,
+			PublicDashboardResult: nil,
+			PublicDashboardErr:    dashboards.ErrDashboardNotFound,
+		},
+		{
+			Name:                  "returns 500 when internal server error",
+			DashboardUid:          "1",
+			ExpectedHttpResponse:  http.StatusInternalServerError,
+			PublicDashboardResult: nil,
+			PublicDashboardErr:    errors.New("database broken"),
+		},
+	}
+
+	for _, test := range testCases {
+		t.Run(test.Name, func(t *testing.T) {
+			service := publicdashboards.NewFakePublicDashboardService(t)
+			service.On("GetPublicDashboardConfig", mock.Anything, mock.AnythingOfType("int64"), mock.AnythingOfType("string")).
+				Return(test.PublicDashboardResult, test.PublicDashboardErr)
+
+			testServer := setupTestServer(
+				t,
+				setting.NewCfg(),
+				buildQueryDataService(t, nil, nil, nil),
+				featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
+				service,
+				nil,
+			)
+
+			response := callAPI(
+				testServer,
+				http.MethodGet,
+				"/api/dashboards/uid/1/public-config",
+				nil,
+				t,
+			)
+
+			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
+
+			if response.Code == http.StatusOK {
+				var pdcResp PublicDashboard
+				err := json.Unmarshal(response.Body.Bytes(), &pdcResp)
+				require.NoError(t, err)
+				assert.Equal(t, test.PublicDashboardResult, &pdcResp)
+			}
+		})
+	}
+}
+
+func TestApiSavePublicDashboardConfig(t *testing.T) {
+	testCases := []struct {
+		Name                  string
+		DashboardUid          string
+		publicDashboardConfig *PublicDashboard
+		ExpectedHttpResponse  int
+		SaveDashboardErr      error
+	}{
+		{
+			Name:                  "returns 200 when update persists",
+			DashboardUid:          "1",
+			publicDashboardConfig: &PublicDashboard{IsEnabled: true},
+			ExpectedHttpResponse:  http.StatusOK,
+			SaveDashboardErr:      nil,
+		},
+		{
+			Name:                  "returns 500 when not persisted",
+			ExpectedHttpResponse:  http.StatusInternalServerError,
+			publicDashboardConfig: &PublicDashboard{},
+			SaveDashboardErr:      errors.New("backend failed to save"),
+		},
+		{
+			Name:                  "returns 404 when dashboard not found",
+			ExpectedHttpResponse:  http.StatusNotFound,
+			publicDashboardConfig: &PublicDashboard{},
+			SaveDashboardErr:      dashboards.ErrDashboardNotFound,
+		},
+	}
+
+	for _, test := range testCases {
+		t.Run(test.Name, func(t *testing.T) {
+			service := publicdashboards.NewFakePublicDashboardService(t)
+			service.On("SavePublicDashboardConfig", mock.Anything, mock.AnythingOfType("*models.SavePublicDashboardConfigDTO")).
+				Return(&PublicDashboard{IsEnabled: true}, test.SaveDashboardErr)
+
+			testServer := setupTestServer(
+				t,
+				setting.NewCfg(),
+				buildQueryDataService(t, nil, nil, nil),
+				featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
+				service,
+				nil,
+			)
+
+			response := callAPI(
+				testServer,
+				http.MethodPost,
+				"/api/dashboards/uid/1/public-config",
+				strings.NewReader(`{ "isPublic": true }`),
+				t,
+			)
+
+			assert.Equal(t, test.ExpectedHttpResponse, response.Code)
+
+			//check the result if it's a 200
+			if response.Code == http.StatusOK {
+				val, err := json.Marshal(test.publicDashboardConfig)
+				require.NoError(t, err)
+				assert.Equal(t, string(val), response.Body.String())
+			}
+		})
+	}
+}
+
+// `/public/dashboards/:uid/query`` endpoint test
+func TestAPIQueryPublicDashboard(t *testing.T) {
+	cacheService := &fakeDatasources.FakeCacheService{
+		DataSources: []*datasources.DataSource{
+			{Uid: "mysqlds"},
+			{Uid: "promds"},
+			{Uid: "promds2"},
+		},
+	}
+
+	// used to determine whether fakePluginClient returns an error
+	queryReturnsError := false
+
+	fakePluginClient := &fakePluginClient{
+		QueryDataHandlerFunc: func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+			if queryReturnsError {
+				return nil, errors.New("error")
+			}
+
+			resp := backend.Responses{}
+
+			for _, query := range req.Queries {
+				resp[query.RefID] = backend.DataResponse{
+					Frames: []*data.Frame{
+						{
+							RefID: query.RefID,
+							Name:  "query-" + query.RefID,
+						},
+					},
+				}
+			}
+			return &backend.QueryDataResponse{Responses: resp}, nil
+		},
+	}
+
+	qds := buildQueryDataService(t, cacheService, fakePluginClient, nil)
+
+	setup := func(enabled bool) (*web.Mux, *publicdashboards.FakePublicDashboardService) {
+		service := publicdashboards.NewFakePublicDashboardService(t)
+
+		testServer := setupTestServer(
+			t,
+			setting.NewCfg(),
+			qds,
+			featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards, enabled),
+			service,
+			nil,
+		)
+
+		return testServer, service
+	}
+
+	t.Run("Status code is 404 when feature toggle is disabled", func(t *testing.T) {
+		server, _ := setup(false)
+		resp := callAPI(server, http.MethodPost, "/api/public/dashboards/abc123/panels/2/query", strings.NewReader("{}"), t)
+		require.Equal(t, http.StatusNotFound, resp.Code)
+	})
+
+	t.Run("Status code is 400 when the panel ID is invalid", func(t *testing.T) {
+		server, _ := setup(true)
+		resp := callAPI(server, http.MethodPost, "/api/public/dashboards/abc123/panels/notanumber/query", strings.NewReader("{}"), t)
+		require.Equal(t, http.StatusBadRequest, resp.Code)
+	})
+
+	t.Run("Returns query data when feature toggle is enabled", func(t *testing.T) {
+		server, fakeDashboardService := setup(true)
+
+		fakeDashboardService.On("GetPublicDashboard", mock.Anything, mock.Anything).Return(&models.Dashboard{}, nil)
+		fakeDashboardService.On("GetPublicDashboardConfig", mock.Anything, mock.Anything, mock.Anything).Return(&PublicDashboard{}, nil)
+		fakeDashboardService.On("BuildAnonymousUser", mock.Anything, mock.Anything, mock.Anything).Return(&models.SignedInUser{}, nil)
+		fakeDashboardService.On("BuildPublicDashboardMetricRequest", mock.Anything, mock.Anything, mock.Anything, int64(2)).Return(dtos.MetricRequest{
+			Queries: []*simplejson.Json{
+				simplejson.MustJson([]byte(`
+        {
+          "datasource": {
+          "type": "prometheus",
+          "uid": "promds"
+          },
+          "exemplar": true,
+          "expr": "query_2_A",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      `)),
+			},
+		}, nil)
+
+		resp := callAPI(server, http.MethodPost, "/api/public/dashboards/abc123/panels/2/query", strings.NewReader("{}"), t)
+
+		require.JSONEq(
+			t,
+			`{
+      "results": {
+        "A": {
+          "frames": [
+            {
+              "data": {
+                "values": []
+              },
+              "schema": {
+                "fields": [],
+                "refId": "A",
+                "name": "query-A"
+              }
+            }
+          ]
+        }
+      }
+    }`,
+			resp.Body.String(),
+		)
+		require.Equal(t, http.StatusOK, resp.Code)
+	})
+
+	t.Run("Status code is 500 when the query fails", func(t *testing.T) {
+		server, fakeDashboardService := setup(true)
+
+		fakeDashboardService.On("GetPublicDashboard", mock.Anything, mock.Anything).Return(&models.Dashboard{}, nil)
+		fakeDashboardService.On("GetPublicDashboardConfig", mock.Anything, mock.Anything, mock.Anything).Return(&PublicDashboard{}, nil)
+		fakeDashboardService.On("BuildAnonymousUser", mock.Anything, mock.Anything, mock.Anything).Return(&models.SignedInUser{}, nil)
+		fakeDashboardService.On("BuildPublicDashboardMetricRequest", mock.Anything, mock.Anything, mock.Anything, int64(2)).Return(dtos.MetricRequest{
+			Queries: []*simplejson.Json{
+				simplejson.MustJson([]byte(`
+	        {
+	          "datasource": {
+	          "type": "prometheus",
+	          "uid": "promds"
+	          },
+	          "exemplar": true,
+	          "expr": "query_2_A",
+	          "interval": "",
+	          "legendFormat": "",
+	          "refId": "A"
+	        }
+	      `)),
+			},
+		}, nil)
+
+		queryReturnsError = true
+		resp := callAPI(server, http.MethodPost, "/api/public/dashboards/abc123/panels/2/query", strings.NewReader("{}"), t)
+		require.Equal(t, http.StatusInternalServerError, resp.Code)
+		queryReturnsError = false
+	})
+
+	t.Run("Status code is 200 when a panel has queries from multiple datasources", func(t *testing.T) {
+		server, fakeDashboardService := setup(true)
+
+		fakeDashboardService.On("GetPublicDashboard", mock.Anything, mock.Anything).Return(&models.Dashboard{}, nil)
+		fakeDashboardService.On("GetPublicDashboardConfig", mock.Anything, mock.Anything, mock.Anything).Return(&PublicDashboard{}, nil)
+		fakeDashboardService.On("BuildAnonymousUser", mock.Anything, mock.Anything, mock.Anything).Return(&models.SignedInUser{}, nil)
+		fakeDashboardService.On("BuildPublicDashboardMetricRequest", mock.Anything, mock.Anything, mock.Anything, int64(2)).Return(dtos.MetricRequest{
+			Queries: []*simplejson.Json{
+				simplejson.MustJson([]byte(`
+{
+						"datasource": {
+						"type": "prometheus",
+						"uid": "promds"
+						},
+						"exemplar": true,
+						"expr": "query_2_A",
+						"interval": "",
+						"legendFormat": "",
+						"refId": "A"
+					}
+				`)),
+				simplejson.MustJson([]byte(`
+{
+						"datasource": {
+						"type": "prometheus",
+						"uid": "promds2"
+						},
+						"exemplar": true,
+						"expr": "query_2_B",
+						"interval": "",
+						"legendFormat": "",
+						"refId": "B"
+					}
+				`)),
+			},
+		}, nil)
+
+		resp := callAPI(server, http.MethodPost, "/api/public/dashboards/abc123/panels/2/query", strings.NewReader("{}"), t)
+		require.JSONEq(
+			t,
+			`{
+				"results": {
+					"A": {
+						"frames": [
+							{
+								"data": {
+									"values": []
+								},
+								"schema": {
+									"fields": [],
+									"refId": "A",
+									"name": "query-A"
+								}
+							}
+						]
+					},
+					"B": {
+						"frames": [
+							{
+								"data": {
+									"values": []
+								},
+								"schema": {
+									"fields": [],
+									"refId": "B",
+									"name": "query-B"
+								}
+							}
+						]
+					}
+				}
+			}`,
+			resp.Body.String(),
+		)
+		require.Equal(t, http.StatusOK, resp.Code)
+	})
+}
+
+func TestIntegrationUnauthenticatedUserCanGetPubdashPanelQueryData(t *testing.T) {
+	db := sqlstore.InitTestDB(t)
+
+	cacheService := service.ProvideCacheService(localcache.ProvideService(), db)
+	qds := buildQueryDataService(t, cacheService, nil, db)
+
+	_ = db.AddDataSource(context.Background(), &datasources.AddDataSourceCommand{
+		Uid:      "ds1",
+		OrgId:    1,
+		Name:     "laban",
+		Type:     datasources.DS_MYSQL,
+		Access:   datasources.DS_ACCESS_DIRECT,
+		Url:      "http://test",
+		Database: "site",
+		ReadOnly: true,
+	})
+
+	// Create Dashboard
+	saveDashboardCmd := models.SaveDashboardCommand{
+		OrgId:    1,
+		FolderId: 1,
+		IsFolder: false,
+		Dashboard: simplejson.NewFromAny(map[string]interface{}{
+			"id":    nil,
+			"title": "test",
+			"panels": []map[string]interface{}{
+				{
+					"id": 1,
+					"targets": []map[string]interface{}{
+						{
+							"datasource": map[string]string{
+								"type": "mysql",
+								"uid":  "ds1",
+							},
+							"refId": "A",
+						},
+					},
+				},
+			},
+		}),
+	}
+
+	// create dashboard
+	dashboardStore := dashboardStore.ProvideDashboardStore(db)
+	dashboard, err := dashboardStore.SaveDashboard(saveDashboardCmd)
+	require.NoError(t, err)
+
+	// Create public dashboard
+	savePubDashboardCmd := &SavePublicDashboardConfigDTO{
+		DashboardUid: dashboard.Uid,
+		OrgId:        dashboard.OrgId,
+		PublicDashboard: &PublicDashboard{
+			IsEnabled: true,
+		},
+	}
+
+	// create public dashboard
+	store := publicdashboardsStore.ProvideStore(db)
+	service := publicdashboardsService.ProvideService(setting.NewCfg(), store)
+	pubdash, err := service.SavePublicDashboardConfig(context.Background(), savePubDashboardCmd)
+	require.NoError(t, err)
+
+	// setup test server
+	server := setupTestServer(t,
+		setting.NewCfg(),
+		qds,
+		featuremgmt.WithFeatures(featuremgmt.FlagPublicDashboards),
+		service,
+		db,
+	)
+
+	resp := callAPI(server, http.MethodPost,
+		fmt.Sprintf("/api/public/dashboards/%s/panels/1/query", pubdash.AccessToken),
+		strings.NewReader(`{}`),
+		t,
+	)
+	require.Equal(t, http.StatusOK, resp.Code)
+	require.NoError(t, err)
+	require.JSONEq(
+		t,
+		`{
+        "results": {
+          "A": {
+            "frames": [
+              {
+                "data": {
+                  "values": []
+                },
+                "schema": {
+                  "fields": []
+                }
+              }
+            ]
+          }
+        }
+      }`,
+		resp.Body.String(),
+	)
+}
diff --git a/pkg/services/publicdashboards/api/common_test.go b/pkg/services/publicdashboards/api/common_test.go
new file mode 100644
index 00000000000..d500c8d6e90
--- /dev/null
+++ b/pkg/services/publicdashboards/api/common_test.go
@@ -0,0 +1,174 @@
+package api
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"golang.org/x/oauth2"
+
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/grafana/grafana/pkg/api/routing"
+	"github.com/grafana/grafana/pkg/infra/localcache"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/plugins"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/database"
+	"github.com/grafana/grafana/pkg/services/accesscontrol/ossaccesscontrol"
+	"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+
+	fakeDatasources "github.com/grafana/grafana/pkg/services/datasources/fakes"
+	datasourceService "github.com/grafana/grafana/pkg/services/datasources/service"
+	"github.com/grafana/grafana/pkg/services/query"
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/web"
+	"github.com/stretchr/testify/require"
+)
+
+type Server struct {
+	Mux           *web.Mux
+	RouteRegister routing.RouteRegister
+	TestServer    *httptest.Server
+}
+
+func setupTestServer(
+	t *testing.T,
+	cfg *setting.Cfg,
+	qs *query.Service,
+	features *featuremgmt.FeatureManager,
+	service publicdashboards.Service,
+	db *sqlstore.SQLStore,
+) *web.Mux {
+	// build router to register routes
+	rr := routing.NewRouteRegister()
+
+	// build access control - FIXME we should be able to mock this, but to get
+	// tests going, we're going to instantiate full accesscontrol
+	//ac := accesscontrolmock.New()
+	//ac.WithDisabled()
+
+	// create a sqlstore for access control.
+	if db == nil {
+		db = sqlstore.InitTestDB(t)
+	}
+
+	var err error
+	ac, err := ossaccesscontrol.ProvideService(features, cfg, database.ProvideService(db), rr)
+	require.NoError(t, err)
+
+	// build mux
+	m := web.New()
+
+	// set initial context
+	m.Use(func(c *web.Context) {
+		ctx := &models.ReqContext{
+			Context:    c,
+			IsSignedIn: true, // FIXME need to be able to change this for tests
+			SkipCache:  true, // hardcoded to make sure query service doesnt hit the cache
+			Logger:     log.New("publicdashboards-test"),
+
+			// Set signed in user. We might not actually need to do this.
+			SignedInUser: &models.SignedInUser{UserId: 1, OrgId: 1, OrgRole: models.ROLE_ADMIN, Login: "testUser"},
+		}
+		c.Req = c.Req.WithContext(ctxkey.Set(c.Req.Context(), ctx))
+	})
+
+	// build api, this will mount the routes at the same time if
+	// featuremgmt.FlagPublicDashboard is enabled
+	ProvideApi(service, rr, ac, qs, features)
+
+	// connect routes to mux
+	rr.Register(m.Router)
+
+	return m
+}
+
+func callAPI(server *web.Mux, method, path string, body io.Reader, t *testing.T) *httptest.ResponseRecorder {
+	req, err := http.NewRequest(method, path, body)
+	require.NoError(t, err)
+	req.Header.Set("Content-Type", "application/json")
+	recorder := httptest.NewRecorder()
+	server.ServeHTTP(recorder, req)
+	return recorder
+}
+
+// helper to query.Service
+// allows us to stub the cache and plugin clients
+func buildQueryDataService(t *testing.T, cs datasources.CacheService, fpc *fakePluginClient, store *sqlstore.SQLStore) *query.Service {
+	//	build database if we need one
+	if store == nil {
+		store = sqlstore.InitTestDB(t)
+	}
+
+	// default cache service
+	if cs == nil {
+		cs = datasourceService.ProvideCacheService(localcache.ProvideService(), store)
+	}
+
+	// default fakePluginClient
+	if fpc == nil {
+		fpc = &fakePluginClient{
+			QueryDataHandlerFunc: func(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+				resp := backend.Responses{
+					"A": backend.DataResponse{
+						Frames: []*data.Frame{{}},
+					},
+				}
+				return &backend.QueryDataResponse{Responses: resp}, nil
+			},
+		}
+	}
+
+	return query.ProvideService(
+		nil,
+		cs,
+		nil,
+		&fakePluginRequestValidator{},
+		&fakeDatasources.FakeDataSourceService{},
+		fpc,
+		&fakeOAuthTokenService{},
+	)
+}
+
+//copied from pkg/api/metrics_test.go
+type fakePluginRequestValidator struct {
+	err error
+}
+
+func (rv *fakePluginRequestValidator) Validate(dsURL string, req *http.Request) error {
+	return rv.err
+}
+
+type fakeOAuthTokenService struct {
+	passThruEnabled bool
+	token           *oauth2.Token
+}
+
+func (ts *fakeOAuthTokenService) GetCurrentOAuthToken(context.Context, *models.SignedInUser) *oauth2.Token {
+	return ts.token
+}
+
+func (ts *fakeOAuthTokenService) IsOAuthPassThruEnabled(*datasources.DataSource) bool {
+	return ts.passThruEnabled
+}
+
+// copied from pkg/api/plugins_test.go
+type fakePluginClient struct {
+	plugins.Client
+	backend.QueryDataHandlerFunc
+}
+
+func (c *fakePluginClient) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
+	if c.QueryDataHandlerFunc != nil {
+		return c.QueryDataHandlerFunc.QueryData(ctx, req)
+	}
+
+	return backend.NewQueryDataResponse(), nil
+}
diff --git a/pkg/middleware/dashboard_public.go b/pkg/services/publicdashboards/api/middleware.go
similarity index 65%
rename from pkg/middleware/dashboard_public.go
rename to pkg/services/publicdashboards/api/middleware.go
index 3c89e8ac566..f7ba59d587a 100644
--- a/pkg/middleware/dashboard_public.go
+++ b/pkg/services/publicdashboards/api/middleware.go
@@ -1,8 +1,6 @@
-package middleware
+package api
 
-import (
-	"github.com/grafana/grafana/pkg/models"
-)
+import "github.com/grafana/grafana/pkg/models"
 
 func SetPublicDashboardFlag() func(c *models.ReqContext) {
 	return func(c *models.ReqContext) {
diff --git a/pkg/services/publicdashboards/database/database.go b/pkg/services/publicdashboards/database/database.go
new file mode 100644
index 00000000000..d89687c1526
--- /dev/null
+++ b/pkg/services/publicdashboards/database/database.go
@@ -0,0 +1,173 @@
+package database
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+// Define the storage implementation. We're generating the mock implementation
+// automatically
+type PublicDashboardStoreImpl struct {
+	sqlStore *sqlstore.SQLStore
+	log      log.Logger
+	dialect  migrator.Dialect
+}
+
+// Gives us a compile time error if our database does not adhere to contract of
+// the interface
+var _ publicdashboards.Store = (*PublicDashboardStoreImpl)(nil)
+
+// Factory used by wire to dependency injection
+func ProvideStore(sqlStore *sqlstore.SQLStore) *PublicDashboardStoreImpl {
+	return &PublicDashboardStoreImpl{
+		sqlStore: sqlStore,
+		log:      log.New("publicdashboards.store"),
+		dialect:  sqlStore.Dialect,
+	}
+}
+
+// Retrieves public dashboard configuration
+func (d *PublicDashboardStoreImpl) GetPublicDashboard(ctx context.Context, accessToken string) (*PublicDashboard, *models.Dashboard, error) {
+	if accessToken == "" {
+		return nil, nil, ErrPublicDashboardIdentifierNotSet
+	}
+
+	// get public dashboard
+	pdRes := &PublicDashboard{AccessToken: accessToken}
+	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		has, err := sess.Get(pdRes)
+		if err != nil {
+			return err
+		}
+		if !has {
+			return ErrPublicDashboardNotFound
+		}
+		return nil
+	})
+
+	if err != nil {
+		return nil, nil, err
+	}
+
+	// find dashboard
+	dashRes := &models.Dashboard{OrgId: pdRes.OrgId, Uid: pdRes.DashboardUid}
+	err = d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		has, err := sess.Get(dashRes)
+		if err != nil {
+			return err
+		}
+		if !has {
+			return ErrPublicDashboardNotFound
+		}
+		return nil
+	})
+
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return pdRes, dashRes, err
+}
+
+// Generates a new unique uid to retrieve a public dashboard
+func (d *PublicDashboardStoreImpl) GenerateNewPublicDashboardUid(ctx context.Context) (string, error) {
+	var uid string
+
+	err := d.sqlStore.WithDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		for i := 0; i < 3; i++ {
+			uid = util.GenerateShortUID()
+
+			exists, err := sess.Get(&PublicDashboard{Uid: uid})
+			if err != nil {
+				return err
+			}
+
+			if !exists {
+				return nil
+			}
+		}
+
+		return ErrPublicDashboardFailedGenerateUniqueUid
+	})
+
+	if err != nil {
+		return "", err
+	}
+
+	return uid, nil
+}
+
+// Retrieves public dashboard configuration
+func (d *PublicDashboardStoreImpl) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*PublicDashboard, error) {
+	if dashboardUid == "" {
+		return nil, dashboards.ErrDashboardIdentifierNotSet
+	}
+
+	pdRes := &PublicDashboard{OrgId: orgId, DashboardUid: dashboardUid}
+	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		// publicDashboard
+		_, err := sess.Get(pdRes)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return pdRes, err
+}
+
+// Persists public dashboard configuration
+func (d *PublicDashboardStoreImpl) SavePublicDashboardConfig(ctx context.Context, cmd SavePublicDashboardConfigCommand) (*PublicDashboard, error) {
+	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		_, err := sess.UseBool("is_enabled").Insert(&cmd.PublicDashboard)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &cmd.PublicDashboard, nil
+}
+
+// updates existing public dashboard configuration
+func (d *PublicDashboardStoreImpl) UpdatePublicDashboardConfig(ctx context.Context, cmd SavePublicDashboardConfigCommand) error {
+	err := d.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
+		timeSettingsJSON, err := cmd.PublicDashboard.TimeSettings.MarshalJSON()
+		if err != nil {
+			return err
+		}
+
+		_, err = sess.Exec("UPDATE dashboard_public SET is_enabled = ?, time_settings = ?, updated_by = ?, updated_at = ? WHERE uid = ?",
+			cmd.PublicDashboard.IsEnabled,
+			string(timeSettingsJSON),
+			cmd.PublicDashboard.UpdatedBy,
+			cmd.PublicDashboard.UpdatedAt.UTC().Format("2006-01-02 15:04:05"),
+			cmd.PublicDashboard.Uid)
+
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	return err
+}
diff --git a/pkg/services/dashboards/database/database_dashboard_public_test.go b/pkg/services/publicdashboards/database/database_test.go
similarity index 61%
rename from pkg/services/dashboards/database/database_dashboard_public_test.go
rename to pkg/services/publicdashboards/database/database_test.go
index 268781cef1d..ec335f13714 100644
--- a/pkg/services/dashboards/database/database_dashboard_public_test.go
+++ b/pkg/services/publicdashboards/database/database_test.go
@@ -5,13 +5,17 @@ import (
 	"testing"
 	"time"
 
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
-	"github.com/grafana/grafana/pkg/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/models"
+	dashboards "github.com/grafana/grafana/pkg/services/dashboards"
+	dashboardsDB "github.com/grafana/grafana/pkg/services/dashboards/database"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/util"
 )
 
 // This is what the db sets empty time settings to
@@ -23,19 +27,21 @@ var DefaultTime = time.Now().UTC().Round(time.Second)
 // GetPublicDashboard
 func TestIntegrationGetPublicDashboard(t *testing.T) {
 	var sqlStore *sqlstore.SQLStore
-	var dashboardStore *DashboardStore
+	var dashboardStore *dashboardsDB.DashboardStore
+	var publicdashboardStore *PublicDashboardStoreImpl
 	var savedDashboard *models.Dashboard
 
 	setup := func() {
 		sqlStore = sqlstore.InitTestDB(t)
-		dashboardStore = ProvideDashboardStore(sqlStore)
+		dashboardStore = dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore = ProvideStore(sqlStore)
 		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 	}
 
 	t.Run("returns PublicDashboard and Dashboard", func(t *testing.T) {
 		setup()
-		pubdash, err := dashboardStore.SavePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
-			PublicDashboard: models.PublicDashboard{
+		pubdash, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
+			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "abc1234",
 				DashboardUid: savedDashboard.Uid,
@@ -48,7 +54,7 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		pd, d, err := dashboardStore.GetPublicDashboard(context.Background(), "NOTAREALUUID")
+		pd, d, err := publicdashboardStore.GetPublicDashboard(context.Background(), "NOTAREALUUID")
 		require.NoError(t, err)
 
 		assert.Equal(t, pd, pubdash)
@@ -57,22 +63,22 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 
 	t.Run("returns ErrPublicDashboardNotFound with empty uid", func(t *testing.T) {
 		setup()
-		_, _, err := dashboardStore.GetPublicDashboard(context.Background(), "")
-		require.Error(t, models.ErrPublicDashboardIdentifierNotSet, err)
+		_, _, err := publicdashboardStore.GetPublicDashboard(context.Background(), "")
+		require.Error(t, ErrPublicDashboardIdentifierNotSet, err)
 	})
 
 	t.Run("returns ErrPublicDashboardNotFound when PublicDashboard not found", func(t *testing.T) {
 		setup()
-		_, _, err := dashboardStore.GetPublicDashboard(context.Background(), "zzzzzz")
-		require.Error(t, models.ErrPublicDashboardNotFound, err)
+		_, _, err := publicdashboardStore.GetPublicDashboard(context.Background(), "zzzzzz")
+		require.Error(t, ErrPublicDashboardNotFound, err)
 	})
 
 	t.Run("returns ErrDashboardNotFound when Dashboard not found", func(t *testing.T) {
 		setup()
-		_, err := dashboardStore.SavePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
+		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
 			DashboardUid: savedDashboard.Uid,
 			OrgId:        savedDashboard.OrgId,
-			PublicDashboard: models.PublicDashboard{
+			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "abc1234",
 				DashboardUid: "nevergonnafindme",
@@ -82,43 +88,45 @@ func TestIntegrationGetPublicDashboard(t *testing.T) {
 			},
 		})
 		require.NoError(t, err)
-		_, _, err = dashboardStore.GetPublicDashboard(context.Background(), "abc1234")
-		require.Error(t, models.ErrDashboardNotFound, err)
+		_, _, err = publicdashboardStore.GetPublicDashboard(context.Background(), "abc1234")
+		require.Error(t, dashboards.ErrDashboardNotFound, err)
 	})
 }
 
 // GetPublicDashboardConfig
 func TestIntegrationGetPublicDashboardConfig(t *testing.T) {
 	var sqlStore *sqlstore.SQLStore
-	var dashboardStore *DashboardStore
+	var dashboardStore *dashboardsDB.DashboardStore
+	var publicdashboardStore *PublicDashboardStoreImpl
 	var savedDashboard *models.Dashboard
 
 	setup := func() {
 		sqlStore = sqlstore.InitTestDB(t)
-		dashboardStore = ProvideDashboardStore(sqlStore)
+		dashboardStore = dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore = ProvideStore(sqlStore)
 		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 	}
 
 	t.Run("returns isPublic and set dashboardUid and orgId", func(t *testing.T) {
 		setup()
-		pubdash, err := dashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
+		pubdash, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
 		require.NoError(t, err)
-		assert.Equal(t, &models.PublicDashboard{IsEnabled: false, DashboardUid: savedDashboard.Uid, OrgId: savedDashboard.OrgId}, pubdash)
+		assert.Equal(t, &PublicDashboard{IsEnabled: false, DashboardUid: savedDashboard.Uid, OrgId: savedDashboard.OrgId}, pubdash)
 	})
 
 	t.Run("returns dashboard errDashboardIdentifierNotSet", func(t *testing.T) {
 		setup()
-		_, err := dashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, "")
-		require.Error(t, models.ErrDashboardIdentifierNotSet, err)
+		_, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, "")
+		require.Error(t, dashboards.ErrDashboardIdentifierNotSet, err)
 	})
 
 	t.Run("returns isPublic along with public dashboard when exists", func(t *testing.T) {
 		setup()
 		// insert test public dashboard
-		resp, err := dashboardStore.SavePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
+		resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
 			DashboardUid: savedDashboard.Uid,
 			OrgId:        savedDashboard.OrgId,
-			PublicDashboard: models.PublicDashboard{
+			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "pubdash-uid",
 				DashboardUid: savedDashboard.Uid,
@@ -130,7 +138,7 @@ func TestIntegrationGetPublicDashboardConfig(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		pubdash, err := dashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
+		pubdash, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
 		require.NoError(t, err)
 
 		assert.True(t, assert.ObjectsAreEqualValues(resp, pubdash))
@@ -141,23 +149,25 @@ func TestIntegrationGetPublicDashboardConfig(t *testing.T) {
 // SavePublicDashboardConfig
 func TestIntegrationSavePublicDashboardConfig(t *testing.T) {
 	var sqlStore *sqlstore.SQLStore
-	var dashboardStore *DashboardStore
+	var dashboardStore *dashboardsDB.DashboardStore
+	var publicdashboardStore *PublicDashboardStoreImpl
 	var savedDashboard *models.Dashboard
 	var savedDashboard2 *models.Dashboard
 
 	setup := func() {
 		sqlStore = sqlstore.InitTestDB(t, sqlstore.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
-		dashboardStore = ProvideDashboardStore(sqlStore)
+		dashboardStore = dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore = ProvideStore(sqlStore)
 		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 		savedDashboard2 = insertTestDashboard(t, dashboardStore, "testDashie2", 1, 0, true)
 	}
 
 	t.Run("saves new public dashboard", func(t *testing.T) {
 		setup()
-		resp, err := dashboardStore.SavePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
+		resp, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
 			DashboardUid: savedDashboard.Uid,
 			OrgId:        savedDashboard.OrgId,
-			PublicDashboard: models.PublicDashboard{
+			PublicDashboard: PublicDashboard{
 				IsEnabled:    true,
 				Uid:          "pubdash-uid",
 				DashboardUid: savedDashboard.Uid,
@@ -170,7 +180,7 @@ func TestIntegrationSavePublicDashboardConfig(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		pubdash, err := dashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
+		pubdash, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
 		require.NoError(t, err)
 
 		//verify saved response and queried response are the same
@@ -180,7 +190,7 @@ func TestIntegrationSavePublicDashboardConfig(t *testing.T) {
 		assert.True(t, util.IsValidShortUID(pubdash.Uid))
 
 		// verify we didn't update all dashboards
-		pubdash2, err := dashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard2.OrgId, savedDashboard2.Uid)
+		pubdash2, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard2.OrgId, savedDashboard2.Uid)
 		require.NoError(t, err)
 		assert.False(t, pubdash2.IsEnabled)
 	})
@@ -188,13 +198,15 @@ func TestIntegrationSavePublicDashboardConfig(t *testing.T) {
 
 func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 	var sqlStore *sqlstore.SQLStore
-	var dashboardStore *DashboardStore
+	var dashboardStore *dashboardsDB.DashboardStore
+	var publicdashboardStore *PublicDashboardStoreImpl
 	var savedDashboard *models.Dashboard
 	var anotherSavedDashboard *models.Dashboard
 
 	setup := func() {
 		sqlStore = sqlstore.InitTestDB(t, sqlstore.InitTestDBOpt{FeatureFlags: []string{featuremgmt.FlagPublicDashboards}})
-		dashboardStore = ProvideDashboardStore(sqlStore)
+		dashboardStore = dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore = ProvideStore(sqlStore)
 		savedDashboard = insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 		anotherSavedDashboard = insertTestDashboard(t, dashboardStore, "test another Dashie", 1, 0, true)
 	}
@@ -202,28 +214,11 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 	t.Run("updates an existing dashboard", func(t *testing.T) {
 		setup()
 
-		// inserting two different public dashboards to test update works and only affect the desired pd by uid
-		anotherPdUid := "anotherUid"
-		_, err := dashboardStore.SavePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
-			DashboardUid: anotherSavedDashboard.Uid,
-			OrgId:        anotherSavedDashboard.OrgId,
-			PublicDashboard: models.PublicDashboard{
-				Uid:          anotherPdUid,
-				DashboardUid: anotherSavedDashboard.Uid,
-				OrgId:        anotherSavedDashboard.OrgId,
-				IsEnabled:    true,
-				CreatedAt:    DefaultTime,
-				CreatedBy:    7,
-				AccessToken:  "fakeaccesstoken",
-			},
-		})
-		require.NoError(t, err)
-
 		pdUid := "asdf1234"
-		_, err = dashboardStore.SavePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
+		_, err := publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
 			DashboardUid: savedDashboard.Uid,
 			OrgId:        savedDashboard.OrgId,
-			PublicDashboard: models.PublicDashboard{
+			PublicDashboard: PublicDashboard{
 				Uid:          pdUid,
 				DashboardUid: savedDashboard.Uid,
 				OrgId:        savedDashboard.OrgId,
@@ -235,7 +230,24 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		updatedPublicDashboard := models.PublicDashboard{
+		// inserting two different public dashboards to test update works and only affect the desired pd by uid
+		anotherPdUid := "anotherUid"
+		_, err = publicdashboardStore.SavePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
+			DashboardUid: anotherSavedDashboard.Uid,
+			OrgId:        anotherSavedDashboard.OrgId,
+			PublicDashboard: PublicDashboard{
+				Uid:          anotherPdUid,
+				DashboardUid: anotherSavedDashboard.Uid,
+				OrgId:        anotherSavedDashboard.OrgId,
+				IsEnabled:    true,
+				CreatedAt:    DefaultTime,
+				CreatedBy:    7,
+				AccessToken:  "fakeaccesstoken",
+			},
+		})
+		require.NoError(t, err)
+
+		updatedPublicDashboard := PublicDashboard{
 			Uid:          pdUid,
 			DashboardUid: savedDashboard.Uid,
 			OrgId:        savedDashboard.OrgId,
@@ -245,7 +257,7 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 			UpdatedBy:    8,
 		}
 		// update initial record
-		err = dashboardStore.UpdatePublicDashboardConfig(context.Background(), models.SavePublicDashboardConfigCommand{
+		err = publicdashboardStore.UpdatePublicDashboardConfig(context.Background(), SavePublicDashboardConfigCommand{
 			DashboardUid:    savedDashboard.Uid,
 			OrgId:           savedDashboard.OrgId,
 			PublicDashboard: updatedPublicDashboard,
@@ -253,7 +265,7 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 		require.NoError(t, err)
 
 		// updated dashboard should have changed
-		pdRetrieved, err := dashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
+		pdRetrieved, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), savedDashboard.OrgId, savedDashboard.Uid)
 		require.NoError(t, err)
 
 		assert.Equal(t, updatedPublicDashboard.UpdatedAt, pdRetrieved.UpdatedAt)
@@ -262,10 +274,30 @@ func TestIntegrationUpdatePublicDashboard(t *testing.T) {
 		assert.Equal(t, updatedPublicDashboard.IsEnabled, pdRetrieved.IsEnabled)
 
 		// not updated dashboard shouldn't have changed
-		pdNotUpdatedRetrieved, err := dashboardStore.GetPublicDashboardConfig(context.Background(), anotherSavedDashboard.OrgId, anotherSavedDashboard.Uid)
+		pdNotUpdatedRetrieved, err := publicdashboardStore.GetPublicDashboardConfig(context.Background(), anotherSavedDashboard.OrgId, anotherSavedDashboard.Uid)
 		require.NoError(t, err)
 
 		assert.NotEqual(t, updatedPublicDashboard.UpdatedAt, pdNotUpdatedRetrieved.UpdatedAt)
 		assert.NotEqual(t, updatedPublicDashboard.IsEnabled, pdNotUpdatedRetrieved.IsEnabled)
 	})
 }
+func insertTestDashboard(t *testing.T, dashboardStore *dashboardsDB.DashboardStore, title string, orgId int64,
+	folderId int64, isFolder bool, tags ...interface{}) *models.Dashboard {
+	t.Helper()
+	cmd := models.SaveDashboardCommand{
+		OrgId:    orgId,
+		FolderId: folderId,
+		IsFolder: isFolder,
+		Dashboard: simplejson.NewFromAny(map[string]interface{}{
+			"id":    nil,
+			"title": title,
+			"tags":  tags,
+		}),
+	}
+	dash, err := dashboardStore.SaveDashboard(cmd)
+	require.NoError(t, err)
+	require.NotNil(t, dash)
+	dash.Data.Set("id", dash.Id)
+	dash.Data.Set("uid", dash.Uid)
+	return dash
+}
diff --git a/pkg/models/dashboards_public.go b/pkg/services/publicdashboards/models/models.go
similarity index 69%
rename from pkg/models/dashboards_public.go
rename to pkg/services/publicdashboards/models/models.go
index 4835b1eabad..31983d53088 100644
--- a/pkg/models/dashboards_public.go
+++ b/pkg/services/publicdashboards/models/models.go
@@ -4,28 +4,44 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/models"
 )
 
+// PublicDashboardErr represents a dashboard error.
+type PublicDashboardErr struct {
+	StatusCode int
+	Status     string
+	Reason     string
+}
+
+// Error returns the error message.
+func (e PublicDashboardErr) Error() string {
+	if e.Reason != "" {
+		return e.Reason
+	}
+	return "Dashboard Error"
+}
+
 var (
-	ErrPublicDashboardFailedGenerateUniqueUid = DashboardErr{
+	ErrPublicDashboardFailedGenerateUniqueUid = PublicDashboardErr{
 		Reason:     "Failed to generate unique public dashboard id",
 		StatusCode: 500,
 	}
-	ErrPublicDashboardFailedGenerateAccesstoken = DashboardErr{
+	ErrPublicDashboardFailedGenerateAccesstoken = PublicDashboardErr{
 		Reason:     "Failed to public dashboard access token",
 		StatusCode: 500,
 	}
-	ErrPublicDashboardNotFound = DashboardErr{
+	ErrPublicDashboardNotFound = PublicDashboardErr{
 		Reason:     "Public dashboard not found",
 		StatusCode: 404,
 		Status:     "not-found",
 	}
-	ErrPublicDashboardPanelNotFound = DashboardErr{
+	ErrPublicDashboardPanelNotFound = PublicDashboardErr{
 		Reason:     "Panel not found in dashboard",
 		StatusCode: 404,
 		Status:     "not-found",
 	}
-	ErrPublicDashboardIdentifierNotSet = DashboardErr{
+	ErrPublicDashboardIdentifierNotSet = PublicDashboardErr{
 		Reason:     "No Uid for public dashboard specified",
 		StatusCode: 400,
 	}
@@ -57,7 +73,7 @@ type TimeSettings struct {
 
 // build time settings object from json on public dashboard. If empty, use
 // defaults on the dashboard
-func (pd PublicDashboard) BuildTimeSettings(dashboard *Dashboard) *TimeSettings {
+func (pd PublicDashboard) BuildTimeSettings(dashboard *models.Dashboard) *TimeSettings {
 	ts := &TimeSettings{
 		From: dashboard.Data.GetPath("time", "from").MustString(),
 		To:   dashboard.Data.GetPath("time", "to").MustString(),
@@ -78,6 +94,16 @@ func (pd PublicDashboard) BuildTimeSettings(dashboard *Dashboard) *TimeSettings
 	return ts
 }
 
+//
+// DTO for transforming user input in the api
+//
+type SavePublicDashboardConfigDTO struct {
+	DashboardUid    string
+	OrgId           int64
+	UserId          int64
+	PublicDashboard *PublicDashboard
+}
+
 //
 // COMMANDS
 //
diff --git a/pkg/models/dashboards_public_test.go b/pkg/services/publicdashboards/models/models_test.go
similarity index 84%
rename from pkg/models/dashboards_public_test.go
rename to pkg/services/publicdashboards/models/models_test.go
index f9b18b0b1cd..b5278c247d8 100644
--- a/pkg/models/dashboards_public_test.go
+++ b/pkg/services/publicdashboards/models/models_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/models"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -15,13 +16,13 @@ func TestBuildTimeSettings(t *testing.T) {
 	var dashboardData = simplejson.NewFromAny(map[string]interface{}{"time": map[string]interface{}{"from": "now-8", "to": "now"}})
 	testCases := []struct {
 		name       string
-		dashboard  *Dashboard
+		dashboard  *models.Dashboard
 		pubdash    *PublicDashboard
 		timeResult *TimeSettings
 	}{
 		{
 			name:      "should use dashboard time if pubdash time empty",
-			dashboard: &Dashboard{Data: dashboardData},
+			dashboard: &models.Dashboard{Data: dashboardData},
 			pubdash:   &PublicDashboard{},
 			timeResult: &TimeSettings{
 				From: "now-8",
@@ -30,7 +31,7 @@ func TestBuildTimeSettings(t *testing.T) {
 		},
 		{
 			name:      "should use dashboard time if pubdash to/from empty",
-			dashboard: &Dashboard{Data: dashboardData},
+			dashboard: &models.Dashboard{Data: dashboardData},
 			pubdash:   &PublicDashboard{},
 			timeResult: &TimeSettings{
 				From: "now-8",
@@ -39,7 +40,7 @@ func TestBuildTimeSettings(t *testing.T) {
 		},
 		{
 			name:      "should use pubdash time",
-			dashboard: &Dashboard{Data: dashboardData},
+			dashboard: &models.Dashboard{Data: dashboardData},
 			pubdash:   &PublicDashboard{TimeSettings: simplejson.NewFromAny(map[string]interface{}{"from": "now-12", "to": "now"})},
 			timeResult: &TimeSettings{
 				From: "now-12",
diff --git a/pkg/services/publicdashboards/public_dashboard_service_mock.go b/pkg/services/publicdashboards/public_dashboard_service_mock.go
new file mode 100644
index 00000000000..1eb14f6c5ce
--- /dev/null
+++ b/pkg/services/publicdashboards/public_dashboard_service_mock.go
@@ -0,0 +1,144 @@
+// Code generated by mockery v2.12.2. DO NOT EDIT.
+
+package publicdashboards
+
+import (
+	context "context"
+
+	dtos "github.com/grafana/grafana/pkg/api/dtos"
+	mock "github.com/stretchr/testify/mock"
+
+	models "github.com/grafana/grafana/pkg/models"
+
+	publicdashboardsmodels "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+
+	testing "testing"
+)
+
+// FakePublicDashboardService is an autogenerated mock type for the Service type
+type FakePublicDashboardService struct {
+	mock.Mock
+}
+
+// BuildAnonymousUser provides a mock function with given fields: ctx, dashboard
+func (_m *FakePublicDashboardService) BuildAnonymousUser(ctx context.Context, dashboard *models.Dashboard) (*models.SignedInUser, error) {
+	ret := _m.Called(ctx, dashboard)
+
+	var r0 *models.SignedInUser
+	if rf, ok := ret.Get(0).(func(context.Context, *models.Dashboard) *models.SignedInUser); ok {
+		r0 = rf(ctx, dashboard)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.SignedInUser)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *models.Dashboard) error); ok {
+		r1 = rf(ctx, dashboard)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// BuildPublicDashboardMetricRequest provides a mock function with given fields: ctx, dashboard, publicDashboard, panelId
+func (_m *FakePublicDashboardService) BuildPublicDashboardMetricRequest(ctx context.Context, dashboard *models.Dashboard, publicDashboard *publicdashboardsmodels.PublicDashboard, panelId int64) (dtos.MetricRequest, error) {
+	ret := _m.Called(ctx, dashboard, publicDashboard, panelId)
+
+	var r0 dtos.MetricRequest
+	if rf, ok := ret.Get(0).(func(context.Context, *models.Dashboard, *publicdashboardsmodels.PublicDashboard, int64) dtos.MetricRequest); ok {
+		r0 = rf(ctx, dashboard, publicDashboard, panelId)
+	} else {
+		r0 = ret.Get(0).(dtos.MetricRequest)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *models.Dashboard, *publicdashboardsmodels.PublicDashboard, int64) error); ok {
+		r1 = rf(ctx, dashboard, publicDashboard, panelId)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetPublicDashboard provides a mock function with given fields: ctx, accessToken
+func (_m *FakePublicDashboardService) GetPublicDashboard(ctx context.Context, accessToken string) (*models.Dashboard, error) {
+	ret := _m.Called(ctx, accessToken)
+
+	var r0 *models.Dashboard
+	if rf, ok := ret.Get(0).(func(context.Context, string) *models.Dashboard); ok {
+		r0 = rf(ctx, accessToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.Dashboard)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, string) error); ok {
+		r1 = rf(ctx, accessToken)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetPublicDashboardConfig provides a mock function with given fields: ctx, orgId, dashboardUid
+func (_m *FakePublicDashboardService) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*publicdashboardsmodels.PublicDashboard, error) {
+	ret := _m.Called(ctx, orgId, dashboardUid)
+
+	var r0 *publicdashboardsmodels.PublicDashboard
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *publicdashboardsmodels.PublicDashboard); ok {
+		r0 = rf(ctx, orgId, dashboardUid)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*publicdashboardsmodels.PublicDashboard)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
+		r1 = rf(ctx, orgId, dashboardUid)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// SavePublicDashboardConfig provides a mock function with given fields: ctx, dto
+func (_m *FakePublicDashboardService) SavePublicDashboardConfig(ctx context.Context, dto *publicdashboardsmodels.SavePublicDashboardConfigDTO) (*publicdashboardsmodels.PublicDashboard, error) {
+	ret := _m.Called(ctx, dto)
+
+	var r0 *publicdashboardsmodels.PublicDashboard
+	if rf, ok := ret.Get(0).(func(context.Context, *publicdashboardsmodels.SavePublicDashboardConfigDTO) *publicdashboardsmodels.PublicDashboard); ok {
+		r0 = rf(ctx, dto)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*publicdashboardsmodels.PublicDashboard)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, *publicdashboardsmodels.SavePublicDashboardConfigDTO) error); ok {
+		r1 = rf(ctx, dto)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// NewFakePublicDashboardService creates a new instance of FakePublicDashboardService. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations.
+func NewFakePublicDashboardService(t testing.TB) *FakePublicDashboardService {
+	mock := &FakePublicDashboardService{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/publicdashboards/public_dashboard_store_mock.go b/pkg/services/publicdashboards/public_dashboard_store_mock.go
new file mode 100644
index 00000000000..20102fc1179
--- /dev/null
+++ b/pkg/services/publicdashboards/public_dashboard_store_mock.go
@@ -0,0 +1,142 @@
+// Code generated by mockery v2.12.2. DO NOT EDIT.
+
+package publicdashboards
+
+import (
+	context "context"
+
+	models "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	mock "github.com/stretchr/testify/mock"
+
+	pkgmodels "github.com/grafana/grafana/pkg/models"
+
+	testing "testing"
+)
+
+// FakePublicDashboardStore is an autogenerated mock type for the Store type
+type FakePublicDashboardStore struct {
+	mock.Mock
+}
+
+// GenerateNewPublicDashboardUid provides a mock function with given fields: ctx
+func (_m *FakePublicDashboardStore) GenerateNewPublicDashboardUid(ctx context.Context) (string, error) {
+	ret := _m.Called(ctx)
+
+	var r0 string
+	if rf, ok := ret.Get(0).(func(context.Context) string); ok {
+		r0 = rf(ctx)
+	} else {
+		r0 = ret.Get(0).(string)
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context) error); ok {
+		r1 = rf(ctx)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// GetPublicDashboard provides a mock function with given fields: ctx, accessToken
+func (_m *FakePublicDashboardStore) GetPublicDashboard(ctx context.Context, accessToken string) (*models.PublicDashboard, *pkgmodels.Dashboard, error) {
+	ret := _m.Called(ctx, accessToken)
+
+	var r0 *models.PublicDashboard
+	if rf, ok := ret.Get(0).(func(context.Context, string) *models.PublicDashboard); ok {
+		r0 = rf(ctx, accessToken)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.PublicDashboard)
+		}
+	}
+
+	var r1 *pkgmodels.Dashboard
+	if rf, ok := ret.Get(1).(func(context.Context, string) *pkgmodels.Dashboard); ok {
+		r1 = rf(ctx, accessToken)
+	} else {
+		if ret.Get(1) != nil {
+			r1 = ret.Get(1).(*pkgmodels.Dashboard)
+		}
+	}
+
+	var r2 error
+	if rf, ok := ret.Get(2).(func(context.Context, string) error); ok {
+		r2 = rf(ctx, accessToken)
+	} else {
+		r2 = ret.Error(2)
+	}
+
+	return r0, r1, r2
+}
+
+// GetPublicDashboardConfig provides a mock function with given fields: ctx, orgId, dashboardUid
+func (_m *FakePublicDashboardStore) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*models.PublicDashboard, error) {
+	ret := _m.Called(ctx, orgId, dashboardUid)
+
+	var r0 *models.PublicDashboard
+	if rf, ok := ret.Get(0).(func(context.Context, int64, string) *models.PublicDashboard); ok {
+		r0 = rf(ctx, orgId, dashboardUid)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.PublicDashboard)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, int64, string) error); ok {
+		r1 = rf(ctx, orgId, dashboardUid)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// SavePublicDashboardConfig provides a mock function with given fields: ctx, cmd
+func (_m *FakePublicDashboardStore) SavePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) (*models.PublicDashboard, error) {
+	ret := _m.Called(ctx, cmd)
+
+	var r0 *models.PublicDashboard
+	if rf, ok := ret.Get(0).(func(context.Context, models.SavePublicDashboardConfigCommand) *models.PublicDashboard); ok {
+		r0 = rf(ctx, cmd)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*models.PublicDashboard)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(context.Context, models.SavePublicDashboardConfigCommand) error); ok {
+		r1 = rf(ctx, cmd)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// UpdatePublicDashboardConfig provides a mock function with given fields: ctx, cmd
+func (_m *FakePublicDashboardStore) UpdatePublicDashboardConfig(ctx context.Context, cmd models.SavePublicDashboardConfigCommand) error {
+	ret := _m.Called(ctx, cmd)
+
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, models.SavePublicDashboardConfigCommand) error); ok {
+		r0 = rf(ctx, cmd)
+	} else {
+		r0 = ret.Error(0)
+	}
+
+	return r0
+}
+
+// NewFakePublicDashboardStore creates a new instance of FakePublicDashboardStore. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations.
+func NewFakePublicDashboardStore(t testing.TB) *FakePublicDashboardStore {
+	mock := &FakePublicDashboardStore{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/pkg/services/publicdashboards/publicdashboard.go b/pkg/services/publicdashboards/publicdashboard.go
new file mode 100644
index 00000000000..4d3be2b3fa7
--- /dev/null
+++ b/pkg/services/publicdashboards/publicdashboard.go
@@ -0,0 +1,29 @@
+package publicdashboards
+
+import (
+	"context"
+
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/models"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+)
+
+// These are the api contracts. The API should match the underlying service and store
+
+//go:generate mockery --name Service --structname FakePublicDashboardService --inpackage --filename public_dashboard_service_mock.go
+type Service interface {
+	BuildAnonymousUser(ctx context.Context, dashboard *models.Dashboard) (*models.SignedInUser, error)
+	GetPublicDashboard(ctx context.Context, accessToken string) (*models.Dashboard, error)
+	GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*PublicDashboard, error)
+	SavePublicDashboardConfig(ctx context.Context, dto *SavePublicDashboardConfigDTO) (*PublicDashboard, error)
+	BuildPublicDashboardMetricRequest(ctx context.Context, dashboard *models.Dashboard, publicDashboard *PublicDashboard, panelId int64) (dtos.MetricRequest, error)
+}
+
+//go:generate mockery --name Store --structname FakePublicDashboardStore --inpackage --filename public_dashboard_store_mock.go
+type Store interface {
+	GetPublicDashboard(ctx context.Context, accessToken string) (*PublicDashboard, *models.Dashboard, error)
+	GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*PublicDashboard, error)
+	GenerateNewPublicDashboardUid(ctx context.Context) (string, error)
+	SavePublicDashboardConfig(ctx context.Context, cmd SavePublicDashboardConfigCommand) (*PublicDashboard, error)
+	UpdatePublicDashboardConfig(ctx context.Context, cmd SavePublicDashboardConfigCommand) error
+}
diff --git a/pkg/services/publicdashboards/service/service.go b/pkg/services/publicdashboards/service/service.go
new file mode 100644
index 00000000000..c1f69db5463
--- /dev/null
+++ b/pkg/services/publicdashboards/service/service.go
@@ -0,0 +1,200 @@
+package service
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/grafana/grafana/pkg/api/dtos"
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
+	"github.com/grafana/grafana/pkg/services/datasources"
+	"github.com/grafana/grafana/pkg/services/publicdashboards"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+// Define the Service Implementation. We're generating mock implementation
+// automatically
+type PublicDashboardServiceImpl struct {
+	log   log.Logger
+	cfg   *setting.Cfg
+	store publicdashboards.Store
+}
+
+// Gives us compile time error if the service does not adhere to the contract of
+// the interface
+var _ publicdashboards.Service = (*PublicDashboardServiceImpl)(nil)
+
+// Factory for method used by wire to inject dependencies.
+// builds the service, and api, and configures routes
+func ProvideService(
+	cfg *setting.Cfg,
+	store publicdashboards.Store,
+) *PublicDashboardServiceImpl {
+	return &PublicDashboardServiceImpl{
+		log:   log.New("publicdashboards"),
+		cfg:   cfg,
+		store: store,
+	}
+}
+
+// Gets public dashboard via access token
+func (pd *PublicDashboardServiceImpl) GetPublicDashboard(ctx context.Context, accessToken string) (*models.Dashboard, error) {
+	pubdash, d, err := pd.store.GetPublicDashboard(ctx, accessToken)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if pubdash == nil || d == nil {
+		return nil, ErrPublicDashboardNotFound
+	}
+
+	if !pubdash.IsEnabled {
+		return nil, ErrPublicDashboardNotFound
+	}
+
+	ts := pubdash.BuildTimeSettings(d)
+	d.Data.SetPath([]string{"time", "from"}, ts.From)
+	d.Data.SetPath([]string{"time", "to"}, ts.To)
+
+	return d, nil
+}
+
+// GetPublicDashboardConfig is a helper method to retrieve the public dashboard configuration for a given dashboard from the database
+func (pd *PublicDashboardServiceImpl) GetPublicDashboardConfig(ctx context.Context, orgId int64, dashboardUid string) (*PublicDashboard, error) {
+	pdc, err := pd.store.GetPublicDashboardConfig(ctx, orgId, dashboardUid)
+	if err != nil {
+		return nil, err
+	}
+
+	return pdc, nil
+}
+
+// SavePublicDashboardConfig is a helper method to persist the sharing config
+// to the database. It handles validations for sharing config and persistence
+func (pd *PublicDashboardServiceImpl) SavePublicDashboardConfig(ctx context.Context, dto *SavePublicDashboardConfigDTO) (*PublicDashboard, error) {
+	if len(dto.DashboardUid) == 0 {
+		return nil, dashboards.ErrDashboardIdentifierNotSet
+	}
+
+	// set default value for time settings
+	if dto.PublicDashboard.TimeSettings == nil {
+		dto.PublicDashboard.TimeSettings = simplejson.New()
+	}
+
+	if dto.PublicDashboard.Uid == "" {
+		return pd.savePublicDashboardConfig(ctx, dto)
+	}
+
+	return pd.updatePublicDashboardConfig(ctx, dto)
+}
+
+func (pd *PublicDashboardServiceImpl) savePublicDashboardConfig(ctx context.Context, dto *SavePublicDashboardConfigDTO) (*PublicDashboard, error) {
+	uid, err := pd.store.GenerateNewPublicDashboardUid(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	accessToken, err := GenerateAccessToken()
+	if err != nil {
+		return nil, err
+	}
+
+	cmd := SavePublicDashboardConfigCommand{
+		DashboardUid: dto.DashboardUid,
+		OrgId:        dto.OrgId,
+		PublicDashboard: PublicDashboard{
+			Uid:          uid,
+			DashboardUid: dto.DashboardUid,
+			OrgId:        dto.OrgId,
+			IsEnabled:    dto.PublicDashboard.IsEnabled,
+			TimeSettings: dto.PublicDashboard.TimeSettings,
+			CreatedBy:    dto.UserId,
+			CreatedAt:    time.Now(),
+			AccessToken:  accessToken,
+		},
+	}
+
+	return pd.store.SavePublicDashboardConfig(ctx, cmd)
+}
+
+func (pd *PublicDashboardServiceImpl) updatePublicDashboardConfig(ctx context.Context, dto *SavePublicDashboardConfigDTO) (*PublicDashboard, error) {
+	cmd := SavePublicDashboardConfigCommand{
+		PublicDashboard: PublicDashboard{
+			Uid:          dto.PublicDashboard.Uid,
+			IsEnabled:    dto.PublicDashboard.IsEnabled,
+			TimeSettings: dto.PublicDashboard.TimeSettings,
+			UpdatedBy:    dto.UserId,
+			UpdatedAt:    time.Now(),
+		},
+	}
+
+	err := pd.store.UpdatePublicDashboardConfig(ctx, cmd)
+	if err != nil {
+		return nil, err
+	}
+
+	publicDashboard, err := pd.store.GetPublicDashboardConfig(ctx, dto.OrgId, dto.DashboardUid)
+	if err != nil {
+		return nil, err
+	}
+
+	return publicDashboard, nil
+}
+
+// BuildPublicDashboardMetricRequest merges public dashboard parameters with
+// dashboard and returns a metrics request to be sent to query backend
+func (pd *PublicDashboardServiceImpl) BuildPublicDashboardMetricRequest(ctx context.Context, dashboard *models.Dashboard, publicDashboard *PublicDashboard, panelId int64) (dtos.MetricRequest, error) {
+	if !publicDashboard.IsEnabled {
+		return dtos.MetricRequest{}, ErrPublicDashboardNotFound
+	}
+
+	queriesByPanel := models.GroupQueriesByPanelId(dashboard.Data)
+
+	if _, ok := queriesByPanel[panelId]; !ok {
+		return dtos.MetricRequest{}, ErrPublicDashboardPanelNotFound
+	}
+
+	ts := publicDashboard.BuildTimeSettings(dashboard)
+
+	return dtos.MetricRequest{
+		From:    ts.From,
+		To:      ts.To,
+		Queries: queriesByPanel[panelId],
+	}, nil
+}
+
+// BuildAnonymousUser creates a user with permissions to read from all datasources used in the dashboard
+func (pd *PublicDashboardServiceImpl) BuildAnonymousUser(ctx context.Context, dashboard *models.Dashboard) (*models.SignedInUser, error) {
+	datasourceUids := models.GetUniqueDashboardDatasourceUids(dashboard.Data)
+
+	// Create a temp user with read-only datasource permissions
+	anonymousUser := &models.SignedInUser{OrgId: dashboard.OrgId, Permissions: make(map[int64]map[string][]string)}
+	permissions := make(map[string][]string)
+	queryScopes := make([]string, 0)
+	readScopes := make([]string, 0)
+	for _, uid := range datasourceUids {
+		queryScopes = append(queryScopes, fmt.Sprintf("datasources:uid:%s", uid))
+		readScopes = append(readScopes, fmt.Sprintf("datasources:uid:%s", uid))
+	}
+	permissions[datasources.ActionQuery] = queryScopes
+	permissions[datasources.ActionRead] = readScopes
+	anonymousUser.Permissions[dashboard.OrgId] = permissions
+
+	return anonymousUser, nil
+}
+
+// generates a uuid formatted without dashes to use as access token
+func GenerateAccessToken() (string, error) {
+	token, err := uuid.NewRandom()
+	if err != nil {
+		return "", err
+	}
+
+	return fmt.Sprintf("%x", token[:]), nil
+}
diff --git a/pkg/services/dashboards/service/dashboard_public_test.go b/pkg/services/publicdashboards/service/service_test.go
similarity index 74%
rename from pkg/services/dashboards/service/dashboard_public_test.go
rename to pkg/services/publicdashboards/service/service_test.go
index 758d8ee8371..8198d41f4fa 100644
--- a/pkg/services/dashboards/service/dashboard_public_test.go
+++ b/pkg/services/publicdashboards/service/service_test.go
@@ -5,16 +5,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gofrs/uuid"
-	"github.com/grafana/grafana/pkg/components/simplejson"
-	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/models"
-	"github.com/grafana/grafana/pkg/services/dashboards"
-	"github.com/grafana/grafana/pkg/services/dashboards/database"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
+
+	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/models"
+	dashboardsDB "github.com/grafana/grafana/pkg/services/dashboards/database"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards"
+	database "github.com/grafana/grafana/pkg/services/publicdashboards/database"
+	. "github.com/grafana/grafana/pkg/services/publicdashboards/models"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
 )
 
 var timeSettings, _ = simplejson.NewJson([]byte(`{"from": "now-12", "to": "now"}`))
@@ -24,7 +27,7 @@ var mergedDashboardData = simplejson.NewFromAny(map[string]interface{}{"time": m
 
 func TestGetPublicDashboard(t *testing.T) {
 	type storeResp struct {
-		pd  *models.PublicDashboard
+		pd  *PublicDashboard
 		d   *models.Dashboard
 		err error
 	}
@@ -40,7 +43,7 @@ func TestGetPublicDashboard(t *testing.T) {
 			Name:        "returns a dashboard",
 			AccessToken: "abc123",
 			StoreResp: &storeResp{
-				pd:  &models.PublicDashboard{IsEnabled: true},
+				pd:  &PublicDashboard{IsEnabled: true},
 				d:   &models.Dashboard{Uid: "mydashboard", Data: dashboardData},
 				err: nil,
 			},
@@ -51,7 +54,7 @@ func TestGetPublicDashboard(t *testing.T) {
 			Name:        "puts pubdash time settings into dashboard",
 			AccessToken: "abc123",
 			StoreResp: &storeResp{
-				pd:  &models.PublicDashboard{IsEnabled: true, TimeSettings: timeSettings},
+				pd:  &PublicDashboard{IsEnabled: true, TimeSettings: timeSettings},
 				d:   &models.Dashboard{Data: dashboardData},
 				err: nil,
 			},
@@ -62,35 +65,35 @@ func TestGetPublicDashboard(t *testing.T) {
 			Name:        "returns ErrPublicDashboardNotFound when isEnabled is false",
 			AccessToken: "abc123",
 			StoreResp: &storeResp{
-				pd:  &models.PublicDashboard{IsEnabled: false},
+				pd:  &PublicDashboard{IsEnabled: false},
 				d:   &models.Dashboard{Uid: "mydashboard"},
 				err: nil,
 			},
-			ErrResp:  models.ErrPublicDashboardNotFound,
+			ErrResp:  ErrPublicDashboardNotFound,
 			DashResp: nil,
 		},
 		{
 			Name:        "returns ErrPublicDashboardNotFound if PublicDashboard missing",
 			AccessToken: "abc123",
 			StoreResp:   &storeResp{pd: nil, d: nil, err: nil},
-			ErrResp:     models.ErrPublicDashboardNotFound,
+			ErrResp:     ErrPublicDashboardNotFound,
 			DashResp:    nil,
 		},
 		{
 			Name:        "returns ErrPublicDashboardNotFound if Dashboard missing",
 			AccessToken: "abc123",
 			StoreResp:   &storeResp{pd: nil, d: nil, err: nil},
-			ErrResp:     models.ErrPublicDashboardNotFound,
+			ErrResp:     ErrPublicDashboardNotFound,
 			DashResp:    nil,
 		},
 	}
 
 	for _, test := range testCases {
 		t.Run(test.Name, func(t *testing.T) {
-			fakeStore := dashboards.FakeDashboardStore{}
-			service := &DashboardServiceImpl{
-				log:            log.New("test.logger"),
-				dashboardStore: &fakeStore,
+			fakeStore := FakePublicDashboardStore{}
+			service := &PublicDashboardServiceImpl{
+				log:   log.New("test.logger"),
+				store: &fakeStore,
 			}
 
 			fakeStore.On("GetPublicDashboard", mock.Anything, mock.Anything).
@@ -115,19 +118,20 @@ func TestGetPublicDashboard(t *testing.T) {
 func TestSavePublicDashboard(t *testing.T) {
 	t.Run("Saving public dashboard", func(t *testing.T) {
 		sqlStore := sqlstore.InitTestDB(t)
-		dashboardStore := database.ProvideDashboardStore(sqlStore)
+		dashboardStore := dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore := database.ProvideStore(sqlStore)
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 
-		service := &DashboardServiceImpl{
-			log:            log.New("test.logger"),
-			dashboardStore: dashboardStore,
+		service := &PublicDashboardServiceImpl{
+			log:   log.New("test.logger"),
+			store: publicdashboardStore,
 		}
 
-		dto := &dashboards.SavePublicDashboardConfigDTO{
+		dto := &SavePublicDashboardConfigDTO{
 			DashboardUid: dashboard.Uid,
 			OrgId:        dashboard.OrgId,
 			UserId:       7,
-			PublicDashboard: &models.PublicDashboard{
+			PublicDashboard: &PublicDashboard{
 				IsEnabled:    true,
 				DashboardUid: "NOTTHESAME",
 				OrgId:        9999999,
@@ -152,25 +156,26 @@ func TestSavePublicDashboard(t *testing.T) {
 		// Time settings set by db
 		assert.Equal(t, timeSettings, pubdash.TimeSettings)
 		// accessToken is valid uuid
-		_, err = uuid.FromString(pubdash.AccessToken)
-		require.NoError(t, err)
+		_, err = uuid.Parse(pubdash.AccessToken)
+		require.NoError(t, err, "expected a valid UUID, got %s", pubdash.AccessToken)
 	})
 
 	t.Run("Validate pubdash has default time setting value", func(t *testing.T) {
 		sqlStore := sqlstore.InitTestDB(t)
-		dashboardStore := database.ProvideDashboardStore(sqlStore)
+		dashboardStore := dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore := database.ProvideStore(sqlStore)
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 
-		service := &DashboardServiceImpl{
-			log:            log.New("test.logger"),
-			dashboardStore: dashboardStore,
+		service := &PublicDashboardServiceImpl{
+			log:   log.New("test.logger"),
+			store: publicdashboardStore,
 		}
 
-		dto := &dashboards.SavePublicDashboardConfigDTO{
+		dto := &SavePublicDashboardConfigDTO{
 			DashboardUid: dashboard.Uid,
 			OrgId:        dashboard.OrgId,
 			UserId:       7,
-			PublicDashboard: &models.PublicDashboard{
+			PublicDashboard: &PublicDashboard{
 				IsEnabled:    true,
 				DashboardUid: "NOTTHESAME",
 				OrgId:        9999999,
@@ -191,19 +196,20 @@ func TestSavePublicDashboard(t *testing.T) {
 func TestUpdatePublicDashboard(t *testing.T) {
 	t.Run("Updating public dashboard", func(t *testing.T) {
 		sqlStore := sqlstore.InitTestDB(t)
-		dashboardStore := database.ProvideDashboardStore(sqlStore)
+		dashboardStore := dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore := database.ProvideStore(sqlStore)
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 
-		service := &DashboardServiceImpl{
-			log:            log.New("test.logger"),
-			dashboardStore: dashboardStore,
+		service := &PublicDashboardServiceImpl{
+			log:   log.New("test.logger"),
+			store: publicdashboardStore,
 		}
 
-		dto := &dashboards.SavePublicDashboardConfigDTO{
+		dto := &SavePublicDashboardConfigDTO{
 			DashboardUid: dashboard.Uid,
 			OrgId:        dashboard.OrgId,
 			UserId:       7,
-			PublicDashboard: &models.PublicDashboard{
+			PublicDashboard: &PublicDashboard{
 				IsEnabled:    true,
 				TimeSettings: timeSettings,
 			},
@@ -216,11 +222,11 @@ func TestUpdatePublicDashboard(t *testing.T) {
 		require.NoError(t, err)
 
 		// attempt to overwrite settings
-		dto = &dashboards.SavePublicDashboardConfigDTO{
+		dto = &SavePublicDashboardConfigDTO{
 			DashboardUid: dashboard.Uid,
 			OrgId:        dashboard.OrgId,
 			UserId:       8,
-			PublicDashboard: &models.PublicDashboard{
+			PublicDashboard: &PublicDashboard{
 				Uid:          savedPubdash.Uid,
 				OrgId:        9,
 				DashboardUid: "abc1234",
@@ -257,19 +263,20 @@ func TestUpdatePublicDashboard(t *testing.T) {
 
 	t.Run("Updating set empty time settings", func(t *testing.T) {
 		sqlStore := sqlstore.InitTestDB(t)
-		dashboardStore := database.ProvideDashboardStore(sqlStore)
+		dashboardStore := dashboardsDB.ProvideDashboardStore(sqlStore)
+		publicdashboardStore := database.ProvideStore(sqlStore)
 		dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 
-		service := &DashboardServiceImpl{
-			log:            log.New("test.logger"),
-			dashboardStore: dashboardStore,
+		service := &PublicDashboardServiceImpl{
+			log:   log.New("test.logger"),
+			store: publicdashboardStore,
 		}
 
-		dto := &dashboards.SavePublicDashboardConfigDTO{
+		dto := &SavePublicDashboardConfigDTO{
 			DashboardUid: dashboard.Uid,
 			OrgId:        dashboard.OrgId,
 			UserId:       7,
-			PublicDashboard: &models.PublicDashboard{
+			PublicDashboard: &PublicDashboard{
 				IsEnabled:    true,
 				TimeSettings: timeSettings,
 			},
@@ -284,11 +291,11 @@ func TestUpdatePublicDashboard(t *testing.T) {
 		require.NoError(t, err)
 
 		// attempt to overwrite settings
-		dto = &dashboards.SavePublicDashboardConfigDTO{
+		dto = &SavePublicDashboardConfigDTO{
 			DashboardUid: dashboard.Uid,
 			OrgId:        dashboard.OrgId,
 			UserId:       8,
-			PublicDashboard: &models.PublicDashboard{
+			PublicDashboard: &PublicDashboard{
 				Uid:          savedPubdash.Uid,
 				OrgId:        9,
 				DashboardUid: "abc1234",
@@ -313,21 +320,44 @@ func TestUpdatePublicDashboard(t *testing.T) {
 	})
 }
 
+func TestBuildAnonymousUser(t *testing.T) {
+	sqlStore := sqlstore.InitTestDB(t)
+	dashboardStore := dashboardsDB.ProvideDashboardStore(sqlStore)
+	dashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
+	publicdashboardStore := database.ProvideStore(sqlStore)
+	service := &PublicDashboardServiceImpl{
+		log:   log.New("test.logger"),
+		store: publicdashboardStore,
+	}
+
+	t.Run("will add datasource read and query permissions to user for each datasource in dashboard", func(t *testing.T) {
+		user, err := service.BuildAnonymousUser(context.Background(), dashboard)
+		require.NoError(t, err)
+		require.Equal(t, dashboard.OrgId, user.OrgId)
+		require.Equal(t, "datasources:uid:ds1", user.Permissions[user.OrgId]["datasources:query"][0])
+		require.Equal(t, "datasources:uid:ds3", user.Permissions[user.OrgId]["datasources:query"][1])
+		require.Equal(t, "datasources:uid:ds1", user.Permissions[user.OrgId]["datasources:read"][0])
+		require.Equal(t, "datasources:uid:ds3", user.Permissions[user.OrgId]["datasources:read"][1])
+	})
+}
+
 func TestBuildPublicDashboardMetricRequest(t *testing.T) {
 	sqlStore := sqlstore.InitTestDB(t)
-	dashboardStore := database.ProvideDashboardStore(sqlStore)
+	dashboardStore := dashboardsDB.ProvideDashboardStore(sqlStore)
+	publicdashboardStore := database.ProvideStore(sqlStore)
+
 	publicDashboard := insertTestDashboard(t, dashboardStore, "testDashie", 1, 0, true)
 	nonPublicDashboard := insertTestDashboard(t, dashboardStore, "testNonPublicDashie", 1, 0, true)
 
-	service := &DashboardServiceImpl{
-		log:            log.New("test.logger"),
-		dashboardStore: dashboardStore,
+	service := &PublicDashboardServiceImpl{
+		log:   log.New("test.logger"),
+		store: publicdashboardStore,
 	}
 
-	dto := &dashboards.SavePublicDashboardConfigDTO{
+	dto := &SavePublicDashboardConfigDTO{
 		DashboardUid: publicDashboard.Uid,
 		OrgId:        publicDashboard.OrgId,
-		PublicDashboard: &models.PublicDashboard{
+		PublicDashboard: &PublicDashboard{
 			IsEnabled:    true,
 			DashboardUid: "NOTTHESAME",
 			OrgId:        9999999,
@@ -338,10 +368,10 @@ func TestBuildPublicDashboardMetricRequest(t *testing.T) {
 	publicDashboardPD, err := service.SavePublicDashboardConfig(context.Background(), dto)
 	require.NoError(t, err)
 
-	nonPublicDto := &dashboards.SavePublicDashboardConfigDTO{
+	nonPublicDto := &SavePublicDashboardConfigDTO{
 		DashboardUid: nonPublicDashboard.Uid,
 		OrgId:        nonPublicDashboard.OrgId,
-		PublicDashboard: &models.PublicDashboard{
+		PublicDashboard: &PublicDashboard{
 			IsEnabled:    false,
 			DashboardUid: "NOTTHESAME",
 			OrgId:        9999999,
@@ -410,7 +440,7 @@ func TestBuildPublicDashboardMetricRequest(t *testing.T) {
 	})
 }
 
-func insertTestDashboard(t *testing.T, dashboardStore *database.DashboardStore, title string, orgId int64,
+func insertTestDashboard(t *testing.T, dashboardStore *dashboardsDB.DashboardStore, title string, orgId int64,
 	folderId int64, isFolder bool, tags ...interface{}) *models.Dashboard {
 	t.Helper()
 	cmd := models.SaveDashboardCommand{
@@ -424,6 +454,9 @@ func insertTestDashboard(t *testing.T, dashboardStore *database.DashboardStore,
 			"panels": []interface{}{
 				map[string]interface{}{
 					"id": 1,
+					"datasource": map[string]interface{}{
+						"uid": "ds1",
+					},
 					"targets": []interface{}{
 						map[string]interface{}{
 							"datasource": map[string]interface{}{
@@ -443,6 +476,9 @@ func insertTestDashboard(t *testing.T, dashboardStore *database.DashboardStore,
 				},
 				map[string]interface{}{
 					"id": 2,
+					"datasource": map[string]interface{}{
+						"uid": "ds3",
+					},
 					"targets": []interface{}{
 						map[string]interface{}{
 							"datasource": map[string]interface{}{
diff --git a/pkg/services/rendering/capabilities.go b/pkg/services/rendering/capabilities.go
index 9339bfc4915..2087577ed04 100644
--- a/pkg/services/rendering/capabilities.go
+++ b/pkg/services/rendering/capabilities.go
@@ -16,6 +16,7 @@ type CapabilityName string
 const (
 	ScalingDownImages CapabilityName = "ScalingDownImages"
 	FullHeightImages  CapabilityName = "FullHeightImages"
+	SvgSanitization   CapabilityName = "SvgSanitization"
 )
 
 var ErrUnknownCapability = errors.New("unknown capability")
diff --git a/pkg/services/rendering/interface.go b/pkg/services/rendering/interface.go
index 1cf6abbbc3e..6a7197f12e9 100644
--- a/pkg/services/rendering/interface.go
+++ b/pkg/services/rendering/interface.go
@@ -62,6 +62,15 @@ type ErrorOpts struct {
 	ErrorRenderUnavailable bool
 }
 
+type SanitizeSVGRequest struct {
+	Filename string
+	Content  []byte
+}
+
+type SanitizeSVGResponse struct {
+	Sanitized []byte
+}
+
 type CSVOpts struct {
 	TimeoutOpts
 	AuthOpts
@@ -83,6 +92,7 @@ type RenderCSVResult struct {
 
 type renderFunc func(ctx context.Context, renderKey string, options Opts) (*RenderResult, error)
 type renderCSVFunc func(ctx context.Context, renderKey string, options CSVOpts) (*RenderCSVResult, error)
+type sanitizeFunc func(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error)
 
 type renderKeyProvider interface {
 	get(ctx context.Context, opts AuthOpts) (string, error)
@@ -114,4 +124,5 @@ type Service interface {
 	GetRenderUser(ctx context.Context, key string) (*RenderUser, bool)
 	HasCapability(capability CapabilityName) (CapabilitySupportRequestResult, error)
 	CreateRenderingSession(ctx context.Context, authOpts AuthOpts, sessionOpts SessionOpts) (Session, error)
+	SanitizeSVG(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error)
 }
diff --git a/pkg/services/rendering/mock.go b/pkg/services/rendering/mock.go
index d8a52a81520..705a05a1f9f 100644
--- a/pkg/services/rendering/mock.go
+++ b/pkg/services/rendering/mock.go
@@ -139,6 +139,21 @@ func (mr *MockServiceMockRecorder) RenderErrorImage(arg0, arg1 interface{}) *gom
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RenderErrorImage", reflect.TypeOf((*MockService)(nil).RenderErrorImage), arg0, arg1)
 }
 
+// SanitizeSVG mocks base method.
+func (m *MockService) SanitizeSVG(arg0 context.Context, arg1 *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "SanitizeSVG", arg0, arg1)
+	ret0, _ := ret[0].(*SanitizeSVGResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// SanitizeSVG indicates an expected call of SanitizeSVG.
+func (mr *MockServiceMockRecorder) SanitizeSVG(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SanitizeSVG", reflect.TypeOf((*MockService)(nil).SanitizeSVG), arg0, arg1)
+}
+
 // Version mocks base method.
 func (m *MockService) Version() string {
 	m.ctrl.T.Helper()
diff --git a/pkg/services/rendering/rendering.go b/pkg/services/rendering/rendering.go
index 694d93890f6..1bde374b7bb 100644
--- a/pkg/services/rendering/rendering.go
+++ b/pkg/services/rendering/rendering.go
@@ -27,18 +27,22 @@ func init() {
 	remotecache.Register(&RenderUser{})
 }
 
+var _ Service = (*RenderingService)(nil)
+
 const ServiceName = "RenderingService"
 
 type RenderingService struct {
-	log             log.Logger
-	pluginInfo      *plugins.Plugin
-	renderAction    renderFunc
-	renderCSVAction renderCSVFunc
-	domain          string
-	inProgressCount int32
-	version         string
-	versionMutex    sync.RWMutex
-	capabilities    []Capability
+	log               log.Logger
+	pluginInfo        *plugins.Plugin
+	renderAction      renderFunc
+	renderCSVAction   renderCSVFunc
+	sanitizeSVGAction sanitizeFunc
+	sanitizeURL       string
+	domain            string
+	inProgressCount   int32
+	version           string
+	versionMutex      sync.RWMutex
+	capabilities      []Capability
 
 	perRequestRenderKeyProvider renderKeyProvider
 	Cfg                         *setting.Cfg
@@ -59,8 +63,14 @@ func ProvideService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache, rm p
 		return nil, fmt.Errorf("failed to create CSVs directory %q: %w", cfg.CSVsDir, err)
 	}
 
+	logger := log.New("rendering")
+
+	// URL for HTTP sanitize API
+	var sanitizeURL string
+
+	//  value used for domain attribute of renderKey cookie
 	var domain string
-	// set value used for domain attribute of renderKey cookie
+
 	switch {
 	case cfg.RendererUrl != "":
 		// RendererCallbackUrl has already been passed, it won't generate an error.
@@ -69,6 +79,7 @@ func ProvideService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache, rm p
 			return nil, err
 		}
 
+		sanitizeURL = getSanitizerURL(cfg.RendererUrl)
 		domain = u.Hostname()
 	case cfg.HTTPAddr != setting.DefaultHTTPAddr:
 		domain = cfg.HTTPAddr
@@ -76,7 +87,6 @@ func ProvideService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache, rm p
 		domain = "localhost"
 	}
 
-	logger := log.New("rendering")
 	s := &RenderingService{
 		perRequestRenderKeyProvider: &perRequestRenderKeyProvider{
 			cache:     remoteCache,
@@ -92,16 +102,26 @@ func ProvideService(cfg *setting.Cfg, remoteCache *remotecache.RemoteCache, rm p
 				name:             ScalingDownImages,
 				semverConstraint: ">= 3.4.0",
 			},
+			{
+				name:             SvgSanitization,
+				semverConstraint: ">= 3.5.0",
+			},
 		},
 		Cfg:                   cfg,
 		RemoteCacheService:    remoteCache,
 		RendererPluginManager: rm,
 		log:                   logger,
 		domain:                domain,
+		sanitizeURL:           sanitizeURL,
 	}
 	return s, nil
 }
 
+func getSanitizerURL(rendererURL string) string {
+	rendererBaseURL := strings.TrimSuffix(rendererURL, "/render")
+	return rendererBaseURL + "/sanitize"
+}
+
 func (rs *RenderingService) Run(ctx context.Context) error {
 	if rs.remoteAvailable() {
 		rs.log = rs.log.New("renderer", "http")
@@ -120,6 +140,7 @@ func (rs *RenderingService) Run(ctx context.Context) error {
 		})
 		rs.renderAction = rs.renderViaHTTP
 		rs.renderCSVAction = rs.renderCSVViaHTTP
+		rs.sanitizeSVGAction = rs.sanitizeViaHTTP
 
 		refreshTicker := time.NewTicker(remoteVersionRefreshInterval)
 
@@ -146,6 +167,7 @@ func (rs *RenderingService) Run(ctx context.Context) error {
 		rs.version = rs.pluginInfo.Info.Version
 		rs.renderAction = rs.renderViaPlugin
 		rs.renderCSVAction = rs.renderCSVViaPlugin
+		rs.sanitizeSVGAction = rs.sanitizeSVGViaPlugin
 		<-ctx.Done()
 
 		// On Windows, Chromium is generating a debug.log file that breaks signature check on next restart
@@ -293,6 +315,26 @@ func (rs *RenderingService) RenderCSV(ctx context.Context, opts CSVOpts, session
 	return result, err
 }
 
+func (rs *RenderingService) SanitizeSVG(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
+	capability, err := rs.HasCapability(SvgSanitization)
+	if err != nil {
+		return nil, err
+	}
+
+	if !capability.IsSupported {
+		return nil, fmt.Errorf("svg sanitization unsupported, requires image renderer version: %s", capability.SemverConstraint)
+	}
+
+	start := time.Now()
+
+	action, err := rs.sanitizeSVGAction(ctx, req)
+	if err != nil {
+		defer rs.log.Info("svg sanitization finished", "duration", time.Since(start), "filename", req.Filename, "isError", err != nil)
+	}
+
+	return action, err
+}
+
 func (rs *RenderingService) renderCSV(ctx context.Context, opts CSVOpts, renderKeyProvider renderKeyProvider) (*RenderCSVResult, error) {
 	if int(atomic.LoadInt32(&rs.inProgressCount)) > opts.ConcurrentLimit {
 		return nil, ErrConcurrentLimitReached
diff --git a/pkg/services/rendering/svgSanitizer.go b/pkg/services/rendering/svgSanitizer.go
new file mode 100644
index 00000000000..b6b40038032
--- /dev/null
+++ b/pkg/services/rendering/svgSanitizer.go
@@ -0,0 +1,178 @@
+package rendering
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"mime/multipart"
+	"net/http"
+	"net/textproto"
+	"net/url"
+	"time"
+
+	"github.com/grafana/grafana/pkg/plugins/backendplugin/pluginextensionv2"
+)
+
+var (
+	domPurifySvgConfig = map[string]interface{}{
+		// domPurifyConfig is passed directly to DOMPurify https://github.com/cure53/DOMPurify#can-i-configure-dompurify
+		"domPurifyConfig": map[string]interface{}{
+			"USE_PROFILES": map[string]bool{"svg": true, "svgFilters": true},
+			"ADD_TAGS":     []string{"use"},
+		},
+		// allowAllLinksInSvgUseTags will preserve all `use` tags.
+		// By default, we remove all non-self-referential `use` tags, i.e. those which `href` attribute does not start with `#`
+		"allowAllLinksInSvgUseTags": false,
+	}
+	domPurifyConfigType = "DOMPurify"
+)
+
+type formFile struct {
+	fileName    string
+	key         string
+	contentType string
+	content     io.Reader
+}
+
+func createMultipartRequestBody(values []formFile) (bytes.Buffer, string, error) {
+	var b bytes.Buffer
+	w := multipart.NewWriter(&b)
+	for _, f := range values {
+		h := make(textproto.MIMEHeader)
+		h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="%s"; filename="%s"`, f.key, f.fileName))
+		h.Set("Content-Type", f.contentType)
+		formWriter, err := w.CreatePart(h)
+
+		if err != nil {
+			return bytes.Buffer{}, "", err
+		}
+
+		if _, err := io.Copy(formWriter, f.content); err != nil {
+			return bytes.Buffer{}, "", err
+		}
+
+		if x, ok := f.content.(io.Closer); ok {
+			_ = x.Close()
+		}
+	}
+
+	if err := w.Close(); err != nil {
+		return bytes.Buffer{}, "", err
+	}
+
+	return b, w.FormDataContentType(), nil
+}
+
+func (rs *RenderingService) sanitizeViaHTTP(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
+	sanitizerUrl, err := url.Parse(rs.sanitizeURL)
+	if err != nil {
+		return nil, err
+	}
+
+	configJson, err := json.Marshal(map[string]interface{}{
+		"config":     domPurifySvgConfig,
+		"configType": domPurifyConfigType,
+	})
+	if err != nil {
+		rs.log.Error("Sanitizer - HTTP: failed to create the request config", "error", err, "filename", req.Filename)
+		return nil, fmt.Errorf("config creation fail: %s", err)
+	}
+
+	body, contentType, err := createMultipartRequestBody([]formFile{
+		{
+			fileName:    "config",
+			key:         "config",
+			contentType: "application/json",
+			content:     bytes.NewReader(configJson),
+		},
+		{
+			fileName:    req.Filename,
+			key:         "file",
+			contentType: "image/svg+xml",
+			content:     bytes.NewReader(req.Content),
+		},
+	})
+	if err != nil {
+		rs.log.Error("Sanitizer - HTTP: failed to create the request body", "error", err, "filename", req.Filename)
+		return nil, fmt.Errorf("body creation fail: %s", err)
+	}
+
+	reqContext, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+	httpReq, err := http.NewRequestWithContext(reqContext, "POST", sanitizerUrl.String(), &body)
+	if err != nil {
+		rs.log.Error("Sanitizer - HTTP: failed to create the HTTP request", "error", err, "filename", req.Filename)
+		return nil, err
+	}
+
+	httpReq.Header.Set("User-Agent", fmt.Sprintf("Grafana/%s", rs.Cfg.BuildVersion))
+	httpReq.Header.Set("Content-Type", contentType)
+
+	rs.log.Debug("Sanitizer - HTTP: calling", "filename", req.Filename, "contentLength", len(req.Content), "url", sanitizerUrl)
+	// make request to renderer server
+	resp, err := netClient.Do(httpReq)
+	if err != nil {
+		rs.log.Error("Sanitizer - HTTP: failed to send request", "error", err)
+		return nil, fmt.Errorf("sanitizer - HTTP: failed to send request: %w", err)
+	}
+
+	defer func() {
+		if err := resp.Body.Close(); err != nil {
+			rs.log.Error("Sanitizer - HTTP: failed to close response body", "statusCode", resp.StatusCode, "error", err)
+		}
+	}()
+
+	if resp.StatusCode != http.StatusOK {
+		if body, err := io.ReadAll(resp.Body); body != nil {
+			rs.log.Error("Sanitizer - HTTP: failed to sanitize", "statusCode", resp.StatusCode, "error", err, "resp", string(body))
+		} else {
+			rs.log.Error("Sanitizer - HTTP: failed to sanitize", "statusCode", resp.StatusCode, "error", err)
+		}
+		return nil, fmt.Errorf("sanitizer - HTTP: failed to sanitize %s", req.Filename)
+	}
+
+	sanitized, err := io.ReadAll(resp.Body)
+	if err != nil {
+		rs.log.Error("Sanitizer - HTTP: failed to read response body", "error", err, "filename", req.Filename)
+		return nil, fmt.Errorf("sanitizer - HTTP: failed to read response body: %s", err)
+	}
+
+	return &SanitizeSVGResponse{Sanitized: sanitized}, nil
+}
+
+func (rs *RenderingService) sanitizeSVGViaPlugin(ctx context.Context, req *SanitizeSVGRequest) (*SanitizeSVGResponse, error) {
+	ctx, cancel := context.WithTimeout(ctx, time.Second*20)
+	defer cancel()
+
+	domPurifyConfig, err := json.Marshal(domPurifySvgConfig)
+	if err != nil {
+		rs.log.Error("Sanitizer - plugin: failed to parse domPurifyConfig")
+		return nil, fmt.Errorf("sanitizer - plugin: failed to parse domPurifyConfig %s", err)
+	}
+	grpcReq := &pluginextensionv2.SanitizeRequest{
+		Filename:   req.Filename,
+		Content:    req.Content,
+		ConfigType: domPurifyConfigType,
+		Config:     domPurifyConfig,
+	}
+	rs.log.Debug("Sanitizer - plugin: calling", "filename", req.Filename, "contentLength", len(req.Content))
+
+	rsp, err := rs.pluginInfo.Renderer.Sanitize(ctx, grpcReq)
+	if err != nil {
+		if errors.Is(ctx.Err(), context.DeadlineExceeded) {
+			rs.log.Info("Sanitizer - plugin: time out")
+			return nil, ErrTimeout
+		}
+
+		return nil, err
+	}
+
+	if rsp.Error != "" {
+		return nil, fmt.Errorf("sanitizer - plugin: failed to sanitize: %s", rsp.Error)
+	}
+
+	return &SanitizeSVGResponse{Sanitized: rsp.Sanitized}, nil
+}
diff --git a/pkg/services/screenshot/screenshot.go b/pkg/services/screenshot/screenshot.go
index e0a4157e5fb..e963448099e 100644
--- a/pkg/services/screenshot/screenshot.go
+++ b/pkg/services/screenshot/screenshot.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 	"path"
+	"strconv"
 	"time"
 
 	gocache "github.com/patrickmn/go-cache"
@@ -81,71 +82,6 @@ type ScreenshotService interface {
 	Take(ctx context.Context, opts ScreenshotOptions) (*Screenshot, error)
 }
 
-// BrowserScreenshotService takes screenshots using a headless browser.
-type BrowserScreenshotService struct {
-	ds dashboards.DashboardService
-	rs rendering.Service
-}
-
-func NewBrowserScreenshotService(ds dashboards.DashboardService, rs rendering.Service) ScreenshotService {
-	return &BrowserScreenshotService{
-		ds: ds,
-		rs: rs,
-	}
-}
-
-// Take returns a screenshot or an error if either the dashboard does not exist
-// or it failed to screenshot the dashboard. It uses both the context and the
-// timeout in ScreenshotOptions, however the timeout in ScreenshotOptions is
-// sent to the remote browser where it is used as a client timeout.
-func (s *BrowserScreenshotService) Take(ctx context.Context, opts ScreenshotOptions) (*Screenshot, error) {
-	q := models.GetDashboardQuery{Uid: opts.DashboardUID}
-	if err := s.ds.GetDashboard(ctx, &q); err != nil {
-		return nil, err
-	}
-
-	opts = opts.SetDefaults()
-
-	// Compute the URL to screenshot.
-	renderPath := path.Join("d-solo", q.Result.Uid, q.Result.Slug)
-	url := &url.URL{}
-	url.Path = renderPath
-	qParams := url.Query()
-	qParams.Add("orgId", fmt.Sprint(q.Result.OrgId))
-	if opts.PanelID != 0 {
-		qParams.Add("panelId", fmt.Sprint(opts.PanelID))
-	}
-	url.RawQuery = qParams.Encode()
-	path := url.String()
-
-	renderOpts := rendering.Opts{
-		AuthOpts: rendering.AuthOpts{
-			OrgID:   q.Result.OrgId,
-			OrgRole: models.ROLE_ADMIN,
-		},
-		ErrorOpts: rendering.ErrorOpts{
-			ErrorConcurrentLimitReached: true,
-			ErrorRenderUnavailable:      true,
-		},
-		TimeoutOpts: rendering.TimeoutOpts{
-			Timeout: opts.Timeout,
-		},
-		Width:           opts.Width,
-		Height:          opts.Height,
-		Theme:           opts.Theme,
-		ConcurrentLimit: setting.AlertingRenderLimit,
-		Path:            path,
-	}
-
-	result, err := s.rs.Render(ctx, renderOpts, nil)
-	if err != nil {
-		return nil, fmt.Errorf("failed to take screenshot: %w", err)
-	}
-
-	screenshot := Screenshot{Path: result.FilePath}
-	return &screenshot, nil
-}
-
 // CachableScreenshotService caches screenshots.
 type CachableScreenshotService struct {
 	cache       *gocache.Cache
@@ -203,7 +139,7 @@ func (s *NoopScreenshotService) Take(_ context.Context, _ ScreenshotOptions) (*S
 type ObservableScreenshotService struct {
 	service   ScreenshotService
 	duration  prometheus.Histogram
-	failures  prometheus.Counter
+	failures  *prometheus.CounterVec
 	successes prometheus.Counter
 }
 
@@ -216,11 +152,11 @@ func NewObservableScreenshotService(r prometheus.Registerer, service ScreenshotS
 			Namespace: namespace,
 			Subsystem: subsystem,
 		}),
-		failures: promauto.With(r).NewCounter(prometheus.CounterOpts{
+		failures: promauto.With(r).NewCounterVec(prometheus.CounterOpts{
 			Name:      "failures_total",
 			Namespace: namespace,
 			Subsystem: subsystem,
-		}),
+		}, []string{"reason"}),
 		successes: promauto.With(r).NewCounter(prometheus.CounterOpts{
 			Name:      "successes_total",
 			Namespace: namespace,
@@ -235,13 +171,86 @@ func (s *ObservableScreenshotService) Take(ctx context.Context, opts ScreenshotO
 
 	screenshot, err := s.service.Take(ctx, opts)
 	if err != nil {
-		defer s.failures.Inc()
+		if errors.Is(err, dashboards.ErrDashboardNotFound) {
+			defer s.failures.With(prometheus.Labels{
+				"reason": "dashboard_not_found",
+			}).Inc()
+		} else if errors.Is(err, context.Canceled) {
+			defer s.failures.With(prometheus.Labels{
+				"reason": "context_canceled",
+			}).Inc()
+		} else {
+			defer s.failures.With(prometheus.Labels{
+				"reason": "error",
+			}).Inc()
+		}
 	} else {
 		defer s.successes.Inc()
 	}
 	return screenshot, err
 }
 
+// RemoteRenderScreenshotService takes screenshots using a remote render service.
+type RemoteRenderScreenshotService struct {
+	ds dashboards.DashboardService
+	rs rendering.Service
+}
+
+func NewRemoteRenderScreenshotService(ds dashboards.DashboardService, rs rendering.Service) ScreenshotService {
+	return &RemoteRenderScreenshotService{
+		ds: ds,
+		rs: rs,
+	}
+}
+
+// Take returns a screenshot or an error if either the dashboard does not exist or
+// the service failed to screenshot the dashboard. It uses both the context and the
+// timeout in ScreenshotOptions, however the context is used in any database queries
+// and the request to the remote render service, while the timeout in ScreenshotOptions
+// is passed to the remote render service where it is used as a client timeout. It is
+// not recommended to pass a context without a deadline.
+func (s *RemoteRenderScreenshotService) Take(ctx context.Context, opts ScreenshotOptions) (*Screenshot, error) {
+	q := models.GetDashboardQuery{Uid: opts.DashboardUID}
+	if err := s.ds.GetDashboard(ctx, &q); err != nil {
+		return nil, err
+	}
+
+	u := url.URL{}
+	u.Path = path.Join("d-solo", q.Result.Uid, q.Result.Slug)
+	p := u.Query()
+	p.Add("orgId", strconv.FormatInt(q.Result.OrgId, 10))
+	p.Add("panelId", strconv.FormatInt(opts.PanelID, 10))
+	u.RawQuery = p.Encode()
+
+	opts = opts.SetDefaults()
+	renderOpts := rendering.Opts{
+		AuthOpts: rendering.AuthOpts{
+			OrgID:   q.Result.OrgId,
+			OrgRole: models.ROLE_ADMIN,
+		},
+		ErrorOpts: rendering.ErrorOpts{
+			ErrorConcurrentLimitReached: true,
+			ErrorRenderUnavailable:      true,
+		},
+		TimeoutOpts: rendering.TimeoutOpts{
+			Timeout: opts.Timeout,
+		},
+		Width:           opts.Width,
+		Height:          opts.Height,
+		Theme:           opts.Theme,
+		ConcurrentLimit: setting.AlertingRenderLimit,
+		Path:            u.String(),
+	}
+
+	result, err := s.rs.Render(ctx, renderOpts, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to take screenshot: %w", err)
+	}
+
+	screenshot := Screenshot{Path: result.FilePath}
+	return &screenshot, nil
+}
+
 type ScreenshotUnavailableService struct{}
 
 func (s *ScreenshotUnavailableService) Take(_ context.Context, _ ScreenshotOptions) (*Screenshot, error) {
diff --git a/pkg/services/screenshot/screenshot_test.go b/pkg/services/screenshot/screenshot_test.go
index 9cc912a6d42..729fcf8297b 100644
--- a/pkg/services/screenshot/screenshot_test.go
+++ b/pkg/services/screenshot/screenshot_test.go
@@ -76,10 +76,10 @@ func TestBrowserScreenshotService(t *testing.T) {
 
 	d := dashboards.FakeDashboardService{}
 	r := rendering.NewMockService(c)
-	s := NewBrowserScreenshotService(&d, r)
+	s := NewRemoteRenderScreenshotService(&d, r)
 
 	// a non-existent dashboard should return error
-	d.On("GetDashboard", mock.Anything, mock.AnythingOfType("*models.GetDashboardQuery")).Return(models.ErrDashboardNotFound).Once()
+	d.On("GetDashboard", mock.Anything, mock.AnythingOfType("*models.GetDashboardQuery")).Return(dashboards.ErrDashboardNotFound).Once()
 	ctx := context.Background()
 	opts := ScreenshotOptions{}
 	screenshot, err := s.Take(ctx, opts)
diff --git a/pkg/services/searchV2/bluge.go b/pkg/services/searchV2/bluge.go
index 79f7d52ea4a..c65624c7f16 100644
--- a/pkg/services/searchV2/bluge.go
+++ b/pkg/services/searchV2/bluge.go
@@ -9,9 +9,6 @@ import (
 	"time"
 
 	"github.com/blugelabs/bluge"
-	"github.com/blugelabs/bluge/analysis"
-	"github.com/blugelabs/bluge/analysis/token"
-	"github.com/blugelabs/bluge/analysis/tokenizer"
 	"github.com/blugelabs/bluge/search"
 	"github.com/blugelabs/bluge/search/aggregations"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
@@ -33,12 +30,14 @@ const (
 	documentFieldTransformer = "transformer"
 	documentFieldDSUID       = "ds_uid"
 	documentFieldDSType      = "ds_type"
+	DocumentFieldCreatedAt   = "created_at"
+	DocumentFieldUpdatedAt   = "updated_at"
 )
 
-func initIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashboardFunc) (*bluge.Reader, *bluge.Writer, error) {
-	writer, err := bluge.OpenWriter(bluge.InMemoryOnlyConfig())
+func initOrgIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashboardFunc) (*orgIndex, error) {
+	dashboardWriter, err := bluge.OpenWriter(bluge.InMemoryOnlyConfig())
 	if err != nil {
-		return nil, nil, fmt.Errorf("error opening writer: %v", err)
+		return nil, fmt.Errorf("error opening writer: %v", err)
 	}
 	// Not closing Writer here since we use it later while processing dashboard change events.
 
@@ -50,7 +49,7 @@ func initIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashbo
 	// In order to reduce memory usage while initial indexing we are limiting
 	// the size of batch here.
 	docsInBatch := 0
-	maxBatchSize := 300
+	maxBatchSize := 100
 
 	flushIfRequired := func(force bool) error {
 		docsInBatch++
@@ -58,7 +57,7 @@ func initIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashbo
 		if !needFlush {
 			return nil
 		}
-		err := writer.Batch(batch)
+		err := dashboardWriter.Batch(batch)
 		if err != nil {
 			return err
 		}
@@ -75,11 +74,11 @@ func initIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashbo
 		}
 		doc := getFolderDashboardDoc(dash)
 		if err := extendDoc(dash.uid, doc); err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		batch.Insert(doc)
 		if err := flushIfRequired(false); err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		uid := dash.uid
 		if uid == "" {
@@ -97,11 +96,11 @@ func initIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashbo
 		location := folderUID
 		doc := getNonFolderDashboardDoc(dash, location)
 		if err := extendDoc(dash.uid, doc); err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		batch.Insert(doc)
 		if err := flushIfRequired(false); err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
 		// Index each panel in dashboard.
@@ -110,25 +109,27 @@ func initIndex(dashboards []dashboard, logger log.Logger, extendDoc ExtendDashbo
 		}
 		location += dash.uid
 		docs := getDashboardPanelDocs(dash, location)
+
 		for _, panelDoc := range docs {
 			batch.Insert(panelDoc)
 			if err := flushIfRequired(false); err != nil {
-				return nil, nil, err
+				return nil, err
 			}
 		}
 	}
+
+	// Flush docs in batch with force as we are in the end.
 	if err := flushIfRequired(true); err != nil {
-		return nil, nil, err
+		return nil, err
 	}
+
 	logger.Info("Finish inserting docs into index", "elapsed", time.Since(label))
-
-	reader, err := writer.Reader()
-	if err != nil {
-		return nil, nil, err
-	}
-
 	logger.Info("Finish building index", "totalElapsed", time.Since(start))
-	return reader, writer, err
+	return &orgIndex{
+		writers: map[indexType]*bluge.Writer{
+			indexTypeDashboard: dashboardWriter,
+		},
+	}, err
 }
 
 func getFolderDashboardDoc(dash dashboard) *bluge.Document {
@@ -142,7 +143,9 @@ func getFolderDashboardDoc(dash dashboard) *bluge.Document {
 	}
 
 	return newSearchDocument(uid, dash.info.Title, dash.info.Description, url).
-		AddField(bluge.NewKeywordField(documentFieldKind, string(entityKindFolder)).Aggregatable().StoreValue())
+		AddField(bluge.NewKeywordField(documentFieldKind, string(entityKindFolder)).Aggregatable().StoreValue()).
+		AddField(bluge.NewDateTimeField(DocumentFieldCreatedAt, dash.created).Sortable().StoreValue()).
+		AddField(bluge.NewDateTimeField(DocumentFieldUpdatedAt, dash.updated).Sortable().StoreValue())
 }
 
 func getNonFolderDashboardDoc(dash dashboard, location string) *bluge.Document {
@@ -151,7 +154,9 @@ func getNonFolderDashboardDoc(dash dashboard, location string) *bluge.Document {
 	// Dashboard document
 	doc := newSearchDocument(dash.uid, dash.info.Title, dash.info.Description, url).
 		AddField(bluge.NewKeywordField(documentFieldKind, string(entityKindDashboard)).Aggregatable().StoreValue()).
-		AddField(bluge.NewKeywordField(documentFieldLocation, location).Aggregatable().StoreValue())
+		AddField(bluge.NewKeywordField(documentFieldLocation, location).Aggregatable().StoreValue()).
+		AddField(bluge.NewDateTimeField(DocumentFieldCreatedAt, dash.created).Sortable().StoreValue()).
+		AddField(bluge.NewDateTimeField(DocumentFieldUpdatedAt, dash.updated).Sortable().StoreValue())
 
 	for _, tag := range dash.info.Tags {
 		doc.AddField(bluge.NewKeywordField(documentFieldTag, tag).
@@ -218,23 +223,6 @@ func getDashboardPanelDocs(dash dashboard, location string) []*bluge.Document {
 	return docs
 }
 
-const ngramEdgeFilterMaxLength = 7
-
-var ngramIndexAnalyzer = &analysis.Analyzer{
-	Tokenizer: tokenizer.NewWhitespaceTokenizer(),
-	TokenFilters: []analysis.TokenFilter{
-		token.NewLowerCaseFilter(),
-		token.NewEdgeNgramFilter(token.FRONT, 1, ngramEdgeFilterMaxLength),
-	},
-}
-
-var ngramQueryAnalyzer = &analysis.Analyzer{
-	Tokenizer: tokenizer.NewWhitespaceTokenizer(),
-	TokenFilters: []analysis.TokenFilter{
-		token.NewLowerCaseFilter(),
-	},
-}
-
 // Names need to be indexed a few ways to support key features
 func newSearchDocument(uid string, name string, descr string, url string) *bluge.Document {
 	doc := bluge.NewDocument(uid)
@@ -258,8 +246,15 @@ func newSearchDocument(uid string, name string, descr string, url string) *bluge
 	return doc
 }
 
-func getDashboardPanelIDs(reader *bluge.Reader, panelLocation string) ([]string, error) {
+func getDashboardPanelIDs(index *orgIndex, panelLocation string) ([]string, error) {
 	var panelIDs []string
+
+	reader, cancel, err := index.readerForIndex(indexTypeDashboard)
+	if err != nil {
+		return nil, err
+	}
+	defer cancel()
+
 	fullQuery := bluge.NewBooleanQuery()
 	fullQuery.AddMust(bluge.NewTermQuery(panelLocation).SetField(documentFieldLocation))
 	fullQuery.AddMust(bluge.NewTermQuery(string(entityKindPanel)).SetField(documentFieldKind))
@@ -286,14 +281,21 @@ func getDashboardPanelIDs(reader *bluge.Reader, panelLocation string) ([]string,
 	return panelIDs, err
 }
 
-func getDocsIDsByLocationPrefix(reader *bluge.Reader, prefix string) ([]string, error) {
+func getDocsIDsByLocationPrefix(index *orgIndex, prefix string) ([]string, error) {
 	var ids []string
+
+	reader, cancel, err := index.readerForIndex(indexTypeDashboard)
+	if err != nil {
+		return nil, fmt.Errorf("error getting reader: %w", err)
+	}
+	defer cancel()
+
 	fullQuery := bluge.NewBooleanQuery()
 	fullQuery.AddMust(bluge.NewPrefixQuery(prefix).SetField(documentFieldLocation))
 	req := bluge.NewAllMatches(fullQuery)
 	documentMatchIterator, err := reader.Search(context.Background(), req)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error search: %w", err)
 	}
 	match, err := documentMatchIterator.Next()
 	for err == nil && match != nil {
@@ -313,9 +315,16 @@ func getDocsIDsByLocationPrefix(reader *bluge.Reader, prefix string) ([]string,
 	return ids, err
 }
 
-func getDashboardLocation(reader *bluge.Reader, dashboardUID string) (string, bool, error) {
+func getDashboardLocation(index *orgIndex, dashboardUID string) (string, bool, error) {
 	var dashboardLocation string
 	var found bool
+
+	reader, cancel, err := index.readerForIndex(indexTypeDashboard)
+	if err != nil {
+		return "", false, err
+	}
+	defer cancel()
+
 	fullQuery := bluge.NewBooleanQuery()
 	fullQuery.AddMust(bluge.NewTermQuery(dashboardUID).SetField(documentFieldUID))
 	fullQuery.AddMust(bluge.NewTermQuery(string(entityKindDashboard)).SetField(documentFieldKind))
@@ -348,7 +357,7 @@ func getDashboardLocation(reader *bluge.Reader, dashboardUID string) (string, bo
 func doSearchQuery(
 	ctx context.Context,
 	logger log.Logger,
-	reader *bluge.Reader,
+	index *orgIndex,
 	filter ResourceFilter,
 	q DashboardQuery,
 	extender QueryExtender,
@@ -357,6 +366,14 @@ func doSearchQuery(
 	response := &backend.DataResponse{}
 	header := &customMeta{}
 
+	reader, cancel, err := index.readerForIndex(indexTypeDashboard)
+	if err != nil {
+		logger.Error("error getting reader for dashboard index: %v", err)
+		response.Error = err
+		return response
+	}
+	defer cancel()
+
 	hasConstraints := false
 	fullQuery := bluge.NewBooleanQuery()
 	fullQuery.AddMust(newPermissionFilter(filter, logger))
@@ -419,10 +436,11 @@ func doSearchQuery(
 	} else {
 		// The actual se
 		bq := bluge.NewBooleanQuery().
-			AddShould(bluge.NewMatchPhraseQuery(q.Query).SetField(documentFieldName).SetBoost(6)).
-			AddShould(bluge.NewMatchPhraseQuery(q.Query).SetField(documentFieldDescription).SetBoost(3)).
+			AddShould(bluge.NewMatchQuery(q.Query).SetField(documentFieldName).SetBoost(6)).
+			AddShould(bluge.NewMatchQuery(q.Query).SetField(documentFieldDescription).SetBoost(3)).
 			AddShould(bluge.NewMatchQuery(q.Query).
 				SetField(documentFieldName_ngram).
+				SetOperator(bluge.MatchQueryOperatorAnd). // all terms must match
 				SetAnalyzer(ngramQueryAnalyzer).SetBoost(1))
 
 		if len(q.Query) > 4 {
@@ -464,7 +482,7 @@ func doSearchQuery(
 	// execute this search on the reader
 	documentMatchIterator, err := reader.Search(ctx, req)
 	if err != nil {
-		logger.Error("error executing search: %v", err)
+		logger.Error("error executing search", "err", err)
 		response.Error = err
 		return response
 	}
@@ -546,7 +564,7 @@ func doSearchQuery(
 			return true
 		})
 		if err != nil {
-			logger.Error("error loading stored fields: %v", err)
+			logger.Error("error loading stored fields", "err", err)
 			response.Error = err
 			return response
 		}
diff --git a/pkg/services/searchV2/extract/types.go b/pkg/services/searchV2/extract/types.go
index 71ff5545bb1..9b084cd2409 100644
--- a/pkg/services/searchV2/extract/types.go
+++ b/pkg/services/searchV2/extract/types.go
@@ -22,6 +22,7 @@ type PanelInfo struct {
 }
 
 type DashboardInfo struct {
+	UID           string          `json:"uid,omitempty"`
 	ID            int64           `json:"id,omitempty"` // internal ID
 	Title         string          `json:"title"`
 	Description   string          `json:"description,omitempty"`
diff --git a/pkg/services/searchV2/index.go b/pkg/services/searchV2/index.go
index 44cf9b92c29..6cbe0916d0b 100644
--- a/pkg/services/searchV2/index.go
+++ b/pkg/services/searchV2/index.go
@@ -59,11 +59,32 @@ type buildSignal struct {
 	done  chan error
 }
 
-type dashboardIndex struct {
+type orgIndex struct {
+	writers map[indexType]*bluge.Writer
+}
+
+type indexType string
+
+const (
+	indexTypeDashboard indexType = "dashboard"
+)
+
+func (i *orgIndex) writerForIndex(idxType indexType) *bluge.Writer {
+	return i.writers[idxType]
+}
+
+func (i *orgIndex) readerForIndex(idxType indexType) (*bluge.Reader, func(), error) {
+	reader, err := i.writers[idxType].Reader()
+	if err != nil {
+		return nil, nil, err
+	}
+	return reader, func() { _ = reader.Close() }, nil
+}
+
+type searchIndex struct {
 	mu             sync.RWMutex
 	loader         dashboardLoader
-	perOrgReader   map[int64]*bluge.Reader // orgId -> bluge reader
-	perOrgWriter   map[int64]*bluge.Writer // orgId -> bluge writer
+	perOrgIndex    map[int64]*orgIndex
 	eventStore     eventStore
 	logger         log.Logger
 	buildSignals   chan buildSignal
@@ -72,13 +93,12 @@ type dashboardIndex struct {
 	syncCh         chan chan struct{}
 }
 
-func newDashboardIndex(dashLoader dashboardLoader, evStore eventStore, extender DocumentExtender, folderIDs folderUIDLookup) *dashboardIndex {
-	return &dashboardIndex{
+func newSearchIndex(dashLoader dashboardLoader, evStore eventStore, extender DocumentExtender, folderIDs folderUIDLookup) *searchIndex {
+	return &searchIndex{
 		loader:         dashLoader,
 		eventStore:     evStore,
-		perOrgReader:   map[int64]*bluge.Reader{},
-		perOrgWriter:   map[int64]*bluge.Writer{},
-		logger:         log.New("dashboardIndex"),
+		perOrgIndex:    map[int64]*orgIndex{},
+		logger:         log.New("searchIndex"),
 		buildSignals:   make(chan buildSignal),
 		extender:       extender,
 		folderIdLookup: folderIDs,
@@ -86,7 +106,7 @@ func newDashboardIndex(dashLoader dashboardLoader, evStore eventStore, extender
 	}
 }
 
-func (i *dashboardIndex) sync(ctx context.Context) error {
+func (i *searchIndex) sync(ctx context.Context) error {
 	doneCh := make(chan struct{}, 1)
 	select {
 	case i.syncCh <- doneCh:
@@ -101,7 +121,7 @@ func (i *dashboardIndex) sync(ctx context.Context) error {
 	}
 }
 
-func (i *dashboardIndex) run(ctx context.Context, orgIDs []int64, reIndexSignalCh chan struct{}) error {
+func (i *searchIndex) run(ctx context.Context, orgIDs []int64, reIndexSignalCh chan struct{}) error {
 	reIndexInterval := 5 * time.Minute
 	fullReIndexTimer := time.NewTimer(reIndexInterval)
 	defer fullReIndexTimer.Stop()
@@ -147,7 +167,7 @@ func (i *dashboardIndex) run(ctx context.Context, orgIDs []int64, reIndexSignalC
 		case signal := <-i.buildSignals:
 			// When search read request meets new not-indexed org we build index for it.
 			i.mu.RLock()
-			_, ok := i.perOrgWriter[signal.orgID]
+			_, ok := i.perOrgIndex[signal.orgID]
 			if ok {
 				// Index for org already exists, do nothing.
 				i.mu.RUnlock()
@@ -206,7 +226,7 @@ func (i *dashboardIndex) run(ctx context.Context, orgIDs []int64, reIndexSignalC
 	}
 }
 
-func (i *dashboardIndex) buildInitialIndexes(ctx context.Context, orgIDs []int64) error {
+func (i *searchIndex) buildInitialIndexes(ctx context.Context, orgIDs []int64) error {
 	started := time.Now()
 	i.logger.Info("Start building in-memory indexes")
 	for _, orgID := range orgIDs {
@@ -219,7 +239,7 @@ func (i *dashboardIndex) buildInitialIndexes(ctx context.Context, orgIDs []int64
 	return nil
 }
 
-func (i *dashboardIndex) buildInitialIndex(ctx context.Context, orgID int64) error {
+func (i *searchIndex) buildInitialIndex(ctx context.Context, orgID int64) error {
 	debugCtx, debugCtxCancel := context.WithCancel(ctx)
 	if os.Getenv("GF_SEARCH_DEBUG") != "" {
 		go i.debugResourceUsage(debugCtx, 200*time.Millisecond)
@@ -284,7 +304,7 @@ func getProcessCPU(currentPid int) (float64, error) {
 	return 0, errors.New("process not found")
 }
 
-func (i *dashboardIndex) debugResourceUsage(ctx context.Context, frequency time.Duration) {
+func (i *searchIndex) debugResourceUsage(ctx context.Context, frequency time.Duration) {
 	var maxHeapInuse uint64
 	var maxSys uint64
 
@@ -326,8 +346,14 @@ func (i *dashboardIndex) debugResourceUsage(ctx context.Context, frequency time.
 	}
 }
 
-func (i *dashboardIndex) reportSizeOfIndexDiskBackup(orgID int64) {
-	reader, _ := i.getOrgReader(orgID)
+func (i *searchIndex) reportSizeOfIndexDiskBackup(orgID int64) {
+	index, _ := i.getOrgIndex(orgID)
+	reader, cancel, err := index.readerForIndex(indexTypeDashboard)
+	if err != nil {
+		i.logger.Warn("Error getting reader", "error", err)
+		return
+	}
+	defer cancel()
 
 	// create a temp directory to store the index
 	tmpDir, err := ioutil.TempDir("", "grafana.dashboard_index")
@@ -343,8 +369,8 @@ func (i *dashboardIndex) reportSizeOfIndexDiskBackup(orgID int64) {
 		}
 	}()
 
-	cancel := make(chan struct{})
-	err = reader.Backup(tmpDir, cancel)
+	cancelCh := make(chan struct{})
+	err = reader.Backup(tmpDir, cancelCh)
 	if err != nil {
 		i.logger.Error("can't create index disk backup", "error", err)
 		return
@@ -359,7 +385,7 @@ func (i *dashboardIndex) reportSizeOfIndexDiskBackup(orgID int64) {
 	i.logger.Warn("Size of index disk backup", "size", formatBytes(uint64(size)))
 }
 
-func (i *dashboardIndex) buildOrgIndex(ctx context.Context, orgID int64) (int, error) {
+func (i *searchIndex) buildOrgIndex(ctx context.Context, orgID int64) (int, error) {
 	started := time.Now()
 	ctx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
@@ -373,7 +399,7 @@ func (i *dashboardIndex) buildOrgIndex(ctx context.Context, orgID int64) (int, e
 	i.logger.Info("Finish loading org dashboards", "elapsed", orgSearchIndexLoadTime, "orgId", orgID)
 
 	dashboardExtender := i.extender.GetDashboardExtender(orgID)
-	reader, writer, err := initIndex(dashboards, i.logger, dashboardExtender)
+	index, err := initOrgIndex(dashboards, i.logger, dashboardExtender)
 	if err != nil {
 		return 0, fmt.Errorf("error initializing index: %w", err)
 	}
@@ -388,31 +414,34 @@ func (i *dashboardIndex) buildOrgIndex(ctx context.Context, orgID int64) (int, e
 		"orgSearchDashboardCount", len(dashboards))
 
 	i.mu.Lock()
-	if oldReader, ok := i.perOrgReader[orgID]; ok {
-		_ = oldReader.Close()
+	if oldIndex, ok := i.perOrgIndex[orgID]; ok {
+		for _, w := range oldIndex.writers {
+			_ = w.Close()
+		}
 	}
-	if oldWriter, ok := i.perOrgWriter[orgID]; ok {
-		_ = oldWriter.Close()
-	}
-	i.perOrgReader[orgID] = reader
-	i.perOrgWriter[orgID] = writer
+	i.perOrgIndex[orgID] = index
 	i.mu.Unlock()
 
 	if orgID == 1 {
-		go updateUsageStats(context.Background(), reader, i.logger)
+		go func() {
+			if reader, cancel, err := index.readerForIndex(indexTypeDashboard); err == nil {
+				defer cancel()
+				updateUsageStats(context.Background(), reader, i.logger)
+			}
+		}()
 	}
 	return len(dashboards), nil
 }
 
-func (i *dashboardIndex) getOrgReader(orgID int64) (*bluge.Reader, bool) {
+func (i *searchIndex) getOrgIndex(orgID int64) (*orgIndex, bool) {
 	i.mu.RLock()
 	defer i.mu.RUnlock()
-	r, ok := i.perOrgReader[orgID]
+	r, ok := i.perOrgIndex[orgID]
 	return r, ok
 }
 
-func (i *dashboardIndex) getOrCreateReader(ctx context.Context, orgID int64) (*bluge.Reader, error) {
-	reader, ok := i.getOrgReader(orgID)
+func (i *searchIndex) getOrCreateOrgIndex(ctx context.Context, orgID int64) (*orgIndex, error) {
+	index, ok := i.getOrgIndex(orgID)
 	if !ok {
 		// For non-main organization indexes are built lazily.
 		// If we don't have an index then we are blocking here until an index for
@@ -433,22 +462,15 @@ func (i *dashboardIndex) getOrCreateReader(ctx context.Context, orgID int64) (*b
 		case <-ctx.Done():
 			return nil, ctx.Err()
 		}
-		reader, _ = i.getOrgReader(orgID)
+		index, _ = i.getOrgIndex(orgID)
 	}
-	return reader, nil
+	return index, nil
 }
 
-func (i *dashboardIndex) getOrgWriter(orgID int64) (*bluge.Writer, bool) {
+func (i *searchIndex) reIndexFromScratch(ctx context.Context) {
 	i.mu.RLock()
-	defer i.mu.RUnlock()
-	w, ok := i.perOrgWriter[orgID]
-	return w, ok
-}
-
-func (i *dashboardIndex) reIndexFromScratch(ctx context.Context) {
-	i.mu.RLock()
-	orgIDs := make([]int64, 0, len(i.perOrgWriter))
-	for orgID := range i.perOrgWriter {
+	orgIDs := make([]int64, 0, len(i.perOrgIndex))
+	for orgID := range i.perOrgIndex {
 		orgIDs = append(orgIDs, orgID)
 	}
 	i.mu.RUnlock()
@@ -462,7 +484,7 @@ func (i *dashboardIndex) reIndexFromScratch(ctx context.Context) {
 	}
 }
 
-func (i *dashboardIndex) applyIndexUpdates(ctx context.Context, lastEventID int64) int64 {
+func (i *searchIndex) applyIndexUpdates(ctx context.Context, lastEventID int64) int64 {
 	events, err := i.eventStore.GetAllEventsAfter(context.Background(), lastEventID)
 	if err != nil {
 		i.logger.Error("can't load events", "error", err)
@@ -484,7 +506,7 @@ func (i *dashboardIndex) applyIndexUpdates(ctx context.Context, lastEventID int6
 	return lastEventID
 }
 
-func (i *dashboardIndex) applyEventOnIndex(ctx context.Context, e *store.EntityEvent) error {
+func (i *searchIndex) applyEventOnIndex(ctx context.Context, e *store.EntityEvent) error {
 	i.logger.Debug("processing event", "event", e)
 
 	if !strings.HasPrefix(e.EntityId, "database/") {
@@ -508,9 +530,9 @@ func (i *dashboardIndex) applyEventOnIndex(ctx context.Context, e *store.EntityE
 	return i.applyEvent(ctx, orgID, kind, uid, e.EventType)
 }
 
-func (i *dashboardIndex) applyEvent(ctx context.Context, orgID int64, kind store.EntityType, uid string, _ store.EntityEventType) error {
+func (i *searchIndex) applyEvent(ctx context.Context, orgID int64, kind store.EntityType, uid string, _ store.EntityEventType) error {
 	i.mu.Lock()
-	_, ok := i.perOrgWriter[orgID]
+	_, ok := i.perOrgIndex[orgID]
 	if !ok {
 		// Skip event for org not yet indexed.
 		i.mu.Unlock()
@@ -527,49 +549,39 @@ func (i *dashboardIndex) applyEvent(ctx context.Context, orgID int64, kind store
 	i.mu.Lock()
 	defer i.mu.Unlock()
 
-	writer, ok := i.perOrgWriter[orgID]
+	index, ok := i.perOrgIndex[orgID]
 	if !ok {
 		// Skip event for org not yet fully indexed.
 		return nil
 	}
-	// TODO: should we release index lock while performing removeDashboard/updateDashboard?
-	reader, ok := i.perOrgReader[orgID]
-	if !ok {
-		// Skip event for org not yet fully indexed.
-		return nil
-	}
-
-	var newReader *bluge.Reader
 
 	// In the future we can rely on operation types to reduce work here.
 	if len(dbDashboards) == 0 {
 		switch kind {
 		case store.EntityTypeDashboard:
-			newReader, err = i.removeDashboard(ctx, writer, reader, uid)
+			err = i.removeDashboard(ctx, index, uid)
 		case store.EntityTypeFolder:
-			newReader, err = i.removeFolder(ctx, writer, reader, uid)
+			err = i.removeFolder(ctx, index, uid)
 		default:
 			return nil
 		}
 	} else {
-		newReader, err = i.updateDashboard(ctx, orgID, writer, reader, dbDashboards[0])
+		err = i.updateDashboard(ctx, orgID, index, dbDashboards[0])
 	}
 	if err != nil {
 		return err
 	}
-	_ = reader.Close()
-	i.perOrgReader[orgID] = newReader
 	return nil
 }
 
-func (i *dashboardIndex) removeDashboard(_ context.Context, writer *bluge.Writer, reader *bluge.Reader, dashboardUID string) (*bluge.Reader, error) {
-	dashboardLocation, ok, err := getDashboardLocation(reader, dashboardUID)
+func (i *searchIndex) removeDashboard(_ context.Context, index *orgIndex, dashboardUID string) error {
+	dashboardLocation, ok, err := getDashboardLocation(index, dashboardUID)
 	if err != nil {
-		return nil, err
+		return err
 	}
 	if !ok {
 		// No dashboard, nothing to remove.
-		return reader, nil
+		return nil
 	}
 
 	// Find all panel docs to remove with dashboard.
@@ -577,40 +589,35 @@ func (i *dashboardIndex) removeDashboard(_ context.Context, writer *bluge.Writer
 	if dashboardLocation != "" {
 		panelLocation = dashboardLocation + "/" + dashboardUID
 	}
-	panelIDs, err := getDocsIDsByLocationPrefix(reader, panelLocation)
+	panelIDs, err := getDocsIDsByLocationPrefix(index, panelLocation)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
+	writer := index.writerForIndex(indexTypeDashboard)
+
 	batch := bluge.NewBatch()
 	batch.Delete(bluge.NewDocument(dashboardUID).ID())
 	for _, panelID := range panelIDs {
 		batch.Delete(bluge.NewDocument(panelID).ID())
 	}
 
-	err = writer.Batch(batch)
-	if err != nil {
-		return nil, err
-	}
-
-	return writer.Reader()
+	return writer.Batch(batch)
 }
 
-func (i *dashboardIndex) removeFolder(_ context.Context, writer *bluge.Writer, reader *bluge.Reader, folderUID string) (*bluge.Reader, error) {
-	ids, err := getDocsIDsByLocationPrefix(reader, folderUID)
+func (i *searchIndex) removeFolder(_ context.Context, index *orgIndex, folderUID string) error {
+	ids, err := getDocsIDsByLocationPrefix(index, folderUID)
 	if err != nil {
-		return nil, err
+		return fmt.Errorf("error getting by location prefix: %w", err)
 	}
+
 	batch := bluge.NewBatch()
 	batch.Delete(bluge.NewDocument(folderUID).ID())
 	for _, id := range ids {
 		batch.Delete(bluge.NewDocument(id).ID())
 	}
-	err = writer.Batch(batch)
-	if err != nil {
-		return nil, err
-	}
-	return writer.Reader()
+	writer := index.writerForIndex(indexTypeDashboard)
+	return writer.Batch(batch)
 }
 
 func stringInSlice(str string, slice []string) bool {
@@ -622,67 +629,65 @@ func stringInSlice(str string, slice []string) bool {
 	return false
 }
 
-func (i *dashboardIndex) updateDashboard(ctx context.Context, orgID int64, writer *bluge.Writer, reader *bluge.Reader, dash dashboard) (*bluge.Reader, error) {
-	batch := bluge.NewBatch()
-
+func (i *searchIndex) updateDashboard(ctx context.Context, orgID int64, index *orgIndex, dash dashboard) error {
 	extendDoc := i.extender.GetDashboardExtender(orgID, dash.uid)
 
+	writer := index.writerForIndex(indexTypeDashboard)
+
 	var doc *bluge.Document
 	if dash.isFolder {
 		doc = getFolderDashboardDoc(dash)
 		if err := extendDoc(dash.uid, doc); err != nil {
-			return nil, err
+			return err
 		}
+		return writer.Update(doc.ID(), doc)
+	}
+
+	batch := bluge.NewBatch()
+
+	var folderUID string
+	if dash.folderID == 0 {
+		folderUID = "general"
 	} else {
-		var folderUID string
-		if dash.folderID == 0 {
-			folderUID = "general"
-		} else {
-			var err error
-			folderUID, err = i.folderIdLookup(ctx, dash.folderID)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		location := folderUID
-		doc = getNonFolderDashboardDoc(dash, location)
-		if err := extendDoc(dash.uid, doc); err != nil {
-			return nil, err
-		}
-
-		var actualPanelIDs []string
-
-		if location != "" {
-			location += "/"
-		}
-		location += dash.uid
-		panelDocs := getDashboardPanelDocs(dash, location)
-		for _, panelDoc := range panelDocs {
-			actualPanelIDs = append(actualPanelIDs, string(panelDoc.ID().Term()))
-			batch.Update(panelDoc.ID(), panelDoc)
-		}
-
-		indexedPanelIDs, err := getDashboardPanelIDs(reader, location)
+		var err error
+		folderUID, err = i.folderIdLookup(ctx, dash.folderID)
 		if err != nil {
-			return nil, err
+			return err
 		}
+	}
 
-		for _, panelID := range indexedPanelIDs {
-			if !stringInSlice(panelID, actualPanelIDs) {
-				batch.Delete(bluge.NewDocument(panelID).ID())
-			}
+	location := folderUID
+	doc = getNonFolderDashboardDoc(dash, location)
+	if err := extendDoc(dash.uid, doc); err != nil {
+		return err
+	}
+
+	var actualPanelIDs []string
+
+	if location != "" {
+		location += "/"
+	}
+	location += dash.uid
+	panelDocs := getDashboardPanelDocs(dash, location)
+	for _, panelDoc := range panelDocs {
+		actualPanelIDs = append(actualPanelIDs, string(panelDoc.ID().Term()))
+		batch.Update(panelDoc.ID(), panelDoc)
+	}
+
+	indexedPanelIDs, err := getDashboardPanelIDs(index, location)
+	if err != nil {
+		return err
+	}
+
+	for _, panelID := range indexedPanelIDs {
+		if !stringInSlice(panelID, actualPanelIDs) {
+			batch.Delete(bluge.NewDocument(panelID).ID())
 		}
 	}
 
 	batch.Update(doc.ID(), doc)
 
-	err := writer.Batch(batch)
-	if err != nil {
-		return nil, err
-	}
-
-	return writer.Reader()
+	return writer.Batch(batch)
 }
 
 type sqlDashboardLoader struct {
diff --git a/pkg/services/searchV2/index_test.go b/pkg/services/searchV2/index_test.go
index 5692523a1e0..972899b6788 100644
--- a/pkg/services/searchV2/index_test.go
+++ b/pkg/services/searchV2/index_test.go
@@ -37,17 +37,29 @@ var testDisallowAllFilter = func(uid string) bool {
 
 var testOrgID int64 = 1
 
-func initTestIndexFromDashes(t *testing.T, dashboards []dashboard) (*dashboardIndex, *bluge.Reader, *bluge.Writer) {
+func initTestOrgIndexFromDashes(t *testing.T, dashboards []dashboard) *orgIndex {
+	t.Helper()
+	searchIdx := initTestIndexFromDashesExtended(t, dashboards, &NoopDocumentExtender{})
+	return searchIdx.perOrgIndex[testOrgID]
+}
+
+func initTestOrgIndexFromDashesExtended(t *testing.T, dashboards []dashboard, extender DocumentExtender) *orgIndex {
+	t.Helper()
+	searchIdx := initTestIndexFromDashesExtended(t, dashboards, extender)
+	return searchIdx.perOrgIndex[testOrgID]
+}
+
+func initTestIndexFromDashes(t *testing.T, dashboards []dashboard) *searchIndex {
 	t.Helper()
 	return initTestIndexFromDashesExtended(t, dashboards, &NoopDocumentExtender{})
 }
 
-func initTestIndexFromDashesExtended(t *testing.T, dashboards []dashboard, extender DocumentExtender) (*dashboardIndex, *bluge.Reader, *bluge.Writer) {
+func initTestIndexFromDashesExtended(t *testing.T, dashboards []dashboard, extender DocumentExtender) *searchIndex {
 	t.Helper()
 	dashboardLoader := &testDashboardLoader{
 		dashboards: dashboards,
 	}
-	index := newDashboardIndex(
+	index := newSearchIndex(
 		dashboardLoader,
 		&store.MockEntityEventsService{},
 		extender,
@@ -56,21 +68,17 @@ func initTestIndexFromDashesExtended(t *testing.T, dashboards []dashboard, exten
 	numDashboards, err := index.buildOrgIndex(context.Background(), testOrgID)
 	require.NoError(t, err)
 	require.Equal(t, len(dashboardLoader.dashboards), numDashboards)
-	reader, ok := index.getOrgReader(testOrgID)
-	require.True(t, ok)
-	writer, ok := index.getOrgWriter(testOrgID)
-	require.True(t, ok)
-	return index, reader, writer
+	return index
 }
 
-func checkSearchResponse(t *testing.T, fileName string, reader *bluge.Reader, filter ResourceFilter, query DashboardQuery) {
+func checkSearchResponse(t *testing.T, fileName string, index *orgIndex, filter ResourceFilter, query DashboardQuery) {
 	t.Helper()
-	checkSearchResponseExtended(t, fileName, reader, filter, query, &NoopQueryExtender{})
+	checkSearchResponseExtended(t, fileName, index, filter, query, &NoopQueryExtender{})
 }
 
-func checkSearchResponseExtended(t *testing.T, fileName string, reader *bluge.Reader, filter ResourceFilter, query DashboardQuery, extender QueryExtender) {
+func checkSearchResponseExtended(t *testing.T, fileName string, index *orgIndex, filter ResourceFilter, query DashboardQuery, extender QueryExtender) {
 	t.Helper()
-	resp := doSearchQuery(context.Background(), testLogger, reader, filter, query, extender, "/pfix")
+	resp := doSearchQuery(context.Background(), testLogger, index, filter, query, extender, "/pfix")
 	experimental.CheckGoldenJSONResponse(t, "testdata", fileName, resp, true)
 }
 
@@ -93,15 +101,15 @@ var testDashboards = []dashboard{
 
 func TestDashboardIndex(t *testing.T) {
 	t.Run("basic-search", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "boom"},
 		)
 	})
 
 	t.Run("basic-filter", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testDisallowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testDisallowAllFilter,
 			DashboardQuery{Query: "boom"},
 		)
 	})
@@ -109,20 +117,22 @@ func TestDashboardIndex(t *testing.T) {
 
 func TestDashboardIndexUpdates(t *testing.T) {
 	t.Run("dashboard-delete", func(t *testing.T) {
-		index, reader, writer := initTestIndexFromDashes(t, testDashboards)
-
-		newReader, err := index.removeDashboard(context.Background(), writer, reader, "2")
+		index := initTestIndexFromDashes(t, testDashboards)
+		orgIdx, ok := index.getOrgIndex(testOrgID)
+		require.True(t, ok)
+		err := index.removeDashboard(context.Background(), orgIdx, "2")
 		require.NoError(t, err)
-
-		checkSearchResponse(t, filepath.Base(t.Name()), newReader, testAllowAllFilter,
+		checkSearchResponse(t, filepath.Base(t.Name()), orgIdx, testAllowAllFilter,
 			DashboardQuery{Query: "boom"},
 		)
 	})
 
 	t.Run("dashboard-create", func(t *testing.T) {
-		index, reader, writer := initTestIndexFromDashes(t, testDashboards)
+		index := initTestIndexFromDashes(t, testDashboards)
+		orgIdx, ok := index.getOrgIndex(testOrgID)
+		require.True(t, ok)
 
-		newReader, err := index.updateDashboard(context.Background(), testOrgID, writer, reader, dashboard{
+		err := index.updateDashboard(context.Background(), testOrgID, orgIdx, dashboard{
 			id:  3,
 			uid: "3",
 			info: &extract.DashboardInfo{
@@ -131,15 +141,17 @@ func TestDashboardIndexUpdates(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		checkSearchResponse(t, filepath.Base(t.Name()), newReader, testAllowAllFilter,
+		checkSearchResponse(t, filepath.Base(t.Name()), orgIdx, testAllowAllFilter,
 			DashboardQuery{Query: "created"},
 		)
 	})
 
 	t.Run("dashboard-update", func(t *testing.T) {
-		index, reader, writer := initTestIndexFromDashes(t, testDashboards)
+		index := initTestIndexFromDashes(t, testDashboards)
+		orgIdx, ok := index.getOrgIndex(testOrgID)
+		require.True(t, ok)
 
-		newReader, err := index.updateDashboard(context.Background(), testOrgID, writer, reader, dashboard{
+		err := index.updateDashboard(context.Background(), testOrgID, orgIdx, dashboard{
 			id:  2,
 			uid: "2",
 			info: &extract.DashboardInfo{
@@ -148,7 +160,7 @@ func TestDashboardIndexUpdates(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		checkSearchResponse(t, filepath.Base(t.Name()), newReader, testAllowAllFilter,
+		checkSearchResponse(t, filepath.Base(t.Name()), orgIdx, testAllowAllFilter,
 			DashboardQuery{Query: "nginx"},
 		)
 	})
@@ -231,15 +243,15 @@ func TestDashboardIndexSort(t *testing.T) {
 	}
 
 	t.Run("sort-asc", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashesExtended(t, testSortDashboards, extender.GetDocumentExtender())
-		checkSearchResponseExtended(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashesExtended(t, testSortDashboards, extender.GetDocumentExtender())
+		checkSearchResponseExtended(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "*", Sort: "test"}, extender.GetQueryExtender(),
 		)
 	})
 
 	t.Run("sort-desc", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashesExtended(t, testSortDashboards, extender.GetDocumentExtender())
-		checkSearchResponseExtended(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashesExtended(t, testSortDashboards, extender.GetDocumentExtender())
+		checkSearchResponseExtended(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "*", Sort: "-test"}, extender.GetQueryExtender(),
 		)
 	})
@@ -250,43 +262,43 @@ var testPrefixDashboards = []dashboard{
 		id:  1,
 		uid: "1",
 		info: &extract.DashboardInfo{
-			Title: "Archer Data",
+			Title: "Archer Data System",
 		},
 	},
 	{
 		id:  2,
 		uid: "2",
 		info: &extract.DashboardInfo{
-			Title: "Document Sync",
+			Title: "Document Sync repo",
 		},
 	},
 }
 
 func TestDashboardIndex_PrefixSearch(t *testing.T) {
 	t.Run("prefix-search-beginning", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "Arch"},
 		)
 	})
 
 	t.Run("prefix-search-middle", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "Syn"},
 		)
 	})
 
 	t.Run("prefix-search-beginning-lower", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "arch"},
 		)
 	})
 
 	t.Run("prefix-search-middle-lower", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "syn"},
 		)
 	})
@@ -294,30 +306,31 @@ func TestDashboardIndex_PrefixSearch(t *testing.T) {
 
 func TestDashboardIndex_MultipleTokensInRow(t *testing.T) {
 	t.Run("multiple-tokens-beginning", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "Archer da"},
 		)
 	})
 
 	t.Run("multiple-tokens-beginning-lower", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
-			DashboardQuery{Query: "archer da"},
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
+			DashboardQuery{Query: "da archer"},
 		)
 	})
 
+	// Not sure it is great this matches, but
 	t.Run("multiple-tokens-middle", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
-			DashboardQuery{Query: "rcher Da"},
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
+			DashboardQuery{Query: "ar Da"},
 		)
 	})
 
 	t.Run("multiple-tokens-middle-lower", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, testPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
-			DashboardQuery{Query: "cument sy"},
+		index := initTestOrgIndexFromDashes(t, testPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
+			DashboardQuery{Query: "doc sy"},
 		)
 	})
 }
@@ -334,8 +347,8 @@ var longPrefixDashboards = []dashboard{
 
 func TestDashboardIndex_PrefixNgramExceeded(t *testing.T) {
 	t.Run("prefix-search-ngram-exceeded", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, longPrefixDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, longPrefixDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "Eyjafjallajöku"},
 		)
 	})
@@ -360,14 +373,14 @@ var scatteredTokensDashboards = []dashboard{
 
 func TestDashboardIndex_MultipleTokensScattered(t *testing.T) {
 	t.Run("scattered-tokens-match", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, scatteredTokensDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, scatteredTokensDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "dead secret"},
 		)
 	})
 	t.Run("scattered-tokens-match-reversed", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, scatteredTokensDashboards)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, scatteredTokensDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "powerful secret"},
 		)
 	})
@@ -431,15 +444,15 @@ var dashboardsWithFolders = []dashboard{
 
 func TestDashboardIndex_Folders(t *testing.T) {
 	t.Run("folders-indexed", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, dashboardsWithFolders)
-		checkSearchResponse(t, filepath.Base(t.Name()), reader, testAllowAllFilter,
+		index := initTestOrgIndexFromDashes(t, dashboardsWithFolders)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
 			DashboardQuery{Query: "My folder", Kind: []string{string(entityKindFolder)}},
 		)
 	})
 	t.Run("folders-dashboard-has-folder", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, dashboardsWithFolders)
+		index := initTestOrgIndexFromDashes(t, dashboardsWithFolders)
 		// TODO: golden file compare does not work here.
-		resp := doSearchQuery(context.Background(), testLogger, reader, testAllowAllFilter,
+		resp := doSearchQuery(context.Background(), testLogger, index, testAllowAllFilter,
 			DashboardQuery{Query: "Dashboard in folder", Kind: []string{string(entityKindDashboard)}},
 			&NoopQueryExtender{}, "")
 		custom, ok := resp.Frames[0].Meta.Custom.(*customMeta)
@@ -448,19 +461,23 @@ func TestDashboardIndex_Folders(t *testing.T) {
 		require.Equal(t, "/dashboards/f/1/", custom.Locations["1"].URL)
 	})
 	t.Run("folders-dashboard-removed-on-folder-removed", func(t *testing.T) {
-		index, reader, writer := initTestIndexFromDashes(t, dashboardsWithFolders)
-		newReader, err := index.removeFolder(context.Background(), writer, reader, "1")
+		index := initTestIndexFromDashes(t, dashboardsWithFolders)
+		orgIdx, ok := index.getOrgIndex(testOrgID)
+		require.True(t, ok)
+		err := index.removeFolder(context.Background(), orgIdx, "1")
 		require.NoError(t, err)
 		// In response we expect one dashboard which does not belong to removed folder.
-		checkSearchResponse(t, filepath.Base(t.Name()), newReader, testAllowAllFilter,
+		checkSearchResponse(t, filepath.Base(t.Name()), orgIdx, testAllowAllFilter,
 			DashboardQuery{Query: "dash", Kind: []string{string(entityKindDashboard)}},
 		)
 	})
 	t.Run("folders-panels-removed-on-folder-removed", func(t *testing.T) {
-		index, reader, writer := initTestIndexFromDashes(t, dashboardsWithFolders)
-		newReader, err := index.removeFolder(context.Background(), writer, reader, "1")
+		index := initTestIndexFromDashes(t, dashboardsWithFolders)
+		orgIdx, ok := index.getOrgIndex(testOrgID)
+		require.True(t, ok)
+		err := index.removeFolder(context.Background(), orgIdx, "1")
 		require.NoError(t, err)
-		resp := doSearchQuery(context.Background(), testLogger, newReader, testAllowAllFilter,
+		resp := doSearchQuery(context.Background(), testLogger, orgIdx, testAllowAllFilter,
 			DashboardQuery{Query: "Panel", Kind: []string{string(entityKindPanel)}},
 			&NoopQueryExtender{}, "")
 		custom, ok := resp.Frames[0].Meta.Custom.(*customMeta)
@@ -491,10 +508,10 @@ var dashboardsWithPanels = []dashboard{
 
 func TestDashboardIndex_Panels(t *testing.T) {
 	t.Run("panels-indexed", func(t *testing.T) {
-		_, reader, _ := initTestIndexFromDashes(t, dashboardsWithPanels)
+		index := initTestOrgIndexFromDashes(t, dashboardsWithPanels)
 		// TODO: golden file compare does not work here.
 		resp := doSearchQuery(
-			context.Background(), testLogger, reader, testAllowAllFilter,
+			context.Background(), testLogger, index, testAllowAllFilter,
 			DashboardQuery{Query: "Panel", Kind: []string{string(entityKindPanel)}},
 			&NoopQueryExtender{}, "")
 		custom, ok := resp.Frames[0].Meta.Custom.(*customMeta)
@@ -503,11 +520,65 @@ func TestDashboardIndex_Panels(t *testing.T) {
 		require.Equal(t, "/d/1/", custom.Locations["1"].URL)
 	})
 	t.Run("panels-panel-removed-on-dashboard-removed", func(t *testing.T) {
-		index, reader, writer := initTestIndexFromDashes(t, dashboardsWithPanels)
-		newReader, err := index.removeDashboard(context.Background(), writer, reader, "1")
+		index := initTestIndexFromDashes(t, dashboardsWithPanels)
+		orgIdx, ok := index.getOrgIndex(testOrgID)
+		require.True(t, ok)
+		err := index.removeDashboard(context.Background(), orgIdx, "1")
 		require.NoError(t, err)
-		checkSearchResponse(t, filepath.Base(t.Name()), newReader, testAllowAllFilter,
+		checkSearchResponse(t, filepath.Base(t.Name()), orgIdx, testAllowAllFilter,
 			DashboardQuery{Query: "Panel", Kind: []string{string(entityKindPanel)}},
 		)
 	})
 }
+
+var punctuationSplitNgramDashboards = []dashboard{
+	{
+		id:  1,
+		uid: "1",
+		info: &extract.DashboardInfo{
+			Title: "heat-torkel",
+		},
+	},
+	{
+		id:  2,
+		uid: "2",
+		info: &extract.DashboardInfo{
+			Title: "topology heatmap",
+		},
+	},
+}
+
+func TestDashboardIndex_PunctuationNgram(t *testing.T) {
+	t.Run("ngram-punctuation-split", func(t *testing.T) {
+		index := initTestOrgIndexFromDashes(t, punctuationSplitNgramDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
+			DashboardQuery{Query: "tork he"},
+		)
+	})
+
+	t.Run("ngram-simple", func(t *testing.T) {
+		index := initTestOrgIndexFromDashes(t, punctuationSplitNgramDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
+			DashboardQuery{Query: "hea"},
+		)
+	})
+}
+
+var camelCaseNgramDashboards = []dashboard{
+	{
+		id:  1,
+		uid: "1",
+		info: &extract.DashboardInfo{
+			Title: "heatTorkel",
+		},
+	},
+}
+
+func TestDashboardIndex_CamelCaseNgram(t *testing.T) {
+	t.Run("ngram-camel-case-split", func(t *testing.T) {
+		index := initTestOrgIndexFromDashes(t, camelCaseNgramDashboards)
+		checkSearchResponse(t, filepath.Base(t.Name()), index, testAllowAllFilter,
+			DashboardQuery{Query: "tork"},
+		)
+	})
+}
diff --git a/pkg/services/searchV2/ngram.go b/pkg/services/searchV2/ngram.go
new file mode 100644
index 00000000000..48c1e56fafb
--- /dev/null
+++ b/pkg/services/searchV2/ngram.go
@@ -0,0 +1,47 @@
+package searchV2
+
+import (
+	"strings"
+
+	"github.com/blugelabs/bluge/analysis"
+	"github.com/blugelabs/bluge/analysis/token"
+	"github.com/blugelabs/bluge/analysis/tokenizer"
+)
+
+var punctuationReplacer *strings.Replacer
+
+func init() {
+	var punctuation = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"
+	args := make([]string, 0, len(punctuation)*2)
+	for _, r := range punctuation {
+		args = append(args, string(r), " ")
+	}
+	punctuationReplacer = strings.NewReplacer(args...)
+}
+
+type punctuationCharFilter struct{}
+
+func (t *punctuationCharFilter) Filter(input []byte) []byte {
+	return []byte(punctuationReplacer.Replace(string(input)))
+}
+
+const ngramEdgeFilterMaxLength = 7
+
+var ngramIndexAnalyzer = &analysis.Analyzer{
+	CharFilters: []analysis.CharFilter{&punctuationCharFilter{}},
+	Tokenizer:   tokenizer.NewWhitespaceTokenizer(),
+	TokenFilters: []analysis.TokenFilter{
+		token.NewCamelCaseFilter(),
+		token.NewLowerCaseFilter(),
+		token.NewEdgeNgramFilter(token.FRONT, 1, ngramEdgeFilterMaxLength),
+	},
+}
+
+var ngramQueryAnalyzer = &analysis.Analyzer{
+	CharFilters: []analysis.CharFilter{&punctuationCharFilter{}},
+	Tokenizer:   tokenizer.NewWhitespaceTokenizer(),
+	TokenFilters: []analysis.TokenFilter{
+		token.NewCamelCaseFilter(),
+		token.NewLowerCaseFilter(),
+	},
+}
diff --git a/pkg/services/searchV2/ngram_test.go b/pkg/services/searchV2/ngram_test.go
new file mode 100644
index 00000000000..be2d6646e9e
--- /dev/null
+++ b/pkg/services/searchV2/ngram_test.go
@@ -0,0 +1,59 @@
+package searchV2
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func Test_punctuationCharFilter_Filter(t1 *testing.T) {
+	type args struct {
+		input []byte
+	}
+	tests := []struct {
+		name string
+		args args
+		want []byte
+	}{
+		{
+			name: "1",
+			args: args{
+				input: []byte("x-Rays"),
+			},
+			want: []byte("x Rays"),
+		},
+		{
+			name: "2",
+			args: args{
+				input: []byte("x.Rays"),
+			},
+			want: []byte("x Rays"),
+		},
+		{
+			name: "3",
+			args: args{
+				input: []byte("[x,Rays]"),
+			},
+			want: []byte(" x Rays "),
+		},
+	}
+	for _, tt := range tests {
+		t1.Run(tt.name, func(t1 *testing.T) {
+			t := &punctuationCharFilter{}
+			if got := t.Filter(tt.args.input); !reflect.DeepEqual(got, tt.want) {
+				t1.Errorf("Filter() = %v, want %v", string(got), string(tt.want))
+			}
+		})
+	}
+}
+
+func TestNgramIndexAnalyzer(t *testing.T) {
+	stream := ngramIndexAnalyzer.Analyze([]byte("x-rays.and.xRays, and НемногоКириллицы"))
+	expectedTerms := []string{"x", "r", "ra", "ray", "rays", "a", "an", "and", "x", "r", "ra", "ray", "rays", "a", "an", "and", "н", "не", "нем", "немн", "немно", "немног", "немного", "к", "ки", "кир", "кири", "кирил", "кирилл", "кирилли"}
+	var actualTerms []string
+	for _, t := range stream {
+		actualTerms = append(actualTerms, string(t.Term))
+	}
+	require.Equal(t, expectedTerms, actualTerms)
+}
diff --git a/pkg/services/searchV2/service.go b/pkg/services/searchV2/service.go
index bfcf080a044..2bd11f15b60 100644
--- a/pkg/services/searchV2/service.go
+++ b/pkg/services/searchV2/service.go
@@ -26,7 +26,7 @@ type StandardSearchService struct {
 	ac   accesscontrol.AccessControl
 
 	logger         log.Logger
-	dashboardIndex *dashboardIndex
+	dashboardIndex *searchIndex
 	extender       DashboardIndexExtender
 	reIndexCh      chan struct{}
 }
@@ -41,7 +41,7 @@ func ProvideService(cfg *setting.Cfg, sql *sqlstore.SQLStore, entityEventStore s
 			sql: sql,
 			ac:  ac,
 		},
-		dashboardIndex: newDashboardIndex(
+		dashboardIndex: newSearchIndex(
 			newSQLDashboardLoader(sql),
 			entityEventStore,
 			extender.GetDocumentExtender(),
@@ -163,7 +163,7 @@ func (s *StandardSearchService) DoDashboardQuery(ctx context.Context, user *back
 		return rsp
 	}
 
-	reader, err := s.dashboardIndex.getOrCreateReader(ctx, orgID)
+	index, err := s.dashboardIndex.getOrCreateOrgIndex(ctx, orgID)
 	if err != nil {
 		rsp.Error = err
 		return rsp
@@ -175,5 +175,5 @@ func (s *StandardSearchService) DoDashboardQuery(ctx context.Context, user *back
 		return rsp
 	}
 
-	return doSearchQuery(ctx, s.logger, reader, filter, q, s.extender.GetQueryExtender(q), s.cfg.AppSubURL)
+	return doSearchQuery(ctx, s.logger, index, filter, q, s.extender.GetQueryExtender(q), s.cfg.AppSubURL)
 }
diff --git a/pkg/services/searchV2/testdata/multiple-tokens-beginning-lower.jsonc b/pkg/services/searchV2/testdata/multiple-tokens-beginning-lower.jsonc
index 022b5a15649..8831219a6bd 100644
--- a/pkg/services/searchV2/testdata/multiple-tokens-beginning-lower.jsonc
+++ b/pkg/services/searchV2/testdata/multiple-tokens-beginning-lower.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 1              | Archer Data    |                  | /pfix/d/1/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | Archer Data System |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "1"
           ],
           [
-            "Archer Data"
+            "Archer Data System"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/multiple-tokens-beginning.jsonc b/pkg/services/searchV2/testdata/multiple-tokens-beginning.jsonc
index 022b5a15649..8831219a6bd 100644
--- a/pkg/services/searchV2/testdata/multiple-tokens-beginning.jsonc
+++ b/pkg/services/searchV2/testdata/multiple-tokens-beginning.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 1              | Archer Data    |                  | /pfix/d/1/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | Archer Data System |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "1"
           ],
           [
-            "Archer Data"
+            "Archer Data System"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/multiple-tokens-middle-lower.jsonc b/pkg/services/searchV2/testdata/multiple-tokens-middle-lower.jsonc
index 2db59e343f8..2fe14bb9129 100644
--- a/pkg/services/searchV2/testdata/multiple-tokens-middle-lower.jsonc
+++ b/pkg/services/searchV2/testdata/multiple-tokens-middle-lower.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 2              | Document Sync  |                  | /pfix/d/2/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 2              | Document Sync repo |                  | /pfix/d/2/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "2"
           ],
           [
-            "Document Sync"
+            "Document Sync repo"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/multiple-tokens-middle.jsonc b/pkg/services/searchV2/testdata/multiple-tokens-middle.jsonc
index 022b5a15649..8831219a6bd 100644
--- a/pkg/services/searchV2/testdata/multiple-tokens-middle.jsonc
+++ b/pkg/services/searchV2/testdata/multiple-tokens-middle.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 1              | Archer Data    |                  | /pfix/d/1/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | Archer Data System |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "1"
           ],
           [
-            "Archer Data"
+            "Archer Data System"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/ngram-camel-case-split.jsonc b/pkg/services/searchV2/testdata/ngram-camel-case-split.jsonc
new file mode 100644
index 00000000000..f7c18e0f055
--- /dev/null
+++ b/pkg/services/searchV2/testdata/ngram-camel-case-split.jsonc
@@ -0,0 +1,131 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "search-results",
+//      "custom": {
+//          "count": 1
+//      }
+//  }
+//  Name: Query results
+//  Dimensions: 8 Fields by 1 Rows
+//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | heatTorkel     |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "frames": [
+    {
+      "schema": {
+        "name": "Query results",
+        "meta": {
+          "type": "search-results",
+          "custom": {
+            "count": 1
+          }
+        },
+        "fields": [
+          {
+            "name": "kind",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "uid",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "panel_type",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "url",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "link",
+                  "url": "${__value.text}"
+                }
+              ]
+            }
+          },
+          {
+            "name": "tags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ds_uid",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "location",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "dashboard"
+          ],
+          [
+            "1"
+          ],
+          [
+            "heatTorkel"
+          ],
+          [
+            ""
+          ],
+          [
+            "/pfix/d/1/"
+          ],
+          [
+            null
+          ],
+          [
+            null
+          ],
+          [
+            ""
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/services/searchV2/testdata/ngram-punctuation-split.jsonc b/pkg/services/searchV2/testdata/ngram-punctuation-split.jsonc
new file mode 100644
index 00000000000..4433aa0c09b
--- /dev/null
+++ b/pkg/services/searchV2/testdata/ngram-punctuation-split.jsonc
@@ -0,0 +1,131 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "search-results",
+//      "custom": {
+//          "count": 1
+//      }
+//  }
+//  Name: Query results
+//  Dimensions: 8 Fields by 1 Rows
+//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | heat-torkel    |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "frames": [
+    {
+      "schema": {
+        "name": "Query results",
+        "meta": {
+          "type": "search-results",
+          "custom": {
+            "count": 1
+          }
+        },
+        "fields": [
+          {
+            "name": "kind",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "uid",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "panel_type",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "url",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "link",
+                  "url": "${__value.text}"
+                }
+              ]
+            }
+          },
+          {
+            "name": "tags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ds_uid",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "location",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "dashboard"
+          ],
+          [
+            "1"
+          ],
+          [
+            "heat-torkel"
+          ],
+          [
+            ""
+          ],
+          [
+            "/pfix/d/1/"
+          ],
+          [
+            null
+          ],
+          [
+            null
+          ],
+          [
+            ""
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/services/searchV2/testdata/ngram-simple.jsonc b/pkg/services/searchV2/testdata/ngram-simple.jsonc
new file mode 100644
index 00000000000..65b27bc0727
--- /dev/null
+++ b/pkg/services/searchV2/testdata/ngram-simple.jsonc
@@ -0,0 +1,140 @@
+//  🌟 This was machine generated.  Do not edit. 🌟
+//  
+//  Frame[0] {
+//      "type": "search-results",
+//      "custom": {
+//          "count": 2
+//      }
+//  }
+//  Name: Query results
+//  Dimensions: 8 Fields by 2 Rows
+//  +----------------+----------------+------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name       | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:          | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string   | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | heat-torkel      |                  | /pfix/d/1/     | null                     | null                     |                |
+//  | dashboard      | 2              | topology heatmap |                  | /pfix/d/2/     | null                     | null                     |                |
+//  +----------------+----------------+------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  
+//  
+//  🌟 This was machine generated.  Do not edit. 🌟
+{
+  "frames": [
+    {
+      "schema": {
+        "name": "Query results",
+        "meta": {
+          "type": "search-results",
+          "custom": {
+            "count": 2
+          }
+        },
+        "fields": [
+          {
+            "name": "kind",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "uid",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "name",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "panel_type",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          },
+          {
+            "name": "url",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            },
+            "config": {
+              "links": [
+                {
+                  "title": "link",
+                  "url": "${__value.text}"
+                }
+              ]
+            }
+          },
+          {
+            "name": "tags",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "ds_uid",
+            "type": "other",
+            "typeInfo": {
+              "frame": "json.RawMessage",
+              "nullable": true
+            }
+          },
+          {
+            "name": "location",
+            "type": "string",
+            "typeInfo": {
+              "frame": "string"
+            }
+          }
+        ]
+      },
+      "data": {
+        "values": [
+          [
+            "dashboard",
+            "dashboard"
+          ],
+          [
+            "1",
+            "2"
+          ],
+          [
+            "heat-torkel",
+            "topology heatmap"
+          ],
+          [
+            "",
+            ""
+          ],
+          [
+            "/pfix/d/1/",
+            "/pfix/d/2/"
+          ],
+          [
+            null,
+            null
+          ],
+          [
+            null,
+            null
+          ],
+          [
+            "",
+            ""
+          ]
+        ]
+      }
+    }
+  ]
+}
\ No newline at end of file
diff --git a/pkg/services/searchV2/testdata/prefix-search-beginning-lower.jsonc b/pkg/services/searchV2/testdata/prefix-search-beginning-lower.jsonc
index 022b5a15649..8831219a6bd 100644
--- a/pkg/services/searchV2/testdata/prefix-search-beginning-lower.jsonc
+++ b/pkg/services/searchV2/testdata/prefix-search-beginning-lower.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 1              | Archer Data    |                  | /pfix/d/1/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | Archer Data System |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "1"
           ],
           [
-            "Archer Data"
+            "Archer Data System"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/prefix-search-beginning.jsonc b/pkg/services/searchV2/testdata/prefix-search-beginning.jsonc
index 022b5a15649..8831219a6bd 100644
--- a/pkg/services/searchV2/testdata/prefix-search-beginning.jsonc
+++ b/pkg/services/searchV2/testdata/prefix-search-beginning.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 1              | Archer Data    |                  | /pfix/d/1/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 1              | Archer Data System |                  | /pfix/d/1/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "1"
           ],
           [
-            "Archer Data"
+            "Archer Data System"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/prefix-search-middle-lower.jsonc b/pkg/services/searchV2/testdata/prefix-search-middle-lower.jsonc
index 2db59e343f8..2fe14bb9129 100644
--- a/pkg/services/searchV2/testdata/prefix-search-middle-lower.jsonc
+++ b/pkg/services/searchV2/testdata/prefix-search-middle-lower.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 2              | Document Sync  |                  | /pfix/d/2/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 2              | Document Sync repo |                  | /pfix/d/2/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "2"
           ],
           [
-            "Document Sync"
+            "Document Sync repo"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/testdata/prefix-search-middle.jsonc b/pkg/services/searchV2/testdata/prefix-search-middle.jsonc
index 2db59e343f8..2fe14bb9129 100644
--- a/pkg/services/searchV2/testdata/prefix-search-middle.jsonc
+++ b/pkg/services/searchV2/testdata/prefix-search-middle.jsonc
@@ -8,13 +8,13 @@
 //  }
 //  Name: Query results
 //  Dimensions: 8 Fields by 1 Rows
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | Name: kind     | Name: uid      | Name: name     | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
-//  | Labels:        | Labels:        | Labels:        | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
-//  | Type: []string | Type: []string | Type: []string | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
-//  | dashboard      | 2              | Document Sync  |                  | /pfix/d/2/     | null                     | null                     |                |
-//  +----------------+----------------+----------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | Name: kind     | Name: uid      | Name: name         | Name: panel_type | Name: url      | Name: tags               | Name: ds_uid             | Name: location |
+//  | Labels:        | Labels:        | Labels:            | Labels:          | Labels:        | Labels:                  | Labels:                  | Labels:        |
+//  | Type: []string | Type: []string | Type: []string     | Type: []string   | Type: []string | Type: []*json.RawMessage | Type: []*json.RawMessage | Type: []string |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
+//  | dashboard      | 2              | Document Sync repo |                  | /pfix/d/2/     | null                     | null                     |                |
+//  +----------------+----------------+--------------------+------------------+----------------+--------------------------+--------------------------+----------------+
 //  
 //  
 //  🌟 This was machine generated.  Do not edit. 🌟
@@ -107,7 +107,7 @@
             "2"
           ],
           [
-            "Document Sync"
+            "Document Sync repo"
           ],
           [
             ""
diff --git a/pkg/services/searchV2/usage.go b/pkg/services/searchV2/usage.go
index 7fa3c575ad9..b9814eb66b8 100644
--- a/pkg/services/searchV2/usage.go
+++ b/pkg/services/searchV2/usage.go
@@ -51,7 +51,7 @@ func updateUsageStats(ctx context.Context, reader *bluge.Reader, logger log.Logg
 	// execute this search on the reader
 	documentMatchIterator, err := reader.Search(ctx, req)
 	if err != nil {
-		logger.Error("error executing search: %v", err)
+		logger.Error("error executing search", "err", err)
 		return
 	}
 
diff --git a/pkg/services/secrets/manager/manager.go b/pkg/services/secrets/manager/manager.go
index 03cb18ede29..1c3c391f01e 100644
--- a/pkg/services/secrets/manager/manager.go
+++ b/pkg/services/secrets/manager/manager.go
@@ -34,7 +34,10 @@ type SecretsService struct {
 	mtx          sync.Mutex
 	dataKeyCache *dataKeyCache
 
-	providers         map[secrets.ProviderID]secrets.Provider
+	pOnce               sync.Once
+	providers           map[secrets.ProviderID]secrets.Provider
+	kmsProvidersService kmsproviders.Service
+
 	currentProviderID secrets.ProviderID
 
 	log log.Logger
@@ -48,46 +51,56 @@ func ProvideSecretsService(
 	features featuremgmt.FeatureToggles,
 	usageStats usagestats.Service,
 ) (*SecretsService, error) {
-	providers, err := kmsProvidersService.Provide()
-	if err != nil {
-		return nil, err
-	}
+	ttl := settings.KeyValue("security.encryption", "data_keys_cache_ttl").MustDuration(15 * time.Minute)
 
-	logger := log.New("secrets")
-	enabled := !features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption)
 	currentProviderID := kmsproviders.NormalizeProviderID(secrets.ProviderID(
 		settings.KeyValue("security", "encryption_provider").MustString(kmsproviders.Default),
 	))
 
-	if _, ok := providers[currentProviderID]; enabled && !ok {
+	s := &SecretsService{
+		store:               store,
+		enc:                 enc,
+		settings:            settings,
+		usageStats:          usageStats,
+		kmsProvidersService: kmsProvidersService,
+		dataKeyCache:        newDataKeyCache(ttl),
+		currentProviderID:   currentProviderID,
+		features:            features,
+		log:                 log.New("secrets"),
+	}
+
+	enabled := !features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption)
+
+	if enabled {
+		err := s.InitProviders()
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if _, ok := s.providers[currentProviderID]; enabled && !ok {
 		return nil, fmt.Errorf("missing configuration for current encryption provider %s", currentProviderID)
 	}
 
 	if !enabled && currentProviderID != kmsproviders.Default {
-		logger.Warn("Changing encryption provider requires enabling envelope encryption feature")
+		s.log.Warn("Changing encryption provider requires enabling envelope encryption feature")
 	}
 
-	logger.Info("Envelope encryption state", "enabled", enabled, "current provider", currentProviderID)
-
-	ttl := settings.KeyValue("security.encryption", "data_keys_cache_ttl").MustDuration(15 * time.Minute)
-
-	s := &SecretsService{
-		store:             store,
-		enc:               enc,
-		settings:          settings,
-		usageStats:        usageStats,
-		providers:         providers,
-		dataKeyCache:      newDataKeyCache(ttl),
-		currentProviderID: currentProviderID,
-		features:          features,
-		log:               logger,
-	}
+	s.log.Info("Envelope encryption state", "enabled", enabled, "current provider", currentProviderID)
 
 	s.registerUsageMetrics()
 
 	return s, nil
 }
 
+func (s *SecretsService) InitProviders() (err error) {
+	s.pOnce.Do(func() {
+		s.providers, err = s.kmsProvidersService.Provide()
+	})
+
+	return
+}
+
 func (s *SecretsService) registerUsageMetrics() {
 	s.usageStats.RegisterMetricsFunc(func(context.Context) (map[string]interface{}, error) {
 		usageMetrics := make(map[string]interface{})
diff --git a/pkg/services/secrets/migrator/migrator.go b/pkg/services/secrets/migrator/migrator.go
new file mode 100644
index 00000000000..1db1f88ce99
--- /dev/null
+++ b/pkg/services/secrets/migrator/migrator.go
@@ -0,0 +1,117 @@
+package migrator
+
+import (
+	"context"
+	"encoding/base64"
+	"time"
+
+	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/services/encryption"
+	"github.com/grafana/grafana/pkg/services/secrets/manager"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/grafana/grafana/pkg/setting"
+)
+
+type SecretsMigrator struct {
+	encryptionSrv encryption.Internal
+	secretsSrv    *manager.SecretsService
+	sqlStore      *sqlstore.SQLStore
+	settings      setting.Provider
+}
+
+func ProvideSecretsMigrator(
+	encryptionSrv encryption.Internal,
+	service *manager.SecretsService,
+	sqlStore *sqlstore.SQLStore,
+	settings setting.Provider,
+) *SecretsMigrator {
+	return &SecretsMigrator{
+		encryptionSrv: encryptionSrv,
+		secretsSrv:    service,
+		sqlStore:      sqlStore,
+		settings:      settings,
+	}
+}
+
+func (m *SecretsMigrator) ReEncryptSecrets(ctx context.Context) error {
+	toReencrypt := []interface {
+		reencrypt(context.Context, *manager.SecretsService, *sqlstore.SQLStore)
+	}{
+		simpleSecret{tableName: "dashboard_snapshot", columnName: "dashboard_encrypted"},
+		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_access_token"}, encoding: base64.StdEncoding},
+		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_refresh_token"}, encoding: base64.StdEncoding},
+		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_token_type"}, encoding: base64.StdEncoding},
+		b64Secret{simpleSecret: simpleSecret{tableName: "secrets", columnName: "value"}, hasUpdatedColumn: true, encoding: base64.RawStdEncoding},
+		jsonSecret{tableName: "data_source"},
+		jsonSecret{tableName: "plugin_setting"},
+		alertingSecret{},
+	}
+
+	for _, r := range toReencrypt {
+		r.reencrypt(ctx, m.secretsSrv, m.sqlStore)
+	}
+
+	return nil
+}
+
+func (m *SecretsMigrator) RollBackSecrets(ctx context.Context) error {
+	toRollback := []interface {
+		rollback(context.Context, *manager.SecretsService, encryption.Internal, *sqlstore.SQLStore, string) bool
+	}{
+		simpleSecret{tableName: "dashboard_snapshot", columnName: "dashboard_encrypted"},
+		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_access_token"}, encoding: base64.StdEncoding},
+		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_refresh_token"}, encoding: base64.StdEncoding},
+		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_token_type"}, encoding: base64.StdEncoding},
+		b64Secret{simpleSecret: simpleSecret{tableName: "secrets", columnName: "value"}, hasUpdatedColumn: true, encoding: base64.RawStdEncoding},
+		jsonSecret{tableName: "data_source"},
+		jsonSecret{tableName: "plugin_setting"},
+		alertingSecret{},
+	}
+
+	var anyFailure bool
+
+	for _, r := range toRollback {
+		if failed := r.rollback(ctx,
+			m.secretsSrv,
+			m.encryptionSrv,
+			m.sqlStore,
+			m.settings.KeyValue("security", "secret_key").Value(),
+		); failed {
+			anyFailure = true
+		}
+	}
+
+	if anyFailure {
+		logger.Warn("Some errors happened, not cleaning up data keys table...")
+		return nil
+	}
+
+	if _, sqlErr := m.sqlStore.NewSession(ctx).Exec("DELETE FROM data_keys"); sqlErr != nil {
+		logger.Warn("Error while cleaning up data keys table...", "error", sqlErr)
+	}
+
+	return nil
+}
+
+type simpleSecret struct {
+	tableName  string
+	columnName string
+}
+
+type b64Secret struct {
+	simpleSecret
+	hasUpdatedColumn bool
+	encoding         *base64.Encoding
+}
+
+type jsonSecret struct {
+	tableName string
+}
+
+type alertingSecret struct{}
+
+func nowInUTC() string {
+	return time.Now().UTC().Format("2006-01-02 15:04:05")
+}
+
+var logger = log.New("secrets.migrations")
diff --git a/pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_secrets.go b/pkg/services/secrets/migrator/reencrypt.go
similarity index 86%
rename from pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_secrets.go
rename to pkg/services/secrets/migrator/reencrypt.go
index ee380e3abfb..acbacc90524 100644
--- a/pkg/cmd/grafana-cli/commands/secretsmigrations/reencrypt_secrets.go
+++ b/pkg/services/secrets/migrator/reencrypt.go
@@ -1,4 +1,4 @@
-package secretsmigrations
+package migrator
 
 import (
 	"context"
@@ -6,9 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/secrets"
 	"github.com/grafana/grafana/pkg/services/secrets/manager"
@@ -265,29 +262,3 @@ func (s alertingSecret) reencrypt(ctx context.Context, secretsSrv *manager.Secre
 		logger.Info("Alerting configuration secrets have been re-encrypted successfully")
 	}
 }
-
-func ReEncryptSecrets(_ utils.CommandLine, runner runner.Runner) error {
-	if runner.Features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
-		logger.Warn("Envelope encryption is not enabled, quitting...")
-		return nil
-	}
-
-	toMigrate := []interface {
-		reencrypt(context.Context, *manager.SecretsService, *sqlstore.SQLStore)
-	}{
-		simpleSecret{tableName: "dashboard_snapshot", columnName: "dashboard_encrypted"},
-		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_access_token"}, encoding: base64.StdEncoding},
-		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_refresh_token"}, encoding: base64.StdEncoding},
-		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_token_type"}, encoding: base64.StdEncoding},
-		b64Secret{simpleSecret: simpleSecret{tableName: "secrets", columnName: "value"}, hasUpdatedColumn: true, encoding: base64.RawStdEncoding},
-		jsonSecret{tableName: "data_source"},
-		jsonSecret{tableName: "plugin_setting"},
-		alertingSecret{},
-	}
-
-	for _, m := range toMigrate {
-		m.reencrypt(context.Background(), runner.SecretsService, runner.SQLStore)
-	}
-
-	return nil
-}
diff --git a/pkg/cmd/grafana-cli/commands/secretsmigrations/rollback_secrets.go b/pkg/services/secrets/migrator/rollback.go
similarity index 82%
rename from pkg/cmd/grafana-cli/commands/secretsmigrations/rollback_secrets.go
rename to pkg/services/secrets/migrator/rollback.go
index b631b5492b0..7668ae8e801 100644
--- a/pkg/cmd/grafana-cli/commands/secretsmigrations/rollback_secrets.go
+++ b/pkg/services/secrets/migrator/rollback.go
@@ -1,4 +1,4 @@
-package secretsmigrations
+package migrator
 
 import (
 	"context"
@@ -6,10 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/runner"
-	"github.com/grafana/grafana/pkg/cmd/grafana-cli/utils"
 	"github.com/grafana/grafana/pkg/services/encryption"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
 	"github.com/grafana/grafana/pkg/services/ngalert/notifier"
 	"github.com/grafana/grafana/pkg/services/secrets/manager"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
@@ -289,49 +286,3 @@ func (s alertingSecret) rollback(
 
 	return anyFailure
 }
-
-func RollBackSecrets(_ utils.CommandLine, runner runner.Runner) error {
-	if runner.Features.IsEnabled(featuremgmt.FlagDisableEnvelopeEncryption) {
-		logger.Warn("Envelope encryption is not enabled, quitting...")
-		return nil
-	}
-
-	toRollback := []interface {
-		rollback(context.Context, *manager.SecretsService, encryption.Internal, *sqlstore.SQLStore, string) bool
-	}{
-		simpleSecret{tableName: "dashboard_snapshot", columnName: "dashboard_encrypted"},
-		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_access_token"}, encoding: base64.StdEncoding},
-		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_refresh_token"}, encoding: base64.StdEncoding},
-		b64Secret{simpleSecret: simpleSecret{tableName: "user_auth", columnName: "o_auth_token_type"}, encoding: base64.StdEncoding},
-		b64Secret{simpleSecret: simpleSecret{tableName: "secrets", columnName: "value"}, hasUpdatedColumn: true, encoding: base64.RawStdEncoding},
-		jsonSecret{tableName: "data_source"},
-		jsonSecret{tableName: "plugin_setting"},
-		alertingSecret{},
-	}
-
-	var anyFailure bool
-	ctx := context.Background()
-
-	for _, r := range toRollback {
-		if failed := r.rollback(
-			ctx,
-			runner.SecretsService,
-			runner.EncryptionService,
-			runner.SQLStore,
-			runner.Cfg.SecretKey,
-		); failed {
-			anyFailure = true
-		}
-	}
-
-	if anyFailure {
-		logger.Warn("Some errors happened, not cleaning up data keys table...")
-		return nil
-	}
-
-	if _, sqlErr := runner.SQLStore.NewSession(ctx).Exec("DELETE FROM data_keys"); sqlErr != nil {
-		logger.Warn("Error while cleaning up data keys table...", "error", sqlErr)
-	}
-
-	return nil
-}
diff --git a/pkg/services/secrets/secrets.go b/pkg/services/secrets/secrets.go
index 443d3687588..aa4fdb7b13a 100644
--- a/pkg/services/secrets/secrets.go
+++ b/pkg/services/secrets/secrets.go
@@ -69,3 +69,9 @@ func KeyLabel(scope string, providerID ProviderID) string {
 type BackgroundProvider interface {
 	Run(ctx context.Context) error
 }
+
+// Migrator is responsible for secrets migrations like re-encrypting or rolling back secrets.
+type Migrator interface {
+	ReEncryptSecrets(ctx context.Context) error
+	RollBackSecrets(ctx context.Context) error
+}
diff --git a/pkg/services/serviceaccounts/database/database.go b/pkg/services/serviceaccounts/database/database.go
index 00d09b208fc..f6391889e42 100644
--- a/pkg/services/serviceaccounts/database/database.go
+++ b/pkg/services/serviceaccounts/database/database.go
@@ -32,29 +32,50 @@ func NewServiceAccountsStore(store *sqlstore.SQLStore, kvStore kvstore.KVStore)
 }
 
 // CreateServiceAccount creates service account
-func (s *ServiceAccountsStoreImpl) CreateServiceAccount(ctx context.Context, orgId int64, name string) (saDTO *serviceaccounts.ServiceAccountDTO, err error) {
+func (s *ServiceAccountsStoreImpl) CreateServiceAccount(ctx context.Context, orgId int64, name string) (*serviceaccounts.ServiceAccountDTO, error) {
 	generatedLogin := "sa-" + strings.ToLower(name)
 	generatedLogin = strings.ReplaceAll(generatedLogin, " ", "-")
-	cmd := user.CreateUserCommand{
-		Login:            generatedLogin,
-		OrgID:            orgId,
-		Name:             name,
-		IsServiceAccount: true,
-	}
 
-	newuser, err := s.sqlStore.CreateUser(ctx, cmd)
-	if err != nil {
-		if errors.Is(err, models.ErrUserAlreadyExists) {
+	var newSA *user.User
+	createErr := s.sqlStore.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) (err error) {
+		var errUser error
+		newSA, errUser = s.sqlStore.CreateUser(ctx, user.CreateUserCommand{
+			Login:            generatedLogin,
+			OrgID:            orgId,
+			Name:             name,
+			IsServiceAccount: true,
+			SkipOrgSetup:     true,
+		})
+		if errUser != nil {
+			return errUser
+		}
+
+		errAddOrgUser := s.sqlStore.AddOrgUser(ctx, &models.AddOrgUserCommand{
+			Role:                      models.ROLE_VIEWER,
+			OrgId:                     orgId,
+			UserId:                    newSA.ID,
+			AllowAddingServiceAccount: true,
+		})
+		if errAddOrgUser != nil {
+			return errAddOrgUser
+		}
+
+		return nil
+	})
+
+	if createErr != nil {
+		if errors.Is(createErr, models.ErrUserAlreadyExists) {
 			return nil, ErrServiceAccountAlreadyExists
 		}
-		return nil, fmt.Errorf("failed to create service account: %w", err)
+
+		return nil, fmt.Errorf("failed to create service account: %w", createErr)
 	}
 
 	return &serviceaccounts.ServiceAccountDTO{
-		Id:     newuser.ID,
-		Name:   newuser.Name,
-		Login:  newuser.Login,
-		OrgId:  newuser.OrgID,
+		Id:     newSA.ID,
+		Name:   newSA.Name,
+		Login:  newSA.Login,
+		OrgId:  newSA.OrgID,
 		Tokens: 0,
 	}, nil
 }
diff --git a/pkg/services/serviceaccounts/database/database_test.go b/pkg/services/serviceaccounts/database/database_test.go
index cb50a593196..d7d292df951 100644
--- a/pkg/services/serviceaccounts/database/database_test.go
+++ b/pkg/services/serviceaccounts/database/database_test.go
@@ -13,12 +13,28 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestStore_CreateServiceAccount(t *testing.T) {
+// Service Account should not create an org on its own
+func TestStore_CreateServiceAccountOrgNonExistant(t *testing.T) {
 	_, store := setupTestDatabase(t)
 	t.Run("create service account", func(t *testing.T) {
 		serviceAccountName := "new Service Account"
 		serviceAccountOrgId := int64(1)
 
+		_, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgId, serviceAccountName)
+		require.Error(t, err)
+	})
+}
+
+func TestStore_CreateServiceAccount(t *testing.T) {
+	_, store := setupTestDatabase(t)
+	orgQuery := &models.CreateOrgCommand{Name: sqlstore.MainOrgName}
+	err := store.sqlStore.CreateOrg(context.Background(), orgQuery)
+	require.NoError(t, err)
+
+	t.Run("create service account", func(t *testing.T) {
+		serviceAccountName := "new Service Account"
+		serviceAccountOrgId := orgQuery.Result.Id
+
 		saDTO, err := store.CreateServiceAccount(context.Background(), serviceAccountOrgId, serviceAccountName)
 		require.NoError(t, err)
 		assert.Equal(t, "sa-new-service-account", saDTO.Login)
diff --git a/pkg/services/sqlstore/dashboard_thumbs.go b/pkg/services/sqlstore/dashboard_thumbs.go
index 907d7928991..f4321c4406f 100644
--- a/pkg/services/sqlstore/dashboard_thumbs.go
+++ b/pkg/services/sqlstore/dashboard_thumbs.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 )
 
 func (ss *SQLStore) GetThumbnail(ctx context.Context, query *models.GetDashboardThumbnailCommand) (*models.DashboardThumbnail, error) {
@@ -25,7 +26,7 @@ func (ss *SQLStore) SaveThumbnail(ctx context.Context, cmd *models.SaveDashboard
 	err := ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
 		existing, err := findThumbnailByMeta(sess, cmd.DashboardThumbnailMeta)
 
-		if err != nil && !errors.Is(err, models.ErrDashboardThumbnailNotFound) {
+		if err != nil && !errors.Is(err, dashboards.ErrDashboardThumbnailNotFound) {
 			return err
 		}
 
@@ -150,7 +151,7 @@ func findThumbnailByMeta(sess *DBSession, meta models.DashboardThumbnailMeta) (*
 	exists, err := sess.Get(result)
 
 	if !exists {
-		return nil, models.ErrDashboardThumbnailNotFound
+		return nil, dashboards.ErrDashboardThumbnailNotFound
 	}
 
 	if err != nil {
@@ -174,7 +175,7 @@ func findDashboardIdByThumbMeta(sess *DBSession, meta models.DashboardThumbnailM
 		return nil, err
 	}
 	if !exists {
-		return nil, models.ErrDashboardNotFound
+		return nil, dashboards.ErrDashboardNotFound
 	}
 
 	return result, err
diff --git a/pkg/services/sqlstore/dashboard_thumbs_test.go b/pkg/services/sqlstore/dashboard_thumbs_test.go
index 61cfc7e6bf0..30900ec2017 100644
--- a/pkg/services/sqlstore/dashboard_thumbs_test.go
+++ b/pkg/services/sqlstore/dashboard_thumbs_test.go
@@ -5,11 +5,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
 	"github.com/grafana/grafana/pkg/util"
-	"github.com/stretchr/testify/require"
 )
 
 var theme = models.ThemeDark
@@ -313,7 +315,7 @@ func updateTestDashboard(t *testing.T, sqlStore *SQLStore, dashboard *models.Das
 		if affectedRows, err := sess.Insert(dashVersion); err != nil {
 			return err
 		} else if affectedRows == 0 {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		return nil
diff --git a/pkg/services/sqlstore/migrations/ualert/permissions.go b/pkg/services/sqlstore/migrations/ualert/permissions.go
index 0e2bd3b7e1d..369f6bb15b3 100644
--- a/pkg/services/sqlstore/migrations/ualert/permissions.go
+++ b/pkg/services/sqlstore/migrations/ualert/permissions.go
@@ -7,6 +7,7 @@ import (
 	"xorm.io/xorm"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
 	"github.com/grafana/grafana/pkg/services/sqlstore/migrator"
 	"github.com/grafana/grafana/pkg/util"
@@ -151,7 +152,7 @@ func (m *folderHelper) generateNewDashboardUid(orgId int64) (string, error) {
 		}
 	}
 
-	return "", models.ErrDashboardFailedGenerateUniqueUid
+	return "", dashboards.ErrDashboardFailedGenerateUniqueUid
 }
 
 // based on SQLStore.UpdateDashboardACL()
diff --git a/pkg/services/sqlstore/mockstore/mockstore.go b/pkg/services/sqlstore/mockstore/mockstore.go
index 90d8206b2a8..ad8d48e5f53 100644
--- a/pkg/services/sqlstore/mockstore/mockstore.go
+++ b/pkg/services/sqlstore/mockstore/mockstore.go
@@ -423,11 +423,12 @@ func (m SQLStoreMock) GetDataSource(ctx context.Context, query *datasources.GetD
 }
 
 func (m *SQLStoreMock) GetDataSources(ctx context.Context, query *datasources.GetDataSourcesQuery) error {
-	query.Result = m.ExpectedDatasources
+	query.Result = m.ExpectedDataSources
 	return m.ExpectedError
 }
 
 func (m *SQLStoreMock) GetDataSourcesByType(ctx context.Context, query *datasources.GetDataSourcesByTypeQuery) error {
+	query.Result = m.ExpectedDataSources
 	return m.ExpectedError
 }
 
@@ -580,7 +581,7 @@ func (m *SQLStoreMock) SearchOrgs(ctx context.Context, query *models.SearchOrgsQ
 	return m.ExpectedError
 }
 
-func (m *SQLStoreMock) HasAdminPermissionInFolders(ctx context.Context, query *models.HasAdminPermissionInFoldersQuery) error {
+func (m *SQLStoreMock) HasAdminPermissionInDashboardsOrFolders(ctx context.Context, query *models.HasAdminPermissionInDashboardsOrFoldersQuery) error {
 	return m.ExpectedError
 }
 
diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go
index 93986114e7b..69057ea193b 100644
--- a/pkg/services/sqlstore/org_test.go
+++ b/pkg/services/sqlstore/org_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	dashver "github.com/grafana/grafana/pkg/services/dashboardversion"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/util"
@@ -461,7 +462,7 @@ func insertTestDashboard(t *testing.T, sqlStore *SQLStore, title string, orgId i
 		if affectedRows, err := sess.Insert(dashVersion); err != nil {
 			return err
 		} else if affectedRows == 0 {
-			return models.ErrDashboardNotFound
+			return dashboards.ErrDashboardNotFound
 		}
 
 		return nil
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index c7d2c0df7a3..f1fa782b18b 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -16,7 +16,12 @@ func (ss *SQLStore) AddOrgUser(ctx context.Context, cmd *models.AddOrgUserComman
 	return ss.WithTransactionalDbSession(ctx, func(sess *DBSession) error {
 		// check if user exists
 		var user user.User
-		if exists, err := sess.ID(cmd.UserId).Where(notServiceAccountFilter(ss)).Get(&user); err != nil {
+		session := sess.ID(cmd.UserId)
+		if !cmd.AllowAddingServiceAccount {
+			session = session.Where(notServiceAccountFilter(ss))
+		}
+
+		if exists, err := session.Get(&user); err != nil {
 			return err
 		} else if !exists {
 			return models.ErrUserNotFound
diff --git a/pkg/services/sqlstore/org_users_test.go b/pkg/services/sqlstore/org_users_test.go
index c18a42eaa48..2b9e4ad9d3b 100644
--- a/pkg/services/sqlstore/org_users_test.go
+++ b/pkg/services/sqlstore/org_users_test.go
@@ -148,6 +148,61 @@ func TestSQLStore_SearchOrgUsers(t *testing.T) {
 	}
 }
 
+func TestSQLStore_AddOrgUser(t *testing.T) {
+	var orgID int64 = 1
+	store := InitTestDB(t)
+
+	// create org and admin
+	_, err := store.CreateUser(context.Background(), user.CreateUserCommand{
+		Login: "admin",
+		OrgID: orgID,
+	})
+	require.NoError(t, err)
+
+	// create a service account with no org
+	sa, err := store.CreateUser(context.Background(), user.CreateUserCommand{
+		Login:            "sa-no-org",
+		IsServiceAccount: true,
+		SkipOrgSetup:     true,
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, int64(-1), sa.OrgID)
+
+	// assign the sa to the org but without the override. should fail
+	err = store.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+		Role:   "Viewer",
+		OrgId:  orgID,
+		UserId: sa.ID,
+	})
+	require.Error(t, err)
+
+	// assign the sa to the org with the override. should succeed
+	err = store.AddOrgUser(context.Background(), &models.AddOrgUserCommand{
+		Role:                      "Viewer",
+		OrgId:                     orgID,
+		UserId:                    sa.ID,
+		AllowAddingServiceAccount: true,
+	})
+
+	require.NoError(t, err)
+
+	// assert the org has been correctly set
+	saFound := new(user.User)
+	err = store.WithDbSession(context.Background(), func(sess *DBSession) error {
+		has, err := sess.ID(sa.ID).Get(saFound)
+		if err != nil {
+			return err
+		} else if !has {
+			return models.ErrUserNotFound
+		}
+		return nil
+	})
+
+	require.NoError(t, err)
+	require.Equal(t, saFound.OrgID, orgID)
+}
+
 func TestSQLStore_RemoveOrgUser(t *testing.T) {
 	store := InitTestDB(t)
 
diff --git a/pkg/services/sqlstore/team.go b/pkg/services/sqlstore/team.go
index b303b031a51..dce533502c5 100644
--- a/pkg/services/sqlstore/team.go
+++ b/pkg/services/sqlstore/team.go
@@ -9,6 +9,7 @@ import (
 
 	"github.com/grafana/grafana/pkg/models"
 	ac "github.com/grafana/grafana/pkg/services/accesscontrol"
+	"github.com/grafana/grafana/pkg/services/serviceaccounts"
 )
 
 type TeamStore interface {
@@ -528,17 +529,25 @@ func (ss *SQLStore) GetTeamMembers(ctx context.Context, query *models.GetTeamMem
 	// If the signed in user is not set no member will be returned
 	if !ac.IsDisabled(ss.Cfg) {
 		sqlID := fmt.Sprintf("%s.%s", ss.engine.Dialect().Quote("user"), ss.engine.Dialect().Quote("id"))
+		var filter ac.SQLFilter
 		*acFilter, err = ac.Filter(query.SignedInUser, sqlID, "users:id:", ac.ActionOrgUsersRead)
 		if err != nil {
 			return err
 		}
+
+		filter, err = ac.Filter(query.SignedInUser, sqlID, "serviceaccounts:id:", serviceaccounts.ActionRead)
+		if err != nil {
+			return err
+		}
+		acFilter.Where = fmt.Sprintf("(%s OR %s)", acFilter.Where, filter.Where)
+		acFilter.Args = append(acFilter.Args, filter.Args...)
 	}
 
 	return ss.getTeamMembers(ctx, query, acFilter)
 }
 
 // getTeamMembers return a list of members for the specified team
-func (ss *SQLStore) getTeamMembers(ctx context.Context, query *models.GetTeamMembersQuery, acUserFilter *ac.SQLFilter) error {
+func (ss *SQLStore) getTeamMembers(ctx context.Context, query *models.GetTeamMembersQuery, acFilter *ac.SQLFilter) error {
 	return ss.WithDbSession(ctx, func(dbSess *DBSession) error {
 		query.Result = make([]*models.TeamMemberDTO, 0)
 		sess := dbSess.Table("team_member")
@@ -546,11 +555,8 @@ func (ss *SQLStore) getTeamMembers(ctx context.Context, query *models.GetTeamMem
 			fmt.Sprintf("team_member.user_id=%s.%s", ss.Dialect.Quote("user"), ss.Dialect.Quote("id")),
 		)
 
-		// explicitly check for serviceaccounts
-		sess.Where(fmt.Sprintf("%s.is_service_account=?", ss.Dialect.Quote("user")), ss.Dialect.BooleanStr(false))
-
-		if acUserFilter != nil {
-			sess.Where(acUserFilter.Where, acUserFilter.Args...)
+		if acFilter != nil {
+			sess.Where(acFilter.Where, acFilter.Args...)
 		}
 
 		// Join with only most recent auth module
diff --git a/pkg/services/sqlstore/team_test.go b/pkg/services/sqlstore/team_test.go
index 845b0fddf3d..2726ad0e2ef 100644
--- a/pkg/services/sqlstore/team_test.go
+++ b/pkg/services/sqlstore/team_test.go
@@ -24,9 +24,8 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 			OrgId: 1,
 			Permissions: map[int64]map[string][]string{
 				1: {
-					ac.ActionTeamsRead:         []string{ac.ScopeTeamsAll},
-					ac.ActionOrgUsersRead:      []string{ac.ScopeUsersAll},
-					serviceaccounts.ActionRead: []string{serviceaccounts.ScopeAll},
+					ac.ActionTeamsRead:    []string{ac.ScopeTeamsAll},
+					ac.ActionOrgUsersRead: []string{ac.ScopeUsersAll},
 				},
 			},
 		}
@@ -373,9 +372,21 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				require.EqualValues(t, getTeamQuery.Result.MemberCount, 2)
 			})
 
-			t.Run("Should be able to exclude service accounts from teamembers", func(t *testing.T) {
+			t.Run("Should be able to add service accounts to teams, list it as a team member and remove it from team", func(t *testing.T) {
 				sqlStore = InitTestDB(t)
 				setup()
+
+				signedInUser := &models.SignedInUser{
+					Login: "loginuser0",
+					OrgId: testOrgID,
+					Permissions: map[int64]map[string][]string{
+						testOrgID: {
+							ac.ActionTeamsRead:    []string{ac.ScopeTeamsAll},
+							ac.ActionOrgUsersRead: []string{ac.ScopeUsersAll},
+						},
+					},
+				}
+
 				userCmd = user.CreateUserCommand{
 					Email:            fmt.Sprint("sa", 1, "@test.com"),
 					Name:             fmt.Sprint("sa", 1),
@@ -385,24 +396,23 @@ func TestIntegrationTeamCommandsAndQueries(t *testing.T) {
 				serviceAccount, err := sqlStore.CreateUser(context.Background(), userCmd)
 				require.NoError(t, err)
 
-				groupId := team2.Id
-				// add service account to team
-				err = sqlStore.AddTeamMember(serviceAccount.ID, testOrgID, groupId, false, 0)
+				teamId := team1.Id
+				err = sqlStore.AddTeamMember(serviceAccount.ID, testOrgID, teamId, false, 0)
 				require.NoError(t, err)
 
-				// add user to team
-				err = sqlStore.AddTeamMember(userIds[0], testOrgID, groupId, false, 0)
+				getTeamMembersQuery := &models.GetTeamMembersQuery{OrgId: testOrgID, TeamId: teamId, SignedInUser: signedInUser}
+				err = sqlStore.GetTeamMembers(context.Background(), getTeamMembersQuery)
+				require.NoError(t, err)
+				require.EqualValues(t, 1, len(getTeamMembersQuery.Result))
+				require.EqualValues(t, serviceAccount.ID, getTeamMembersQuery.Result[0].UserId)
+
+				removeTeamMemberCmd := &models.RemoveTeamMemberCommand{OrgId: testOrgID, TeamId: teamId, UserId: serviceAccount.ID}
+				err = sqlStore.RemoveTeamMember(context.Background(), removeTeamMemberCmd)
 				require.NoError(t, err)
 
-				teamMembersQuery := &models.GetTeamMembersQuery{
-					OrgId:        testOrgID,
-					SignedInUser: testUser,
-					TeamId:       groupId,
-				}
-				err = sqlStore.GetTeamMembers(context.Background(), teamMembersQuery)
+				err = sqlStore.GetTeamMembers(context.Background(), getTeamMembersQuery)
 				require.NoError(t, err)
-				// should not receive service account from query
-				require.Equal(t, len(teamMembersQuery.Result), 1)
+				require.EqualValues(t, 0, len(getTeamMembersQuery.Result))
 			})
 		})
 	})
@@ -489,7 +499,7 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 		t.Skip("skipping integration test")
 	}
 	testOrgID := int64(2)
-	userIds := make([]int64, 4)
+	userIds := make([]int64, 5)
 
 	// Seed 2 teams with 2 members
 	setup := func(store *SQLStore) {
@@ -498,12 +508,15 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 		team2, errCreateTeam := store.CreateTeam("group2 name", "test2@example.org", testOrgID)
 		require.NoError(t, errCreateTeam)
 
-		for i := 0; i < 4; i++ {
+		for i := 0; i < 5; i++ {
 			userCmd := user.CreateUserCommand{
 				Email: fmt.Sprint("user", i, "@example.org"),
 				Name:  fmt.Sprint("user", i),
 				Login: fmt.Sprint("loginuser", i),
 			}
+			if i >= 3 {
+				userCmd.IsServiceAccount = true
+			}
 			user, errCreateUser := store.CreateUser(context.Background(), userCmd)
 			require.NoError(t, errCreateUser)
 			userIds[i] = user.ID
@@ -517,6 +530,8 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 		require.NoError(t, errAddMember)
 		errAddMember = store.AddTeamMember(userIds[3], testOrgID, team2.Id, false, 0)
 		require.NoError(t, errAddMember)
+		errAddMember = store.AddTeamMember(userIds[4], testOrgID, team2.Id, false, 0)
+		require.NoError(t, errAddMember)
 	}
 
 	store := InitTestDB(t, InitTestDBOpt{})
@@ -534,11 +549,14 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 			query: &models.GetTeamMembersQuery{
 				OrgId: testOrgID,
 				SignedInUser: &models.SignedInUser{
-					OrgId:       testOrgID,
-					Permissions: map[int64]map[string][]string{testOrgID: {ac.ActionOrgUsersRead: {ac.ScopeUsersAll}}},
+					OrgId: testOrgID,
+					Permissions: map[int64]map[string][]string{testOrgID: {
+						ac.ActionOrgUsersRead:      {ac.ScopeUsersAll},
+						serviceaccounts.ActionRead: {serviceaccounts.ScopeAll},
+					}},
 				},
 			},
-			expectedNumUsers: 4,
+			expectedNumUsers: 5,
 		},
 		{
 			desc: "should return no team members",
@@ -558,11 +576,15 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 				OrgId: testOrgID,
 				SignedInUser: &models.SignedInUser{
 					OrgId: testOrgID,
-					Permissions: map[int64]map[string][]string{testOrgID: {ac.ActionOrgUsersRead: {
-						ac.Scope("users", "id", fmt.Sprintf("%d", userIds[0])),
-						ac.Scope("users", "id", fmt.Sprintf("%d", userIds[2])),
-						ac.Scope("users", "id", fmt.Sprintf("%d", userIds[3])),
-					}}},
+					Permissions: map[int64]map[string][]string{testOrgID: {
+						ac.ActionOrgUsersRead: {
+							ac.Scope("users", "id", fmt.Sprintf("%d", userIds[0])),
+							ac.Scope("users", "id", fmt.Sprintf("%d", userIds[2])),
+						},
+						serviceaccounts.ActionRead: {
+							ac.Scope("serviceaccounts", "id", fmt.Sprintf("%d", userIds[3])),
+						},
+					}},
 				},
 			},
 			expectedNumUsers: 3,
@@ -576,10 +598,20 @@ func TestIntegrationSQLStore_GetTeamMembers_ACFilter(t *testing.T) {
 
 			if !hasWildcardScope(tt.query.SignedInUser, ac.ActionOrgUsersRead) {
 				for _, member := range tt.query.Result {
-					assert.Contains(t,
-						tt.query.SignedInUser.Permissions[tt.query.SignedInUser.OrgId][ac.ActionOrgUsersRead],
-						ac.Scope("users", "id", fmt.Sprintf("%d", member.UserId)),
-					)
+					hasPermission := false
+					for _, scope := range tt.query.SignedInUser.Permissions[tt.query.SignedInUser.OrgId][ac.ActionOrgUsersRead] {
+						if scope == ac.Scope("users", "id", fmt.Sprintf("%d", member.UserId)) {
+							hasPermission = true
+							break
+						}
+					}
+					for _, scope := range tt.query.SignedInUser.Permissions[tt.query.SignedInUser.OrgId][serviceaccounts.ActionRead] {
+						if scope == ac.Scope("serviceaccounts", "id", fmt.Sprintf("%d", member.UserId)) {
+							hasPermission = true
+							break
+						}
+					}
+					assert.True(t, hasPermission)
 				}
 			}
 		})
diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index ecca42cffaf..9b1cbddc47a 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -68,6 +68,11 @@ func (ss *SQLStore) userCaseInsensitiveLoginConflict(ctx context.Context, sess *
 }
 
 // createUser creates a user in the database
+// if autoAssignOrg is enabled then args.OrgID will be used
+// to add to an existing Org with id=args.OrgID
+// if autoAssignOrg is disabled then args.OrgName will be used
+// to create a new Org with name=args.OrgName.
+// If a org already exists with that name, it will error
 func (ss *SQLStore) createUser(ctx context.Context, sess *DBSession, args user.CreateUserCommand) (user.User, error) {
 	var usr user.User
 	var orgID int64 = -1
diff --git a/pkg/services/store/config.go b/pkg/services/store/config.go
index cc65c201b69..3864397674d 100644
--- a/pkg/services/store/config.go
+++ b/pkg/services/store/config.go
@@ -1,9 +1,10 @@
 package store
 
 type RootStorageConfig struct {
-	Type   string `json:"type"`
-	Prefix string `json:"prefix"`
-	Name   string `json:"name"`
+	Type        string `json:"type"`
+	Prefix      string `json:"prefix"`
+	Name        string `json:"name"`
+	Description string `json:"description"`
 
 	// Depending on type, these will be configured
 	Disk *StorageLocalDiskConfig `json:"disk,omitempty"`
diff --git a/pkg/services/store/http.go b/pkg/services/store/http.go
index 413d5aa6fed..d177759a256 100644
--- a/pkg/services/store/http.go
+++ b/pkg/services/store/http.go
@@ -2,12 +2,14 @@ package store
 
 import (
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/api/response"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/util"
 	"github.com/grafana/grafana/pkg/web"
 )
 
@@ -57,7 +59,8 @@ func (s *httpStorage) Upload(c *models.ReqContext) response.Response {
 	}
 	c.Req.Body = http.MaxBytesReader(c.Resp, c.Req.Body, MAX_UPLOAD_SIZE)
 	if err := c.Req.ParseMultipartForm(MAX_UPLOAD_SIZE); err != nil {
-		return response.Error(400, "Please limit file uploaded under 1MB", err)
+		msg := fmt.Sprintf("Please limit file uploaded under %s", util.ByteCountSI(MAX_UPLOAD_SIZE))
+		return response.Error(400, msg, err)
 	}
 
 	files := c.Req.MultipartForm.File["file"]
@@ -92,7 +95,7 @@ func (s *httpStorage) Upload(c *models.ReqContext) response.Response {
 		return errFileTooBig
 	}
 
-	path := RootUpload + "/" + fileHeader.Filename
+	path := RootResources + "/" + fileHeader.Filename
 
 	mimeType := http.DetectContentType(data)
 
@@ -123,6 +126,11 @@ func (s *httpStorage) Read(c *models.ReqContext) response.Response {
 	if err != nil {
 		return response.Error(400, "cannot call read", err)
 	}
+
+	if file == nil || file.Contents == nil {
+		return response.Error(404, "file does not exist", err)
+	}
+
 	// set the correct content type for svg
 	if strings.HasSuffix(path, ".svg") {
 		c.Resp.Header().Set("Content-Type", "image/svg+xml")
diff --git a/pkg/services/store/sanitize.go b/pkg/services/store/sanitize.go
index 6634b77b7f5..df19e9ceaee 100644
--- a/pkg/services/store/sanitize.go
+++ b/pkg/services/store/sanitize.go
@@ -6,20 +6,44 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/filestorage"
 	"github.com/grafana/grafana/pkg/models"
+	"github.com/grafana/grafana/pkg/services/rendering"
+	"github.com/grafana/grafana/pkg/services/store/sanitizer"
 )
 
-func (s *standardStorageService) sanitizeUploadRequest(ctx context.Context, user *models.SignedInUser, req *UploadRequest, storagePath string) (*filestorage.UpsertFileCommand, error) {
+func (s *standardStorageService) sanitizeContents(ctx context.Context, user *models.SignedInUser, req *UploadRequest, storagePath string) ([]byte, error) {
 	if req.EntityType == EntityTypeImage {
 		ext := filepath.Ext(req.Path)
-		//nolint: staticcheck
 		if ext == ".svg" {
-			// TODO: sanitize svg
+			resp, err := sanitizer.SanitizeSVG(ctx, &rendering.SanitizeSVGRequest{
+				Filename: storagePath,
+				Content:  req.Contents,
+			})
+			if err != nil {
+				if s.cfg.allowUnsanitizedSvgUpload {
+					grafanaStorageLogger.Debug("allowing unsanitized svg upload", "filename", req.Path, "sanitizationError", err)
+					return req.Contents, nil
+				} else {
+					grafanaStorageLogger.Debug("disallowing unsanitized svg upload", "filename", req.Path, "sanitizationError", err)
+					return nil, err
+				}
+			}
+
+			return resp.Sanitized, nil
 		}
 	}
 
+	return req.Contents, nil
+}
+
+func (s *standardStorageService) sanitizeUploadRequest(ctx context.Context, user *models.SignedInUser, req *UploadRequest, storagePath string) (*filestorage.UpsertFileCommand, error) {
+	contents, err := s.sanitizeContents(ctx, user, req, storagePath)
+	if err != nil {
+		return nil, err
+	}
+
 	return &filestorage.UpsertFileCommand{
 		Path:               storagePath,
-		Contents:           req.Contents,
+		Contents:           contents,
 		MimeType:           req.MimeType,
 		CacheControl:       req.CacheControl,
 		ContentDisposition: req.ContentDisposition,
diff --git a/pkg/services/store/sanitizer/Provider.go b/pkg/services/store/sanitizer/Provider.go
new file mode 100644
index 00000000000..9830b05c200
--- /dev/null
+++ b/pkg/services/store/sanitizer/Provider.go
@@ -0,0 +1,23 @@
+package sanitizer
+
+import (
+	"context"
+	"errors"
+
+	"github.com/grafana/grafana/pkg/services/rendering"
+)
+
+// workaround for cyclic dep between the store and the renderer
+
+type Provider struct{}
+
+var SanitizeSVG = func(ctx context.Context, req *rendering.SanitizeSVGRequest) (*rendering.SanitizeSVGResponse, error) {
+	return nil, errors.New("not implemented")
+}
+
+func ProvideService(
+	renderer rendering.Service,
+) *Provider {
+	SanitizeSVG = renderer.SanitizeSVG
+	return &Provider{}
+}
diff --git a/pkg/services/store/service.go b/pkg/services/store/service.go
index 8be2bddb2a8..7089494a7c4 100644
--- a/pkg/services/store/service.go
+++ b/pkg/services/store/service.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/infra/filestorage"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/models"
@@ -26,15 +25,15 @@ var ErrValidationFailed = errors.New("request validation failed")
 var ErrFileAlreadyExists = errors.New("file exists")
 
 const RootPublicStatic = "public-static"
-const RootUpload = "upload"
+const RootResources = "resources"
 
-const MAX_UPLOAD_SIZE = 1024 * 1024 // 1MB
+const MAX_UPLOAD_SIZE = 3 * 1024 * 1024 // 3MB
 
 type StorageService interface {
 	registry.BackgroundService
 
 	// List folder contents
-	List(ctx context.Context, user *models.SignedInUser, path string) (*data.Frame, error)
+	List(ctx context.Context, user *models.SignedInUser, path string) (*StorageListFrame, error)
 
 	// Read raw file contents out of the store
 	Read(ctx context.Context, user *models.SignedInUser, path string) (*filestorage.File, error)
@@ -49,9 +48,14 @@ type StorageService interface {
 	sanitizeUploadRequest(ctx context.Context, user *models.SignedInUser, req *UploadRequest, storagePath string) (*filestorage.UpsertFileCommand, error)
 }
 
+type storageServiceConfig struct {
+	allowUnsanitizedSvgUpload bool
+}
+
 type standardStorageService struct {
 	sql  *sqlstore.SQLStore
 	tree *nestedTree
+	cfg  storageServiceConfig
 }
 
 func ProvideService(sql *sqlstore.SQLStore, features featuremgmt.FeatureToggles, cfg *setting.Cfg) StorageService {
@@ -60,26 +64,33 @@ func ProvideService(sql *sqlstore.SQLStore, features featuremgmt.FeatureToggles,
 			Path: cfg.StaticRootPath,
 			Roots: []string{
 				"/testdata/",
-				// "/img/icons/",
-				// "/img/bg/",
 				"/img/",
 				"/gazetteer/",
 				"/maps/",
 			},
-		}).setReadOnly(true).setBuiltin(true),
+		}).setReadOnly(true).setBuiltin(true).
+			setDescription("Access files from the static public files"),
 	}
 
 	initializeOrgStorages := func(orgId int64) []storageRuntime {
 		storages := make([]storageRuntime, 0)
 		if features.IsEnabled(featuremgmt.FlagStorageLocalUpload) {
-			config := &StorageSQLConfig{orgId: orgId}
-			storages = append(storages, newSQLStorage(RootUpload, "Local file upload", config, sql).setBuiltin(true))
+			storages = append(storages,
+				newSQLStorage(RootResources,
+					"Resources",
+					&StorageSQLConfig{orgId: orgId}, sql).
+					setBuiltin(true).
+					setDescription("Upload custom resource files"))
 		}
+
 		return storages
 	}
 
 	s := newStandardStorageService(globalRoots, initializeOrgStorages)
 	s.sql = sql
+	s.cfg = storageServiceConfig{
+		allowUnsanitizedSvgUpload: false,
+	}
 	return s
 }
 
@@ -110,7 +121,7 @@ func getOrgId(user *models.SignedInUser) int64 {
 	return user.OrgId
 }
 
-func (s *standardStorageService) List(ctx context.Context, user *models.SignedInUser, path string) (*data.Frame, error) {
+func (s *standardStorageService) List(ctx context.Context, user *models.SignedInUser, path string) (*StorageListFrame, error) {
 	// apply access control here
 	return s.tree.ListFolder(ctx, getOrgId(user), path)
 }
@@ -133,16 +144,16 @@ type UploadRequest struct {
 }
 
 func (s *standardStorageService) Upload(ctx context.Context, user *models.SignedInUser, req *UploadRequest) error {
-	upload, _ := s.tree.getRoot(getOrgId(user), RootUpload)
+	upload, _ := s.tree.getRoot(getOrgId(user), RootResources)
 	if upload == nil {
 		return ErrUploadFeatureDisabled
 	}
 
-	if !strings.HasPrefix(req.Path, RootUpload+"/") {
+	if !strings.HasPrefix(req.Path, RootResources+"/") {
 		return ErrUnsupportedStorage
 	}
 
-	storagePath := strings.TrimPrefix(req.Path, RootUpload)
+	storagePath := strings.TrimPrefix(req.Path, RootResources)
 	validationResult := s.validateUploadRequest(ctx, user, req, storagePath)
 	if !validationResult.ok {
 		grafanaStorageLogger.Warn("file upload validation failed", "filetype", req.MimeType, "path", req.Path, "reason", validationResult.reason)
@@ -178,7 +189,7 @@ func (s *standardStorageService) Upload(ctx context.Context, user *models.Signed
 }
 
 func (s *standardStorageService) Delete(ctx context.Context, user *models.SignedInUser, path string) error {
-	upload, _ := s.tree.getRoot(getOrgId(user), RootUpload)
+	upload, _ := s.tree.getRoot(getOrgId(user), RootResources)
 	if upload == nil {
 		return fmt.Errorf("upload feature is not enabled")
 	}
diff --git a/pkg/services/store/service_test.go b/pkg/services/store/service_test.go
index 073f135cb3b..9dba7282639 100644
--- a/pkg/services/store/service_test.go
+++ b/pkg/services/store/service_test.go
@@ -43,15 +43,15 @@ func TestListFiles(t *testing.T) {
 	frame, err := store.List(context.Background(), dummyUser, "public/testdata")
 	require.NoError(t, err)
 
-	experimental.CheckGoldenJSONFrame(t, "testdata", "public_testdata.golden", frame, true)
+	experimental.CheckGoldenJSONFrame(t, "testdata", "public_testdata.golden", frame.Frame, true)
 
 	file, err := store.Read(context.Background(), dummyUser, "public/testdata/js_libraries.csv")
 	require.NoError(t, err)
 	require.NotNil(t, file)
 
-	frame, err = testdatasource.LoadCsvContent(bytes.NewReader(file.Contents), file.Name)
+	testDsFrame, err := testdatasource.LoadCsvContent(bytes.NewReader(file.Contents), file.Name)
 	require.NoError(t, err)
-	experimental.CheckGoldenJSONFrame(t, "testdata", "public_testdata_js_libraries.golden", frame, true)
+	experimental.CheckGoldenJSONFrame(t, "testdata", "public_testdata_js_libraries.golden", testDsFrame, true)
 }
 
 func TestUpload(t *testing.T) {
@@ -63,7 +63,7 @@ func TestUpload(t *testing.T) {
 	request := UploadRequest{
 		EntityType: EntityTypeImage,
 		Contents:   make([]byte, 0),
-		Path:       "upload/myFile.jpg",
+		Path:       "resources/myFile.jpg",
 		MimeType:   "image/jpg",
 	}
 	err = s.Upload(context.Background(), dummyUser, &request)
diff --git a/pkg/services/store/testdata/example_list_frame.json b/pkg/services/store/testdata/example_list_frame.json
new file mode 100644
index 00000000000..92814399aa8
--- /dev/null
+++ b/pkg/services/store/testdata/example_list_frame.json
@@ -0,0 +1,73 @@
+{
+  "schema": {
+    "meta": {
+      "type": "directory-listing",
+      "custom": {
+        "HasMore": false
+      }
+    },
+    "fields": [
+      {
+        "name": "name",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "mediaType",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "size",
+        "type": "number",
+        "typeInfo": {
+          "frame": "int64"
+        },
+        "config": {
+          "unit": "bytes"
+        }
+      }
+    ]
+  },
+  "data": {
+    "values": [
+      [
+        "DL_1.jpg",
+        "Screen Shot 2022-06-23 at 9.05.39 PM.png",
+        "Screen Shot 2022-06-24 at 11.58.32 AM.png",
+        "Screen Shot 2022-06-30 at 3.45.03 PM.png",
+        "Screen Shot 2022-07-05 at 3.24.27 PM.png",
+        "image.png",
+        "rocket_1f680.png",
+        "test-folder",
+        "topcoder12.png"
+      ],
+      [
+        "image/jpeg",
+        "image/png",
+        "image/png",
+        "image/png",
+        "image/png",
+        "image/png",
+        "image/png",
+        "directory",
+        "image/png"
+      ],
+      [
+        943004,
+        684257,
+        256396,
+        8796,
+        388290,
+        182568,
+        29066,
+        0,
+        90563
+      ]
+    ]
+  }
+}
diff --git a/pkg/services/store/testdata/example_root_level_list.json b/pkg/services/store/testdata/example_root_level_list.json
new file mode 100644
index 00000000000..1846b25b29e
--- /dev/null
+++ b/pkg/services/store/testdata/example_root_level_list.json
@@ -0,0 +1,90 @@
+{
+  "schema": {
+    "meta": {
+      "type": "directory-listing"
+    },
+    "fields": [
+      {
+        "name": "name",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "title",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "description",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "mediaType",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "storageType",
+        "type": "string",
+        "typeInfo": {
+          "frame": "string"
+        }
+      },
+      {
+        "name": "readOnly",
+        "type": "boolean",
+        "typeInfo": {
+          "frame": "bool"
+        }
+      },
+      {
+        "name": "builtIn",
+        "type": "boolean",
+        "typeInfo": {
+          "frame": "bool"
+        }
+      }
+    ]
+  },
+  "data": {
+    "values": [
+      [
+        "public-static",
+        "resources"
+      ],
+      [
+        "Public static files",
+        "Resources"
+      ],
+      [
+        "Access files from the static public files",
+        "Upload custom resource files"
+      ],
+      [
+        "directory",
+        "directory"
+      ],
+      [
+        "disk",
+        "sql"
+      ],
+      [
+        true,
+        false
+      ],
+      [
+        true,
+        true
+      ]
+    ]
+  }
+}
diff --git a/pkg/services/store/tree.go b/pkg/services/store/tree.go
index 47ebf5ab9e5..24f32377dbd 100644
--- a/pkg/services/store/tree.go
+++ b/pkg/services/store/tree.go
@@ -85,39 +85,60 @@ func (t *nestedTree) GetFile(ctx context.Context, orgId int64, path string) (*fi
 	return root.Get(ctx, path)
 }
 
-func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string) (*data.Frame, error) {
+func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string) (*StorageListFrame, error) {
 	if path == "" || path == "/" {
 		t.assureOrgIsInitialized(orgId)
 
+		idx := 0
 		count := len(t.rootsByOrgId[ac.GlobalOrgID])
 		if orgId != ac.GlobalOrgID {
 			count += len(t.rootsByOrgId[orgId])
 		}
 
-		title := data.NewFieldFromFieldType(data.FieldTypeString, count)
 		names := data.NewFieldFromFieldType(data.FieldTypeString, count)
+		title := data.NewFieldFromFieldType(data.FieldTypeString, count)
+		descr := data.NewFieldFromFieldType(data.FieldTypeString, count)
+		types := data.NewFieldFromFieldType(data.FieldTypeString, count)
+		readOnly := data.NewFieldFromFieldType(data.FieldTypeBool, count)
+		builtIn := data.NewFieldFromFieldType(data.FieldTypeBool, count)
 		mtype := data.NewFieldFromFieldType(data.FieldTypeString, count)
-		title.Name = "title"
-		names.Name = "name"
-		mtype.Name = "mediaType"
-		for i, f := range t.rootsByOrgId[ac.GlobalOrgID] {
-			names.Set(i, f.Meta().Config.Prefix)
-			title.Set(i, f.Meta().Config.Name)
-			mtype.Set(i, "directory")
+		title.Name = titleListFrameField
+		names.Name = nameListFrameField
+		descr.Name = descriptionListFrameField
+		mtype.Name = mediaTypeListFrameField
+		types.Name = storageTypeListFrameField
+		readOnly.Name = readOnlyListFrameField
+		builtIn.Name = builtInListFrameField
+		for _, f := range t.rootsByOrgId[ac.GlobalOrgID] {
+			meta := f.Meta()
+			names.Set(idx, meta.Config.Prefix)
+			title.Set(idx, meta.Config.Name)
+			descr.Set(idx, meta.Config.Description)
+			mtype.Set(idx, "directory")
+			types.Set(idx, meta.Config.Type)
+			readOnly.Set(idx, meta.ReadOnly)
+			builtIn.Set(idx, meta.Builtin)
+			idx++
 		}
 		if orgId != ac.GlobalOrgID {
-			for i, f := range t.rootsByOrgId[orgId] {
-				names.Set(i, f.Meta().Config.Prefix)
-				title.Set(i, f.Meta().Config.Name)
-				mtype.Set(i, "directory")
+			for _, f := range t.rootsByOrgId[orgId] {
+				meta := f.Meta()
+				names.Set(idx, meta.Config.Prefix)
+				title.Set(idx, meta.Config.Name)
+				descr.Set(idx, meta.Config.Description)
+				mtype.Set(idx, "directory")
+				types.Set(idx, meta.Config.Type)
+				readOnly.Set(idx, meta.ReadOnly)
+				builtIn.Set(idx, meta.Builtin)
+				idx++
 			}
 		}
 
-		frame := data.NewFrame("", names, title, mtype)
+		frame := data.NewFrame("", names, title, descr, mtype, types, readOnly, builtIn)
 		frame.SetMeta(&data.FrameMeta{
 			Type: data.FrameTypeDirectoryListing,
 		})
-		return frame, nil
+		return &StorageListFrame{frame}, nil
 	}
 
 	root, path := t.getRoot(orgId, path)
@@ -125,7 +146,11 @@ func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string) (
 		return nil, nil // not found (or not ready)
 	}
 
-	listResponse, err := root.List(ctx, path, nil, &filestorage.ListOptions{Recursive: false, WithFolders: true, WithFiles: true})
+	listResponse, err := root.List(ctx, path, nil, &filestorage.ListOptions{
+		Recursive:   false,
+		WithFolders: true,
+		WithFiles:   true,
+	})
 
 	if err != nil {
 		return nil, err
@@ -135,9 +160,9 @@ func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string) (
 	names := data.NewFieldFromFieldType(data.FieldTypeString, count)
 	mtype := data.NewFieldFromFieldType(data.FieldTypeString, count)
 	fsize := data.NewFieldFromFieldType(data.FieldTypeInt64, count)
-	names.Name = "name"
-	mtype.Name = "mediaType"
-	fsize.Name = "size"
+	names.Name = nameListFrameField
+	mtype.Name = mediaTypeListFrameField
+	fsize.Name = sizeListFrameField
 	fsize.Config = &data.FieldConfig{
 		Unit: "bytes",
 	}
@@ -153,5 +178,5 @@ func (t *nestedTree) ListFolder(ctx context.Context, orgId int64, path string) (
 			"HasMore": listResponse.HasMore,
 		},
 	})
-	return frame, nil
+	return &StorageListFrame{frame}, nil
 }
diff --git a/pkg/services/store/types.go b/pkg/services/store/types.go
index 6acd3ad7e65..db9cdfa8202 100644
--- a/pkg/services/store/types.go
+++ b/pkg/services/store/types.go
@@ -30,7 +30,7 @@ type WriteValueResponse struct {
 
 type storageTree interface {
 	GetFile(ctx context.Context, orgId int64, path string) (*filestorage.File, error)
-	ListFolder(ctx context.Context, orgId int64, path string) (*data.Frame, error)
+	ListFolder(ctx context.Context, orgId int64, path string) (*StorageListFrame, error)
 }
 
 //-------------------------------------------
@@ -82,6 +82,11 @@ func (t *baseStorageRuntime) setBuiltin(val bool) *baseStorageRuntime {
 	return t
 }
 
+func (t *baseStorageRuntime) setDescription(v string) *baseStorageRuntime {
+	t.meta.Config.Description = v
+	return t
+}
+
 type RootStorageMeta struct {
 	ReadOnly bool          `json:"editable,omitempty"`
 	Builtin  bool          `json:"builtin,omitempty"`
@@ -90,3 +95,38 @@ type RootStorageMeta struct {
 
 	Config RootStorageConfig `json:"config"`
 }
+
+type StorageListFrame struct {
+	*data.Frame
+}
+
+const (
+	titleListFrameField       = "title"
+	nameListFrameField        = "name"
+	descriptionListFrameField = "description"
+	mediaTypeListFrameField   = "mediaType"
+	storageTypeListFrameField = "storageType"
+	readOnlyListFrameField    = "readOnly"
+	builtInListFrameField     = "builtIn"
+	sizeListFrameField        = "size"
+)
+
+func (s *StorageListFrame) GetFileNames() []string {
+	var fileNames []string
+	if s == nil {
+		return fileNames
+	}
+
+	field, idx := s.FieldByName(nameListFrameField)
+	if field.Len() == 0 || idx == -1 {
+		return fileNames
+	}
+
+	for i := 0; i < field.Len(); i++ {
+		if stringValue, ok := field.At(i).(string); ok {
+			fileNames = append(fileNames, stringValue)
+		}
+	}
+
+	return fileNames
+}
diff --git a/pkg/services/store/types_test.go b/pkg/services/store/types_test.go
new file mode 100644
index 00000000000..3374c04aed8
--- /dev/null
+++ b/pkg/services/store/types_test.go
@@ -0,0 +1,47 @@
+package store
+
+import (
+	_ "embed"
+	"testing"
+
+	"github.com/grafana/grafana-plugin-sdk-go/data"
+	"github.com/stretchr/testify/require"
+)
+
+var (
+	//go:embed testdata/example_list_frame.json
+	exampleListFrameJSON string
+
+	//go:embed testdata/example_root_level_list.json
+	exampleRootLevelListJSON string
+)
+
+func TestGetFileNames(t *testing.T) {
+	frame := &data.Frame{}
+	err := frame.UnmarshalJSON([]byte(exampleListFrameJSON))
+	require.NoError(t, err)
+
+	listFrame := StorageListFrame{frame}
+	require.Equal(t, []string{
+		"DL_1.jpg",
+		"Screen Shot 2022-06-23 at 9.05.39 PM.png",
+		"Screen Shot 2022-06-24 at 11.58.32 AM.png",
+		"Screen Shot 2022-06-30 at 3.45.03 PM.png",
+		"Screen Shot 2022-07-05 at 3.24.27 PM.png",
+		"image.png", "rocket_1f680.png",
+		"test-folder",
+		"topcoder12.png",
+	}, listFrame.GetFileNames())
+}
+
+func TestGetFileNamesRootLevel(t *testing.T) {
+	frame := &data.Frame{}
+	err := frame.UnmarshalJSON([]byte(exampleRootLevelListJSON))
+	require.NoError(t, err)
+
+	listFrame := StorageListFrame{frame}
+	require.Equal(t, []string{
+		"public-static",
+		"resources",
+	}, listFrame.GetFileNames())
+}
diff --git a/pkg/services/store/utils.go b/pkg/services/store/utils.go
index 95777ace5e0..70f47349f39 100644
--- a/pkg/services/store/utils.go
+++ b/pkg/services/store/utils.go
@@ -1,7 +1,6 @@
 package store
 
 import (
-	"path/filepath"
 	"strings"
 
 	"github.com/grafana/grafana/pkg/models"
@@ -27,5 +26,5 @@ func getPathAndScope(c *models.ReqContext) (string, string) {
 	if path == "" {
 		return "", ""
 	}
-	return splitFirstSegment(filepath.Clean(path))
+	return splitFirstSegment(path)
 }
diff --git a/pkg/services/store/validate.go b/pkg/services/store/validate.go
index b067e0216fd..7ad7cf391bf 100644
--- a/pkg/services/store/validate.go
+++ b/pkg/services/store/validate.go
@@ -13,6 +13,7 @@ var (
 	allowedImageExtensions = map[string]bool{
 		".jpg":  true,
 		".jpeg": true,
+		".svg":  true,
 		".gif":  true,
 		".png":  true,
 		".webp": true,
@@ -23,6 +24,7 @@ var (
 		".gif":  {"image/gif": true},
 		".png":  {"image/png": true},
 		".webp": {"image/webp": true},
+		".svg":  {"text/xml; charset=utf-8": true, "text/plain; charset=utf-8": true, "image/svg+xml": true},
 	}
 )
 
@@ -68,7 +70,7 @@ func (s *standardStorageService) validateUploadRequest(ctx context.Context, user
 	// TODO: validateProperties
 
 	if err := filestorage.ValidatePath(storagePath); err != nil {
-		return fail("path validation failed: " + err.Error())
+		return fail("path validation failed. error:" + err.Error() + ". path: " + storagePath)
 	}
 
 	switch req.EntityType {
diff --git a/pkg/services/thumbs/service.go b/pkg/services/thumbs/service.go
index b6b75e8f983..c2e647b55b9 100644
--- a/pkg/services/thumbs/service.go
+++ b/pkg/services/thumbs/service.go
@@ -222,7 +222,7 @@ func (hs *thumbService) GetImage(c *models.ReqContext) {
 		Kind:         models.ThumbnailKindDefault,
 	})
 
-	if errors.Is(err, models.ErrDashboardThumbnailNotFound) {
+	if errors.Is(err, dashboards.ErrDashboardThumbnailNotFound) {
 		c.Resp.WriteHeader(404)
 		return
 	}
diff --git a/pkg/tests/api/alerting/api_admin_configuration_test.go b/pkg/tests/api/alerting/api_admin_configuration_test.go
index 8a893ce34c7..60a95c8ba56 100644
--- a/pkg/tests/api/alerting/api_admin_configuration_test.go
+++ b/pkg/tests/api/alerting/api_admin_configuration_test.go
@@ -161,7 +161,7 @@ func TestAdminConfiguration_SendingToExternalAlertmanagers(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
index 329666c13db..72040631eba 100644
--- a/pkg/tests/api/alerting/api_alertmanager_test.go
+++ b/pkg/tests/api/alerting/api_alertmanager_test.go
@@ -624,7 +624,7 @@ func TestRulerAccess(t *testing.T) {
 				Rules: []apimodels.PostableExtendedRuleNode{
 					{
 						ApiRuleNode: &apimodels.ApiRuleNode{
-							For:         interval,
+							For:         &interval,
 							Labels:      map[string]string{"label1": "val1"},
 							Annotations: map[string]string{"annotation1": "val1"},
 						},
@@ -865,7 +865,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				rulegroup: "arulegroup",
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -881,7 +881,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				rulegroup: "arulegroup",
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -911,7 +911,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				rulegroup: "arulegroup",
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -941,7 +941,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				rulegroup: getLongString(t, ngstore.AlertRuleMaxTitleLength+1),
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -972,7 +972,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				interval:  invalidInterval,
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -1002,7 +1002,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				rulegroup: "arulegroup",
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -1032,7 +1032,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				rulegroup: "arulegroup",
 				rule: apimodels.PostableExtendedRuleNode{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -1090,7 +1090,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -1219,6 +1219,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 					},
 					{
 					   "expr":"",
+					   "for": "0s",
 					   "grafana_alert":{
 						  "id":2,
 						  "orgId":1,
@@ -1269,7 +1270,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For: interval,
+						For: &interval,
 						Labels: map[string]string{
 							"label1": "val42",
 							"foo":    "bar",
@@ -1342,7 +1343,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For: interval,
+						For: &interval,
 						Labels: map[string]string{
 							"label1": "val42",
 							"foo":    "bar",
@@ -1376,7 +1377,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 				},
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For: interval,
+						For: &interval,
 						Labels: map[string]string{
 							"label1": "val42",
 							"foo":    "bar",
@@ -1448,7 +1449,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For: forValue,
+						For: &forValue,
 						Labels: map[string]string{
 							// delete foo label
 							"label1": "val1", // update label value
@@ -1575,7 +1576,7 @@ func TestAlertRuleCRUD(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For: forValue,
+						For: &forValue,
 					},
 					GrafanaManagedAlert: &apimodels.PostableGrafanaRule{
 						UID:       ruleUID, // Including the UID in the payload makes the endpoint update the existing rule.
diff --git a/pkg/tests/api/alerting/api_prometheus_test.go b/pkg/tests/api/alerting/api_prometheus_test.go
index 42440159a98..8dacad65c22 100644
--- a/pkg/tests/api/alerting/api_prometheus_test.go
+++ b/pkg/tests/api/alerting/api_prometheus_test.go
@@ -87,7 +87,7 @@ func TestPrometheusRules(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{"label1": "val1"},
 						Annotations: map[string]string{"annotation1": "val1"},
 					},
@@ -163,7 +163,7 @@ func TestPrometheusRules(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:         interval,
+						For:         &interval,
 						Labels:      map[string]string{},
 						Annotations: map[string]string{"__panelId__": "1"},
 					},
@@ -351,7 +351,7 @@ func TestPrometheusRulesFilterByDashboard(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:    interval,
+						For:    &interval,
 						Labels: map[string]string{},
 						Annotations: map[string]string{
 							"__dashboardUid__": dashboardUID,
diff --git a/pkg/tests/api/alerting/api_provisioning_test.go b/pkg/tests/api/alerting/api_provisioning_test.go
index fb1a02df474..f4d78dde729 100644
--- a/pkg/tests/api/alerting/api_provisioning_test.go
+++ b/pkg/tests/api/alerting/api_provisioning_test.go
@@ -44,13 +44,32 @@ func TestProvisioning(t *testing.T) {
 		url := fmt.Sprintf("http://%s/api/v1/provisioning/policies", grafanaListedAddr)
 		body := `
 		{
-			"receiver": "grafana-default-email",
+			"receiver": "test-receiver",
 			"group_by": [
 				"..."
 			],
 			"routes": []
 		}`
 
+		// As we check if the receiver exists that is referenced in the policy,
+		// we first need to create it, so the tests passes correctly.
+		urlReceiver := fmt.Sprintf("http://%s/api/v1/provisioning/contact-points", grafanaListedAddr)
+		bodyReceiver := `
+		{
+			"name": "test-receiver",
+			"type": "slack",
+			"settings": {
+				"recipient": "value_recipient", 
+				"token": "value_token"
+			}
+		}`
+
+		req := createTestRequest("POST", urlReceiver, "admin", bodyReceiver)
+		resp, err := http.DefaultClient.Do(req)
+		require.NoError(t, err)
+		require.NoError(t, resp.Body.Close())
+		require.Equal(t, 202, resp.StatusCode)
+
 		t.Run("un-authenticated GET should 401", func(t *testing.T) {
 			req := createTestRequest("GET", url, "", "")
 
@@ -127,7 +146,6 @@ func TestProvisioning(t *testing.T) {
 			resp, err := http.DefaultClient.Do(req)
 			require.NoError(t, err)
 			require.NoError(t, resp.Body.Close())
-
 			require.Equal(t, 202, resp.StatusCode)
 		})
 	})
diff --git a/pkg/tests/api/alerting/api_ruler_test.go b/pkg/tests/api/alerting/api_ruler_test.go
index 8257d51e1b0..cb9c4df0c88 100644
--- a/pkg/tests/api/alerting/api_ruler_test.go
+++ b/pkg/tests/api/alerting/api_ruler_test.go
@@ -274,14 +274,14 @@ func createRule(t *testing.T, client apiClient, folder string) {
 
 	interval, err := model.ParseDuration("1m")
 	require.NoError(t, err)
-
+	doubleInterval := 2 * interval
 	rules := apimodels.PostableRuleGroupConfig{
 		Name:     "arulegroup",
 		Interval: interval,
 		Rules: []apimodels.PostableExtendedRuleNode{
 			{
 				ApiRuleNode: &apimodels.ApiRuleNode{
-					For:         2 * interval,
+					For:         &doubleInterval,
 					Labels:      map[string]string{"label1": "val1"},
 					Annotations: map[string]string{"annotation1": "val1"},
 				},
@@ -414,7 +414,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
 			Rules: []apimodels.PostableExtendedRuleNode{
 				{
 					ApiRuleNode: &apimodels.ApiRuleNode{
-						For:    interval,
+						For:    &interval,
 						Labels: map[string]string{},
 						Annotations: map[string]string{
 							"__dashboardUid__": dashboardUID,
@@ -513,6 +513,7 @@ func TestRulerRulesFilterByDashboard(t *testing.T) {
 			}
 		}, {
 			"expr": "",
+			"for":"0s",
 			"grafana_alert": {
 				"id": 2,
 				"orgId": 1,
@@ -814,13 +815,55 @@ func TestRuleGroupSequence(t *testing.T) {
 	})
 }
 
+func TestRuleUpdate(t *testing.T) {
+	// Setup Grafana and its Database
+	dir, path := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
+		DisableLegacyAlerting: true,
+		EnableUnifiedAlerting: true,
+		DisableAnonymous:      true,
+		AppModeProduction:     true,
+	})
+	grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
+
+	// Create a user to make authenticated requests
+	createUser(t, store, user.CreateUserCommand{
+		DefaultOrgRole: string(models.ROLE_EDITOR),
+		Password:       "password",
+		Login:          "grafana",
+	})
+
+	client := newAlertingApiClient(grafanaListedAddr, "grafana", "password")
+	folder1Title := "folder1"
+	client.CreateFolder(t, util.GenerateShortUID(), folder1Title)
+
+	t.Run("should be able to reset 'for' to 0", func(t *testing.T) {
+		group := generateAlertRuleGroup(1, alertRuleGen())
+		expected := model.Duration(10 * time.Second)
+		group.Rules[0].ApiRuleNode.For = &expected
+
+		status, body := client.PostRulesGroup(t, folder1Title, &group)
+		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
+		getGroup := client.GetRulesGroup(t, folder1Title, group.Name)
+		require.Equal(t, expected, *getGroup.Rules[0].ApiRuleNode.For)
+
+		group = convertGettableRuleGroupToPostable(getGroup.GettableRuleGroupConfig)
+		expected = 0
+		group.Rules[0].ApiRuleNode.For = &expected
+		status, body = client.PostRulesGroup(t, folder1Title, &group)
+		require.Equalf(t, http.StatusAccepted, status, "failed to post rule group. Response: %s", body)
+
+		getGroup = client.GetRulesGroup(t, folder1Title, group.Name)
+		require.Equal(t, expected, *getGroup.Rules[0].ApiRuleNode.For)
+	})
+}
+
 func newTestingRuleConfig(t *testing.T) apimodels.PostableRuleGroupConfig {
 	interval, err := model.ParseDuration("1m")
 	require.NoError(t, err)
 
 	firstRule := apimodels.PostableExtendedRuleNode{
 		ApiRuleNode: &apimodels.ApiRuleNode{
-			For:         interval,
+			For:         &interval,
 			Labels:      map[string]string{"label1": "val1"},
 			Annotations: map[string]string{"annotation1": "val1"},
 		},
@@ -847,7 +890,7 @@ func newTestingRuleConfig(t *testing.T) apimodels.PostableRuleGroupConfig {
 	}
 	secondRule := apimodels.PostableExtendedRuleNode{
 		ApiRuleNode: &apimodels.ApiRuleNode{
-			For:         interval,
+			For:         &interval,
 			Labels:      map[string]string{"label1": "val1"},
 			Annotations: map[string]string{"annotation1": "val1"},
 		},
diff --git a/pkg/tests/api/alerting/testing.go b/pkg/tests/api/alerting/testing.go
index 8d56b9ac261..83fe4b38d1c 100644
--- a/pkg/tests/api/alerting/testing.go
+++ b/pkg/tests/api/alerting/testing.go
@@ -87,9 +87,10 @@ func getBody(t *testing.T, body io.ReadCloser) string {
 
 func alertRuleGen() func() apimodels.PostableExtendedRuleNode {
 	return func() apimodels.PostableExtendedRuleNode {
+		forDuration := model.Duration(10 * time.Second)
 		return apimodels.PostableExtendedRuleNode{
 			ApiRuleNode: &apimodels.ApiRuleNode{
-				For:         model.Duration(10 * time.Second),
+				For:         &forDuration,
 				Labels:      map[string]string{"label1": "val1"},
 				Annotations: map[string]string{"annotation1": "val1"},
 			},
diff --git a/pkg/tests/api/dashboards/api_dashboards_test.go b/pkg/tests/api/dashboards/api_dashboards_test.go
index 711d42b6abd..b05709cf230 100644
--- a/pkg/tests/api/dashboards/api_dashboards_test.go
+++ b/pkg/tests/api/dashboards/api_dashboards_test.go
@@ -12,15 +12,17 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/dashboardimport"
+	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/plugindashboards"
 	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestDashboardQuota(t *testing.T) {
@@ -173,19 +175,19 @@ providers:
 				desc:          "when updating provisioned dashboard using ID it should fail",
 				dashboardData: fmt.Sprintf(`{"title":"just testing", "id": %d, "version": 1}`, dashboardID),
 				expStatus:     http.StatusBadRequest,
-				expErrReason:  models.ErrDashboardCannotSaveProvisionedDashboard.Reason,
+				expErrReason:  dashboards.ErrDashboardCannotSaveProvisionedDashboard.Reason,
 			},
 			{
 				desc:          "when updating provisioned dashboard using UID it should fail",
 				dashboardData: fmt.Sprintf(`{"title":"just testing", "uid": %q, "version": 1}`, dashboardUID),
 				expStatus:     http.StatusBadRequest,
-				expErrReason:  models.ErrDashboardCannotSaveProvisionedDashboard.Reason,
+				expErrReason:  dashboards.ErrDashboardCannotSaveProvisionedDashboard.Reason,
 			},
 			{
 				desc:          "when updating dashboard using unknown ID, it should fail",
 				dashboardData: `{"title":"just testing", "id": 42, "version": 1}`,
 				expStatus:     http.StatusNotFound,
-				expErrReason:  models.ErrDashboardNotFound.Reason,
+				expErrReason:  dashboards.ErrDashboardNotFound.Reason,
 			},
 			{
 				desc:          "when updating dashboard using unknown UID, it should succeed",
@@ -247,7 +249,7 @@ providers:
 			dashboardErr := &errorResponseBody{}
 			err = json.Unmarshal(b, dashboardErr)
 			require.NoError(t, err)
-			assert.Equal(t, models.ErrDashboardCannotDeleteProvisionedDashboard.Reason, dashboardErr.Message)
+			assert.Equal(t, dashboards.ErrDashboardCannotDeleteProvisionedDashboard.Reason, dashboardErr.Message)
 		})
 	})
 }
diff --git a/pkg/tests/testinfra/testinfra.go b/pkg/tests/testinfra/testinfra.go
index 1213bf8bba5..cae8ee96d75 100644
--- a/pkg/tests/testinfra/testinfra.go
+++ b/pkg/tests/testinfra/testinfra.go
@@ -267,6 +267,12 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
 			_, err = anonSect.NewKey("plugin_admin_enabled", "true")
 			require.NoError(t, err)
 		}
+		if o.PluginAdminExternalManageEnabled {
+			anonSect, err := cfg.NewSection("plugins")
+			require.NoError(t, err)
+			_, err = anonSect.NewKey("plugin_admin_external_manage_enabled", "true")
+			require.NoError(t, err)
+		}
 		if o.ViewersCanEdit {
 			usersSection, err := cfg.NewSection("users")
 			require.NoError(t, err)
@@ -322,6 +328,7 @@ type GrafanaOpts struct {
 	CatalogAppEnabled                     bool
 	ViewersCanEdit                        bool
 	PluginAdminEnabled                    bool
+	PluginAdminExternalManageEnabled      bool
 	AppModeProduction                     bool
 	DisableLegacyAlerting                 bool
 	EnableUnifiedAlerting                 bool
diff --git a/pkg/tsdb/grafanads/grafana.go b/pkg/tsdb/grafanads/grafana.go
index 129f3ea875d..a1011f39962 100644
--- a/pkg/tsdb/grafanads/grafana.go
+++ b/pkg/tsdb/grafanads/grafana.go
@@ -109,10 +109,10 @@ func (s *Service) doListQuery(ctx context.Context, query backend.DataQuery) back
 	}
 
 	path := store.RootPublicStatic + "/" + q.Path
-	frame, err := s.store.List(ctx, nil, path)
+	listFrame, err := s.store.List(ctx, nil, path)
 	response.Error = err
-	if frame != nil {
-		response.Frames = data.Frames{frame}
+	if listFrame != nil {
+		response.Frames = data.Frames{listFrame.Frame}
 	}
 	return response
 }
diff --git a/pkg/tsdb/prometheus/buffered/client.go b/pkg/tsdb/prometheus/buffered/client.go
index 4b4e02c18eb..b5a60633d96 100644
--- a/pkg/tsdb/prometheus/buffered/client.go
+++ b/pkg/tsdb/prometheus/buffered/client.go
@@ -5,11 +5,11 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/buffered/azureauth"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/middleware"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
@@ -20,7 +20,7 @@ import (
 
 // CreateTransportOptions creates options for the http client. Probably should be shared and should not live in the
 // buffered package.
-func CreateTransportOptions(settings backend.DataSourceInstanceSettings, cfg *setting.Cfg, features featuremgmt.FeatureToggles, logger log.Logger) (*sdkhttpclient.Options, error) {
+func CreateTransportOptions(settings backend.DataSourceInstanceSettings, azureSettings *azsettings.AzureSettings, features featuremgmt.FeatureToggles, logger log.Logger) (*sdkhttpclient.Options, error) {
 	opts, err := settings.HTTPClientOptions()
 	if err != nil {
 		return nil, err
@@ -41,7 +41,7 @@ func CreateTransportOptions(settings backend.DataSourceInstanceSettings, cfg *se
 
 	// Azure authentication is experimental (#35857)
 	if features.IsEnabled(featuremgmt.FlagPrometheusAzureAuth) {
-		err = azureauth.ConfigureAzureAuthentication(settings, cfg.Azure, &opts)
+		err = azureauth.ConfigureAzureAuthentication(settings, azureSettings, &opts)
 		if err != nil {
 			return nil, fmt.Errorf("error configuring Azure auth: %v", err)
 		}
diff --git a/pkg/tsdb/prometheus/buffered/client_test.go b/pkg/tsdb/prometheus/buffered/client_test.go
new file mode 100644
index 00000000000..5dc96a904a3
--- /dev/null
+++ b/pkg/tsdb/prometheus/buffered/client_test.go
@@ -0,0 +1,27 @@
+package buffered
+
+import (
+	"testing"
+
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
+	"github.com/grafana/grafana-plugin-sdk-go/backend"
+	"github.com/grafana/grafana/pkg/infra/log/logtest"
+	"github.com/grafana/grafana/pkg/services/featuremgmt"
+	"github.com/stretchr/testify/require"
+)
+
+func TestCreateTransportOptions(t *testing.T) {
+	t.Run("creates correct options object", func(t *testing.T) {
+		settings := backend.DataSourceInstanceSettings{
+			BasicAuthEnabled: false,
+			BasicAuthUser:    "",
+			JSONData:         []byte(`{"httpHeaderName1": "foo"}`),
+			DecryptedSecureJSONData: map[string]string{
+				"httpHeaderValue1": "bar",
+			},
+		}
+		opts, err := CreateTransportOptions(settings, &azsettings.AzureSettings{}, featuremgmt.WithFeatures(), &logtest.Fake{})
+		require.NoError(t, err)
+		require.Equal(t, map[string]string{"foo": "bar"}, opts.Headers)
+	})
+}
diff --git a/pkg/tsdb/prometheus/client/cache.go b/pkg/tsdb/prometheus/client/cache.go
deleted file mode 100644
index 85e447b9b9f..00000000000
--- a/pkg/tsdb/prometheus/client/cache.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package client
-
-import (
-	"sort"
-	"strings"
-
-	lru "github.com/hashicorp/golang-lru"
-)
-
-type ProviderCache struct {
-	provider promClientProvider
-	cache    *lru.Cache
-}
-
-type promClientProvider interface {
-	GetClient(map[string]string) (*Client, error)
-}
-
-func NewProviderCache(p promClientProvider) (*ProviderCache, error) {
-	cache, err := lru.New(500)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ProviderCache{
-		provider: p,
-		cache:    cache,
-	}, nil
-}
-
-func (c *ProviderCache) GetClient(headers map[string]string) (*Client, error) {
-	key := c.key(headers)
-	if client, ok := c.cache.Get(key); ok {
-		return client.(*Client), nil
-	}
-
-	client, err := c.provider.GetClient(headers)
-	if err != nil {
-		return nil, err
-	}
-
-	c.cache.Add(key, client)
-	return client, nil
-}
-
-func (c *ProviderCache) key(headers map[string]string) string {
-	vals := make([]string, len(headers))
-	var i int
-	for _, v := range headers {
-		vals[i] = v
-		i++
-	}
-	sort.Strings(vals)
-	return strings.Join(vals, "")
-}
diff --git a/pkg/tsdb/prometheus/client/cache_test.go b/pkg/tsdb/prometheus/client/cache_test.go
deleted file mode 100644
index 0d73a2216a8..00000000000
--- a/pkg/tsdb/prometheus/client/cache_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package client_test
-
-import (
-	"errors"
-	"io/ioutil"
-	"net/http"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestCache_GetClient(t *testing.T) {
-	t.Run("it caches the client for a set of auth headers", func(t *testing.T) {
-		tc := setupCacheContext()
-
-		c, err := tc.providerCache.GetClient(headers)
-		require.Nil(t, err)
-
-		c2, err := tc.providerCache.GetClient(headers)
-		require.Nil(t, err)
-
-		require.Equal(t, c, c2)
-		require.Equal(t, 1, tc.clientProvider.numCalls)
-	})
-
-	t.Run("it returns different clients when the headers differ", func(t *testing.T) {
-		tc := setupCacheContext()
-		h1 := map[string]string{"Authorization": "token", "X-ID-Token": "id-token"}
-		h2 := map[string]string{"Authorization": "token2", "X-ID-Token": "id-token"}
-
-		c, err := tc.providerCache.GetClient(h1)
-		require.Nil(t, err)
-
-		c2, err := tc.providerCache.GetClient(h2)
-		require.Nil(t, err)
-
-		require.NotEqual(t, c, c2)
-		require.Equal(t, 2, tc.clientProvider.numCalls)
-	})
-
-	t.Run("it returns from the cache when headers are the same", func(t *testing.T) {
-		tc := setupCacheContext()
-		h1 := map[string]string{"Authorization": "token", "X-ID-Token": "id-token"}
-		h2 := map[string]string{"Authorization": "token", "X-ID-Token": "id-token"}
-
-		c, err := tc.providerCache.GetClient(h1)
-		require.Nil(t, err)
-
-		c2, err := tc.providerCache.GetClient(h2)
-		require.Nil(t, err)
-
-		require.Equal(t, c, c2)
-		require.Equal(t, 1, tc.clientProvider.numCalls)
-	})
-
-	t.Run("it doesn't cache anything when an error occurs", func(t *testing.T) {
-		tc := setupCacheContext()
-		tc.clientProvider.errors <- errors.New("something bad")
-
-		_, err := tc.providerCache.GetClient(headers)
-		require.EqualError(t, err, "something bad")
-
-		c, err := tc.providerCache.GetClient(headers)
-		require.Nil(t, err)
-
-		require.NotNil(t, c)
-		require.Equal(t, 2, tc.clientProvider.numCalls)
-	})
-}
-
-type cacheTestContext struct {
-	providerCache  *client.ProviderCache
-	clientProvider *fakeClientProvider
-}
-
-func setupCacheContext() *cacheTestContext {
-	fp := newFakePromClientProvider()
-	p, err := client.NewProviderCache(fp)
-	if err != nil {
-		panic(err)
-	}
-
-	return &cacheTestContext{
-		providerCache:  p,
-		clientProvider: fp,
-	}
-}
-
-func newFakePromClientProvider() *fakeClientProvider {
-	return &fakeClientProvider{
-		errors: make(chan error, 1),
-	}
-}
-
-type fakeClientProvider struct {
-	headers  map[string]string
-	numCalls int
-	errors   chan error
-}
-
-func (p *fakeClientProvider) GetClient(h map[string]string) (*client.Client, error) {
-	p.headers = h
-	p.numCalls++
-
-	var err error
-	select {
-	case err = <-p.errors:
-	default:
-	}
-
-	var config []string
-	for _, v := range h {
-		config = append(config, v)
-	}
-	sort.Strings(config) //because map
-	res := &http.Response{
-		StatusCode: 200,
-		Header:     http.Header{},
-		Body:       ioutil.NopCloser(strings.NewReader(strings.Join(config, ","))),
-	}
-	c := &fakeClient{res: res}
-	return client.NewClient(c, "GET", "http://localhost:9090/"), err
-}
-
-type fakeClient struct {
-	res *http.Response
-}
-
-func (c *fakeClient) Do(req *http.Request) (*http.Response, error) {
-	return c.res, nil
-}
diff --git a/pkg/tsdb/prometheus/client/client.go b/pkg/tsdb/prometheus/client/client.go
index f6df3de7191..21e847afe0f 100644
--- a/pkg/tsdb/prometheus/client/client.go
+++ b/pkg/tsdb/prometheus/client/client.go
@@ -18,6 +18,9 @@ type doer interface {
 	Do(req *http.Request) (*http.Response, error)
 }
 
+// Client is a custom Prometheus client. Reason for this is that Prom Go client serializes response into its own
+// objects, we have to go through them and then serialize again into DataFrame which isn't very efficient. Using custom
+// client we can parse response directly into DataFrame.
 type Client struct {
 	doer    doer
 	method  string
@@ -28,101 +31,122 @@ func NewClient(d doer, method, baseUrl string) *Client {
 	return &Client{doer: d, method: method, baseUrl: baseUrl}
 }
 
-func (c *Client) QueryRange(ctx context.Context, q *models.Query) (*http.Response, error) {
-	u, err := url.ParseRequestURI(c.baseUrl)
+func (c *Client) QueryRange(ctx context.Context, q *models.Query, headers http.Header) (*http.Response, error) {
+	tr := q.TimeRange()
+	u, err := c.createUrl("api/v1/query_range", map[string]string{
+		"query": q.Expr,
+		"start": formatTime(tr.Start),
+		"end":   formatTime(tr.End),
+		"step":  strconv.FormatFloat(tr.Step.Seconds(), 'f', -1, 64),
+	})
+	if err != nil {
+		return nil, err
+	}
+	req, err := createRequest(ctx, c.method, u, nil, headers)
 	if err != nil {
 		return nil, err
 	}
 
-	u.Path = path.Join(u.Path, "api/v1/query_range")
-
-	qs := u.Query()
-	qs.Set("query", q.Expr)
-	tr := q.TimeRange()
-	qs.Set("start", formatTime(tr.Start))
-	qs.Set("end", formatTime(tr.End))
-	qs.Set("step", strconv.FormatFloat(tr.Step.Seconds(), 'f', -1, 64))
-
-	return c.fetch(ctx, c.method, u, qs, nil)
+	return c.doer.Do(req)
 }
 
-func (c *Client) QueryInstant(ctx context.Context, q *models.Query) (*http.Response, error) {
-	u, err := url.ParseRequestURI(c.baseUrl)
-	if err != nil {
-		return nil, err
-	}
-
-	u.Path = path.Join(u.Path, "api/v1/query")
-
-	qs := u.Query()
-	qs.Set("query", q.Expr)
+func (c *Client) QueryInstant(ctx context.Context, q *models.Query, headers http.Header) (*http.Response, error) {
+	qs := map[string]string{"query": q.Expr}
 	tr := q.TimeRange()
 	if !tr.End.IsZero() {
-		qs.Set("time", formatTime(tr.End))
+		qs["time"] = formatTime(tr.End)
 	}
 
-	return c.fetch(ctx, c.method, u, qs, nil)
-}
-
-func (c *Client) QueryExemplars(ctx context.Context, q *models.Query) (*http.Response, error) {
-	u, err := url.ParseRequestURI(c.baseUrl)
+	u, err := c.createUrl("api/v1/query", qs)
+	if err != nil {
+		return nil, err
+	}
+	req, err := createRequest(ctx, c.method, u, nil, headers)
 	if err != nil {
 		return nil, err
 	}
 
-	u.Path = path.Join(u.Path, "api/v1/query_exemplars")
-
-	qs := u.Query()
-	tr := q.TimeRange()
-	qs.Set("query", q.Expr)
-	qs.Set("start", formatTime(tr.Start))
-	qs.Set("end", formatTime(tr.End))
-
-	return c.fetch(ctx, c.method, u, qs, nil)
+	return c.doer.Do(req)
 }
 
-type FetchReq struct {
-	Method      string
-	Url         *url.URL
-	QueryString url.Values
+func (c *Client) QueryExemplars(ctx context.Context, q *models.Query, headers http.Header) (*http.Response, error) {
+	tr := q.TimeRange()
+	u, err := c.createUrl("api/v1/query_exemplars", map[string]string{
+		"query": q.Expr,
+		"start": formatTime(tr.Start),
+		"end":   formatTime(tr.End),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	req, err := createRequest(ctx, c.method, u, nil, headers)
+	if err != nil {
+		return nil, err
+	}
+
+	return c.doer.Do(req)
 }
 
 func (c *Client) QueryResource(ctx context.Context, req *backend.CallResourceRequest) (*http.Response, error) {
 	// The way URL is represented in CallResourceRequest and what we need for the fetch function is different
 	// so here we have to do a bit of parsing, so we can then compose it with the base url in correct way.
-	baseUrlParsed, err := url.ParseRequestURI(c.baseUrl)
-	if err != nil {
-		return nil, err
-	}
 	reqUrlParsed, err := url.Parse(req.URL)
 	if err != nil {
 		return nil, err
 	}
+	u, err := c.createUrl(req.Path, nil)
+	if err != nil {
+		return nil, err
+	}
+	u.RawQuery = reqUrlParsed.RawQuery
 
-	baseUrlParsed.Path = path.Join(baseUrlParsed.Path, req.Path)
-	baseUrlParsed.RawQuery = reqUrlParsed.RawQuery
+	// We use method from the request, as for resources front end may do a fallback to GET if POST does not work
+	// nad we want to respect that.
+	httpRequest, err := createRequest(ctx, req.Method, u, req.Body, req.Headers)
+	if err != nil {
+		return nil, err
+	}
 
-	return c.fetch(ctx, req.Method, baseUrlParsed, nil, req.Body)
+	return c.doer.Do(httpRequest)
 }
 
-func (c *Client) fetch(ctx context.Context, method string, u *url.URL, qs url.Values, body []byte) (*http.Response, error) {
-	// The qs arg seems to be used in some callers of this method, but you can already pass them in the URL object
-	if strings.ToUpper(method) == http.MethodGet && qs != nil {
-		u.RawQuery = qs.Encode()
+func (c *Client) createUrl(endpoint string, qs map[string]string) (*url.URL, error) {
+	finalUrl, err := url.ParseRequestURI(c.baseUrl)
+	if err != nil {
+		return nil, err
 	}
+
+	finalUrl.Path = path.Join(finalUrl.Path, endpoint)
+	urlQuery := finalUrl.Query()
+
+	for key, val := range qs {
+		urlQuery.Set(key, val)
+	}
+
+	finalUrl.RawQuery = urlQuery.Encode()
+	return finalUrl, nil
+}
+
+func createRequest(ctx context.Context, method string, u *url.URL, body []byte, header http.Header) (*http.Request, error) {
 	bodyReader := bytes.NewReader(body)
 	request, err := http.NewRequestWithContext(ctx, method, u.String(), bodyReader)
 	if err != nil {
 		return nil, err
 	}
-
-	// This may not be true but right now we don't have more information here and seems like we send just this type
-	// of encoding right now if it is a POST
-	if strings.ToUpper(method) == http.MethodPost {
-		request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	// request.Header is created empty from NewRequestWithContext so we can just replace it
+	if header != nil {
+		request.Header = header
 	}
-
-	return c.doer.Do(request)
+	if strings.ToUpper(method) == http.MethodPost {
+		// This may not be true but right now we don't have more information here and seems like we send just this type
+		// of encoding right now if it is a POST
+		request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+		// This allows transport to retry request. See https://github.com/prometheus/client_golang/pull/1022
+		// It's set to nil so it is not actually sent over the wire, just used in Go http lib to retry requests.
+		request.Header["Idempotency-Key"] = nil
+	}
+	return request, nil
 }
 
 func formatTime(t time.Time) string {
diff --git a/pkg/tsdb/prometheus/client/provider.go b/pkg/tsdb/prometheus/client/provider.go
deleted file mode 100644
index 808f1630068..00000000000
--- a/pkg/tsdb/prometheus/client/provider.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package client
-
-import (
-	"net/http"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/middleware"
-	"github.com/grafana/grafana/pkg/util/maputil"
-
-	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/infra/log"
-)
-
-type Provider struct {
-	settings       backend.DataSourceInstanceSettings
-	jsonData       map[string]interface{}
-	httpMethod     string
-	clientProvider httpclient.Provider
-	cfg            *setting.Cfg
-	features       featuremgmt.FeatureToggles
-	log            log.Logger
-}
-
-func NewProvider(
-	settings backend.DataSourceInstanceSettings,
-	jsonData map[string]interface{},
-	clientProvider httpclient.Provider,
-	cfg *setting.Cfg,
-	features featuremgmt.FeatureToggles,
-	log log.Logger,
-) *Provider {
-	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
-	if httpMethod == "" {
-		httpMethod = http.MethodPost
-	}
-	return &Provider{
-		settings:       settings,
-		jsonData:       jsonData,
-		httpMethod:     httpMethod,
-		clientProvider: clientProvider,
-		cfg:            cfg,
-		features:       features,
-		log:            log,
-	}
-}
-
-func (p *Provider) GetClient(headers map[string]string) (*Client, error) {
-	opts, err := p.settings.HTTPClientOptions()
-	if err != nil {
-		return nil, err
-	}
-
-	opts.Middlewares = p.middlewares()
-	opts.Headers = reqHeaders(headers)
-
-	// Set SigV4 service namespace
-	if opts.SigV4 != nil {
-		opts.SigV4.Service = "aps"
-	}
-
-	// Azure authentication
-	err = p.configureAzureAuthentication(&opts)
-	if err != nil {
-		return nil, err
-	}
-
-	httpClient, err := p.clientProvider.New(opts)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewClient(httpClient, p.httpMethod, p.settings.URL), nil
-}
-
-func (p *Provider) middlewares() []sdkhttpclient.Middleware {
-	middlewares := []sdkhttpclient.Middleware{
-		middleware.CustomQueryParameters(p.log),
-		sdkhttpclient.CustomHeadersMiddleware(),
-	}
-	return middlewares
-}
-
-func reqHeaders(headers map[string]string) map[string]string {
-	// copy to avoid changing the original map
-	h := make(map[string]string, len(headers))
-	for k, v := range headers {
-		h[k] = v
-	}
-	return h
-}
diff --git a/pkg/tsdb/prometheus/client/provider_azure.go b/pkg/tsdb/prometheus/client/provider_azure.go
deleted file mode 100644
index b3ee277c7e8..00000000000
--- a/pkg/tsdb/prometheus/client/provider_azure.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"net/url"
-	"path"
-
-	"github.com/grafana/grafana-azure-sdk-go/azcredentials"
-	"github.com/grafana/grafana-azure-sdk-go/azhttpclient"
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/util/maputil"
-)
-
-var (
-	azurePrometheusScopes = map[string][]string{
-		azsettings.AzurePublic:       {"https://prometheus.monitor.azure.com/.default"},
-		azsettings.AzureChina:        {"https://prometheus.monitor.chinacloudapp.cn/.default"},
-		azsettings.AzureUSGovernment: {"https://prometheus.monitor.usgovcloudapi.net/.default"},
-	}
-)
-
-func (p *Provider) configureAzureAuthentication(opts *sdkhttpclient.Options) error {
-	// Azure authentication is experimental (#35857)
-	if !p.features.IsEnabled(featuremgmt.FlagPrometheusAzureAuth) {
-		return nil
-	}
-
-	credentials, err := azcredentials.FromDatasourceData(p.jsonData, p.settings.DecryptedSecureJSONData)
-	if err != nil {
-		err = fmt.Errorf("invalid Azure credentials: %w", err)
-		return err
-	}
-
-	if credentials != nil {
-		var scopes []string
-
-		if scopes, err = getOverriddenScopes(p.jsonData); err != nil {
-			return err
-		}
-
-		if scopes == nil {
-			if scopes, err = getPrometheusScopes(p.cfg.Azure, credentials); err != nil {
-				return err
-			}
-		}
-
-		azhttpclient.AddAzureAuthentication(opts, p.cfg.Azure, credentials, scopes)
-	}
-
-	return nil
-}
-
-func getOverriddenScopes(jsonData map[string]interface{}) ([]string, error) {
-	resourceIdStr, err := maputil.GetStringOptional(jsonData, "azureEndpointResourceId")
-	if err != nil {
-		err = fmt.Errorf("overridden resource ID (audience) invalid")
-		return nil, err
-	} else if resourceIdStr == "" {
-		return nil, nil
-	}
-
-	resourceId, err := url.Parse(resourceIdStr)
-	if err != nil || resourceId.Scheme == "" || resourceId.Host == "" {
-		err = fmt.Errorf("overridden endpoint resource ID (audience) '%s' invalid", resourceIdStr)
-		return nil, err
-	}
-
-	resourceId.Path = path.Join(resourceId.Path, ".default")
-	scopes := []string{resourceId.String()}
-	return scopes, nil
-}
-
-func getPrometheusScopes(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials) ([]string, error) {
-	// Extract cloud from credentials
-	azureCloud, err := getAzureCloudFromCredentials(settings, credentials)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get scopes for the given cloud
-	if scopes, ok := azurePrometheusScopes[azureCloud]; !ok {
-		err := fmt.Errorf("the Azure cloud '%s' not supported by Prometheus datasource", azureCloud)
-		return nil, err
-	} else {
-		return scopes, nil
-	}
-}
-
-// To be part of grafana-azure-sdk-go
-func getAzureCloudFromCredentials(settings *azsettings.AzureSettings, credentials azcredentials.AzureCredentials) (string, error) {
-	switch c := credentials.(type) {
-	case *azcredentials.AzureManagedIdentityCredentials:
-		// In case of managed identity, the cloud is always same as where Grafana is hosted
-		return getDefaultAzureCloud(settings), nil
-	case *azcredentials.AzureClientSecretCredentials:
-		return c.AzureCloud, nil
-	default:
-		err := fmt.Errorf("the Azure credentials of type '%s' not supported by Prometheus datasource", c.AzureAuthType())
-		return "", err
-	}
-}
-
-// To be part of grafana-azure-sdk-go
-func getDefaultAzureCloud(settings *azsettings.AzureSettings) string {
-	cloudName := settings.Cloud
-	if cloudName == "" {
-		return azsettings.AzurePublic
-	}
-	return cloudName
-}
diff --git a/pkg/tsdb/prometheus/client/provider_azure_test.go b/pkg/tsdb/prometheus/client/provider_azure_test.go
deleted file mode 100644
index faf45cd59ed..00000000000
--- a/pkg/tsdb/prometheus/client/provider_azure_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package client
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana-azure-sdk-go/azsettings"
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestConfigureAzureAuthentication(t *testing.T) {
-	cfg := &setting.Cfg{
-		Azure: &azsettings.AzureSettings{},
-	}
-	settings := backend.DataSourceInstanceSettings{}
-
-	t.Run("given feature flag enabled", func(t *testing.T) {
-		features := featuremgmt.WithFeatures(featuremgmt.FlagPrometheusAzureAuth)
-
-		t.Run("should set Azure middleware when JsonData contains valid credentials", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod": "POST",
-				"azureCredentials": map[string]interface{}{
-					"authType": "msi",
-				},
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			require.NoError(t, err)
-
-			require.NotNil(t, opts.Middlewares)
-			assert.Len(t, opts.Middlewares, 1)
-		})
-
-		t.Run("should not set Azure middleware when JsonData doesn't contain valid credentials", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod": "POST",
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			require.NoError(t, err)
-
-			assert.NotContains(t, opts.CustomOptions, "_azureCredentials")
-		})
-
-		t.Run("should return error when JsonData contains invalid credentials", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod":       "POST",
-				"azureCredentials": "invalid",
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			assert.Error(t, err)
-		})
-
-		t.Run("should set Azure middleware when JsonData contains credentials and valid audience", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod": "POST",
-				"azureCredentials": map[string]interface{}{
-					"authType": "msi",
-				},
-				"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			require.NoError(t, err)
-
-			require.NotNil(t, opts.Middlewares)
-			assert.Len(t, opts.Middlewares, 1)
-		})
-
-		t.Run("should not set Azure middleware when JsonData doesn't contain credentials", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod":              "POST",
-				"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			require.NoError(t, err)
-
-			if opts.Middlewares != nil {
-				assert.Len(t, opts.Middlewares, 0)
-			}
-		})
-
-		t.Run("should return error when JsonData contains invalid audience", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod": "POST",
-				"azureCredentials": map[string]interface{}{
-					"authType": "msi",
-				},
-				"azureEndpointResourceId": "invalid",
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			assert.Error(t, err)
-		})
-	})
-
-	t.Run("given feature flag not enabled", func(t *testing.T) {
-		features := featuremgmt.WithFeatures()
-
-		t.Run("should not set Azure Credentials even when JsonData contains credentials", func(t *testing.T) {
-			jsonData := map[string]interface{}{
-				"httpMethod": "POST",
-				"azureCredentials": map[string]interface{}{
-					"authType": "msi",
-				},
-				"azureEndpointResourceId": "https://api.example.com/abd5c4ce-ca73-41e9-9cb2-bed39aa2adb5",
-			}
-
-			var p = NewProvider(settings, jsonData, nil, cfg, features, nil)
-
-			var opts = &sdkhttpclient.Options{CustomOptions: map[string]interface{}{}}
-
-			err := p.configureAzureAuthentication(opts)
-			require.NoError(t, err)
-
-			if opts.Middlewares != nil {
-				assert.Len(t, opts.Middlewares, 0)
-			}
-		})
-	})
-}
diff --git a/pkg/tsdb/prometheus/client/provider_test.go b/pkg/tsdb/prometheus/client/provider_test.go
deleted file mode 100644
index 400eb343835..00000000000
--- a/pkg/tsdb/prometheus/client/provider_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package client_test
-
-import (
-	"encoding/json"
-	"net/http"
-	"testing"
-
-	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
-
-	"github.com/stretchr/testify/require"
-)
-
-var headers = map[string]string{"Authorization": "token", "X-ID-Token": "id-token"}
-
-func TestGetClient(t *testing.T) {
-	t.Run("it sets the SigV4 service if it exists", func(t *testing.T) {
-		tc := setup(`{"sigV4Auth":true}`)
-
-		setting.SigV4AuthEnabled = true
-		defer func() { setting.SigV4AuthEnabled = false }()
-
-		_, err := tc.clientProvider.GetClient(headers)
-		require.Nil(t, err)
-
-		require.Equal(t, "aps", tc.httpProvider.opts.SigV4.Service)
-	})
-
-	t.Run("it always uses the custom params and custom headers middlewares", func(t *testing.T) {
-		tc := setup()
-
-		_, err := tc.clientProvider.GetClient(headers)
-		require.Nil(t, err)
-
-		require.Len(t, tc.httpProvider.middlewares(), 2)
-		require.Contains(t, tc.httpProvider.middlewares(), "prom-custom-query-parameters")
-		require.Contains(t, tc.httpProvider.middlewares(), "CustomHeaders")
-	})
-
-	t.Run("extra headers", func(t *testing.T) {
-		t.Run("it sets the headers when 'oauthPassThru' is true and auth headers are passed", func(t *testing.T) {
-			tc := setup(`{"oauthPassThru":true}`)
-			_, err := tc.clientProvider.GetClient(headers)
-			require.Nil(t, err)
-
-			require.Equal(t, headers, tc.httpProvider.opts.Headers)
-		})
-
-		t.Run("it sets all headers", func(t *testing.T) {
-			withNonAuth := map[string]string{"X-Not-Auth": "stuff"}
-
-			tc := setup(`{"oauthPassThru":true}`)
-			_, err := tc.clientProvider.GetClient(withNonAuth)
-			require.Nil(t, err)
-
-			require.Equal(t, map[string]string{"X-Not-Auth": "stuff"}, tc.httpProvider.opts.Headers)
-		})
-
-		t.Run("it does not error when headers are nil", func(t *testing.T) {
-			tc := setup(`{"oauthPassThru":true}`)
-
-			_, err := tc.clientProvider.GetClient(nil)
-			require.Nil(t, err)
-		})
-	})
-}
-
-func setup(jsonData ...string) *testContext {
-	var rawData []byte
-	if len(jsonData) > 0 {
-		rawData = []byte(jsonData[0])
-	}
-
-	var jd map[string]interface{}
-	_ = json.Unmarshal(rawData, &jd)
-
-	cfg := &setting.Cfg{}
-	settings := backend.DataSourceInstanceSettings{URL: "test-url", JSONData: rawData}
-	features := featuremgmt.WithFeatures()
-	hp := &fakeHttpClientProvider{}
-	p := client.NewProvider(settings, jd, hp, cfg, features, nil)
-
-	return &testContext{
-		httpProvider:   hp,
-		clientProvider: p,
-	}
-}
-
-type testContext struct {
-	httpProvider   *fakeHttpClientProvider
-	clientProvider *client.Provider
-}
-
-type fakeHttpClientProvider struct {
-	httpclient.Provider
-
-	opts sdkhttpclient.Options
-}
-
-func (p *fakeHttpClientProvider) New(opts ...sdkhttpclient.Options) (*http.Client, error) {
-	p.opts = opts[0]
-	return sdkhttpclient.New(opts[0])
-}
-
-func (p *fakeHttpClientProvider) GetTransport(opts ...sdkhttpclient.Options) (http.RoundTripper, error) {
-	p.opts = opts[0]
-	return http.DefaultTransport, nil
-}
-
-func (p *fakeHttpClientProvider) middlewares() []string {
-	var middlewareNames []string
-	for _, m := range p.opts.Middlewares {
-		mw, ok := m.(sdkhttpclient.MiddlewareName)
-		if !ok {
-			panic("unexpected middleware type")
-		}
-
-		middlewareNames = append(middlewareNames, mw.MiddlewareName())
-	}
-	return middlewareNames
-}
diff --git a/pkg/tsdb/prometheus/prometheus.go b/pkg/tsdb/prometheus/prometheus.go
index 4febc222925..200d85402ad 100644
--- a/pkg/tsdb/prometheus/prometheus.go
+++ b/pkg/tsdb/prometheus/prometheus.go
@@ -43,26 +43,28 @@ func ProvideService(httpClientProvider httpclient.Provider, cfg *setting.Cfg, fe
 func newInstanceSettings(httpClientProvider httpclient.Provider, cfg *setting.Cfg, features featuremgmt.FeatureToggles, tracer tracing.Tracer) datasource.InstanceFactoryFunc {
 	return func(settings backend.DataSourceInstanceSettings) (instancemgmt.Instance, error) {
 		// Creates a http roundTripper. Probably should be used for both buffered and streaming/querydata instances.
-		opts, err := buffered.CreateTransportOptions(settings, cfg, features, plog)
+		opts, err := buffered.CreateTransportOptions(settings, cfg.Azure, features, plog)
 		if err != nil {
 			return nil, fmt.Errorf("error creating transport options: %v", err)
 		}
-		roundTripper, err := httpClientProvider.GetTransport(*opts)
+		httpClient, err := httpClientProvider.New(*opts)
 		if err != nil {
 			return nil, fmt.Errorf("error creating http client: %v", err)
 		}
-
-		b, err := buffered.New(roundTripper, tracer, settings, plog)
+		// Older version using standard Go Prometheus client
+		b, err := buffered.New(httpClient.Transport, tracer, settings, plog)
 		if err != nil {
 			return nil, err
 		}
 
-		qd, err := querydata.New(httpClientProvider, cfg, features, tracer, settings, plog)
+		// New version using custom client and better response parsing
+		qd, err := querydata.New(httpClient, features, tracer, settings, plog)
 		if err != nil {
 			return nil, err
 		}
 
-		r, err := resource.New(httpClientProvider, cfg, features, settings, plog)
+		// Resource call management using new custom client same as querydata
+		r, err := resource.New(httpClient, settings, plog)
 		if err != nil {
 			return nil, err
 		}
@@ -98,19 +100,12 @@ func (s *Service) CallResource(ctx context.Context, req *backend.CallResourceReq
 		return err
 	}
 
-	statusCode, bytes, err := i.resource.Execute(ctx, req)
-	body := bytes
+	resp, err := i.resource.Execute(ctx, req)
 	if err != nil {
-		body = []byte(err.Error())
+		return err
 	}
 
-	return sender.Send(&backend.CallResourceResponse{
-		Status: statusCode,
-		Headers: map[string][]string{
-			"content-type": {"application/json"},
-		},
-		Body: body,
-	})
+	return sender.Send(resp)
 }
 
 func (s *Service) getInstance(pluginCtx backend.PluginContext) (*instance, error) {
diff --git a/pkg/tsdb/prometheus/prometheus_test.go b/pkg/tsdb/prometheus/prometheus_test.go
index 29a496c0139..4cca2bacb95 100644
--- a/pkg/tsdb/prometheus/prometheus_test.go
+++ b/pkg/tsdb/prometheus/prometheus_test.go
@@ -2,6 +2,7 @@ package prometheus
 
 import (
 	"context"
+	"io"
 	"net/http"
 	"testing"
 	"time"
@@ -21,9 +22,12 @@ func (sender *fakeSender) Send(resp *backend.CallResourceResponse) error {
 	return nil
 }
 
-type fakeRoundtripper struct{}
+type fakeRoundtripper struct {
+	Req *http.Request
+}
 
 func (rt *fakeRoundtripper) RoundTrip(req *http.Request) (*http.Response, error) {
+	rt.Req = req
 	return &http.Response{
 		Status:        "200",
 		StatusCode:    200,
@@ -35,13 +39,13 @@ func (rt *fakeRoundtripper) RoundTrip(req *http.Request) (*http.Response, error)
 
 type fakeHTTPClientProvider struct {
 	httpclient.Provider
-	opts []sdkHttpClient.Options
+	Roundtripper *fakeRoundtripper
 }
 
 func (provider *fakeHTTPClientProvider) New(opts ...sdkHttpClient.Options) (*http.Client, error) {
 	client := &http.Client{}
-	client.Transport = &fakeRoundtripper{}
-	provider.opts = opts
+	provider.Roundtripper = &fakeRoundtripper{}
+	client.Transport = provider.Roundtripper
 	return client, nil
 }
 
@@ -49,15 +53,10 @@ func (provider *fakeHTTPClientProvider) GetTransport(opts ...sdkHttpClient.Optio
 	return &fakeRoundtripper{}, nil
 }
 
-func TestClient(t *testing.T) {
+func TestService(t *testing.T) {
 	t.Run("Service", func(t *testing.T) {
 		t.Run("CallResource", func(t *testing.T) {
-			t.Run("Adds correct headers", func(t *testing.T) {
-				// Not a great test as right now we put the headers form request and custom headers into a client during
-				// it's creation and then relly on sdk middleware to add it to the request later on. This is hard to
-				// test so for now this just checks if the correct headers are passed to the http client not whether
-				// they are actually added to the request.
-
+			t.Run("creates correct request", func(t *testing.T) {
 				httpProvider := &fakeHTTPClientProvider{}
 				service := &Service{
 					im: datasource.NewInstanceManager(newInstanceSettings(httpProvider, &setting.Cfg{}, &featuremgmt.FeatureManager{}, nil)),
@@ -79,18 +78,14 @@ func TestClient(t *testing.T) {
 							Database:         "",
 							BasicAuthEnabled: true,
 							BasicAuthUser:    "admin",
-							// Custom headers from data source configuration
-							JSONData: []byte("{\"httpHeaderName1\":\"x-tenant-id\"}"),
-							DecryptedSecureJSONData: map[string]string{
-								"httpHeaderValue1": "0987",
-							},
-							Updated: time.Time{},
+							Updated:          time.Time{},
+							JSONData:         []byte("{}"),
 						},
 					},
 					Path:   "/api/v1/series",
 					Method: http.MethodPost,
 					URL:    "/api/v1/series",
-					// Header in the request itself sent from the browser
+					// This header should be passed on to the resource request
 					Headers: map[string][]string{
 						"foo": {"bar"},
 					},
@@ -100,7 +95,19 @@ func TestClient(t *testing.T) {
 				sender := &fakeSender{}
 				err := service.CallResource(context.Background(), req, sender)
 				require.NoError(t, err)
-				require.Equal(t, map[string]string{"X-Tenant-Id": "0987", "foo": "bar"}, httpProvider.opts[0].Headers)
+				require.Equal(
+					t,
+					http.Header{
+						"Content-Type":    {"application/x-www-form-urlencoded"},
+						"Idempotency-Key": []string(nil),
+						"foo":             {"bar"},
+					},
+					httpProvider.Roundtripper.Req.Header)
+				require.Equal(t, http.MethodPost, httpProvider.Roundtripper.Req.Method)
+				body, err := io.ReadAll(httpProvider.Roundtripper.Req.Body)
+				require.NoError(t, err)
+				require.Equal(t, []byte("match%5B%5D: ALERTS\nstart: 1655271408\nend: 1655293008"), body)
+				require.Equal(t, "http://localhost:9090/api/v1/series", httpProvider.Roundtripper.Req.URL.String())
 			})
 		})
 	})
diff --git a/pkg/tsdb/prometheus/querydata/framing_test.go b/pkg/tsdb/prometheus/querydata/framing_test.go
index 66b7afa3747..a551c1f2080 100644
--- a/pkg/tsdb/prometheus/querydata/framing_test.go
+++ b/pkg/tsdb/prometheus/querydata/framing_test.go
@@ -118,7 +118,10 @@ func loadStoredQuery(fileName string) (*backend.QueryDataRequest, error) {
 }
 
 func runQuery(response []byte, q *backend.QueryDataRequest, wide bool) (*backend.QueryDataResponse, error) {
-	tCtx := setup(wide)
+	tCtx, err := setup(wide)
+	if err != nil {
+		return nil, err
+	}
 	res := &http.Response{
 		StatusCode: 200,
 		Body:       ioutil.NopCloser(bytes.NewReader(response)),
diff --git a/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go b/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
index 0f610b4a4d2..564d4ea6308 100644
--- a/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
+++ b/pkg/tsdb/prometheus/querydata/prometeus_bench_test.go
@@ -22,7 +22,9 @@ import (
 // - go tool pprof -http=localhost:6061 memprofile.out
 func BenchmarkJson(b *testing.B) {
 	body, q := createJsonTestData(1642000000, 1, 300, 400)
-	tCtx := setup(true)
+	tCtx, err := setup(true)
+	require.NoError(b, err)
+
 	b.ResetTimer()
 	for n := 0; n < b.N; n++ {
 		res := http.Response{
diff --git a/pkg/tsdb/prometheus/querydata/request.go b/pkg/tsdb/prometheus/querydata/request.go
index 2e7ebac3c45..0269b05c380 100644
--- a/pkg/tsdb/prometheus/querydata/request.go
+++ b/pkg/tsdb/prometheus/querydata/request.go
@@ -2,21 +2,19 @@ package querydata
 
 import (
 	"context"
-	"encoding/json"
-	"fmt"
+	"net/http"
 	"regexp"
 	"time"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/infra/log"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/intervalv2"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
 	"github.com/grafana/grafana/pkg/util/maputil"
 	"go.opentelemetry.io/otel/attribute"
 )
@@ -25,18 +23,18 @@ const legendFormatAuto = "__auto"
 
 var legendFormatRegexp = regexp.MustCompile(`\{\{\s*(.+?)\s*\}\}`)
 
-type clientGetter func(map[string]string) (*client.Client, error)
-
 type ExemplarEvent struct {
 	Time   time.Time
 	Value  float64
 	Labels map[string]string
 }
 
+// QueryData handles querying but different from buffered package uses a custom client instead of default Go Prom
+// client.
 type QueryData struct {
 	intervalCalculator intervalv2.Calculator
 	tracer             tracing.Tracer
-	getClient          clientGetter
+	client             *client.Client
 	log                log.Logger
 	ID                 int64
 	URL                string
@@ -45,34 +43,30 @@ type QueryData struct {
 }
 
 func New(
-	httpClientProvider httpclient.Provider,
-	cfg *setting.Cfg,
+	httpClient *http.Client,
 	features featuremgmt.FeatureToggles,
 	tracer tracing.Tracer,
 	settings backend.DataSourceInstanceSettings,
 	plog log.Logger,
 ) (*QueryData, error) {
-	var jsonData map[string]interface{}
-	if err := json.Unmarshal(settings.JSONData, &jsonData); err != nil {
-		return nil, fmt.Errorf("error reading settings: %w", err)
+	jsonData, err := utils.GetJsonData(settings)
+	if err != nil {
+		return nil, err
 	}
+	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
 
 	timeInterval, err := maputil.GetStringOptional(jsonData, "timeInterval")
 	if err != nil {
 		return nil, err
 	}
 
-	p := client.NewProvider(settings, jsonData, httpClientProvider, cfg, features, plog)
-	pc, err := client.NewProviderCache(p)
-	if err != nil {
-		return nil, err
-	}
+	promClient := client.NewClient(httpClient, httpMethod, settings.URL)
 
 	return &QueryData{
 		intervalCalculator: intervalv2.NewCalculator(),
 		tracer:             tracer,
 		log:                plog,
-		getClient:          pc.GetClient,
+		client:             promClient,
 		TimeInterval:       timeInterval,
 		ID:                 settings.ID,
 		URL:                settings.URL,
@@ -86,17 +80,12 @@ func (s *QueryData) Execute(ctx context.Context, req *backend.QueryDataRequest)
 		Responses: backend.Responses{},
 	}
 
-	client, err := s.getClient(req.Headers)
-	if err != nil {
-		return &result, err
-	}
-
 	for _, q := range req.Queries {
 		query, err := models.Parse(q, s.TimeInterval, s.intervalCalculator, fromAlert)
 		if err != nil {
 			return &result, err
 		}
-		r, err := s.fetch(ctx, client, query)
+		r, err := s.fetch(ctx, s.client, query, req.Headers)
 		if err != nil {
 			return &result, err
 		}
@@ -110,11 +99,11 @@ func (s *QueryData) Execute(ctx context.Context, req *backend.QueryDataRequest)
 	return &result, nil
 }
 
-func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.Query) (*backend.DataResponse, error) {
+func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.Query, headers map[string]string) (*backend.DataResponse, error) {
 	s.log.Debug("Sending query", "start", q.Start, "end", q.End, "step", q.Step, "query", q.Expr)
 
-	traceCtx, span := s.trace(ctx, q)
-	defer span.End()
+	traceCtx, end := s.trace(ctx, q)
+	defer end()
 
 	response := &backend.DataResponse{
 		Frames: data.Frames{},
@@ -122,7 +111,7 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
 	}
 
 	if q.RangeQuery {
-		res, err := s.rangeQuery(traceCtx, client, q)
+		res, err := s.rangeQuery(traceCtx, client, q, headers)
 		if err != nil {
 			return nil, err
 		}
@@ -130,7 +119,7 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
 	}
 
 	if q.InstantQuery {
-		res, err := s.instantQuery(traceCtx, client, q)
+		res, err := s.instantQuery(traceCtx, client, q, headers)
 		if err != nil {
 			return nil, err
 		}
@@ -138,7 +127,7 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
 	}
 
 	if q.ExemplarQuery {
-		res, err := s.exemplarQuery(traceCtx, client, q)
+		res, err := s.exemplarQuery(traceCtx, client, q, headers)
 		if err != nil {
 			// If exemplar query returns error, we want to only log it and
 			// continue with other results processing
@@ -152,34 +141,42 @@ func (s *QueryData) fetch(ctx context.Context, client *client.Client, q *models.
 	return response, nil
 }
 
-func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query) (*backend.DataResponse, error) {
-	res, err := c.QueryRange(ctx, q)
+func (s *QueryData) rangeQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (*backend.DataResponse, error) {
+	res, err := c.QueryRange(ctx, q, sdkHeaderToHttpHeader(headers))
 	if err != nil {
 		return nil, err
 	}
 	return s.parseResponse(ctx, q, res)
 }
 
-func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query) (*backend.DataResponse, error) {
-	res, err := c.QueryInstant(ctx, q)
+func (s *QueryData) instantQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (*backend.DataResponse, error) {
+	res, err := c.QueryInstant(ctx, q, sdkHeaderToHttpHeader(headers))
 	if err != nil {
 		return nil, err
 	}
 	return s.parseResponse(ctx, q, res)
 }
 
-func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query) (*backend.DataResponse, error) {
-	res, err := c.QueryExemplars(ctx, q)
+func (s *QueryData) exemplarQuery(ctx context.Context, c *client.Client, q *models.Query, headers map[string]string) (*backend.DataResponse, error) {
+	res, err := c.QueryExemplars(ctx, q, sdkHeaderToHttpHeader(headers))
 	if err != nil {
 		return nil, err
 	}
 	return s.parseResponse(ctx, q, res)
 }
 
-func (s *QueryData) trace(ctx context.Context, q *models.Query) (context.Context, tracing.Span) {
-	traceCtx, span := s.tracer.Start(ctx, "datasource.prometheus")
-	span.SetAttributes("expr", q.Expr, attribute.Key("expr").String(q.Expr))
-	span.SetAttributes("start_unixnano", q.Start, attribute.Key("start_unixnano").Int64(q.Start.UnixNano()))
-	span.SetAttributes("stop_unixnano", q.End, attribute.Key("stop_unixnano").Int64(q.End.UnixNano()))
-	return traceCtx, span
+func (s *QueryData) trace(ctx context.Context, q *models.Query) (context.Context, func()) {
+	return utils.StartTrace(ctx, s.tracer, "datasource.prometheus", []utils.Attribute{
+		{Key: "expr", Value: q.Expr, Kv: attribute.Key("expr").String(q.Expr)},
+		{Key: "start_unixnano", Value: q.Start, Kv: attribute.Key("start_unixnano").Int64(q.Start.UnixNano())},
+		{Key: "stop_unixnano", Value: q.End, Kv: attribute.Key("stop_unixnano").Int64(q.End.UnixNano())},
+	})
+}
+
+func sdkHeaderToHttpHeader(headers map[string]string) http.Header {
+	httpHeader := make(http.Header)
+	for key, val := range headers {
+		httpHeader[key] = []string{val}
+	}
+	return httpHeader
 }
diff --git a/pkg/tsdb/prometheus/querydata/request_test.go b/pkg/tsdb/prometheus/querydata/request_test.go
index ce9176c290e..1092fc8e2e8 100644
--- a/pkg/tsdb/prometheus/querydata/request_test.go
+++ b/pkg/tsdb/prometheus/querydata/request_test.go
@@ -10,12 +10,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/grafana-azure-sdk-go/azsettings"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	sdkhttpclient "github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
 	"github.com/grafana/grafana-plugin-sdk-go/data"
 	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/buffered"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/models"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/querydata"
 	apiv1 "github.com/prometheus/client_golang/api/prometheus/v1"
@@ -58,7 +59,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 		}
 
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 
 		qm := models.QueryModel{
 			LegendFormat:  "legend {{app}}",
@@ -119,7 +121,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 			JSON: b,
 		}
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 		res, err := execute(tctx, query, result)
 		require.NoError(t, err)
 
@@ -165,7 +168,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 			JSON: b,
 		}
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 		res, err := execute(tctx, query, result)
 
 		require.NoError(t, err)
@@ -207,7 +211,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			},
 			JSON: b,
 		}
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 		res, err := execute(tctx, query, result)
 
 		require.NoError(t, err)
@@ -248,7 +253,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 			JSON: b,
 		}
 
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 		res, err := execute(tctx, query, result)
 		require.NoError(t, err)
 
@@ -277,7 +283,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 		query := backend.DataQuery{
 			JSON: b,
 		}
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 		res, err := execute(tctx, query, qr)
 		require.NoError(t, err)
 
@@ -315,7 +322,8 @@ func TestPrometheus_parseTimeSeriesResponse(t *testing.T) {
 		query := backend.DataQuery{
 			JSON: b,
 		}
-		tctx := setup(true)
+		tctx, err := setup(true)
+		require.NoError(t, err)
 		res, err := execute(tctx, query, qr)
 		require.NoError(t, err)
 
@@ -389,7 +397,7 @@ type testContext struct {
 	queryData    *querydata.QueryData
 }
 
-func setup(wideFrames bool) *testContext {
+func setup(wideFrames bool) (*testContext, error) {
 	tracer := tracing.InitializeTracerForTest()
 	httpProvider := &fakeHttpClientProvider{
 		opts: sdkhttpclient.Options{
@@ -400,19 +408,29 @@ func setup(wideFrames bool) *testContext {
 			Body:       ioutil.NopCloser(bytes.NewReader([]byte(`{}`))),
 		},
 	}
-	queryData, _ := querydata.New(
-		httpProvider,
-		setting.NewCfg(),
-		&fakeFeatureToggles{flags: map[string]bool{"prometheusStreamingJSONParser": true, "prometheusWideSeries": wideFrames}},
-		tracer,
-		backend.DataSourceInstanceSettings{URL: "http://localhost:9090", JSONData: json.RawMessage(`{"timeInterval": "15s"}`)},
-		&fakeLogger{},
-	)
+	settings := backend.DataSourceInstanceSettings{
+		URL:      "http://localhost:9090",
+		JSONData: json.RawMessage(`{"timeInterval": "15s"}`),
+	}
+
+	features := &fakeFeatureToggles{flags: map[string]bool{"prometheusStreamingJSONParser": true, "prometheusWideSeries": wideFrames}}
+
+	opts, err := buffered.CreateTransportOptions(settings, &azsettings.AzureSettings{}, features, &fakeLogger{})
+	if err != nil {
+		return nil, err
+	}
+
+	httpClient, err := httpProvider.New(*opts)
+	if err != nil {
+		return nil, err
+	}
+
+	queryData, _ := querydata.New(httpClient, features, tracer, settings, &fakeLogger{})
 
 	return &testContext{
 		httpProvider: httpProvider,
 		queryData:    queryData,
-	}
+	}, nil
 }
 
 type fakeFeatureToggles struct {
diff --git a/pkg/tsdb/prometheus/resource/resource.go b/pkg/tsdb/prometheus/resource/resource.go
index 4c58be8d5ce..bf69cd5d8c1 100644
--- a/pkg/tsdb/prometheus/resource/resource.go
+++ b/pkg/tsdb/prometheus/resource/resource.go
@@ -1,27 +1,21 @@
 package resource
 
 import (
-	"compress/gzip"
+	"bytes"
 	"context"
-	"encoding/json"
 	"fmt"
-	"io"
-	"io/ioutil"
 	"net/http"
-	"strings"
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
-	"github.com/grafana/grafana/pkg/infra/httpclient"
 	"github.com/grafana/grafana/pkg/infra/log"
-	"github.com/grafana/grafana/pkg/services/featuremgmt"
-	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tsdb/prometheus/client"
+	"github.com/grafana/grafana/pkg/tsdb/prometheus/utils"
+	"github.com/grafana/grafana/pkg/util/maputil"
 )
 
 type Resource struct {
-	provider      *client.Provider
-	log           log.Logger
-	customHeaders map[string]string
+	promClient *client.Client
+	log        log.Logger
 }
 
 // Hop-by-hop headers. These are removed when sent to the backend.
@@ -55,113 +49,52 @@ func delStopHeaders(header http.Header) {
 	}
 }
 
-func addHeaders(header http.Header, toAdd map[string]string) {
-	for k, v := range toAdd {
-		header.Add(k, v)
-	}
-}
-
-func normalizeReqHeaders(headers map[string][]string) map[string]string {
-	h := make(map[string]string, len(headers))
-	for k, v := range headers {
-		h[k] = strings.Join(v, ",")
-	}
-	return h
-}
-
 func New(
-	httpClientProvider httpclient.Provider,
-	cfg *setting.Cfg,
-	features featuremgmt.FeatureToggles,
+	httpClient *http.Client,
 	settings backend.DataSourceInstanceSettings,
 	plog log.Logger,
 ) (*Resource, error) {
-	var jsonData map[string]interface{}
-	if err := json.Unmarshal(settings.JSONData, &jsonData); err != nil {
-		return nil, fmt.Errorf("error reading settings: %w", err)
-	}
-
-	customHeaders := make(map[string]string)
-	var jsonDataMap map[string]interface{}
-
-	err := json.Unmarshal(settings.JSONData, &jsonDataMap)
+	jsonData, err := utils.GetJsonData(settings)
 	if err != nil {
 		return nil, err
 	}
-
-	index := 1
-	for {
-		headerNameSuffix := fmt.Sprintf("httpHeaderName%d", index)
-		headerValueSuffix := fmt.Sprintf("httpHeaderValue%d", index)
-
-		key := jsonDataMap[headerNameSuffix]
-		if key == nil {
-			// No (more) header values are available
-			break
-		}
-
-		if val, ok := settings.DecryptedSecureJSONData[headerValueSuffix]; ok {
-			switch k := key.(type) {
-			case string:
-				customHeaders[k] = val
-			}
-		}
-		index++
-	}
+	httpMethod, _ := maputil.GetStringOptional(jsonData, "httpMethod")
 
 	return &Resource{
-		log:           plog,
-		provider:      client.NewProvider(settings, jsonData, httpClientProvider, cfg, features, plog),
-		customHeaders: customHeaders,
+		log:        plog,
+		promClient: client.NewClient(httpClient, httpMethod, settings.URL),
 	}, nil
 }
 
-func (r *Resource) Execute(ctx context.Context, req *backend.CallResourceRequest) (int, []byte, error) {
+func (r *Resource) Execute(ctx context.Context, req *backend.CallResourceRequest) (*backend.CallResourceResponse, error) {
 	delHopHeaders(req.Headers)
 	delStopHeaders(req.Headers)
-	addHeaders(req.Headers, r.customHeaders)
-	client, err := r.provider.GetClient(normalizeReqHeaders(req.Headers))
-	if err != nil {
-		return 500, nil, err
-	}
 
-	return r.fetch(ctx, client, req)
-}
-
-func (r *Resource) fetch(ctx context.Context, client *client.Client, req *backend.CallResourceRequest) (int, []byte, error) {
 	r.log.Debug("Sending resource query", "URL", req.URL)
-	resp, err := client.QueryResource(ctx, req)
+	resp, err := r.promClient.QueryResource(ctx, req)
 	if err != nil {
-		statusCode := 500
-		if resp != nil {
-			statusCode = resp.StatusCode
-		}
-		return statusCode, nil, err
+		return nil, fmt.Errorf("error querying resource: %v", err)
 	}
 
 	defer func() {
-		err = resp.Body.Close()
+		tmpErr := resp.Body.Close()
+		if tmpErr != nil && err == nil {
+			err = tmpErr
+		}
 	}()
 
-	// Check that the server actually sent compressed data
-	var reader io.ReadCloser
-	switch resp.Header.Get("Content-Encoding") {
-	case "gzip":
-		reader, err = gzip.NewReader(resp.Body)
-		defer func() {
-			err = reader.Close()
-		}()
-		if err != nil {
-			return 500, nil, err
-		}
-	default:
-		reader = resp.Body
-	}
-
-	data, err := ioutil.ReadAll(reader)
+	var buf bytes.Buffer
+	// Should be more efficient than ReadAll. See https://github.com/prometheus/client_golang/pull/976
+	_, err = buf.ReadFrom(resp.Body)
+	body := buf.Bytes()
 	if err != nil {
-		return 500, nil, err
+		return nil, err
+	}
+	callResponse := &backend.CallResourceResponse{
+		Status:  resp.StatusCode,
+		Headers: resp.Header,
+		Body:    body,
 	}
 
-	return resp.StatusCode, data, err
+	return callResponse, err
 }
diff --git a/pkg/util/strings.go b/pkg/util/strings.go
index e066ca5c2bf..1cacce669ef 100644
--- a/pkg/util/strings.go
+++ b/pkg/util/strings.go
@@ -117,3 +117,17 @@ func Capitalize(s string) string {
 	r[0] = unicode.ToUpper(r[0])
 	return string(r)
 }
+
+func ByteCountSI(b int64) string {
+	const unit = 1000
+	if b < unit {
+		return fmt.Sprintf("%d B", b)
+	}
+	div, exp := int64(unit), 0
+	for n := b / unit; n >= unit; n /= unit {
+		div *= unit
+		exp++
+	}
+	return fmt.Sprintf("%.1f %cB",
+		float64(b)/float64(div), "kMGTPE"[exp])
+}
diff --git a/public/app/AppWrapper.tsx b/public/app/AppWrapper.tsx
index 2b8efc69b88..14ade91ddf7 100644
--- a/public/app/AppWrapper.tsx
+++ b/public/app/AppWrapper.tsx
@@ -12,6 +12,7 @@ import { store } from 'app/store/store';
 import { AngularRoot } from './angular/AngularRoot';
 import { loadAndInitAngularIfEnabled } from './angular/loadAndInitAngularIfEnabled';
 import { GrafanaApp } from './app';
+import { AppChrome } from './core/components/AppChrome/AppChrome';
 import { AppNotificationList } from './core/components/AppNotifications/AppNotificationList';
 import { NavBar } from './core/components/NavBar/NavBar';
 import { I18nProvider } from './core/localisation';
@@ -125,7 +126,7 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                     <div className="grafana-app">
                       <Router history={locationService.getHistory()}>
                         {this.renderNavBar()}
-                        <main className="main-view">
+                        <AppChrome>
                           {pageBanners.map((Banner, index) => (
                             <Banner key={index.toString()} />
                           ))}
@@ -137,7 +138,7 @@ export class AppWrapper extends React.Component<AppWrapperProps, AppWrapperState
                           {bodyRenderHooks.map((Hook, index) => (
                             <Hook key={index.toString()} />
                           ))}
-                        </main>
+                        </AppChrome>
                       </Router>
                     </div>
                     <LiveConnectionWarning />
diff --git a/public/app/angular/angular_wrappers.ts b/public/app/angular/angular_wrappers.ts
index 15159553cd7..30a63a5af02 100644
--- a/public/app/angular/angular_wrappers.ts
+++ b/public/app/angular/angular_wrappers.ts
@@ -17,7 +17,7 @@ import { QueryEditor as CloudMonitoringQueryEditor } from 'app/plugins/datasourc
 
 import EmptyListCTA from '../core/components/EmptyListCTA/EmptyListCTA';
 import { Footer } from '../core/components/Footer/Footer';
-import PageHeader from '../core/components/PageHeader/PageHeader';
+import { PageHeader } from '../core/components/PageHeader/PageHeader';
 import { MetricSelect } from '../core/components/Select/MetricSelect';
 import { TagFilter } from '../core/components/TagFilter/TagFilter';
 import { HelpModal } from '../core/components/help/HelpModal';
diff --git a/public/app/angular/services/nav_model_srv.ts b/public/app/angular/services/nav_model_srv.ts
index 73506625130..bf8790e1b3b 100644
--- a/public/app/angular/services/nav_model_srv.ts
+++ b/public/app/angular/services/nav_model_srv.ts
@@ -71,7 +71,6 @@ export function getWarningNav(text: string, subTitle?: string): NavModel {
     icon: 'exclamation-triangle',
   };
   return {
-    breadcrumbs: [node],
     node: node,
     main: node,
   };
diff --git a/public/app/core/components/AccessControl/AddPermission.tsx b/public/app/core/components/AccessControl/AddPermission.tsx
index 8c17862ec7a..9785b75776a 100644
--- a/public/app/core/components/AccessControl/AddPermission.tsx
+++ b/public/app/core/components/AccessControl/AddPermission.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 
 import { Button, Form, HorizontalGroup, Select } from '@grafana/ui';
 import { CloseButton } from 'app/core/components/CloseButton/CloseButton';
+import { ServiceAccountPicker } from 'app/core/components/Select/ServiceAccountPicker';
 import { TeamPicker } from 'app/core/components/Select/TeamPicker';
 import { UserPicker } from 'app/core/components/Select/UserPicker';
 import { OrgRole } from 'app/types/acl';
@@ -28,6 +29,9 @@ export const AddPermission = ({ title = 'Add Permission For', permissions, assig
     if (assignments.users) {
       options.push({ value: PermissionTarget.User, label: 'User' });
     }
+    if (assignments.serviceAccounts) {
+      options.push({ value: PermissionTarget.ServiceAccount, label: 'Service Account' });
+    }
     if (assignments.teams) {
       options.push({ value: PermissionTarget.Team, label: 'Team' });
     }
@@ -46,6 +50,7 @@ export const AddPermission = ({ title = 'Add Permission For', permissions, assig
   const isValid = () =>
     (target === PermissionTarget.Team && teamId > 0) ||
     (target === PermissionTarget.User && userId > 0) ||
+    (target === PermissionTarget.ServiceAccount && userId > 0) ||
     (PermissionTarget.BuiltInRole && OrgRole.hasOwnProperty(builtInRole));
 
   return (
@@ -72,6 +77,10 @@ export const AddPermission = ({ title = 'Add Permission For', permissions, assig
               <UserPicker onSelected={(u) => setUserId(u.value || 0)} className={'width-20'} />
             )}
 
+            {target === PermissionTarget.ServiceAccount && (
+              <ServiceAccountPicker onSelected={(s) => setUserId(s.value?.id || 0)} className={'width-20'} />
+            )}
+
             {target === PermissionTarget.Team && (
               <TeamPicker onSelected={(t) => setTeamId(t.value?.id || 0)} className={'width-20'} />
             )}
diff --git a/public/app/core/components/AccessControl/Permissions.tsx b/public/app/core/components/AccessControl/Permissions.tsx
index 39446dedd47..0e8b9955ef1 100644
--- a/public/app/core/components/AccessControl/Permissions.tsx
+++ b/public/app/core/components/AccessControl/Permissions.tsx
@@ -16,6 +16,7 @@ const INITIAL_DESCRIPTION: Description = {
   assignments: {
     teams: false,
     users: false,
+    serviceAccounts: false,
     builtInRoles: false,
   },
 };
@@ -57,7 +58,7 @@ export const Permissions = ({
 
   const onAdd = (state: SetPermission) => {
     let promise: Promise<void> | null = null;
-    if (state.target === PermissionTarget.User) {
+    if (state.target === PermissionTarget.User || state.target === PermissionTarget.ServiceAccount) {
       promise = setUserPermission(resource, resourceId, state.userId!, state.permission);
     } else if (state.target === PermissionTarget.Team) {
       promise = setTeamPermission(resource, resourceId, state.teamId!, state.permission);
@@ -109,7 +110,15 @@ export const Permissions = ({
   const users = useMemo(
     () =>
       sortBy(
-        items.filter((i) => i.userId),
+        items.filter((i) => i.userId && !i.userIsServiceAccount),
+        ['userLogin']
+      ),
+    [items]
+  );
+  const serviceAccounts = useMemo(
+    () =>
+      sortBy(
+        items.filter((i) => i.userId && i.userIsServiceAccount),
         ['userLogin']
       ),
     [items]
@@ -161,6 +170,14 @@ export const Permissions = ({
           onRemove={onRemove}
           canSet={canSetPermissions}
         />
+        <PermissionList
+          title="Service Account"
+          items={serviceAccounts}
+          permissionLevels={desc.permissions}
+          onChange={onChange}
+          onRemove={onRemove}
+          canSet={canSetPermissions}
+        />
         <PermissionList
           title="Team"
           items={teams}
diff --git a/public/app/core/components/AccessControl/types.ts b/public/app/core/components/AccessControl/types.ts
index e08589eefab..34788fff05b 100644
--- a/public/app/core/components/AccessControl/types.ts
+++ b/public/app/core/components/AccessControl/types.ts
@@ -5,6 +5,7 @@ export type ResourcePermission = {
   userId?: number;
   userLogin?: string;
   userAvatarUrl?: string;
+  userIsServiceAccount?: boolean;
   team?: string;
   teamId?: number;
   teamAvatarUrl?: string;
@@ -25,6 +26,7 @@ export enum PermissionTarget {
   None = 'None',
   Team = 'Team',
   User = 'User',
+  ServiceAccount = 'Service Account',
   BuiltInRole = 'builtInRole',
 }
 export type Description = {
@@ -35,5 +37,6 @@ export type Description = {
 export type Assignments = {
   users: boolean;
   teams: boolean;
+  serviceAccounts: boolean;
   builtInRoles: boolean;
 };
diff --git a/public/app/core/components/TopNav/TopNavPage.tsx b/public/app/core/components/AppChrome/AppChrome.tsx
similarity index 54%
rename from public/app/core/components/TopNav/TopNavPage.tsx
rename to public/app/core/components/AppChrome/AppChrome.tsx
index 5924ad69485..cfa37b4e79d 100644
--- a/public/app/core/components/TopNav/TopNavPage.tsx
+++ b/public/app/core/components/AppChrome/AppChrome.tsx
@@ -1,70 +1,64 @@
 import { css, cx } from '@emotion/css';
-import React, { PropsWithChildren } from 'react';
-import { useSelector } from 'react-redux';
-import { useObservable, useToggle } from 'react-use';
-import { createSelector } from 'reselect';
+import React, { PropsWithChildren, useState } from 'react';
+import { useToggle } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
-import { getNavModel } from 'app/core/selectors/navModel';
-import { StoreState } from 'app/types';
 
+import { MegaMenu } from '../MegaMenu/MegaMenu';
+
+import { appChromeService } from './AppChromeService';
 import { NavToolbar } from './NavToolbar';
-import { topNavDefaultProps, topNavUpdates } from './TopNavUpdate';
 import { TopSearchBar } from './TopSearchBar';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
-export interface Props extends PropsWithChildren<{}> {
-  /** This is nav tree id provided by route.
-   *  It's not enough for item navigation. For that pages will need provide an item nav model as well via TopNavUpdate
-   */
-  navId?: string;
-}
+export interface Props extends PropsWithChildren<{}> {}
 
-export function TopNavPage({ children, navId }: Props) {
+export function AppChrome({ children }: Props) {
   const styles = useStyles2(getStyles);
   const [searchBarHidden, toggleSearchBar] = useToggle(false); // repace with local storage
-  const props = useObservable(topNavUpdates, topNavDefaultProps);
-  const navModel = useSelector(createSelector(getNavIndex, (navIndex) => getNavModel(navIndex, navId ?? 'home')));
+  const [megaMenuOpen, setMegaMenuOpen] = useState(false);
+  const state = appChromeService.useState();
+
+  if (state.chromeless || !config.featureToggles.topnav) {
+    return <main className="main-view">{children} </main>;
+  }
 
   return (
-    <div className={styles.viewport}>
+    <main className="main-view">
       <div className={styles.topNav}>
         {!searchBarHidden && <TopSearchBar />}
         <NavToolbar
-          {...props}
           searchBarHidden={searchBarHidden}
+          sectionNav={state.sectionNav}
+          pageNav={state.pageNav}
+          actions={state.actions}
           onToggleSearchBar={toggleSearchBar}
-          sectionNav={navModel.node}
+          onToggleMegaMenu={() => setMegaMenuOpen(!megaMenuOpen)}
         />
       </div>
       <div className={cx(styles.content, searchBarHidden && styles.contentNoSearchBar)}>{children}</div>
-    </div>
+      {megaMenuOpen && <MegaMenu searchBarHidden={searchBarHidden} onClose={() => setMegaMenuOpen(false)} />}
+    </main>
   );
 }
 
-function getNavIndex(store: StoreState) {
-  return store.navIndex;
-}
-
 const getStyles = (theme: GrafanaTheme2) => {
   const shadow = theme.isDark
     ? `0 0.6px 1.5px rgb(0 0 0), 0 2px 4px rgb(0 0 0 / 40%), 0 5px 10px rgb(0 0 0 / 23%)`
     : '0 0.6px 1.5px rgb(0 0 0 / 8%), 0 2px 4px rgb(0 0 0 / 6%), 0 5px 10px rgb(0 0 0 / 5%)';
 
   return {
-    viewport: css({
+    content: css({
       display: 'flex',
+      flexDirection: 'column',
+      paddingTop: TOP_BAR_LEVEL_HEIGHT * 2,
       flexGrow: 1,
       height: '100%',
     }),
-    content: css({
-      display: 'flex',
-      paddingTop: TOP_BAR_LEVEL_HEIGHT * 2 + 16,
-      flexGrow: 1,
-    }),
     contentNoSearchBar: css({
-      paddingTop: TOP_BAR_LEVEL_HEIGHT + 16,
+      paddingTop: TOP_BAR_LEVEL_HEIGHT,
     }),
     topNav: css({
       display: 'flex',
diff --git a/public/app/core/components/AppChrome/AppChromeService.tsx b/public/app/core/components/AppChrome/AppChromeService.tsx
new file mode 100644
index 00000000000..0c113f7701d
--- /dev/null
+++ b/public/app/core/components/AppChrome/AppChromeService.tsx
@@ -0,0 +1,51 @@
+import { useObservable } from 'react-use';
+import { BehaviorSubject } from 'rxjs';
+
+import { NavModelItem } from '@grafana/data';
+import { isShallowEqual } from 'app/core/utils/isShallowEqual';
+
+import { RouteDescriptor } from '../../navigation/types';
+
+export interface AppChromeState {
+  chromeless: boolean;
+  sectionNav: NavModelItem;
+  pageNav?: NavModelItem;
+  actions?: React.ReactNode;
+}
+
+const defaultSection: NavModelItem = { text: 'Grafana' };
+
+export class AppChromeService {
+  readonly state = new BehaviorSubject<AppChromeState>({
+    chromeless: true, // start out hidden to not flash it on pages without chrome
+    sectionNav: defaultSection,
+  });
+
+  routeMounted(route: RouteDescriptor) {
+    this.update({
+      chromeless: route.chromeless === true,
+      sectionNav: defaultSection,
+      pageNav: undefined,
+      actions: undefined,
+    });
+  }
+
+  update(state: Partial<AppChromeState>) {
+    const current = this.state.getValue();
+    const newState: AppChromeState = {
+      ...current,
+      ...state,
+    };
+
+    if (!isShallowEqual(current, newState)) {
+      this.state.next(newState);
+    }
+  }
+
+  useState() {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return useObservable(this.state, this.state.getValue());
+  }
+}
+
+export const appChromeService = new AppChromeService();
diff --git a/public/app/core/components/AppChrome/AppChromeUpdate.tsx b/public/app/core/components/AppChrome/AppChromeUpdate.tsx
new file mode 100644
index 00000000000..38545bfce8f
--- /dev/null
+++ b/public/app/core/components/AppChrome/AppChromeUpdate.tsx
@@ -0,0 +1,22 @@
+import React, { useEffect } from 'react';
+
+import { NavModelItem } from '@grafana/data';
+
+import { appChromeService } from './AppChromeService';
+
+export interface AppChromeUpdateProps {
+  pageNav?: NavModelItem;
+  actions?: React.ReactNode;
+}
+/**
+ * This needs to be moved to @grafana/ui or runtime.
+ * This is the way core pages and plugins update the breadcrumbs and page toolbar actions
+ */
+export const AppChromeUpdate = React.memo<AppChromeUpdateProps>(({ pageNav, actions }: AppChromeUpdateProps) => {
+  useEffect(() => {
+    appChromeService.update({ pageNav, actions });
+  });
+  return null;
+});
+
+AppChromeUpdate.displayName = 'TopNavUpdate';
diff --git a/public/app/core/components/TopNav/Breadcrumbs.tsx b/public/app/core/components/AppChrome/Breadcrumbs.tsx
similarity index 86%
rename from public/app/core/components/TopNav/Breadcrumbs.tsx
rename to public/app/core/components/AppChrome/Breadcrumbs.tsx
index bdfad00315e..c7bc80ec1d8 100644
--- a/public/app/core/components/TopNav/Breadcrumbs.tsx
+++ b/public/app/core/components/AppChrome/Breadcrumbs.tsx
@@ -4,11 +4,9 @@ import React from 'react';
 import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { useStyles2, Icon, IconName } from '@grafana/ui';
 
-import { TopNavProps } from './TopNavUpdate';
-
-export interface Props extends TopNavProps {
+export interface Props {
   sectionNav: NavModelItem;
-  subNav?: NavModelItem;
+  pageNav?: NavModelItem;
 }
 
 export interface Breadcrumb {
@@ -17,9 +15,9 @@ export interface Breadcrumb {
   href?: string;
 }
 
-export function Breadcrumbs({ sectionNav, subNav }: Props) {
+export function Breadcrumbs({ sectionNav, pageNav }: Props) {
   const styles = useStyles2(getStyles);
-  const crumbs: Breadcrumb[] = [{ icon: 'home', href: '/' }];
+  const crumbs: Breadcrumb[] = [{ icon: 'home-alt', href: '/' }];
 
   function addCrumbs(node: NavModelItem) {
     if (node.parentItem) {
@@ -31,8 +29,8 @@ export function Breadcrumbs({ sectionNav, subNav }: Props) {
 
   addCrumbs(sectionNav);
 
-  if (subNav) {
-    addCrumbs(subNav);
+  if (pageNav) {
+    addCrumbs(pageNav);
   }
 
   return (
diff --git a/public/app/core/components/TopNav/NavToolbar.tsx b/public/app/core/components/AppChrome/NavToolbar.tsx
similarity index 80%
rename from public/app/core/components/TopNav/NavToolbar.tsx
rename to public/app/core/components/AppChrome/NavToolbar.tsx
index afe8474d3d1..d0ca6b346d6 100644
--- a/public/app/core/components/TopNav/NavToolbar.tsx
+++ b/public/app/core/components/AppChrome/NavToolbar.tsx
@@ -5,25 +5,33 @@ import { GrafanaTheme2, NavModelItem } from '@grafana/data';
 import { IconButton, ToolbarButton, useStyles2 } from '@grafana/ui';
 
 import { Breadcrumbs } from './Breadcrumbs';
-import { TopNavProps } from './TopNavUpdate';
 import { TOP_BAR_LEVEL_HEIGHT } from './types';
 
-export interface Props extends TopNavProps {
+export interface Props {
   onToggleSearchBar(): void;
+  onToggleMegaMenu(): void;
   searchBarHidden?: boolean;
   sectionNav: NavModelItem;
-  subNav?: NavModelItem;
+  pageNav?: NavModelItem;
+  actions: React.ReactNode;
 }
 
-export function NavToolbar({ actions, onToggleSearchBar, searchBarHidden, sectionNav, subNav }: Props) {
+export function NavToolbar({
+  actions,
+  searchBarHidden,
+  sectionNav,
+  pageNav,
+  onToggleMegaMenu,
+  onToggleSearchBar,
+}: Props) {
   const styles = useStyles2(getStyles);
 
   return (
     <div className={styles.pageToolbar}>
       <div className={styles.menuButton}>
-        <IconButton name="bars" tooltip="Toggle menu" tooltipPlacement="bottom" size="xl" onClick={() => {}} />
+        <IconButton name="bars" tooltip="Toggle menu" tooltipPlacement="bottom" size="xl" onClick={onToggleMegaMenu} />
       </div>
-      <Breadcrumbs sectionNav={sectionNav} subNav={subNav} />
+      <Breadcrumbs sectionNav={sectionNav} pageNav={pageNav} />
       <div className={styles.leftActions}></div>
       <div className={styles.rightActions}>
         {actions}
diff --git a/public/app/core/components/TopNav/TopSearchBar.tsx b/public/app/core/components/AppChrome/TopSearchBar.tsx
similarity index 100%
rename from public/app/core/components/TopNav/TopSearchBar.tsx
rename to public/app/core/components/AppChrome/TopSearchBar.tsx
diff --git a/public/app/core/components/AppChrome/types.ts b/public/app/core/components/AppChrome/types.ts
new file mode 100644
index 00000000000..654334fdea6
--- /dev/null
+++ b/public/app/core/components/AppChrome/types.ts
@@ -0,0 +1,8 @@
+import { NavModelItem } from '@grafana/data';
+
+export const TOP_BAR_LEVEL_HEIGHT = 40;
+
+export interface ToolbarUpdateProps {
+  pageNav?: NavModelItem;
+  actions?: React.ReactNode;
+}
diff --git a/public/app/core/components/ErrorPage/ErrorPage.tsx b/public/app/core/components/ErrorPage/ErrorPage.tsx
index 8fe3e4c645e..25e77912f6c 100644
--- a/public/app/core/components/ErrorPage/ErrorPage.tsx
+++ b/public/app/core/components/ErrorPage/ErrorPage.tsx
@@ -7,7 +7,7 @@ import { Icon } from '@grafana/ui';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
-import Page from '../Page/Page';
+import { Page } from '../Page/Page';
 
 interface ConnectedProps {
   navModel: NavModel;
diff --git a/public/app/core/components/MegaMenu/MegaMenu.test.tsx b/public/app/core/components/MegaMenu/MegaMenu.test.tsx
new file mode 100644
index 00000000000..04283424de5
--- /dev/null
+++ b/public/app/core/components/MegaMenu/MegaMenu.test.tsx
@@ -0,0 +1,61 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+import { Router } from 'react-router-dom';
+
+import { NavModelItem, NavSection } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
+import { configureStore } from 'app/store/configureStore';
+
+import TestProvider from '../../../../test/helpers/TestProvider';
+
+import { MegaMenu } from './MegaMenu';
+
+const setup = () => {
+  const navBarTree: NavModelItem[] = [
+    {
+      text: 'Section name',
+      section: NavSection.Core,
+      id: 'section',
+      url: 'section',
+      children: [
+        { text: 'Child1', id: 'child1', url: 'section/child1' },
+        { text: 'Child2', id: 'child2', url: 'section/child2' },
+      ],
+    },
+    {
+      text: 'Profile',
+      id: 'profile',
+      section: NavSection.Config,
+      url: 'profile',
+    },
+  ];
+
+  const store = configureStore({ navBarTree });
+
+  return render(
+    <Provider store={store}>
+      <TestProvider>
+        <Router history={locationService.getHistory()}>
+          <MegaMenu onClose={() => {}} />
+        </Router>
+      </TestProvider>
+    </Provider>
+  );
+};
+
+describe('MegaMenu', () => {
+  it('should render component', async () => {
+    setup();
+
+    expect(await screen.findByTestId('navbarmenu')).toBeInTheDocument();
+    expect(await screen.findByLabelText('Home')).toBeInTheDocument();
+    expect(screen.queryAllByLabelText('Section name').length).toBe(2);
+  });
+
+  it('should filter out profile', async () => {
+    setup();
+
+    expect(screen.queryByLabelText('Profile')).not.toBeInTheDocument();
+  });
+});
diff --git a/public/app/core/components/MegaMenu/MegaMenu.tsx b/public/app/core/components/MegaMenu/MegaMenu.tsx
new file mode 100644
index 00000000000..894949df2c4
--- /dev/null
+++ b/public/app/core/components/MegaMenu/MegaMenu.tsx
@@ -0,0 +1,80 @@
+import { css } from '@emotion/css';
+import { cloneDeep } from 'lodash';
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import { useLocation } from 'react-router-dom';
+
+import { GrafanaTheme2, NavModelItem, NavSection } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { useTheme2 } from '@grafana/ui';
+import { StoreState } from 'app/types';
+
+import { enrichConfigItems, enrichWithInteractionTracking, getActiveItem } from '../NavBar/utils';
+
+import { NavBarMenu } from './NavBarMenu';
+
+export interface Props {
+  onClose: () => void;
+  searchBarHidden?: boolean;
+}
+
+export const MegaMenu = React.memo<Props>(({ onClose, searchBarHidden }) => {
+  const navBarTree = useSelector((state: StoreState) => state.navBarTree);
+  const theme = useTheme2();
+  const styles = getStyles(theme);
+  const location = useLocation();
+  const [showSwitcherModal, setShowSwitcherModal] = useState(false);
+
+  const toggleSwitcherModal = () => {
+    setShowSwitcherModal(!showSwitcherModal);
+  };
+
+  const homeItem: NavModelItem = enrichWithInteractionTracking(
+    {
+      id: 'home',
+      text: 'Home',
+      url: config.appSubUrl || '/',
+      icon: 'home-alt',
+    },
+    true
+  );
+
+  const navTree = cloneDeep(navBarTree);
+
+  const coreItems = navTree
+    .filter((item) => item.section === NavSection.Core)
+    .map((item) => enrichWithInteractionTracking(item, true));
+  const pluginItems = navTree
+    .filter((item) => item.section === NavSection.Plugin)
+    .map((item) => enrichWithInteractionTracking(item, true));
+  const configItems = enrichConfigItems(
+    navTree.filter((item) => item.section === NavSection.Config && item && item.id !== 'help' && item.id !== 'profile'),
+    location,
+    toggleSwitcherModal
+  ).map((item) => enrichWithInteractionTracking(item, true));
+
+  const activeItem = getActiveItem(navTree, location.pathname);
+
+  return (
+    <div className={styles.menuWrapper}>
+      <NavBarMenu
+        activeItem={activeItem}
+        navItems={[homeItem, ...coreItems, ...pluginItems, ...configItems]}
+        onClose={onClose}
+        searchBarHidden={searchBarHidden}
+      />
+    </div>
+  );
+});
+
+MegaMenu.displayName = 'MegaMenu';
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  menuWrapper: css({
+    position: 'fixed',
+    display: 'grid',
+    gridAutoFlow: 'column',
+    height: '100%',
+    zIndex: theme.zIndex.sidemenu,
+  }),
+});
diff --git a/public/app/core/components/MegaMenu/NavBarMenu.tsx b/public/app/core/components/MegaMenu/NavBarMenu.tsx
new file mode 100644
index 00000000000..2b2df363de4
--- /dev/null
+++ b/public/app/core/components/MegaMenu/NavBarMenu.tsx
@@ -0,0 +1,211 @@
+import { css } from '@emotion/css';
+import { useDialog } from '@react-aria/dialog';
+import { FocusScope } from '@react-aria/focus';
+import { OverlayContainer, useOverlay } from '@react-aria/overlays';
+import React, { useRef } from 'react';
+import CSSTransition from 'react-transition-group/CSSTransition';
+
+import { GrafanaTheme2, NavModelItem } from '@grafana/data';
+import { reportInteraction } from '@grafana/runtime';
+import { CustomScrollbar, Icon, IconButton, useTheme2 } from '@grafana/ui';
+
+import { TOP_BAR_LEVEL_HEIGHT } from '../AppChrome/types';
+import { NavItem } from '../NavBar/NavBarMenu';
+import { NavBarToggle } from '../NavBar/NavBarToggle';
+
+const MENU_WIDTH = '350px';
+
+export interface Props {
+  activeItem?: NavModelItem;
+  navItems: NavModelItem[];
+  searchBarHidden?: boolean;
+  onClose: () => void;
+}
+
+export function NavBarMenu({ activeItem, navItems, searchBarHidden, onClose }: Props) {
+  const theme = useTheme2();
+  const styles = getStyles(theme, searchBarHidden);
+  const animationSpeed = theme.transitions.duration.shortest;
+  const animStyles = getAnimStyles(theme, animationSpeed);
+  const ref = useRef(null);
+  const { dialogProps } = useDialog({}, ref);
+
+  const { overlayProps, underlayProps } = useOverlay(
+    {
+      isDismissable: true,
+      isOpen: true,
+      onClose,
+    },
+    ref
+  );
+
+  return (
+    <OverlayContainer>
+      <FocusScope contain autoFocus>
+        <CSSTransition appear={true} in={true} classNames={animStyles.overlay} timeout={animationSpeed}>
+          <div data-testid="navbarmenu" ref={ref} {...overlayProps} {...dialogProps} className={styles.container}>
+            <div className={styles.mobileHeader}>
+              <Icon name="bars" size="xl" />
+              <IconButton
+                aria-label="Close navigation menu"
+                name="times"
+                onClick={onClose}
+                size="xl"
+                variant="secondary"
+              />
+            </div>
+            <NavBarToggle
+              className={styles.menuCollapseIcon}
+              isExpanded={true}
+              onClick={() => {
+                reportInteraction('grafana_navigation_collapsed');
+                onClose();
+              }}
+            />
+            <nav className={styles.content}>
+              <CustomScrollbar hideHorizontalTrack>
+                <ul className={styles.itemList}>
+                  {navItems.map((link) => (
+                    <NavItem link={link} onClose={onClose} activeItem={activeItem} key={link.text} />
+                  ))}
+                </ul>
+              </CustomScrollbar>
+            </nav>
+          </div>
+        </CSSTransition>
+        <CSSTransition appear={true} in={true} classNames={animStyles.backdrop} timeout={animationSpeed}>
+          <div className={styles.backdrop} {...underlayProps} />
+        </CSSTransition>
+      </FocusScope>
+    </OverlayContainer>
+  );
+}
+
+NavBarMenu.displayName = 'NavBarMenu';
+
+const getStyles = (theme: GrafanaTheme2, searchBarHidden?: boolean) => {
+  const topPosition = (searchBarHidden ? TOP_BAR_LEVEL_HEIGHT : TOP_BAR_LEVEL_HEIGHT * 2) + 1;
+
+  return {
+    backdrop: css({
+      backdropFilter: 'blur(1px)',
+      backgroundColor: theme.components.overlay.background,
+      bottom: 0,
+      left: 0,
+      position: 'fixed',
+      right: 0,
+      top: topPosition,
+      zIndex: theme.zIndex.navbarFixed - 2,
+    }),
+    container: css({
+      display: 'flex',
+      bottom: 0,
+      flexDirection: 'column',
+      left: 0,
+      paddingTop: theme.spacing(1),
+      marginRight: theme.spacing(1.5),
+      right: 0,
+      // Needs to below navbar should we change the navbarFixed? add add a new level?
+      zIndex: theme.zIndex.navbarFixed - 1,
+      position: 'fixed',
+      top: topPosition,
+      boxSizing: 'content-box',
+      [theme.breakpoints.up('md')]: {
+        borderRight: `1px solid ${theme.colors.border.weak}`,
+        right: 'unset',
+      },
+    }),
+    content: css({
+      display: 'flex',
+      flexDirection: 'column',
+      overflow: 'auto',
+    }),
+    mobileHeader: css({
+      borderBottom: `1px solid ${theme.colors.border.weak}`,
+      display: 'flex',
+      justifyContent: 'space-between',
+      padding: theme.spacing(1, 2, 2),
+      [theme.breakpoints.up('md')]: {
+        display: 'none',
+      },
+    }),
+    itemList: css({
+      display: 'grid',
+      gridAutoRows: `minmax(${theme.spacing(6)}, auto)`,
+      minWidth: MENU_WIDTH,
+    }),
+    menuCollapseIcon: css({
+      position: 'absolute',
+      top: '43px',
+      right: '0px',
+      transform: `translateX(50%)`,
+    }),
+  };
+};
+
+const getAnimStyles = (theme: GrafanaTheme2, animationDuration: number) => {
+  const commonTransition = {
+    transitionDuration: `${animationDuration}ms`,
+    transitionTimingFunction: theme.transitions.easing.easeInOut,
+    [theme.breakpoints.down('md')]: {
+      overflow: 'hidden',
+    },
+  };
+
+  const overlayTransition = {
+    ...commonTransition,
+    transitionProperty: 'background-color, box-shadow, width',
+    // this is needed to prevent a horizontal scrollbar during the animation on firefox
+    '.scrollbar-view': {
+      overflow: 'hidden !important',
+    },
+  };
+
+  const backdropTransition = {
+    ...commonTransition,
+    transitionProperty: 'opacity',
+  };
+
+  const overlayOpen = {
+    backgroundColor: theme.colors.background.primary,
+    boxShadow: theme.shadows.z3,
+    width: '100%',
+    [theme.breakpoints.up('md')]: {
+      width: MENU_WIDTH,
+    },
+  };
+
+  const overlayClosed = {
+    boxShadow: 'none',
+    width: 0,
+    [theme.breakpoints.up('md')]: {
+      backgroundColor: theme.colors.background.primary,
+      width: theme.spacing(7),
+    },
+  };
+
+  const backdropOpen = {
+    opacity: 1,
+  };
+
+  const backdropClosed = {
+    opacity: 0,
+  };
+
+  return {
+    backdrop: {
+      appear: css(backdropClosed),
+      appearActive: css(backdropTransition, backdropOpen),
+      appearDone: css(backdropOpen),
+      exit: css(backdropOpen),
+      exitActive: css(backdropTransition, backdropClosed),
+    },
+    overlay: {
+      appear: css(overlayClosed),
+      appearActive: css(overlayTransition, overlayOpen),
+      appearDone: css(overlayOpen),
+      exit: css(overlayOpen),
+      exitActive: css(overlayTransition, overlayClosed),
+    },
+  };
+};
diff --git a/public/app/core/components/NavBar/NavBarMenu.tsx b/public/app/core/components/NavBar/NavBarMenu.tsx
index e549cd222b7..53ac531b05a 100644
--- a/public/app/core/components/NavBar/NavBarMenu.tsx
+++ b/public/app/core/components/NavBar/NavBarMenu.tsx
@@ -220,7 +220,7 @@ const getAnimStyles = (theme: GrafanaTheme2, animationDuration: number) => {
   };
 };
 
-function NavItem({
+export function NavItem({
   link,
   activeItem,
   onClose,
@@ -458,7 +458,7 @@ function linkHasChildren(link: NavModelItem): link is NavModelItem & { children:
 }
 
 function getLinkIcon(link: NavModelItem) {
-  if (link.id === 'home') {
+  if (link.icon === 'grafana') {
     return <Branding.MenuLogo />;
   } else if (link.icon) {
     return <Icon name={link.icon as IconName} size="xl" />;
diff --git a/public/app/core/components/Page/Page.test.tsx b/public/app/core/components/Page/Page.test.tsx
new file mode 100644
index 00000000000..3ac2e7edcff
--- /dev/null
+++ b/public/app/core/components/Page/Page.test.tsx
@@ -0,0 +1,67 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+
+import { NavModelItem } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { configureStore } from 'app/store/configureStore';
+
+import { Page } from './Page';
+import { PageProps } from './types';
+
+const pageNav: NavModelItem = {
+  text: 'Main title',
+  children: [
+    { text: 'Child1', url: '1', active: true },
+    { text: 'Child2', url: '2' },
+  ],
+};
+
+const setup = (props: Partial<PageProps>) => {
+  config.bootData.navTree = [
+    {
+      text: 'Section name',
+      id: 'section',
+      url: 'section',
+      children: [
+        { text: 'Child1', id: 'child1', url: 'section/child1' },
+        { text: 'Child2', id: 'child2', url: 'section/child2' },
+      ],
+    },
+  ];
+
+  const store = configureStore();
+
+  return render(
+    <Provider store={store}>
+      <Page {...props}>
+        <div data-testid="page-children">Children</div>
+      </Page>
+    </Provider>
+  );
+};
+
+describe('Render', () => {
+  it('should render component with emtpy Page container', async () => {
+    setup({});
+    const children = await screen.findByTestId('page-children');
+    expect(children).toBeInTheDocument();
+
+    const pageHeader = screen.queryByRole('heading');
+    expect(pageHeader).not.toBeInTheDocument();
+  });
+
+  it('should render header when pageNav supplied', async () => {
+    setup({ pageNav });
+
+    expect(screen.getByRole('heading', { name: 'Main title' })).toBeInTheDocument();
+    expect(screen.getAllByRole('tab').length).toBe(2);
+  });
+
+  it('should get header nav model from redux navIndex', async () => {
+    setup({ navId: 'child1' });
+
+    expect(screen.getByRole('heading', { name: 'Section name' })).toBeInTheDocument();
+    expect(screen.getAllByRole('tab').length).toBe(2);
+  });
+});
diff --git a/public/app/core/components/Page/Page.tsx b/public/app/core/components/Page/Page.tsx
index 121b9ba1548..643c9ee281e 100644
--- a/public/app/core/components/Page/Page.tsx
+++ b/public/app/core/components/Page/Page.tsx
@@ -1,45 +1,33 @@
 // Libraries
 import { css, cx } from '@emotion/css';
-import React, { FC, HTMLAttributes, useEffect } from 'react';
+import React from 'react';
 
-import { GrafanaTheme2, NavModel } from '@grafana/data';
+import { GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
 import { CustomScrollbar, useStyles2 } from '@grafana/ui';
-import { getTitleFromNavModel } from 'app/core/selectors/navModel';
 
-// Components
-import { Branding } from '../Branding/Branding';
 import { Footer } from '../Footer/Footer';
-import PageHeader from '../PageHeader/PageHeader';
+import { PageHeader } from '../PageHeader/PageHeader';
+import { Page as NewPage } from '../PageNew/Page';
 
 import { PageContents } from './PageContents';
+import { PageType } from './types';
+import { usePageNav } from './usePageNav';
+import { usePageTitle } from './usePageTitle';
 
-interface Props extends HTMLAttributes<HTMLDivElement> {
-  children: React.ReactNode;
-  navModel?: NavModel;
-}
-
-export interface PageType extends FC<Props> {
-  Header: typeof PageHeader;
-  Contents: typeof PageContents;
-}
-
-export const Page: PageType = ({ navModel, children, className, ...otherProps }) => {
+export const OldPage: PageType = ({ navId, navModel: oldNavProp, pageNav, children, className, ...otherProps }) => {
   const styles = useStyles2(getStyles);
+  const navModel = usePageNav(navId, oldNavProp);
 
-  useEffect(() => {
-    if (navModel) {
-      const title = getTitleFromNavModel(navModel);
-      document.title = title ? `${title} - ${Branding.AppTitle}` : Branding.AppTitle;
-    } else {
-      document.title = Branding.AppTitle;
-    }
-  }, [navModel]);
+  usePageTitle(navModel, pageNav);
+
+  const pageHeaderNav = pageNav ?? navModel?.main;
 
   return (
     <div {...otherProps} className={cx(styles.wrapper, className)}>
       <CustomScrollbar autoHeightMin={'100%'}>
         <div className="page-scrollbar-content">
-          {navModel && <PageHeader model={navModel} />}
+          {pageHeaderNav && <PageHeader navItem={pageHeaderNav} />}
           {children}
           <Footer />
         </div>
@@ -48,12 +36,12 @@ export const Page: PageType = ({ navModel, children, className, ...otherProps })
   );
 };
 
-Page.Header = PageHeader;
-Page.Contents = PageContents;
+OldPage.Header = PageHeader;
+OldPage.Contents = PageContents;
 
-export default Page;
+export const Page: PageType = config.featureToggles.topnav ? NewPage : OldPage;
 
-const getStyles = (theme: GrafanaTheme2) => ({
+const getStyles = (_: GrafanaTheme2) => ({
   wrapper: css`
     width: 100%;
     flex-grow: 1;
diff --git a/public/app/core/components/Page/types.ts b/public/app/core/components/Page/types.ts
new file mode 100644
index 00000000000..bc8340f22fc
--- /dev/null
+++ b/public/app/core/components/Page/types.ts
@@ -0,0 +1,19 @@
+import { FC, HTMLAttributes } from 'react';
+
+import { NavModel, NavModelItem } from '@grafana/data';
+
+import { PageHeader } from '../PageHeader/PageHeader';
+
+import { PageContents } from './PageContents';
+
+export interface PageProps extends HTMLAttributes<HTMLDivElement> {
+  children: React.ReactNode;
+  navId?: string;
+  navModel?: NavModel;
+  pageNav?: NavModelItem;
+}
+
+export interface PageType extends FC<PageProps> {
+  Header: typeof PageHeader;
+  Contents: typeof PageContents;
+}
diff --git a/public/app/core/components/Page/usePageNav.ts b/public/app/core/components/Page/usePageNav.ts
new file mode 100644
index 00000000000..e78a5d17aa6
--- /dev/null
+++ b/public/app/core/components/Page/usePageNav.ts
@@ -0,0 +1,29 @@
+import { useSelector } from 'react-redux';
+import { createSelector } from 'reselect';
+
+import { NavModel } from '@grafana/data';
+import { getNavModel } from 'app/core/selectors/navModel';
+import { store } from 'app/store/store';
+import { StoreState } from 'app/types';
+
+export function usePageNav(navId?: string, oldProp?: NavModel): NavModel | undefined {
+  if (oldProp) {
+    return oldProp;
+  }
+
+  if (!navId) {
+    return;
+  }
+
+  // Page component is used in so many tests, this simplifies not having to initialize a full redux store
+  if (!store) {
+    return;
+  }
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  return useSelector(createSelector(getNavIndex, (navIndex) => getNavModel(navIndex, navId ?? 'home')));
+}
+
+function getNavIndex(store: StoreState) {
+  return store.navIndex;
+}
diff --git a/public/app/core/components/Page/usePageTitle.ts b/public/app/core/components/Page/usePageTitle.ts
new file mode 100644
index 00000000000..b7512bb7b46
--- /dev/null
+++ b/public/app/core/components/Page/usePageTitle.ts
@@ -0,0 +1,32 @@
+import { useEffect } from 'react';
+
+import { NavModel, NavModelItem } from '@grafana/data';
+
+import { Branding } from '../Branding/Branding';
+
+export function usePageTitle(navModel?: NavModel, pageNav?: NavModelItem) {
+  useEffect(() => {
+    const parts: string[] = [];
+
+    if (pageNav) {
+      if (pageNav.children) {
+        const activePage = pageNav.children.find((x) => x.active);
+        if (activePage) {
+          parts.push(activePage.text);
+        }
+      }
+      parts.push(pageNav.text);
+    }
+
+    if (navModel) {
+      if (navModel.node !== navModel.main) {
+        parts.push(navModel.node.text);
+      }
+      parts.push(navModel.main.text);
+    }
+
+    parts.push(Branding.AppTitle);
+
+    document.title = parts.join(' - ');
+  }, [navModel, pageNav]);
+}
diff --git a/public/app/core/components/PageHeader/PageHeader.test.tsx b/public/app/core/components/PageHeader/PageHeader.test.tsx
index 2965d007142..3e5af5ee1f9 100644
--- a/public/app/core/components/PageHeader/PageHeader.test.tsx
+++ b/public/app/core/components/PageHeader/PageHeader.test.tsx
@@ -1,23 +1,20 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import PageHeader from './PageHeader';
+import { PageHeader } from './PageHeader';
 
 describe('PageHeader', () => {
   describe('when the nav tree has a node with a title', () => {
     it('should render the title', async () => {
       const nav = {
-        main: {
-          icon: 'folder-open',
-          id: 'node',
-          subTitle: 'node subtitle',
-          url: '',
-          text: 'node',
-        },
-        node: {},
+        icon: 'folder-open',
+        id: 'node',
+        subTitle: 'node subtitle',
+        url: '',
+        text: 'node',
       };
 
-      render(<PageHeader model={nav as any} />);
+      render(<PageHeader navItem={nav as any} />);
 
       expect(screen.getByRole('heading', { name: 'node' })).toBeInTheDocument();
     });
@@ -26,18 +23,15 @@ describe('PageHeader', () => {
   describe('when the nav tree has a node with breadcrumbs and a title', () => {
     it('should render the title with breadcrumbs first and then title last', async () => {
       const nav = {
-        main: {
-          icon: 'folder-open',
-          id: 'child',
-          subTitle: 'child subtitle',
-          url: '',
-          text: 'child',
-          breadcrumbs: [{ title: 'Parent', url: 'parentUrl' }],
-        },
-        node: {},
+        icon: 'folder-open',
+        id: 'child',
+        subTitle: 'child subtitle',
+        url: '',
+        text: 'child',
+        breadcrumbs: [{ title: 'Parent', url: 'parentUrl' }],
       };
 
-      render(<PageHeader model={nav as any} />);
+      render(<PageHeader navItem={nav as any} />);
 
       expect(screen.getByRole('heading', { name: 'Parent / child' })).toBeInTheDocument();
       expect(screen.getByRole('link', { name: 'Parent' })).toBeInTheDocument();
diff --git a/public/app/core/components/PageHeader/PageHeader.tsx b/public/app/core/components/PageHeader/PageHeader.tsx
index 116ff8186dd..45fe58f1474 100644
--- a/public/app/core/components/PageHeader/PageHeader.tsx
+++ b/public/app/core/components/PageHeader/PageHeader.tsx
@@ -1,14 +1,14 @@
 import { css } from '@emotion/css';
 import React, { FC } from 'react';
 
-import { NavModel, NavModelItem, NavModelBreadcrumb, GrafanaTheme2 } from '@grafana/data';
+import { NavModelItem, NavModelBreadcrumb, GrafanaTheme2 } from '@grafana/data';
 import { Tab, TabsBar, Icon, IconName, useStyles2 } from '@grafana/ui';
 import { PanelHeaderMenuItem } from 'app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuItem';
 
 import { ProBadge } from '../Upgrade/ProBadge';
 
 export interface Props {
-  model: NavModel;
+  navItem: NavModelItem;
 }
 
 const SelectNav = ({ children, customCss }: { children: NavModelItem[]; customCss: string }) => {
@@ -75,21 +75,19 @@ const Navigation = ({ children }: { children: NavModelItem[] }) => {
   );
 };
 
-export const PageHeader: FC<Props> = ({ model }) => {
+export const PageHeader: FC<Props> = ({ navItem: model }) => {
   const styles = useStyles2(getStyles);
 
   if (!model) {
     return null;
   }
 
-  const main = model.main;
-  const children = main.children;
   return (
     <div className={styles.headerCanvas}>
       <div className="page-container">
         <div className="page-header">
-          {renderHeaderTitle(main)}
-          {children && children.length && <Navigation>{children}</Navigation>}
+          {renderHeaderTitle(model)}
+          {model.children && model.children.length > 0 && <Navigation>{model.children}</Navigation>}
         </div>
       </div>
     </div>
@@ -157,5 +155,3 @@ const getStyles = (theme: GrafanaTheme2) => ({
     background: ${theme.colors.background.canvas};
   `,
 });
-
-export default PageHeader;
diff --git a/public/app/core/components/PageNew/Page.test.tsx b/public/app/core/components/PageNew/Page.test.tsx
new file mode 100644
index 00000000000..a28ecec2b7d
--- /dev/null
+++ b/public/app/core/components/PageNew/Page.test.tsx
@@ -0,0 +1,79 @@
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { Provider } from 'react-redux';
+
+import { NavModelItem } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { configureStore } from 'app/store/configureStore';
+
+import { PageProps } from '../Page/types';
+
+import { Page } from './Page';
+
+const pageNav: NavModelItem = {
+  text: 'pageNav title',
+  children: [
+    { text: 'pageNav child1', url: '1', active: true },
+    { text: 'pageNav child2', url: '2' },
+  ],
+};
+
+const setup = (props: Partial<PageProps>) => {
+  config.bootData.navTree = [
+    {
+      text: 'Section name',
+      id: 'section',
+      url: 'section',
+      children: [
+        { text: 'Child1', id: 'child1', url: 'section/child1' },
+        { text: 'Child2', id: 'child2', url: 'section/child2' },
+      ],
+    },
+  ];
+
+  const store = configureStore();
+
+  return render(
+    <Provider store={store}>
+      <Page {...props}>
+        <div data-testid="page-children">Children</div>
+      </Page>
+    </Provider>
+  );
+};
+
+describe('Render', () => {
+  it('should render component with emtpy Page container', async () => {
+    setup({});
+    const children = await screen.findByTestId('page-children');
+    expect(children).toBeInTheDocument();
+
+    const pageHeader = screen.queryByRole('heading');
+    expect(pageHeader).not.toBeInTheDocument();
+  });
+
+  it('should render header when pageNav supplied', async () => {
+    setup({ pageNav });
+
+    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
+    expect(screen.getAllByRole('tab').length).toBe(2);
+  });
+
+  it('should render section nav model based on navId', async () => {
+    setup({ navId: 'child1' });
+
+    expect(screen.getByRole('heading', { name: 'Section name' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'Child1' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
+    expect(screen.getAllByRole('tab').length).toBe(2);
+  });
+
+  it('should render section nav model based on navId and item page nav', async () => {
+    setup({ navId: 'child1', pageNav });
+
+    expect(screen.getByRole('heading', { name: 'Section name' })).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: 'pageNav title' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab Child1' })).toBeInTheDocument();
+    expect(screen.getByRole('tab', { name: 'Tab pageNav child1' })).toBeInTheDocument();
+  });
+});
diff --git a/public/app/core/components/PageNew/Page.tsx b/public/app/core/components/PageNew/Page.tsx
new file mode 100644
index 00000000000..72bf56d951a
--- /dev/null
+++ b/public/app/core/components/PageNew/Page.tsx
@@ -0,0 +1,93 @@
+// Libraries
+import { css, cx } from '@emotion/css';
+import React, { useEffect } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { CustomScrollbar, useStyles2 } from '@grafana/ui';
+
+// Components
+import { appChromeService } from '../AppChrome/AppChromeService';
+import { Footer } from '../Footer/Footer';
+import { PageType } from '../Page/types';
+import { usePageNav } from '../Page/usePageNav';
+import { usePageTitle } from '../Page/usePageTitle';
+
+import { PageContents } from './PageContents';
+import { PageHeader } from './PageHeader';
+import { PageTabs } from './PageTabs';
+import { SectionNav } from './SectionNav';
+
+export const Page: PageType = ({ navId, navModel: oldNavProp, pageNav, children, className, ...otherProps }) => {
+  const styles = useStyles2(getStyles);
+  const navModel = usePageNav(navId, oldNavProp);
+
+  usePageTitle(navModel, pageNav);
+
+  const pageHeaderNav = pageNav ?? navModel?.node;
+
+  useEffect(() => {
+    if (navModel || pageNav) {
+      appChromeService.update({ sectionNav: navModel?.node, pageNav });
+    }
+  }, [navModel, pageNav]);
+
+  return (
+    <div {...otherProps} className={cx(styles.wrapper, className)}>
+      <div className={styles.panes}>
+        {navModel && navModel.main.children && <SectionNav model={navModel} />}
+        <div className={styles.pageContent}>
+          <CustomScrollbar autoHeightMin={'100%'}>
+            <div className={styles.pageInner}>
+              {pageHeaderNav && <PageHeader navItem={pageHeaderNav} />}
+              {pageNav && pageNav.children && <PageTabs navItem={pageNav} />}
+              {children}
+            </div>
+            <Footer />
+          </CustomScrollbar>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+Page.Header = PageHeader;
+Page.Contents = PageContents;
+
+const getStyles = (theme: GrafanaTheme2) => {
+  const shadow = theme.isDark
+    ? `0 0.6px 1.5px -1px rgb(0 0 0),0 2px 4px -1px rgb(0 0 0 / 40%),0 5px 10px -1px rgb(0 0 0 / 23%)`
+    : '0 0.6px 1.5px -1px rgb(0 0 0 / 8%),0 2px 4px rgb(0 0 0 / 6%),0 5px 10px -1px rgb(0 0 0 / 5%)';
+
+  return {
+    wrapper: css`
+      height: 100%;
+      display: flex;
+      flex: 1 1 0;
+      flex-direction: column;
+      min-height: 0;
+    `,
+    panes: css({
+      display: 'flex',
+      height: '100%',
+      width: '100%',
+      flexGrow: 1,
+      minHeight: 0,
+      flexDirection: 'column',
+      [theme.breakpoints.up('md')]: {
+        flexDirection: 'row',
+      },
+    }),
+    pageContent: css({
+      flexGrow: 1,
+    }),
+    pageInner: css({
+      padding: theme.spacing(3),
+      boxShadow: shadow,
+      background: theme.colors.background.primary,
+      margin: theme.spacing(2, 2, 2, 1),
+      display: 'flex',
+      flexDirection: 'column',
+      flexGrow: 1,
+    }),
+  };
+};
diff --git a/public/app/core/components/PageNew/PageContents.tsx b/public/app/core/components/PageNew/PageContents.tsx
new file mode 100644
index 00000000000..85a04fa295a
--- /dev/null
+++ b/public/app/core/components/PageNew/PageContents.tsx
@@ -0,0 +1,14 @@
+// Libraries
+import React, { FC } from 'react';
+
+import PageLoader from '../PageLoader/PageLoader';
+
+interface Props {
+  isLoading?: boolean;
+  children: React.ReactNode;
+  className?: string;
+}
+
+export const PageContents: FC<Props> = ({ isLoading, children }) => {
+  return <>{isLoading ? <PageLoader /> : children}</>;
+};
diff --git a/public/app/core/components/PageNew/PageHeader.tsx b/public/app/core/components/PageNew/PageHeader.tsx
new file mode 100644
index 00000000000..1879563c90e
--- /dev/null
+++ b/public/app/core/components/PageNew/PageHeader.tsx
@@ -0,0 +1,43 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { NavModelItem, GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+export interface Props {
+  navItem: NavModelItem;
+}
+
+export function PageHeader({ navItem }: Props) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <>
+      <h1 className={styles.pageTitle}>
+        {navItem.img && <img className={styles.pageImg} src={navItem.img} alt={`logo for ${navItem.text}`} />}
+        {navItem.text}
+      </h1>
+      {navItem.subTitle && <div className={styles.pageSubTitle}>{navItem.subTitle}</div>}
+    </>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    pageTitle: css({
+      display: 'flex',
+      marginBottom: theme.spacing(3),
+    }),
+    pageSubTitle: css({
+      marginBottom: theme.spacing(2),
+      position: 'relative',
+      top: theme.spacing(-1),
+      color: theme.colors.text.secondary,
+    }),
+    pageImg: css({
+      width: '32px',
+      height: '32px',
+      marginRight: theme.spacing(2),
+    }),
+  };
+};
diff --git a/public/app/core/components/PageNew/PageTabs.tsx b/public/app/core/components/PageNew/PageTabs.tsx
new file mode 100644
index 00000000000..d3fb3a73c9b
--- /dev/null
+++ b/public/app/core/components/PageNew/PageTabs.tsx
@@ -0,0 +1,42 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { NavModelItem, GrafanaTheme2 } from '@grafana/data';
+import { IconName, useStyles2, TabsBar, Tab } from '@grafana/ui';
+
+export interface Props {
+  navItem: NavModelItem;
+}
+
+export function PageTabs({ navItem }: Props) {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.tabsWrapper}>
+      <TabsBar>
+        {navItem.children!.map((child, index) => {
+          return (
+            !child.hideFromTabs && (
+              <Tab
+                label={child.text}
+                active={child.active}
+                key={`${child.url}-${index}`}
+                icon={child.icon as IconName}
+                href={child.url}
+                suffix={child.tabSuffix}
+              />
+            )
+          );
+        })}
+      </TabsBar>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    tabsWrapper: css({
+      paddingBottom: theme.spacing(3),
+    }),
+  };
+};
diff --git a/public/app/core/components/PageNew/SectionNav.tsx b/public/app/core/components/PageNew/SectionNav.tsx
new file mode 100644
index 00000000000..3570de4294f
--- /dev/null
+++ b/public/app/core/components/PageNew/SectionNav.tsx
@@ -0,0 +1,92 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { NavModel, GrafanaTheme2 } from '@grafana/data';
+import { IconName, useStyles2, Icon, VerticalTab } from '@grafana/ui';
+
+export interface Props {
+  model: NavModel;
+}
+
+export function SectionNav(props: Props) {
+  const styles = useStyles2(getStyles);
+
+  const main = props.model.main;
+  const directChildren = props.model.main.children!.filter((x) => !x.hideFromTabs && !x.children);
+  const nestedItems = props.model.main.children!.filter((x) => x.children && x.children.length);
+
+  return (
+    <nav className={styles.nav}>
+      <h2 className={styles.sectionName}>
+        {main.icon && <Icon name={main.icon as IconName} size="lg" />}
+        {main.img && <img className="page-header__img" src={main.img} alt={`logo of ${main.text}`} />}
+        {props.model.main.text}
+      </h2>
+      <div className={styles.items}>
+        {directChildren.map((child, index) => {
+          return (
+            !child.hideFromTabs &&
+            !child.children && (
+              <VerticalTab
+                label={child.text}
+                active={child.active}
+                key={`${child.url}-${index}`}
+                // icon={child.icon as IconName}
+                href={child.url}
+              />
+            )
+          );
+        })}
+        {nestedItems.map((child) => (
+          <>
+            <div className={styles.subSection}>{child.text}</div>
+            {child.children!.map((child, index) => {
+              return (
+                !child.hideFromTabs &&
+                !child.children && (
+                  <VerticalTab
+                    label={child.text}
+                    active={child.active}
+                    key={`${child.url}-${index}`}
+                    // icon={child.icon as IconName}
+                    href={child.url}
+                  />
+                )
+              );
+            })}
+          </>
+        ))}
+      </div>
+    </nav>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    nav: css({
+      display: 'flex',
+      flexDirection: 'column',
+      background: theme.colors.background.canvas,
+      padding: theme.spacing(3, 2),
+      flexShrink: 0,
+      [theme.breakpoints.up('md')]: {
+        width: '250px',
+      },
+    }),
+    sectionName: css({
+      display: 'flex',
+      gap: theme.spacing(1),
+      padding: theme.spacing(0.5, 0, 3, 0.25),
+      fontSize: theme.typography.h4.fontSize,
+      margin: 0,
+    }),
+    items: css({
+      // paddingLeft: '9px',
+    }),
+    subSection: css({
+      padding: theme.spacing(3, 0, 1, 1),
+      fontWeight: 500,
+      fontSize: '16px',
+    }),
+  };
+};
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx b/public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx
index b046539d99f..2efdd6a2729 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx
@@ -1,56 +1,44 @@
-import { mount, shallow } from 'enzyme';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import React from 'react';
-import { act } from 'react-dom/test-utils';
 
-import { QueryOperationRow } from './QueryOperationRow';
+import { QueryOperationRow, QueryOperationRowProps } from './QueryOperationRow';
+
+const setup = (propOverrides?: Partial<QueryOperationRowProps>) => {
+  const props: QueryOperationRowProps = {
+    title: 'test-title',
+    headerElement: '',
+    index: 0,
+    id: 'test-id',
+    children: <div>children</div>,
+    ...propOverrides,
+  };
+  return render(<QueryOperationRow {...props}></QueryOperationRow>);
+};
 
 describe('QueryOperationRow', () => {
-  it('renders', () => {
-    expect(() =>
-      shallow(
-        <QueryOperationRow id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      )
-    ).not.toThrow();
+  it('renders without exploding', () => {
+    expect(() => setup()).not.toThrow();
+  });
+
+  it('renders the component content', () => {
+    setup();
+    expect(screen.getByText(/^test-title$/)).toBeInTheDocument();
   });
 
   describe('callbacks', () => {
-    it('should not call onOpen when component is shallowed', async () => {
-      const onOpenSpy = jest.fn();
-      // @ts-ignore strict null error, you shouldn't use promise like approach with act but I don't know what the intention is here
-      await act(async () => {
-        shallow(
-          <QueryOperationRow onOpen={onOpenSpy} id="test-id" index={0}>
-            <div>Test</div>
-          </QueryOperationRow>
-        );
-      });
-      expect(onOpenSpy).not.toBeCalled();
-    });
-
     it('should call onOpen when row is opened and onClose when row is collapsed', async () => {
       const onOpenSpy = jest.fn();
       const onCloseSpy = jest.fn();
-      const wrapper = mount(
-        <QueryOperationRow title="title" onOpen={onOpenSpy} onClose={onCloseSpy} isOpen={false} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
-      const titleEl = wrapper.find({ 'aria-label': 'Query operation row title' });
-      expect(titleEl).toHaveLength(1);
+      setup({ isOpen: false, onOpen: onOpenSpy, onClose: onCloseSpy });
 
-      // @ts-ignore strict null error, you shouldn't use promise like approach with act but I don't know what the intention is here
-      await act(async () => {
-        // open
-        titleEl.first().simulate('click');
-      });
+      const queryRow = screen.getByText(/^test-title$/);
+      expect(queryRow).toBeInTheDocument();
 
-      // @ts-ignore strict null error, you shouldn't use promise like approach with act but I don't know what the intention is here
-      await act(async () => {
-        // close
-        titleEl.first().simulate('click');
-      });
+      // open row on click
+      await userEvent.click(queryRow);
+      // close row on click
+      await userEvent.click(queryRow);
 
       expect(onOpenSpy).toBeCalledTimes(1);
       expect(onCloseSpy).toBeCalledTimes(1);
@@ -59,40 +47,26 @@ describe('QueryOperationRow', () => {
 
   describe('headerElement rendering', () => {
     it('should render headerElement provided as element', () => {
-      const title = <div aria-label="test title">Test</div>;
-      const wrapper = mount(
-        <QueryOperationRow headerElement={title} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
+      const title = <div aria-label="test title">test-header-element</div>;
+      setup({ headerElement: title, id: 'test-id', index: 0 });
 
-      const titleEl = wrapper.find({ 'aria-label': 'test title' });
-      expect(titleEl).toHaveLength(1);
+      expect(screen.getByText(/^test-header-element$/)).toBeInTheDocument();
     });
 
     it('should render headerElement provided as function', () => {
-      const title = () => <div aria-label="test title">Test</div>;
-      const wrapper = mount(
-        <QueryOperationRow headerElement={title} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
+      const title = () => <div aria-label="test title">test-function-header</div>;
+      setup({ headerElement: title, id: 'test-id', index: 0 });
 
-      const titleEl = wrapper.find({ 'aria-label': 'test title' });
-      expect(titleEl).toHaveLength(1);
+      expect(screen.getByText(/^test-function-header$/)).toBeInTheDocument();
     });
 
     it('should expose api to headerElement rendered as function', () => {
       const propsSpy = jest.fn();
-      const title = (props: any) => {
+      const title = (props: Partial<QueryOperationRowProps>) => {
         propsSpy(props);
         return <div aria-label="test title">Test</div>;
       };
-      shallow(
-        <QueryOperationRow headerElement={title} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
+      setup({ headerElement: title, id: 'test-id', index: 0 });
 
       expect(Object.keys(propsSpy.mock.calls[0][0])).toContain('isOpen');
     });
@@ -100,40 +74,27 @@ describe('QueryOperationRow', () => {
 
   describe('actions rendering', () => {
     it('should render actions provided as element', () => {
-      const actions = <div aria-label="test actions">Test</div>;
-      const wrapper = mount(
-        <QueryOperationRow actions={actions} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
+      const actions = <div aria-label="test actions">test-actions</div>;
+      setup({ actions: actions, id: 'test-id', index: 0 });
 
-      const actionsEl = wrapper.find({ 'aria-label': 'test actions' });
-      expect(actionsEl).toHaveLength(1);
+      expect(screen.getByText(/^test-actions$/)).toBeInTheDocument();
     });
     it('should render actions provided as function', () => {
-      const actions = () => <div aria-label="test actions">Test</div>;
-      const wrapper = mount(
-        <QueryOperationRow actions={actions} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
+      const actions = () => <div aria-label="test actions">test-actions</div>;
+      setup({ actions: actions, id: 'test-id', index: 0 });
 
-      const actionsEl = wrapper.find({ 'aria-label': 'test actions' });
-      expect(actionsEl).toHaveLength(1);
+      expect(screen.getByText(/^test-actions$/)).toBeInTheDocument();
     });
 
     it('should expose api to title rendered as function', () => {
       const propsSpy = jest.fn();
-      const actions = (props: any) => {
+      const actions = (props: Partial<QueryOperationRowProps>) => {
         propsSpy(props);
-        return <div aria-label="test actions">Test</div>;
+        return <div aria-label="test actions">test-actions</div>;
       };
-      shallow(
-        <QueryOperationRow actions={actions} id="test-id" index={0}>
-          <div>Test</div>
-        </QueryOperationRow>
-      );
+      setup({ actions: actions, id: 'test-id', index: 0 });
 
+      expect(screen.getByText(/^test-actions$/)).toBeInTheDocument();
       expect(Object.keys(propsSpy.mock.calls[0][0])).toEqual(['isOpen', 'onOpen', 'onClose']);
     });
   });
diff --git a/public/app/core/components/QueryOperationRow/QueryOperationRow.tsx b/public/app/core/components/QueryOperationRow/QueryOperationRow.tsx
index 331e189e976..5fd86d4267d 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationRow.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationRow.tsx
@@ -9,7 +9,7 @@ import { ReactUtils, stylesFactory, useTheme } from '@grafana/ui';
 
 import { QueryOperationRowHeader } from './QueryOperationRowHeader';
 
-interface QueryOperationRowProps {
+export interface QueryOperationRowProps {
   index: number;
   id: string;
   title?: string;
diff --git a/public/app/core/components/Select/ServiceAccountPicker.tsx b/public/app/core/components/Select/ServiceAccountPicker.tsx
new file mode 100644
index 00000000000..954f1ddc425
--- /dev/null
+++ b/public/app/core/components/Select/ServiceAccountPicker.tsx
@@ -0,0 +1,69 @@
+import { debounce, isNil } from 'lodash';
+import React, { useEffect, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { getBackendSrv } from '@grafana/runtime';
+import { AsyncSelect } from '@grafana/ui';
+import { ServiceAccount } from 'app/types';
+
+export interface Props {
+  onSelected: (serviceAccount: SelectableValue<ServiceAccount>) => void;
+  className?: string;
+  inputId?: string;
+  autoFocus?: boolean;
+}
+
+export function ServiceAccountPicker({ onSelected, className, inputId, autoFocus }: Props) {
+  const [loadingServiceAccounts, setLoadingServiceAccounts] = useState(false);
+
+  // For whatever reason the autoFocus prop doesn't seem to work
+  // with AsyncSelect, hence this workaround. Maybe fixed in a later version?
+  useEffect(() => {
+    if (autoFocus && inputId) {
+      document.getElementById(inputId)?.focus();
+    }
+  }, [autoFocus, inputId]);
+
+  let search = (query?: string) => {
+    setLoadingServiceAccounts(true);
+
+    if (isNil(query)) {
+      query = '';
+    }
+
+    return getBackendSrv()
+      .get(`/api/serviceaccounts/search?query=${query}`)
+      .then((result: { serviceAccounts: ServiceAccount[] }) => {
+        const serviceAccounts: Array<SelectableValue<ServiceAccount>> = result.serviceAccounts.map((serviceAccount) => {
+          return {
+            id: serviceAccount.id,
+            value: serviceAccount,
+            label: serviceAccount.login,
+            imgUrl: serviceAccount.avatarUrl,
+            login: serviceAccount.login,
+          };
+        });
+        setLoadingServiceAccounts(false);
+        return serviceAccounts;
+      });
+  };
+
+  const debouncedSearch = debounce(search, 300, {
+    leading: true,
+    trailing: true,
+  });
+
+  return (
+    <AsyncSelect
+      inputId={inputId}
+      className={className}
+      isLoading={loadingServiceAccounts}
+      defaultOptions={true}
+      isSearchable={true}
+      loadOptions={debouncedSearch}
+      onChange={onSelected}
+      placeholder="Start typing to search for service accounts"
+      noOptionsMessage="No service accounts found"
+    />
+  );
+}
diff --git a/public/app/core/components/TopNav/TopNavUpdate.tsx b/public/app/core/components/TopNav/TopNavUpdate.tsx
deleted file mode 100644
index c16ba7a2755..00000000000
--- a/public/app/core/components/TopNav/TopNavUpdate.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useEffect } from 'react';
-import { Subject } from 'rxjs';
-
-import { NavModelItem } from '@grafana/data';
-
-export interface TopNavProps {
-  subNav?: NavModelItem;
-  actions?: React.ReactNode;
-}
-
-export const topNavUpdates = new Subject<TopNavProps>();
-export const topNavDefaultProps: TopNavProps = {};
-
-/**
- * This needs to be moved to @grafana/ui or runtime.
- * This is the way core pages and plugins update the breadcrumbs and page toolbar actions
- */
-export function TopNavUpdate(props: TopNavProps) {
-  useEffect(() => {
-    topNavUpdates.next(props);
-  });
-  return null;
-}
diff --git a/public/app/core/components/TopNav/types.ts b/public/app/core/components/TopNav/types.ts
deleted file mode 100644
index 9171a881c48..00000000000
--- a/public/app/core/components/TopNav/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const TOP_BAR_LEVEL_HEIGHT = 40;
diff --git a/public/app/core/logsModel.ts b/public/app/core/logsModel.ts
index 48facc8143f..eae01687679 100644
--- a/public/app/core/logsModel.ts
+++ b/public/app/core/logsModel.ts
@@ -1,5 +1,5 @@
 import { size } from 'lodash';
-import { Observable } from 'rxjs';
+import { Observable, from, isObservable } from 'rxjs';
 
 import {
   AbsoluteTimeRange,
@@ -8,6 +8,7 @@ import {
   DataQueryRequest,
   DataQueryResponse,
   DataSourceApi,
+  DataSourceJsonData,
   dateTimeFormat,
   dateTimeFormatTimeAgo,
   FieldCache,
@@ -106,13 +107,20 @@ export function filterLogLevels(logRows: LogRowModel[], hiddenLogLevels: Set<Log
   });
 }
 
+interface Series {
+  lastTs: number | null;
+  datapoints: Array<[number, number]>;
+  target: LogLevel;
+  color: string;
+}
+
 export function makeDataFramesForLogs(sortedRows: LogRowModel[], bucketSize: number): DataFrame[] {
   // currently interval is rangeMs / resolution, which is too low for showing series as bars.
   // Should be solved higher up the chain when executing queries & interval calculated and not here but this is a temporary fix.
 
   // Graph time series by log level
-  const seriesByLevel: any = {};
-  const seriesList: any[] = [];
+  const seriesByLevel: Record<string, Series> = {};
+  const seriesList: Series[] = [];
 
   for (const row of sortedRows) {
     let series = seriesByLevel[row.logLevel];
@@ -459,12 +467,13 @@ export function logSeriesToLogsModel(logSeries: DataFrame[]): LogsModel | undefi
   }
 
   const limits = logSeries.filter((series) => series.meta && series.meta.limit);
-  const limitValue = Object.values(
-    limits.reduce((acc: any, elem: any) => {
-      acc[elem.refId] = elem.meta.limit;
-      return acc;
-    }, {})
-  ).reduce((acc: number, elem: any) => (acc += elem), 0) as number;
+  const lastLimitPerRef = limits.reduce<Record<string, number>>((acc, elem) => {
+    acc[elem.refId ?? ''] = elem.meta?.limit ?? 0;
+
+    return acc;
+  }, {});
+
+  const limitValue = Object.values(lastLimitPerRef).reduce((acc, elem) => (acc += elem), 0);
 
   if (limitValue > 0) {
     meta.push({
@@ -598,6 +607,7 @@ export function aggregateRawLogsVolume(
   extractLevel: (dataFrame: DataFrame) => LogLevel
 ): DataFrame[] {
   const logsVolumeByLevelMap: Partial<Record<LogLevel, DataFrame[]>> = {};
+
   rawLogsVolume.forEach((dataFrame) => {
     const level = extractLevel(dataFrame);
     if (!logsVolumeByLevelMap[level]) {
@@ -661,10 +671,10 @@ type LogsVolumeQueryOptions<T extends DataQuery> = {
 /**
  * Creates an observable, which makes requests to get logs volume and aggregates results.
  */
-export function queryLogsVolume<T extends DataQuery>(
-  datasource: DataSourceApi<T, any, any>,
-  logsVolumeRequest: DataQueryRequest<T>,
-  options: LogsVolumeQueryOptions<T>
+export function queryLogsVolume<TQuery extends DataQuery, TOptions extends DataSourceJsonData>(
+  datasource: DataSourceApi<TQuery, TOptions>,
+  logsVolumeRequest: DataQueryRequest<TQuery>,
+  options: LogsVolumeQueryOptions<TQuery>
 ): Observable<DataQueryResponse> {
   const timespan = options.range.to.valueOf() - options.range.from.valueOf();
   const intervalInfo = getIntervalInfo(logsVolumeRequest.scopedVars, timespan);
@@ -683,7 +693,10 @@ export function queryLogsVolume<T extends DataQuery>(
       data: [],
     });
 
-    const subscription = (datasource.query(logsVolumeRequest) as Observable<DataQueryResponse>).subscribe({
+    const queryResponse = datasource.query(logsVolumeRequest);
+    const queryObservable = isObservable(queryResponse) ? queryResponse : from(queryResponse);
+
+    const subscription = queryObservable.subscribe({
       complete: () => {
         const aggregatedLogsVolume = aggregateRawLogsVolume(rawLogsVolume, options.extractLevel);
         if (aggregatedLogsVolume[0]) {
diff --git a/public/app/core/navigation/GrafanaRoute.tsx b/public/app/core/navigation/GrafanaRoute.tsx
index 7b2e7445b0d..17a2e93d3b9 100644
--- a/public/app/core/navigation/GrafanaRoute.tsx
+++ b/public/app/core/navigation/GrafanaRoute.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 // @ts-ignore
 import Drop from 'tether-drop';
 
-import { config, locationSearchToObject, navigationLogger, reportPageview } from '@grafana/runtime';
+import { locationSearchToObject, navigationLogger, reportPageview } from '@grafana/runtime';
 
-import { TopNavPage } from '../components/TopNav/TopNavPage';
+import { appChromeService } from '../components/AppChrome/AppChromeService';
 import { keybindingSrv } from '../services/keybindingSrv';
 
 import { GrafanaRouteComponentProps } from './types';
@@ -13,6 +13,8 @@ export interface Props extends Omit<GrafanaRouteComponentProps, 'queryParams'> {
 
 export class GrafanaRoute extends React.Component<Props> {
   componentDidMount() {
+    appChromeService.routeMounted(this.props.route);
+
     this.updateBodyClassNames();
     this.cleanupDOM();
     // unbinds all and re-bind global keybindins
@@ -71,12 +73,6 @@ export class GrafanaRoute extends React.Component<Props> {
     navigationLogger('GrafanaRoute', false, 'Rendered', props.route);
 
     const RouteComponent = props.route.component;
-    const routeElement = <RouteComponent {...props} queryParams={locationSearchToObject(props.location.search)} />;
-
-    if (config.featureToggles.topnav && !props.route.navHidden) {
-      return <TopNavPage navId={props.route.navId}>{routeElement}</TopNavPage>;
-    }
-
-    return routeElement;
+    return <RouteComponent {...props} queryParams={locationSearchToObject(props.location.search)} />;
   }
 }
diff --git a/public/app/core/navigation/types.ts b/public/app/core/navigation/types.ts
index d34089aca8f..cffda8ede63 100644
--- a/public/app/core/navigation/types.ts
+++ b/public/app/core/navigation/types.ts
@@ -17,7 +17,6 @@ export interface RouteDescriptor {
   pageClass?: string;
   /** Can be used like an id for the route if the same component is used by many routes */
   routeName?: string;
-  navHidden?: boolean;
+  chromeless?: boolean;
   exact?: boolean;
-  navId?: string;
 }
diff --git a/public/app/core/reducers/navBarTree.ts b/public/app/core/reducers/navBarTree.ts
index b05979ac042..6907d7af6b9 100644
--- a/public/app/core/reducers/navBarTree.ts
+++ b/public/app/core/reducers/navBarTree.ts
@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import { NavModelItem } from '@grafana/data';
-import config from 'app/core/config';
+import { config } from '@grafana/runtime';
 
 export const initialState: NavModelItem[] = config.bootData?.navTree ?? [];
 
diff --git a/public/app/core/reducers/navModel.ts b/public/app/core/reducers/navModel.ts
index bdb256bfe1a..6be4673248d 100644
--- a/public/app/core/reducers/navModel.ts
+++ b/public/app/core/reducers/navModel.ts
@@ -32,7 +32,6 @@ function buildWarningNav(text: string, subTitle?: string): NavModel {
     icon: 'exclamation-triangle',
   };
   return {
-    breadcrumbs: [node],
     node: node,
     main: node,
   };
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 8d726b03d84..d0c67af38ab 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -398,19 +398,19 @@ export class BackendSrv implements BackendService {
     return await this.request({ method: 'GET', url, params, requestId });
   }
 
-  async delete(url: string, data?: any) {
+  async delete<T = any>(url: string, data?: any): Promise<T> {
     return await this.request({ method: 'DELETE', url, data });
   }
 
-  async post(url: string, data?: any) {
+  async post<T = any>(url: string, data?: any): Promise<T> {
     return await this.request({ method: 'POST', url, data });
   }
 
-  async patch(url: string, data: any) {
+  async patch<T = any>(url: string, data: any): Promise<T> {
     return await this.request({ method: 'PATCH', url, data });
   }
 
-  async put(url: string, data: any) {
+  async put<T = any>(url: string, data: any): Promise<T> {
     return await this.request({ method: 'PUT', url, data });
   }
 
@@ -425,6 +425,7 @@ export class BackendSrv implements BackendService {
     return this.request({ url: '/api/login/ping', method: 'GET', retry: 1 });
   }
 
+  /** @deprecated */
   search(query: any): Promise<DashboardSearchHit[]> {
     return this.get('/api/search', query);
   }
diff --git a/public/app/core/services/search_srv.ts b/public/app/core/services/search_srv.ts
index a5030a3c22a..b6111211610 100644
--- a/public/app/core/services/search_srv.ts
+++ b/public/app/core/services/search_srv.ts
@@ -13,6 +13,7 @@ interface Sections {
   [key: string]: Partial<DashboardSection>;
 }
 
+/** @deprecated */
 export class SearchSrv {
   private getRecentDashboards(sections: DashboardSection[] | any) {
     return this.queryForRecentDashboards().then((result: any[]) => {
diff --git a/public/app/core/utils/isShallowEqual.ts b/public/app/core/utils/isShallowEqual.ts
new file mode 100644
index 00000000000..8d772c8af5b
--- /dev/null
+++ b/public/app/core/utils/isShallowEqual.ts
@@ -0,0 +1,29 @@
+// From https://github.com/streamich/fast-shallow-equal
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isShallowEqual(a: any, b: any) {
+  if (a === b) {
+    return true;
+  }
+
+  if (!(a instanceof Object) || !(b instanceof Object)) {
+    return false;
+  }
+
+  var keys = Object.keys(a);
+  var length = keys.length;
+
+  for (let i = 0; i < length; i++) {
+    if (!(keys[i] in b)) {
+      return false;
+    }
+  }
+
+  for (let i = 0; i < length; i++) {
+    if (a[keys[i]] !== b[keys[i]]) {
+      return false;
+    }
+  }
+
+  return length === Object.keys(b).length;
+}
diff --git a/public/app/features/admin/AdminEditOrgPage.tsx b/public/app/features/admin/AdminEditOrgPage.tsx
index 44bc10e0134..8ab6d856d77 100644
--- a/public/app/features/admin/AdminEditOrgPage.tsx
+++ b/public/app/features/admin/AdminEditOrgPage.tsx
@@ -6,7 +6,7 @@ import { useAsyncFn } from 'react-use';
 import { UrlQueryValue } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
 import { Form, Field, Input, Button, Legend, Alert } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/admin/AdminListOrgsPage.tsx b/public/app/features/admin/AdminListOrgsPage.tsx
index 6fff515aa09..94757ff3715 100644
--- a/public/app/features/admin/AdminListOrgsPage.tsx
+++ b/public/app/features/admin/AdminListOrgsPage.tsx
@@ -4,7 +4,7 @@ import useAsyncFn from 'react-use/lib/useAsyncFn';
 
 import { getBackendSrv } from '@grafana/runtime';
 import { LinkButton } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { contextSrv } from 'app/core/services/context_srv';
 import { AccessControlAction } from 'app/types';
diff --git a/public/app/features/admin/AdminSettings.tsx b/public/app/features/admin/AdminSettings.tsx
index e2e2a0c7ecb..f0b90e6e2b8 100644
--- a/public/app/features/admin/AdminSettings.tsx
+++ b/public/app/features/admin/AdminSettings.tsx
@@ -4,7 +4,7 @@ import { useAsync } from 'react-use';
 
 import { NavModel } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/admin/ExportStartButton.tsx b/public/app/features/admin/ExportStartButton.tsx
deleted file mode 100644
index f94d4f5b081..00000000000
--- a/public/app/features/admin/ExportStartButton.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useState } from 'react';
-
-import { GrafanaTheme2 } from '@grafana/data';
-import { getBackendSrv } from '@grafana/runtime';
-import { Button, CodeEditor, Modal, useTheme2 } from '@grafana/ui';
-
-export const ExportStartButton = () => {
-  const styles = getStyles(useTheme2());
-  const [open, setOpen] = useState(false);
-  const [body, setBody] = useState({
-    format: 'git',
-    git: {},
-  });
-  const onDismiss = () => setOpen(false);
-  const doStart = () => {
-    getBackendSrv()
-      .post('/api/admin/export', body)
-      .then((v) => {
-        console.log('GOT', v);
-        onDismiss();
-      });
-  };
-
-  return (
-    <>
-      <Modal title={'Export grafana instance'} isOpen={open} onDismiss={onDismiss}>
-        <div className={styles.wrap}>
-          <CodeEditor
-            height={200}
-            value={JSON.stringify(body, null, 2) ?? ''}
-            showLineNumbers={false}
-            readOnly={false}
-            language="json"
-            showMiniMap={false}
-            onBlur={(text: string) => {
-              setBody(JSON.parse(text)); // force JSON?
-            }}
-          />
-        </div>
-        <Modal.ButtonRow>
-          <Button onClick={doStart}>Start</Button>
-          <Button variant="secondary" onClick={onDismiss}>
-            Cancel
-          </Button>
-        </Modal.ButtonRow>
-      </Modal>
-
-      <Button onClick={() => setOpen(true)} variant="primary">
-        Export
-      </Button>
-    </>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    wrap: css`
-      border: 2px solid #111;
-    `,
-  };
-};
diff --git a/public/app/features/admin/ExportStatus.tsx b/public/app/features/admin/ExportStatus.tsx
deleted file mode 100644
index 6b638b8f358..00000000000
--- a/public/app/features/admin/ExportStatus.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { css } from '@emotion/css';
-import React, { useEffect, useState } from 'react';
-
-import { GrafanaTheme2, isLiveChannelMessageEvent, isLiveChannelStatusEvent, LiveChannelScope } from '@grafana/data';
-import { getBackendSrv, getGrafanaLiveSrv } from '@grafana/runtime';
-import { Button, useTheme2 } from '@grafana/ui';
-
-import { ExportStartButton } from './ExportStartButton';
-
-interface ExportStatusMessage {
-  running: boolean;
-  target: string;
-  started: number;
-  finished: number;
-  update: number;
-  count: number;
-  current: number;
-  last: string;
-  status: string;
-}
-
-export const ExportStatus = () => {
-  const styles = getStyles(useTheme2());
-  const [status, setStatus] = useState<ExportStatusMessage>();
-
-  useEffect(() => {
-    const subscription = getGrafanaLiveSrv()
-      .getStream<ExportStatusMessage>({
-        scope: LiveChannelScope.Grafana,
-        namespace: 'broadcast',
-        path: 'export',
-      })
-      .subscribe({
-        next: (evt) => {
-          if (isLiveChannelMessageEvent(evt)) {
-            setStatus(evt.message);
-          } else if (isLiveChannelStatusEvent(evt)) {
-            setStatus(evt.message);
-          }
-        },
-      });
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, []);
-
-  if (!status) {
-    return (
-      <div className={styles.wrap}>
-        <ExportStartButton />
-      </div>
-    );
-  }
-
-  return (
-    <div className={styles.wrap}>
-      <pre>{JSON.stringify(status, null, 2)}</pre>
-      {Boolean(!status.running) && <ExportStartButton />}
-      {Boolean(status.running) && (
-        <Button
-          variant="secondary"
-          onClick={() => {
-            getBackendSrv().post('/api/admin/export/stop');
-          }}
-        >
-          Stop
-        </Button>
-      )}
-    </div>
-  );
-};
-
-const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    wrap: css`
-      border: 4px solid red;
-    `,
-    running: css`
-      border: 4px solid green;
-    `,
-  };
-};
diff --git a/public/app/features/admin/ServerStats.tsx b/public/app/features/admin/ServerStats.tsx
index 1b3cf7799d6..672d1ba2746 100644
--- a/public/app/features/admin/ServerStats.tsx
+++ b/public/app/features/admin/ServerStats.tsx
@@ -10,7 +10,6 @@ import { contextSrv } from '../../core/services/context_srv';
 import { Loader } from '../plugins/admin/components/Loader';
 
 import { CrawlerStatus } from './CrawlerStatus';
-import { ExportStatus } from './ExportStatus';
 import { getServerStats, ServerStat } from './state/apis';
 
 export const ServerStats = () => {
@@ -99,7 +98,6 @@ export const ServerStats = () => {
       )}
 
       {config.featureToggles.dashboardPreviews && config.featureToggles.dashboardPreviewsAdmin && <CrawlerStatus />}
-      {config.featureToggles.export && <ExportStatus />}
     </>
   );
 };
diff --git a/public/app/features/admin/UpgradePage.tsx b/public/app/features/admin/UpgradePage.tsx
index 3678cb244c6..07b93187d28 100644
--- a/public/app/features/admin/UpgradePage.tsx
+++ b/public/app/features/admin/UpgradePage.tsx
@@ -4,8 +4,8 @@ import { connect } from 'react-redux';
 
 import { GrafanaTheme2, NavModel } from '@grafana/data';
 import { LinkButton, useStyles2 } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
 
-import Page from '../../core/components/Page/Page';
 import { getNavModel } from '../../core/selectors/navModel';
 import { StoreState } from '../../types';
 
diff --git a/public/app/features/admin/UserAdminPage.tsx b/public/app/features/admin/UserAdminPage.tsx
index 264e9ce943a..14865464d1e 100644
--- a/public/app/features/admin/UserAdminPage.tsx
+++ b/public/app/features/admin/UserAdminPage.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { NavModel } from '@grafana/data';
 import { featureEnabled } from '@grafana/runtime';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/admin/UserCreatePage.tsx b/public/app/features/admin/UserCreatePage.tsx
index b98e82a3e6a..e68a20eeebf 100644
--- a/public/app/features/admin/UserCreatePage.tsx
+++ b/public/app/features/admin/UserCreatePage.tsx
@@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom';
 import { NavModel } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
 import { Form, Button, Input, Field } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 
 import { getNavModel } from '../../core/selectors/navModel';
 import { StoreState } from '../../types';
diff --git a/public/app/features/admin/UserListAdminPage.tsx b/public/app/features/admin/UserListAdminPage.tsx
index 7fa5809ae4f..f7435d397df 100644
--- a/public/app/features/admin/UserListAdminPage.tsx
+++ b/public/app/features/admin/UserListAdminPage.tsx
@@ -13,7 +13,7 @@ import {
   useStyles2,
   FilterInput,
 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { TagBadge } from 'app/core/components/TagFilter/TagBadge';
 import { contextSrv } from 'app/core/core';
 
diff --git a/public/app/features/admin/ldap/LdapPage.tsx b/public/app/features/admin/ldap/LdapPage.tsx
index 28adbdc13ad..f0959e6f70e 100644
--- a/public/app/features/admin/ldap/LdapPage.tsx
+++ b/public/app/features/admin/ldap/LdapPage.tsx
@@ -5,7 +5,7 @@ import { NavModel } from '@grafana/data';
 import { featureEnabled } from '@grafana/runtime';
 import { Alert, Button, LegacyForms } from '@grafana/ui';
 const { FormField } = LegacyForms;
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/alerting/AlertRuleList.tsx b/public/app/features/alerting/AlertRuleList.tsx
index 10de691e571..a19d2ab7bbd 100644
--- a/public/app/features/alerting/AlertRuleList.tsx
+++ b/public/app/features/alerting/AlertRuleList.tsx
@@ -5,7 +5,7 @@ import { SelectableValue } from '@grafana/data';
 import { config, locationService } from '@grafana/runtime';
 import { Button, FilterInput, LinkButton, Select, VerticalGroup } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { AlertRule, StoreState } from 'app/types';
diff --git a/public/app/features/alerting/EditNotificationChannelPage.tsx b/public/app/features/alerting/EditNotificationChannelPage.tsx
index 45aba248222..7303f7ccfd3 100644
--- a/public/app/features/alerting/EditNotificationChannelPage.tsx
+++ b/public/app/features/alerting/EditNotificationChannelPage.tsx
@@ -4,7 +4,7 @@ import { MapDispatchToProps, MapStateToProps } from 'react-redux';
 import { NavModel } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { Form, Spinner } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { connectWithCleanUp } from 'app/core/components/connectWithCleanUp';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/alerting/FeatureTogglePage.tsx b/public/app/features/alerting/FeatureTogglePage.tsx
index 63f62796f94..e6def5ec3f5 100644
--- a/public/app/features/alerting/FeatureTogglePage.tsx
+++ b/public/app/features/alerting/FeatureTogglePage.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 
 export default function FeatureTogglePage() {
diff --git a/public/app/features/alerting/NewNotificationChannelPage.tsx b/public/app/features/alerting/NewNotificationChannelPage.tsx
index 418029fb2e5..93d6ca43865 100644
--- a/public/app/features/alerting/NewNotificationChannelPage.tsx
+++ b/public/app/features/alerting/NewNotificationChannelPage.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { config } from '@grafana/runtime';
 import { Form } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 
 import { NotificationChannelDTO, StoreState } from '../../types';
diff --git a/public/app/features/alerting/NotificationsListPage.tsx b/public/app/features/alerting/NotificationsListPage.tsx
index 9a5e5b3f4eb..6f11e260aac 100644
--- a/public/app/features/alerting/NotificationsListPage.tsx
+++ b/public/app/features/alerting/NotificationsListPage.tsx
@@ -4,7 +4,7 @@ import { useAsyncFn } from 'react-use';
 import { getBackendSrv } from '@grafana/runtime';
 import { HorizontalGroup, Button, LinkButton } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { appEvents } from 'app/core/core';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 import { AlertNotification } from 'app/types/alerting';
diff --git a/public/app/features/alerting/state/alertDef.ts b/public/app/features/alerting/state/alertDef.ts
index de4f61cf7a6..41f0d3e9660 100644
--- a/public/app/features/alerting/state/alertDef.ts
+++ b/public/app/features/alerting/state/alertDef.ts
@@ -81,8 +81,14 @@ function createReducerPart(model: any) {
   return new QueryPart(model, def);
 }
 
+// state can also contain a "Reason", ie. "Alerting (NoData)" which indicates that the actual state is "Alerting" but
+// the reason it is set to "Alerting" is "NoData"; a lack of data points to evaluate.
+function normalizeAlertState(state: string) {
+  return state.toLowerCase().replace(/_/g, '').split(' ')[0];
+}
+
 function getStateDisplayModel(state: string) {
-  const normalizedState = state.toLowerCase().replace(/_/g, '');
+  const normalizedState = normalizeAlertState(state);
 
   switch (normalizedState) {
     case 'normal':
@@ -121,13 +127,6 @@ function getStateDisplayModel(state: string) {
         stateClass: 'alert-state-warning',
       };
     }
-    case 'unknown': {
-      return {
-        text: 'UNKNOWN',
-        iconClass: 'question-circle',
-        stateClass: '.alert-state-paused',
-      };
-    }
 
     case 'firing': {
       return {
@@ -152,9 +151,16 @@ function getStateDisplayModel(state: string) {
         stateClass: 'alert-state-critical',
       };
     }
-  }
 
-  throw { message: 'Unknown alert state' };
+    case 'unknown':
+    default: {
+      return {
+        text: 'UNKNOWN',
+        iconClass: 'question-circle',
+        stateClass: '.alert-state-paused',
+      };
+    }
+  }
 }
 
 function joinEvalMatches(matches: any, separator: string) {
diff --git a/public/app/features/alerting/unified/RuleEditor.tsx b/public/app/features/alerting/unified/RuleEditor.tsx
index 57d66fc319f..e550148abbe 100644
--- a/public/app/features/alerting/unified/RuleEditor.tsx
+++ b/public/app/features/alerting/unified/RuleEditor.tsx
@@ -5,7 +5,7 @@ import { useAsync } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Alert, LinkButton, LoadingPlaceholder, useStyles2, withErrorBoundary } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useCleanup } from 'app/core/hooks/useCleanup';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { RuleIdentifier } from 'app/types/unified-alerting';
diff --git a/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx b/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx
index 21a7826139e..bb87e4a7a4e 100644
--- a/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx
+++ b/public/app/features/alerting/unified/components/AlertingPageWrapper.tsx
@@ -1,7 +1,7 @@
 import React, { FC } from 'react';
 import { useSelector } from 'react-redux';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types/store';
 
diff --git a/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx b/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
index 5c193fd1053..0666eb1e4dc 100644
--- a/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
+++ b/public/app/features/alerting/unified/components/AnnotationDetailsField.tsx
@@ -7,6 +7,7 @@ import { Tooltip, useStyles } from '@grafana/ui';
 import { Annotation, annotationLabels } from '../utils/constants';
 
 import { DetailsField } from './DetailsField';
+import { Tokenize } from './Tokenize';
 import { Well } from './Well';
 
 const wellableAnnotationKeys = ['message', 'description'];
@@ -38,8 +39,10 @@ const AnnotationValue: FC<Props> = ({ annotationKey, value }) => {
   const needsWell = wellableAnnotationKeys.includes(annotationKey);
   const needsLink = value && value.startsWith('http');
 
+  const tokenizeValue = <Tokenize input={value} delimiter={['{{', '}}']} />;
+
   if (needsWell) {
-    return <Well className={styles.well}>{value}</Well>;
+    return <Well className={styles.well}>{tokenizeValue}</Well>;
   }
 
   if (needsLink) {
@@ -50,7 +53,7 @@ const AnnotationValue: FC<Props> = ({ annotationKey, value }) => {
     );
   }
 
-  return <>{value}</>;
+  return <>{tokenizeValue}</>;
 };
 
 export const getStyles = (theme: GrafanaTheme) => ({
diff --git a/public/app/features/alerting/unified/components/HoverCard.tsx b/public/app/features/alerting/unified/components/HoverCard.tsx
new file mode 100644
index 00000000000..baea3a6e36f
--- /dev/null
+++ b/public/app/features/alerting/unified/components/HoverCard.tsx
@@ -0,0 +1,62 @@
+import { css } from '@emotion/css';
+import { Placement } from '@popperjs/core';
+import classnames from 'classnames';
+import React, { FC, ReactElement, useRef } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Popover as GrafanaPopover, PopoverController, useStyles2 } from '@grafana/ui';
+
+export interface HoverCardProps {
+  children: ReactElement;
+  content: ReactElement;
+  wrapperClassName?: string;
+  placement?: Placement;
+  disabled?: boolean;
+}
+
+export const HoverCard: FC<HoverCardProps> = ({ children, content, wrapperClassName, disabled = false, ...rest }) => {
+  const popoverRef = useRef<HTMLElement>(null);
+  const styles = useStyles2(getStyles);
+
+  if (disabled) {
+    return children;
+  }
+
+  return (
+    <PopoverController content={content} hideAfter={100}>
+      {(showPopper, hidePopper, popperProps) => {
+        return (
+          <>
+            {popoverRef.current && (
+              <GrafanaPopover
+                {...popperProps}
+                {...rest}
+                wrapperClassName={classnames(styles.popover, wrapperClassName)}
+                onMouseLeave={hidePopper}
+                onMouseEnter={showPopper}
+                referenceElement={popoverRef.current}
+              />
+            )}
+
+            {React.cloneElement(children, {
+              ref: popoverRef,
+              onMouseEnter: showPopper,
+              onMouseLeave: hidePopper,
+            })}
+          </>
+        );
+      }}
+    </PopoverController>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  popover: css`
+    border-radius: ${theme.shape.borderRadius()};
+    box-shadow: ${theme.shadows.z3};
+    background: ${theme.colors.background.primary};
+    border: 1px solid ${theme.colors.border.medium};
+
+    padding: ${theme.spacing(1)};
+  `,
+});
diff --git a/public/app/features/alerting/unified/components/Tokenize.tsx b/public/app/features/alerting/unified/components/Tokenize.tsx
new file mode 100644
index 00000000000..77b217e6b9a
--- /dev/null
+++ b/public/app/features/alerting/unified/components/Tokenize.tsx
@@ -0,0 +1,149 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Badge, useStyles2 } from '@grafana/ui';
+
+import { HoverCard } from './HoverCard';
+import { keywords as KEYWORDS, builtinFunctions as FUNCTIONS } from './receivers/editor/language';
+
+const VARIABLES = ['$', '.', '"'];
+
+interface TokenizerProps {
+  input: string;
+  delimiter?: [string, string];
+}
+
+function Tokenize({ input, delimiter = ['{{', '}}'] }: TokenizerProps) {
+  const styles = useStyles2(getStyles);
+
+  const [open, close] = delimiter;
+  const normalizedIput = normalizeInput(input);
+
+  /**
+   * This RegExp uses 2 named capture groups, text that comes before the token and the token itself
+   *
+   *  <before> open  <token>  close
+   *  ───────── ── ─────────── ──
+   *  Some text {{ $labels.foo }}
+   */
+  const regex = new RegExp(`(?<before>.*?)(${open}(?<token>.*?)${close}|$)`, 'gm');
+
+  const matches = Array.from(normalizedIput.matchAll(regex));
+
+  const output: React.ReactElement[] = [];
+
+  matches.forEach((match, index) => {
+    const before = match.groups?.before;
+    const token = match.groups?.token?.trim();
+
+    if (before) {
+      output.push(<span key={`${index}-before`}>{before}</span>);
+    }
+
+    if (token) {
+      const type = tokenType(token);
+      const description = type === TokenType.Variable ? token : '';
+      const tokenContent = `${open} ${token} ${close}`;
+
+      output.push(<Token key={`${index}-token`} content={tokenContent} type={type} description={description} />);
+    }
+  });
+
+  return <span className={styles.wrapper}>{output}</span>;
+}
+
+enum TokenType {
+  Variable = 'variable',
+  Function = 'function',
+  Keyword = 'keyword',
+  Unknown = 'unknown',
+}
+
+interface TokenProps {
+  content: string;
+  type?: TokenType;
+  description?: string;
+}
+
+function Token({ content, description, type }: TokenProps) {
+  const styles = useStyles2(getStyles);
+  const varName = content.trim();
+
+  const disableCard = Boolean(type) === false;
+
+  return (
+    <HoverCard
+      placement="top-start"
+      disabled={disableCard}
+      content={
+        <div className={styles.hoverTokenItem}>
+          <Badge text={<>{type}</>} color={'blue'} /> {description && <code>{description}</code>}
+        </div>
+      }
+    >
+      <span>
+        <Badge className={styles.token} text={varName} color={'blue'} />
+      </span>
+    </HoverCard>
+  );
+}
+
+function normalizeInput(input: string) {
+  return input.replace(/\s+/g, ' ').trim();
+}
+
+function isVariable(input: string) {
+  return VARIABLES.some((character) => input.startsWith(character));
+}
+
+function isKeyword(input: string) {
+  return KEYWORDS.some((keyword) => input.startsWith(keyword));
+}
+
+function isFunction(input: string) {
+  return FUNCTIONS.some((functionName) => input.startsWith(functionName));
+}
+
+function tokenType(input: string) {
+  let tokenType;
+  if (isVariable(input)) {
+    tokenType = TokenType.Variable;
+  } else if (isKeyword(input)) {
+    tokenType = TokenType.Keyword;
+  } else if (isFunction(input)) {
+    tokenType = TokenType.Function;
+  } else {
+    tokenType = TokenType.Unknown;
+  }
+
+  return tokenType;
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  wrapper: css`
+    display: inline-flex;
+    align-items: center;
+    white-space: pre;
+  `,
+  token: css`
+    cursor: default;
+    font-family: ${theme.typography.fontFamilyMonospace};
+  `,
+  popover: css`
+    border-radius: ${theme.shape.borderRadius()};
+    box-shadow: ${theme.shadows.z3};
+    background: ${theme.colors.background.primary};
+    border: 1px solid ${theme.colors.border.medium};
+
+    padding: ${theme.spacing(1)};
+  `,
+  hoverTokenItem: css`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: ${theme.spacing(1)};
+  `,
+});
+
+export { Tokenize, Token };
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateEditor.tsx b/public/app/features/alerting/unified/components/receivers/TemplateEditor.tsx
new file mode 100644
index 00000000000..556b29b2ac5
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/TemplateEditor.tsx
@@ -0,0 +1,53 @@
+/**
+ * This file contains the template editor we'll be using for alertmanager templates.
+ *
+ * It includes auto-complete for template data and syntax highlighting
+ */
+import { editor } from 'monaco-editor';
+import React, { FC } from 'react';
+
+import { CodeEditor } from '@grafana/ui';
+import { CodeEditorProps } from '@grafana/ui/src/components/Monaco/types';
+
+import goTemplateLanguageDefinition, { GO_TEMPLATE_LANGUAGE_ID } from './editor/definition';
+import { registerLanguage } from './editor/register';
+
+const getSuggestions = () => {
+  return [];
+};
+
+type TemplateEditorProps = Omit<CodeEditorProps, 'language' | 'theme'> & {
+  autoHeight?: boolean;
+};
+
+const TemplateEditor: FC<TemplateEditorProps> = (props) => {
+  const shouldAutoHeight = Boolean(props.autoHeight);
+
+  const onEditorDidMount = (editor: editor.IStandaloneCodeEditor) => {
+    if (shouldAutoHeight) {
+      const contentHeight = editor.getContentHeight();
+
+      try {
+        // we're passing NaN in to the width because the type definition wants a number (NaN is a number, go figure)
+        // but the width could be defined as a string "auto", passing NaN seems to just ignore our width update here
+        editor.layout({ height: contentHeight, width: NaN });
+      } catch (err) {}
+    }
+  };
+
+  return (
+    <CodeEditor
+      showLineNumbers={true}
+      getSuggestions={getSuggestions}
+      showMiniMap={false}
+      {...props}
+      onEditorDidMount={onEditorDidMount}
+      onBeforeEditorMount={(monaco) => {
+        registerLanguage(monaco, goTemplateLanguageDefinition);
+      }}
+      language={GO_TEMPLATE_LANGUAGE_ID}
+    />
+  );
+};
+
+export { TemplateEditor };
diff --git a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
index 3348b3c3fce..2eba93cb61e 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplateForm.tsx
@@ -2,9 +2,10 @@ import { css } from '@emotion/css';
 import React, { FC } from 'react';
 import { useForm, Validate } from 'react-hook-form';
 import { useDispatch } from 'react-redux';
+import AutoSizer from 'react-virtualized-auto-sizer';
 
 import { GrafanaTheme2 } from '@grafana/data';
-import { Alert, Button, Field, FieldSet, Input, LinkButton, TextArea, useStyles2 } from '@grafana/ui';
+import { Alert, Button, Field, FieldSet, Input, LinkButton, useStyles2 } from '@grafana/ui';
 import { useCleanup } from 'app/core/hooks/useCleanup';
 import { AlertManagerCortexConfig } from 'app/plugins/datasource/alertmanager/types';
 
@@ -14,6 +15,8 @@ import { makeAMLink } from '../../utils/misc';
 import { ensureDefine } from '../../utils/templates';
 import { ProvisionedResource, ProvisioningAlert } from '../Provisioning';
 
+import { TemplateEditor } from './TemplateEditor';
+
 interface Values {
   name: string;
   content: string;
@@ -83,6 +86,8 @@ export const TemplateForm: FC<Props> = ({ existing, alertManagerSourceName, conf
     handleSubmit,
     register,
     formState: { errors },
+    getValues,
+    setValue,
   } = useForm<Values>({
     mode: 'onSubmit',
     defaultValues: existing ?? defaults,
@@ -143,12 +148,18 @@ export const TemplateForm: FC<Props> = ({ existing, alertManagerSourceName, conf
           invalid={!!errors.content?.message}
           required
         >
-          <TextArea
-            {...register('content', { required: { value: true, message: 'Required.' } })}
-            className={styles.textarea}
-            placeholder="Message"
-            rows={12}
-          />
+          <div className={styles.editWrapper}>
+            <AutoSizer>
+              {({ width, height }) => (
+                <TemplateEditor
+                  value={getValues('content')}
+                  width={width}
+                  height={height}
+                  onBlur={(value) => setValue('content', value)}
+                />
+              )}
+            </AutoSizer>
+          </div>
         </Field>
         <div className={styles.buttons}>
           {loading && (
@@ -189,4 +200,10 @@ const getStyles = (theme: GrafanaTheme2) => ({
   textarea: css`
     max-width: 758px;
   `,
+  editWrapper: css`
+    display: block;
+    position: relative;
+    width: 640px;
+    height: 320px;
+  `,
 });
diff --git a/public/app/features/alerting/unified/components/receivers/TemplatesTable.tsx b/public/app/features/alerting/unified/components/receivers/TemplatesTable.tsx
index 2d78751ee87..375dc5f25c6 100644
--- a/public/app/features/alerting/unified/components/receivers/TemplatesTable.tsx
+++ b/public/app/features/alerting/unified/components/receivers/TemplatesTable.tsx
@@ -16,6 +16,7 @@ import { ProvisioningBadge } from '../Provisioning';
 import { ActionIcon } from '../rules/ActionIcon';
 
 import { ReceiversSection } from './ReceiversSection';
+import { TemplateEditor } from './TemplateEditor';
 
 interface Props {
   config: AlertManagerCortexConfig;
@@ -128,7 +129,17 @@ export const TemplatesTable: FC<Props> = ({ config, alertManagerName }) => {
                     <td></td>
                     <td colSpan={2}>
                       <DetailsField label="Description" horizontal={true}>
-                        <pre>{template}</pre>
+                        <TemplateEditor
+                          width={'auto'}
+                          height={'auto'}
+                          autoHeight={true}
+                          value={template}
+                          showLineNumbers={false}
+                          monacoOptions={{
+                            readOnly: true,
+                            scrollBeyondLastLine: false,
+                          }}
+                        />
                       </DetailsField>
                     </td>
                   </tr>
diff --git a/public/app/features/alerting/unified/components/receivers/editor/definition.ts b/public/app/features/alerting/unified/components/receivers/editor/definition.ts
new file mode 100644
index 00000000000..20d2a3b4989
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/editor/definition.ts
@@ -0,0 +1,12 @@
+import { LanguageDefinition } from './register';
+
+export const GO_TEMPLATE_LANGUAGE_ID = 'go-template';
+
+const goTemplateLanguageDefinition: LanguageDefinition = {
+  id: GO_TEMPLATE_LANGUAGE_ID,
+  extensions: [],
+  aliases: [],
+  mimetypes: [],
+  loader: () => import('./language'),
+};
+export default goTemplateLanguageDefinition;
diff --git a/public/app/features/alerting/unified/components/receivers/editor/language.ts b/public/app/features/alerting/unified/components/receivers/editor/language.ts
new file mode 100644
index 00000000000..04418d052d0
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/editor/language.ts
@@ -0,0 +1,129 @@
+import type * as monacoType from 'monaco-editor/esm/vs/editor/editor.api';
+
+// these map to the builtin token types
+enum TokenType {
+  Delimiter = 'delimiter',
+  Keyword = 'keyword',
+  Function = 'type.identifier',
+  String = 'string',
+  Variable = 'variable.name',
+  Number = 'number',
+  Comment = 'comment',
+  Operator = 'operator',
+  Identifier = 'idenfifier',
+}
+
+// list of available functions in Alertmanager templates
+// see https://cs.github.com/prometheus/alertmanager/blob/805e505288ce82c3e2b625a3ca63aaf2b0aa9cea/template/template.go?q=join#L132-L151
+export const availableAlertManagerFunctions = [
+  'toUpper',
+  'toLower',
+  'title',
+  'join',
+  'match',
+  'safeHtml',
+  'reReplaceAll',
+  'stringSlice',
+];
+
+// boolean functions
+const booleanFunctions = ['eq', 'ne', 'lt', 'le', 'gt', 'ge'];
+
+// built-in functions for Go templates
+export const builtinFunctions = [
+  'and',
+  'call',
+  'html',
+  'index',
+  'slice',
+  'js',
+  'len',
+  'not',
+  'or',
+  'print',
+  'printf',
+  'println',
+  'urlquery',
+  ...booleanFunctions,
+];
+
+// Go template keywords
+export const keywords = ['define', 'if', 'else', 'end', 'range', 'break', 'continue', 'template', 'block', 'with'];
+
+// Monarch language definition, see https://microsoft.github.io/monaco-editor/monarch.html
+// check https://github.com/microsoft/monaco-editor/blob/main/src/basic-languages/go/go.ts for an example
+// see https://pkg.go.dev/text/template for the available keywords etc
+export const language: monacoType.languages.IMonarchLanguage = {
+  defaultToken: '', // change this to "invalid" to find tokens that were never matched
+  keywords: keywords,
+  functions: [...builtinFunctions, ...availableAlertManagerFunctions],
+  operators: ['|'],
+  tokenizer: {
+    root: [
+      // strings
+      [/"/, TokenType.String, '@string'],
+      [/`/, TokenType.String, '@rawstring'],
+      // numbers
+      [/\d*\d+[eE]([\-+]?\d+)?/, 'number.float'],
+      [/\d*\.\d+([eE][\-+]?\d+)?/, 'number.float'],
+      [/0[xX][0-9a-fA-F']*[0-9a-fA-F]/, 'number.hex'],
+      [/0[0-7']*[0-7]/, 'number.octal'],
+      [/0[bB][0-1']*[0-1]/, 'number.binary'],
+      [/\d[\d']*/, TokenType.Number],
+      [/\d/, TokenType.Number],
+      // delimiter: after number because of .\d floats
+      [/[;,.]/, TokenType.Delimiter],
+      // delimiters
+      [/{{-?/, TokenType.Delimiter],
+      [/-?}}/, TokenType.Delimiter],
+      // variables
+      // [/\.([A-Za-z]+)?/, TokenType.Variable],
+      // identifiers and keywords
+      [
+        /[a-zA-Z_]\w*/,
+        {
+          cases: {
+            '@keywords': { token: TokenType.Keyword },
+            '@functions': { token: TokenType.Function },
+            '@default': TokenType.Identifier,
+          },
+        },
+      ],
+      // comments
+      [/\/\*.*\*\//, TokenType.Comment],
+    ],
+    string: [
+      [/[^\\"]+/, TokenType.String],
+      [/\\./, 'string.escape.invalid'],
+      [/"/, TokenType.String, '@pop'],
+    ],
+    rawstring: [
+      [/[^\`]/, TokenType.String],
+      [/`/, TokenType.String, '@pop'],
+    ],
+  },
+};
+
+export const conf: monacoType.languages.LanguageConfiguration = {
+  comments: {
+    blockComment: ['/*', '*/'],
+  },
+  brackets: [
+    ['{{', '}}'],
+    ['(', ')'],
+  ],
+  autoClosingPairs: [
+    { open: '{{', close: '}}' },
+    { open: '(', close: ')' },
+    { open: '`', close: '`' },
+    { open: '"', close: '"' },
+    { open: "'", close: "'" },
+  ],
+  surroundingPairs: [
+    { open: '{{', close: '}}' },
+    { open: '(', close: ')' },
+    { open: '`', close: '`' },
+    { open: '"', close: '"' },
+    { open: "'", close: "'" },
+  ],
+};
diff --git a/public/app/features/alerting/unified/components/receivers/editor/register.ts b/public/app/features/alerting/unified/components/receivers/editor/register.ts
new file mode 100644
index 00000000000..dbf5fe2b69a
--- /dev/null
+++ b/public/app/features/alerting/unified/components/receivers/editor/register.ts
@@ -0,0 +1,34 @@
+import type * as monacoType from 'monaco-editor/esm/vs/editor/editor.api';
+
+import { Monaco } from '@grafana/ui';
+
+export type LanguageDefinition = {
+  id: string;
+  extensions: string[];
+  aliases: string[];
+  mimetypes: string[];
+  loader: () => Promise<{
+    language: monacoType.languages.IMonarchLanguage;
+    conf: monacoType.languages.LanguageConfiguration;
+  }>;
+};
+
+export const registerLanguage = (
+  monaco: Monaco,
+  language: LanguageDefinition
+  // completionItemProvider: Completeable
+) => {
+  const { id, loader } = language;
+
+  const languages = monaco.languages.getLanguages();
+  if (languages.find((l) => l.id === id)) {
+    return;
+  }
+
+  monaco.languages.register({ id });
+  loader().then((monarch) => {
+    monaco.languages.setMonarchTokensProvider(id, monarch.language);
+    monaco.languages.setLanguageConfiguration(id, monarch.conf);
+    // monaco.languages.registerCompletionItemProvider(id, completionItemProvider.getCompletionProvider(monaco, language));
+  });
+};
diff --git a/public/app/features/alerting/unified/components/rules/RulesTable.tsx b/public/app/features/alerting/unified/components/rules/RulesTable.tsx
index a6676beccb8..6bc2dd398bb 100644
--- a/public/app/features/alerting/unified/components/rules/RulesTable.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesTable.tsx
@@ -13,6 +13,7 @@ import { DynamicTable, DynamicTableColumnProps, DynamicTableItemProps } from '..
 import { DynamicTableWithGuidelines } from '../DynamicTableWithGuidelines';
 import { ProvisioningBadge } from '../Provisioning';
 import { RuleLocation } from '../RuleLocation';
+import { Tokenize } from '../Tokenize';
 
 import { RuleDetails } from './RuleDetails';
 import { RuleHealth } from './RuleHealth';
@@ -160,7 +161,9 @@ function useColumns(showSummaryColumn: boolean, showGroupColumn: boolean) {
         id: 'summary',
         label: 'Summary',
         // eslint-disable-next-line react/display-name
-        renderCell: ({ data: rule }) => rule.annotations[Annotation.summary] ?? '',
+        renderCell: ({ data: rule }) => {
+          return <Tokenize input={rule.annotations[Annotation.summary] ?? ''} />;
+        },
         size: 5,
       });
     }
diff --git a/public/app/features/alerting/unified/utils/matchers.test.ts b/public/app/features/alerting/unified/utils/matchers.test.ts
index 0a073dde7c4..09a54217fb7 100644
--- a/public/app/features/alerting/unified/utils/matchers.test.ts
+++ b/public/app/features/alerting/unified/utils/matchers.test.ts
@@ -56,27 +56,38 @@ describe('Unified Alerting matchers', () => {
     });
 
     it('should match for regex', () => {
-      const matchers = [{ name: 'foo', value: 'bar', operator: MatcherOperator.regex }];
+      const matchers = [{ name: 'foo', value: 'b{1}a.*', operator: MatcherOperator.regex }];
       const alerts = [
+        mockPromAlert({ labels: { foo: 'bbr' } }),
+        mockPromAlert({ labels: { foo: 'aba' } }), // This does not match because the regex is implicitly anchored.
+        mockPromAlert({ labels: { foo: 'ba' } }),
         mockPromAlert({ labels: { foo: 'bar' } }),
         mockPromAlert({ labels: { foo: 'baz' } }),
         mockPromAlert({ labels: { foo: 'bas' } }),
       ];
 
       const matchedAlerts = findAlertInstancesWithMatchers(alerts, matchers);
-      expect(matchedAlerts).toHaveLength(1);
+      expect(matchedAlerts).toHaveLength(4);
+      expect(matchedAlerts.map((instance) => instance.data.matchedInstance.labels.foo)).toEqual([
+        'ba',
+        'bar',
+        'baz',
+        'bas',
+      ]);
     });
 
     it('should not match regex', () => {
-      const matchers = [{ name: 'foo', value: 'bar', operator: MatcherOperator.notRegex }];
+      const matchers = [{ name: 'foo', value: 'ba{3}', operator: MatcherOperator.notRegex }];
       const alerts = [
         mockPromAlert({ labels: { foo: 'bar' } }),
         mockPromAlert({ labels: { foo: 'baz' } }),
+        mockPromAlert({ labels: { foo: 'baaa' } }),
         mockPromAlert({ labels: { foo: 'bas' } }),
       ];
 
       const matchedAlerts = findAlertInstancesWithMatchers(alerts, matchers);
-      expect(matchedAlerts).toHaveLength(2);
+      expect(matchedAlerts).toHaveLength(3);
+      expect(matchedAlerts.map((instance) => instance.data.matchedInstance.labels.foo)).toEqual(['bar', 'baz', 'bas']);
     });
   });
 });
diff --git a/public/app/features/alerting/unified/utils/matchers.ts b/public/app/features/alerting/unified/utils/matchers.ts
index 66fe014b2bc..d8889638f58 100644
--- a/public/app/features/alerting/unified/utils/matchers.ts
+++ b/public/app/features/alerting/unified/utils/matchers.ts
@@ -41,29 +41,44 @@ export const findAlertInstancesWithMatchers = (
   instances: Alert[],
   matchers: MatcherFieldValue[]
 ): MatchedInstance[] => {
-  const hasMatcher = (instance: Alert, matcher: MatcherFieldValue) => {
+  const anchorRegex = (regexpString: string): RegExp => {
+    // Silence matchers are always fully anchored in the Alertmanager: https://github.com/prometheus/alertmanager/pull/748
+    if (!regexpString.startsWith('^')) {
+      regexpString = '^' + regexpString;
+    }
+    if (!regexpString.endsWith('$')) {
+      regexpString = regexpString + '$';
+    }
+    return new RegExp(regexpString);
+  };
+
+  const matchesInstance = (instance: Alert, matcher: MatcherFieldValue) => {
     return Object.entries(instance.labels).some(([key, value]) => {
       if (!matcher.name || !matcher.value) {
         return false;
       }
-      if (matcher.operator === MatcherOperator.equal) {
-        return matcher.name === key && matcher.value === value;
+      if (matcher.name !== key) {
+        return false;
       }
-      if (matcher.operator === MatcherOperator.notEqual) {
-        return matcher.name === key && matcher.value !== value;
+      switch (matcher.operator) {
+        case MatcherOperator.equal:
+          return matcher.value === value;
+        case MatcherOperator.notEqual:
+          return matcher.value !== value;
+        case MatcherOperator.regex:
+          const regex = anchorRegex(matcher.value);
+          return regex.test(value);
+        case MatcherOperator.notRegex:
+          const negregex = anchorRegex(matcher.value);
+          return !negregex.test(value);
+        default:
+          return false;
       }
-      if (matcher.operator === MatcherOperator.regex) {
-        return matcher.name === key && matcher.value.match(value);
-      }
-      if (matcher.operator === MatcherOperator.notRegex) {
-        return matcher.name === key && !matcher.value.match(value);
-      }
-      return false;
     });
   };
 
   const filteredInstances = instances.filter((instance) => {
-    return matchers.every((matcher) => hasMatcher(instance, matcher));
+    return matchers.every((matcher) => matchesInstance(instance, matcher));
   });
   const mappedInstances = filteredInstances.map((instance) => ({
     id: `${instance.activeAt}-${instance.value}`,
diff --git a/public/app/features/api-keys/ApiKeysPage.tsx b/public/app/features/api-keys/ApiKeysPage.tsx
index 9df08efd22e..4cb20857620 100644
--- a/public/app/features/api-keys/ApiKeysPage.tsx
+++ b/public/app/features/api-keys/ApiKeysPage.tsx
@@ -6,7 +6,7 @@ import { rangeUtil } from '@grafana/data';
 import { InlineField, InlineSwitch, VerticalGroup } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import config from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 09101d40d5a..d306ad6022b 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -5,7 +5,7 @@ import { useLocation } from 'react-router-dom';
 import { locationUtil, textUtil } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { ButtonGroup, ModalsController, ToolbarButton, PageToolbar, useForceUpdate } from '@grafana/ui';
-import { TopNavUpdate } from 'app/core/components/TopNav/TopNavUpdate';
+import { AppChromeUpdate } from 'app/core/components/AppChrome/AppChromeUpdate';
 import config from 'app/core/config';
 import { toggleKioskMode } from 'app/core/navigation/kiosk';
 import { DashboardCommentsModal } from 'app/features/dashboard/components/DashboardComments/DashboardCommentsModal';
@@ -277,8 +277,8 @@ export const DashNav = React.memo<Props>((props) => {
 
   if (config.featureToggles.topnav) {
     return (
-      <TopNavUpdate
-        subNav={{ text: title }}
+      <AppChromeUpdate
+        pageNav={{ text: title }}
         actions={<ToolbarButton onClick={onOpenSettings} icon="cog"></ToolbarButton>}
       />
     );
diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx
index 64affcdc4b0..ae7153af8af 100644
--- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx
+++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx
@@ -29,12 +29,16 @@ describe('DashboardRow', () => {
     expect(row).not.toHaveClass('dashboard-row--collapsed');
   });
 
+  it('Should collapse when the panel is collapsed', async () => {
+    const panel = new PanelModel({ collapsed: true });
+    render(<DashboardRow panel={panel} dashboard={dashboardMock} />);
+    const row = screen.getByTestId('dashboard-row-container');
+    expect(row).toHaveClass('dashboard-row--collapsed');
+  });
+
   it('Should collapse after clicking title', async () => {
     render(<DashboardRow panel={panel} dashboard={dashboardMock} />);
     await userEvent.click(screen.getByTestId('data-testid dashboard-row-title-'));
-
-    const row = screen.getByTestId('dashboard-row-container');
-    expect(row).toHaveClass('dashboard-row--collapsed');
     expect(dashboardMock.toggleRow.mock.calls).toHaveLength(1);
   });
 
diff --git a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
index 58d7e9726b9..e708b68423d 100644
--- a/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
+++ b/public/app/features/dashboard/components/DashboardRow/DashboardRow.tsx
@@ -19,13 +19,6 @@ export interface DashboardRowProps {
 
 export class DashboardRow extends React.Component<DashboardRowProps, any> {
   sub?: Unsubscribable;
-  constructor(props: DashboardRowProps) {
-    super(props);
-
-    this.state = {
-      collapsed: this.props.panel.collapsed,
-    };
-  }
 
   componentDidMount() {
     this.sub = this.props.dashboard.events.subscribe(RefreshEvent, this.onVariableUpdated);
@@ -43,10 +36,6 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
 
   onToggle = () => {
     this.props.dashboard.toggleRow(this.props.panel);
-
-    this.setState((prevState: any) => {
-      return { collapsed: !prevState.collapsed };
-    });
   };
 
   onUpdate = (title: string, repeat?: string | null) => {
@@ -77,7 +66,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
   render() {
     const classes = classNames({
       'dashboard-row': true,
-      'dashboard-row--collapsed': this.state.collapsed,
+      'dashboard-row--collapsed': this.props.panel.collapsed,
     });
 
     const title = getTemplateSrv().replace(this.props.panel.title, this.props.panel.scopedVars, 'text');
@@ -92,7 +81,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
           data-testid={selectors.components.DashboardRow.title(title)}
           onClick={this.onToggle}
         >
-          <Icon name={this.state.collapsed ? 'angle-right' : 'angle-down'} />
+          <Icon name={this.props.panel.collapsed ? 'angle-right' : 'angle-down'} />
           {title}
           <span className="dashboard-row__panel_count">
             ({count} {panels})
@@ -110,7 +99,7 @@ export class DashboardRow extends React.Component<DashboardRowProps, any> {
             </a>
           </div>
         )}
-        {this.state.collapsed === true && (
+        {this.props.panel.collapsed === true && (
           <div className="dashboard-row__toggle-target" onClick={this.onToggle}>
             &nbsp;
           </div>
diff --git a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
index 363eae8acc6..b709ec8a7ff 100644
--- a/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/DashboardSettings.tsx
@@ -161,7 +161,7 @@ export function DashboardSettings({ dashboard, editview }: Props) {
   const styles = getStyles(config.theme2);
 
   return (
-    <FocusScope contain autoFocus restoreFocus>
+    <FocusScope contain autoFocus>
       <div className="dashboard-settings" ref={ref} {...overlayProps} {...dialogProps}>
         <PageToolbar title={`${dashboard.title} / Settings`} parent={folderTitle} onGoBack={onClose} />
         <CustomScrollbar>
diff --git a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
index 8cfa6969013..baa2878f749 100644
--- a/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
+++ b/public/app/features/dashboard/components/PanelEditor/OptionsPaneCategory.tsx
@@ -57,9 +57,12 @@ export const OptionsPaneCategory: FC<OptionsPaneCategoryProps> = React.memo(
 
     const onToggle = useCallback(() => {
       manualClickTime.current = Date.now();
-      updateQueryParams({
-        [CATEGORY_PARAM_NAME]: isExpanded ? undefined : id,
-      });
+      updateQueryParams(
+        {
+          [CATEGORY_PARAM_NAME]: isExpanded ? undefined : id,
+        },
+        true
+      );
       setSavedState({ isExpanded: !isExpanded });
       setIsExpanded(!isExpanded);
     }, [setSavedState, setIsExpanded, updateQueryParams, isExpanded, id]);
diff --git a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
index 145e659574a..6c42a952944 100644
--- a/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
+++ b/public/app/features/dashboard/components/ShareModal/SharePublicDashboard.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 
 import { AppEvents } from '@grafana/data';
 import { reportInteraction } from '@grafana/runtime/src';
-import { Alert, Button, Checkbox, ClipboardButton, Field, FieldSet, Icon, Input, Switch } from '@grafana/ui';
+import { Alert, Button, Checkbox, ClipboardButton, Field, FieldSet, Input, LinkButton, Switch } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
 import { createErrorNotification } from 'app/core/copy/appNotification';
 import { appEvents } from 'app/core/core';
@@ -45,6 +45,16 @@ export const SharePublicDashboard = (props: Props) => {
     getPublicDashboardConfig(props.dashboard.uid, setPublicDashboardConfig).catch();
   }, [props.dashboard.uid]);
 
+  useEffect(() => {
+    if (publicDashboardPersisted(publicDashboard)) {
+      setAcknowledgements({
+        public: true,
+        datasources: true,
+        usage: true,
+      });
+    }
+  }, [publicDashboard]);
+
   const onSavePublicConfig = () => {
     reportInteraction('grafana_dashboards_public_create_clicked');
 
@@ -97,103 +107,119 @@ export const SharePublicDashboard = (props: Props) => {
             github discussion
           </a>
           <hr />
-          {!publicDashboardPersisted(publicDashboard) && (
-            <div>
-              Before you click Save, please acknowledge the following information: <br />
-              <FieldSet>
-                <br />
-                <div>
-                  <Checkbox
-                    label="Your entire dashboard will be public"
-                    value={acknowledgements.public}
-                    onChange={(e) => onAcknowledge('public', e.currentTarget.checked)}
-                  />
-                </div>
-                <br />
-                <div>
-                  <Checkbox
-                    label="Publishing currently only works with a subset of datasources"
-                    value={acknowledgements.datasources}
-                    description="Learn more about public datasources"
-                    onChange={(e) => onAcknowledge('datasources', e.currentTarget.checked)}
-                  />
-                </div>
-                <br />
+          <div>
+            Before you click Save, please acknowledge the following information: <br />
+            <FieldSet>
+              <br />
+              <div>
                 <Checkbox
-                  label="Making your dashboard public will cause queries to run each time the dashboard is viewed which may increase costs"
-                  value={acknowledgements.usage}
-                  description="Learn more about query caching"
-                  onChange={(e) => onAcknowledge('usage', e.currentTarget.checked)}
+                  label="Your entire dashboard will be public"
+                  value={acknowledgements.public}
+                  disabled={publicDashboardPersisted(publicDashboard)}
+                  onChange={(e) => onAcknowledge('public', e.currentTarget.checked)}
                 />
-                <br />
-                <br />
-              </FieldSet>
-            </div>
-          )}
-          {(publicDashboardPersisted(publicDashboard) || acknowledged()) && (
-            <div>
-              <h4 className="share-modal-info-text">Public Dashboard Configuration</h4>
-              <FieldSet>
-                Time Range
-                <br />
-                <div style={{ padding: '5px' }}>
-                  <Input
-                    value={props.dashboard.time.from}
-                    disabled={true}
-                    addonBefore={
-                      <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>
-                        From:
-                      </span>
-                    }
-                  />
-                  <Input
-                    value={props.dashboard.time.to}
-                    disabled={true}
-                    addonBefore={
-                      <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>To:</span>
-                    }
-                  />
-                </div>
-                <br />
-                <Field label="Enabled" description="Configures whether current dashboard can be available publicly">
-                  <Switch
-                    disabled={dashboardHasTemplateVariables(dashboardVariables)}
-                    value={publicDashboard?.isEnabled}
-                    onChange={() => {
-                      reportInteraction('grafana_dashboards_public_enable_clicked', {
-                        action: publicDashboard?.isEnabled ? 'disable' : 'enable',
-                      });
+              </div>
+              <br />
+              <div>
+                <Checkbox
+                  label="Publishing currently only works with a subset of datasources"
+                  value={acknowledgements.datasources}
+                  disabled={publicDashboardPersisted(publicDashboard)}
+                  onChange={(e) => onAcknowledge('datasources', e.currentTarget.checked)}
+                />
+                <LinkButton
+                  variant="primary"
+                  href="https://grafana.com/docs/grafana/latest/datasources/"
+                  target="_blank"
+                  fill="text"
+                  icon="info-circle"
+                  rel="noopener noreferrer"
+                  tooltip="Learn more about public datasources"
+                />
+              </div>
+              <br />
+              <Checkbox
+                label="Making your dashboard public will cause queries to run each time the dashboard is viewed which may increase costs"
+                value={acknowledgements.usage}
+                disabled={publicDashboardPersisted(publicDashboard)}
+                onChange={(e) => onAcknowledge('usage', e.currentTarget.checked)}
+              />
+              <LinkButton
+                variant="primary"
+                href="https://grafana.com/docs/grafana/latest/enterprise/query-caching/"
+                target="_blank"
+                fill="text"
+                icon="info-circle"
+                rel="noopener noreferrer"
+                tooltip="Learn more about query caching"
+              />
+              <br />
+              <br />
+            </FieldSet>
+          </div>
+          <div>
+            <h4 className="share-modal-info-text">Public Dashboard Configuration</h4>
+            <FieldSet>
+              Time Range
+              <br />
+              <div style={{ padding: '5px' }}>
+                <Input
+                  value={props.dashboard.time.from}
+                  disabled={true}
+                  addonBefore={
+                    <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>From:</span>
+                  }
+                />
+                <Input
+                  value={props.dashboard.time.to}
+                  disabled={true}
+                  addonBefore={
+                    <span style={{ width: '50px', display: 'flex', alignItems: 'center', padding: '5px' }}>To:</span>
+                  }
+                />
+              </div>
+              <br />
+              <Field label="Enabled" description="Configures whether current dashboard can be available publicly">
+                <Switch
+                  disabled={dashboardHasTemplateVariables(dashboardVariables)}
+                  value={publicDashboard?.isEnabled}
+                  onChange={() => {
+                    reportInteraction('grafana_dashboards_public_enable_clicked', {
+                      action: publicDashboard?.isEnabled ? 'disable' : 'enable',
+                    });
 
-                      setPublicDashboardConfig({
-                        ...publicDashboard,
-                        isEnabled: !publicDashboard.isEnabled,
-                      });
-                    }}
+                    setPublicDashboardConfig({
+                      ...publicDashboard,
+                      isEnabled: !publicDashboard.isEnabled,
+                    });
+                  }}
+                />
+              </Field>
+              {publicDashboardPersisted(publicDashboard) && publicDashboard.isEnabled && (
+                <Field label="Link URL">
+                  <Input
+                    value={generatePublicDashboardUrl(publicDashboard)}
+                    readOnly
+                    addonAfter={
+                      <ClipboardButton
+                        variant="primary"
+                        icon="copy"
+                        getText={() => {
+                          return generatePublicDashboardUrl(publicDashboard);
+                        }}
+                        onClipboardCopy={onShareUrlCopy}
+                      >
+                        Copy
+                      </ClipboardButton>
+                    }
                   />
                 </Field>
-                {publicDashboardPersisted(publicDashboard) && publicDashboard.isEnabled && (
-                  <Field label="Link URL">
-                    <Input
-                      value={generatePublicDashboardUrl(publicDashboard)}
-                      readOnly
-                      addonAfter={
-                        <ClipboardButton
-                          variant="primary"
-                          getText={() => {
-                            return generatePublicDashboardUrl(publicDashboard);
-                          }}
-                          onClipboardCopy={onShareUrlCopy}
-                        >
-                          <Icon name="copy" /> Copy
-                        </ClipboardButton>
-                      }
-                    />
-                  </Field>
-                )}
-              </FieldSet>
-              <Button onClick={onSavePublicConfig}>Save Sharing Configuration</Button>
-            </div>
-          )}
+              )}
+            </FieldSet>
+            <Button disabled={!acknowledged()} onClick={onSavePublicConfig}>
+              Save Sharing Configuration
+            </Button>
+          </div>
         </>
       )}
     </>
diff --git a/public/app/features/dashboard/containers/DashboardPage.tsx b/public/app/features/dashboard/containers/DashboardPage.tsx
index d32eb5c1817..017e6adc8a1 100644
--- a/public/app/features/dashboard/containers/DashboardPage.tsx
+++ b/public/app/features/dashboard/containers/DashboardPage.tsx
@@ -5,7 +5,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { GrafanaTheme2, TimeRange } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { locationService } from '@grafana/runtime';
+import { config, locationService } from '@grafana/runtime';
 import { CustomScrollbar, stylesFactory, Themeable2, withTheme2 } from '@grafana/ui';
 import { notifyApp } from 'app/core/actions';
 import { Branding } from 'app/core/components/Branding/Branding';
@@ -387,7 +387,8 @@ export class UnthemedDashboardPage extends PureComponent<Props, State> {
  * Styles
  */
 export const getStyles = stylesFactory((theme: GrafanaTheme2, kioskMode: KioskMode) => {
-  const contentPadding = kioskMode !== KioskMode.Full ? theme.spacing(0, 2, 2) : theme.spacing(2);
+  const contentPadding =
+    kioskMode === KioskMode.Full || config.featureToggles.topnav ? theme.spacing(2) : theme.spacing(0, 2, 2);
   return {
     dashboardContainer: css`
       width: 100%;
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
index 7d8eff8de7d..c5bf73cf32b 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeader.tsx
@@ -3,7 +3,7 @@ import React, { FC } from 'react';
 
 import { DataLink, GrafanaTheme2, PanelData } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
-import { Icon, useStyles2 } from '@grafana/ui';
+import { Icon, useStyles2, ClickOutsideWrapper } from '@grafana/ui';
 import { DashboardModel } from 'app/features/dashboard/state/DashboardModel';
 import { PanelModel } from 'app/features/dashboard/state/PanelModel';
 import { getPanelLinksSupplier } from 'app/features/panel/panellinks/linkSuppliers';
@@ -48,34 +48,33 @@ export const PanelHeader: FC<Props> = ({ panel, error, isViewing, isEditing, dat
         <PanelHeaderMenuTrigger data-testid={selectors.components.Panels.Panel.title(title)}>
           {({ closeMenu, panelMenuOpen }) => {
             return (
-              <div className="panel-title">
-                <PanelHeaderNotices frames={data.series} panelId={panel.id} />
-                {alertState ? (
-                  <Icon
-                    name={alertState === 'alerting' ? 'heart-break' : 'heart'}
-                    className="icon-gf panel-alert-icon"
-                    style={{ marginRight: '4px' }}
-                    size="sm"
-                  />
-                ) : null}
-                <h2 className={styles.titleText}>{title}</h2>
-                {!dashboard.meta.publicDashboardAccessToken && (
-                  <div data-testid="panel-dropdown">
-                    <Icon name="angle-down" className="panel-menu-toggle" />
-                    <PanelHeaderMenuWrapper
-                      panel={panel}
-                      dashboard={dashboard}
-                      show={panelMenuOpen}
-                      onClose={closeMenu}
+              <ClickOutsideWrapper onClick={closeMenu} parent={document}>
+                <div className="panel-title">
+                  <PanelHeaderNotices frames={data.series} panelId={panel.id} />
+                  {alertState ? (
+                    <Icon
+                      name={alertState === 'alerting' ? 'heart-break' : 'heart'}
+                      className="icon-gf panel-alert-icon"
+                      style={{ marginRight: '4px' }}
+                      size="sm"
                     />
-                  </div>
-                )}
-                {data.request && data.request.timeInfo && (
-                  <span className="panel-time-info">
-                    <Icon name="clock-nine" size="sm" /> {data.request.timeInfo}
-                  </span>
-                )}
-              </div>
+                  ) : null}
+                  <h2 className={styles.titleText}>{title}</h2>
+                  {!dashboard.meta.publicDashboardAccessToken && (
+                    <div data-testid="panel-dropdown">
+                      <Icon name="angle-down" className="panel-menu-toggle" />
+                      {panelMenuOpen ? (
+                        <PanelHeaderMenuWrapper panel={panel} dashboard={dashboard} onClose={closeMenu} />
+                      ) : null}
+                    </div>
+                  )}
+                  {data.request && data.request.timeInfo && (
+                    <span className="panel-time-info">
+                      <Icon name="clock-nine" size="sm" /> {data.request.timeInfo}
+                    </span>
+                  )}
+                </div>
+              </ClickOutsideWrapper>
             );
           }}
         </PanelHeaderMenuTrigger>
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
index 174c07a2d49..8a52e5cec03 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuTrigger.tsx
@@ -14,18 +14,18 @@ interface Props extends HTMLAttributes<HTMLDivElement> {
 export const PanelHeaderMenuTrigger: FC<Props> = ({ children, ...divProps }) => {
   const [clickCoordinates, setClickCoordinates] = useState<CartesianCoords2D>({ x: 0, y: 0 });
   const [panelMenuOpen, setPanelMenuOpen] = useState<boolean>(false);
+
   const onMenuToggle = useCallback(
     (event: MouseEvent<HTMLDivElement>) => {
       if (!isClick(clickCoordinates, eventToClickCoordinates(event))) {
         return;
       }
 
-      event.stopPropagation();
-
       setPanelMenuOpen(!panelMenuOpen);
     },
     [clickCoordinates, panelMenuOpen, setPanelMenuOpen]
   );
+
   const onMouseDown = useCallback(
     (event: MouseEvent<HTMLDivElement>) => {
       setClickCoordinates(eventToClickCoordinates(event));
diff --git a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx
index 40d69a5efe7..cc2ac9b90b8 100644
--- a/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx
+++ b/public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderMenuWrapper.tsx
@@ -1,7 +1,5 @@
 import React, { FC } from 'react';
 
-import { ClickOutsideWrapper } from '@grafana/ui';
-
 import { DashboardModel, PanelModel } from '../../state';
 
 import { PanelHeaderMenu } from './PanelHeaderMenu';
@@ -10,22 +8,15 @@ import { PanelHeaderMenuProvider } from './PanelHeaderMenuProvider';
 interface Props {
   panel: PanelModel;
   dashboard: DashboardModel;
-  show: boolean;
   onClose: () => void;
 }
 
-export const PanelHeaderMenuWrapper: FC<Props> = ({ show, onClose, panel, dashboard }) => {
-  if (!show) {
-    return null;
-  }
-
+export const PanelHeaderMenuWrapper: FC<Props> = ({ panel, dashboard }) => {
   return (
-    <ClickOutsideWrapper onClick={onClose} parent={document}>
-      <PanelHeaderMenuProvider panel={panel} dashboard={dashboard}>
-        {({ items }) => {
-          return <PanelHeaderMenu items={items} />;
-        }}
-      </PanelHeaderMenuProvider>
-    </ClickOutsideWrapper>
+    <PanelHeaderMenuProvider panel={panel} dashboard={dashboard}>
+      {({ items }) => {
+        return <PanelHeaderMenu items={items} />;
+      }}
+    </PanelHeaderMenuProvider>
   );
 };
diff --git a/public/app/features/dashboard/services/PublicDashboardDataSource.ts b/public/app/features/dashboard/services/PublicDashboardDataSource.ts
index 7a384b0835d..52e89d55fba 100644
--- a/public/app/features/dashboard/services/PublicDashboardDataSource.ts
+++ b/public/app/features/dashboard/services/PublicDashboardDataSource.ts
@@ -1,19 +1,41 @@
 import { catchError, Observable, of, switchMap } from 'rxjs';
 
-import { DataQuery, DataQueryRequest, DataQueryResponse, DataSourceApi, PluginMeta } from '@grafana/data';
+import {
+  DataQuery,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceApi,
+  DataSourceRef,
+  PluginMeta,
+} from '@grafana/data';
 import { BackendDataSourceResponse, getBackendSrv, toDataQueryResponse } from '@grafana/runtime';
 
+export const PUBLIC_DATASOURCE = '-- Public --';
+
 export class PublicDashboardDataSource extends DataSourceApi<any> {
-  constructor() {
+  constructor(datasource: DataSourceRef | string | DataSourceApi | null) {
     super({
       name: 'public-ds',
-      id: 1,
+      id: 0,
       type: 'public-ds',
       meta: {} as PluginMeta,
-      uid: '1',
+      uid: PublicDashboardDataSource.resolveUid(datasource),
       jsonData: {},
       access: 'proxy',
     });
+
+    this.interval = '1min';
+  }
+
+  /**
+   * Get the datasource uid based on the many types a datasource can be.
+   */
+  private static resolveUid(datasource: DataSourceRef | string | DataSourceApi | null): string {
+    if (typeof datasource === 'string') {
+      return datasource;
+    }
+
+    return datasource?.uid ?? PUBLIC_DATASOURCE;
   }
 
   /**
diff --git a/public/app/features/dashboard/services/TimeSrv.test.ts b/public/app/features/dashboard/services/TimeSrv.test.ts
index c508b100c60..c9d4b6b341e 100644
--- a/public/app/features/dashboard/services/TimeSrv.test.ts
+++ b/public/app/features/dashboard/services/TimeSrv.test.ts
@@ -253,24 +253,18 @@ describe('timeSrv', () => {
   });
 
   describe('pauseAutoRefresh', () => {
-    it('should set refresh to empty value', () => {
+    it('should set autoRefreshPaused to true', () => {
       _dashboard.refresh = '10s';
       timeSrv.pauseAutoRefresh();
-      expect(_dashboard.refresh).toBe('');
-    });
-
-    it('should set previousAutoRefresh value', () => {
-      _dashboard.refresh = '10s';
-      timeSrv.pauseAutoRefresh();
-      expect(timeSrv.previousAutoRefresh).toBe('10s');
+      expect(timeSrv.autoRefreshPaused).toBe(true);
     });
   });
 
   describe('resumeAutoRefresh', () => {
     it('should set refresh to empty value', () => {
-      timeSrv.previousAutoRefresh = '10s';
+      timeSrv.autoRefreshPaused = true;
       timeSrv.resumeAutoRefresh();
-      expect(_dashboard.refresh).toBe('10s');
+      expect(timeSrv.autoRefreshPaused).toBe(false);
     });
   });
 
diff --git a/public/app/features/dashboard/services/TimeSrv.ts b/public/app/features/dashboard/services/TimeSrv.ts
index cf3b7e7f6e1..e9792b20e9e 100644
--- a/public/app/features/dashboard/services/TimeSrv.ts
+++ b/public/app/features/dashboard/services/TimeSrv.ts
@@ -24,7 +24,7 @@ export class TimeSrv {
   time: any;
   refreshTimer: any;
   refresh: any;
-  previousAutoRefresh: any;
+  autoRefreshPaused = false;
   oldRefresh: string | null | undefined;
   timeModel?: TimeModel;
   timeAtLoad: any;
@@ -232,7 +232,7 @@ export class TimeSrv {
 
     this.refreshTimer = setTimeout(() => {
       this.startNextRefreshTimer(intervalMs);
-      this.refreshTimeModel();
+      !this.autoRefreshPaused && this.refreshTimeModel();
     }, intervalMs);
 
     const refresh = this.contextSrv.getValidInterval(interval);
@@ -250,7 +250,7 @@ export class TimeSrv {
     this.refreshTimer = setTimeout(() => {
       this.startNextRefreshTimer(afterMs);
       if (this.contextSrv.isGrafanaVisible()) {
-        this.refreshTimeModel();
+        !this.autoRefreshPaused && this.refreshTimeModel();
       } else {
         this.autoRefreshBlocked = true;
       }
@@ -264,13 +264,13 @@ export class TimeSrv {
   // store timeModel refresh value and pause auto-refresh in some places
   // i.e panel edit
   pauseAutoRefresh() {
-    this.previousAutoRefresh = this.timeModel?.refresh;
-    this.setAutoRefresh('');
+    this.autoRefreshPaused = true;
   }
 
   // resume auto-refresh based on old dashboard refresh property
   resumeAutoRefresh() {
-    this.setAutoRefresh(this.previousAutoRefresh);
+    this.autoRefreshPaused = false;
+    this.refreshTimeModel();
   }
 
   setTime(time: RawTimeRange, updateUrl = true) {
diff --git a/public/app/features/dashboard/state/DashboardModel.test.ts b/public/app/features/dashboard/state/DashboardModel.test.ts
index da4e8165a8e..77e0c59af21 100644
--- a/public/app/features/dashboard/state/DashboardModel.test.ts
+++ b/public/app/features/dashboard/state/DashboardModel.test.ts
@@ -976,7 +976,7 @@ describe('exitViewPanel', () => {
 });
 
 describe('exitPanelEditor', () => {
-  function getTestContext(setPreviousAutoRefresh = false) {
+  function getTestContext(pauseAutoRefresh = false) {
     const panel: any = { destroy: jest.fn() };
     const dashboard = new DashboardModel({});
     const timeSrvMock = {
@@ -986,8 +986,8 @@ describe('exitPanelEditor', () => {
     } as unknown as TimeSrv;
     dashboard.startRefresh = jest.fn();
     dashboard.panelInEdit = panel;
-    if (setPreviousAutoRefresh) {
-      timeSrvMock.previousAutoRefresh = '5s';
+    if (pauseAutoRefresh) {
+      timeSrvMock.autoRefreshPaused = true;
     }
     setTimeSrv(timeSrvMock);
     return { dashboard, panel, timeSrvMock };
diff --git a/public/app/features/dashboard/state/DashboardModel.ts b/public/app/features/dashboard/state/DashboardModel.ts
index 13b1a51d5f4..2bd035411c1 100644
--- a/public/app/features/dashboard/state/DashboardModel.ts
+++ b/public/app/features/dashboard/state/DashboardModel.ts
@@ -1108,6 +1108,10 @@ export class DashboardModel implements TimeModel {
     }
   }
 
+  getDefaultTime() {
+    return this.originalTime;
+  }
+
   private getPanelRepeatVariable(panel: PanelModel) {
     return this.getVariablesFromState(this.uid).find((variable) => variable.name === panel.repeat);
   }
diff --git a/public/app/features/data-connections/DataConnectionsPage.test.tsx b/public/app/features/data-connections/DataConnectionsPage.test.tsx
index 515b3dd0e47..ba0bcddeca8 100644
--- a/public/app/features/data-connections/DataConnectionsPage.test.tsx
+++ b/public/app/features/data-connections/DataConnectionsPage.test.tsx
@@ -7,7 +7,7 @@ import { locationService } from '@grafana/runtime';
 import { configureStore } from 'app/store/configureStore';
 
 import DataConnectionsPage from './DataConnectionsPage';
-import navIndex from './__mocks__/store.navIndex.mock';
+import { navIndex } from './__mocks__/store.navIndex.mock';
 import { ROUTE_BASE_ID, ROUTES } from './constants';
 
 const renderPage = (path = `/${ROUTE_BASE_ID}`): RenderResult => {
diff --git a/public/app/features/data-connections/__mocks__/store.navIndex.mock.ts b/public/app/features/data-connections/__mocks__/store.navIndex.mock.ts
index 4546a29ec7c..a6093868d83 100644
--- a/public/app/features/data-connections/__mocks__/store.navIndex.mock.ts
+++ b/public/app/features/data-connections/__mocks__/store.navIndex.mock.ts
@@ -1,8 +1,10 @@
-export default {
+import { NavIndex, NavSection } from '@grafana/data';
+
+export const navIndex: NavIndex = {
   dashboards: {
     id: 'dashboards',
     text: 'Dashboards',
-    section: 'core',
+    section: NavSection.Core,
     subTitle: 'Manage dashboards and folders',
     icon: 'apps',
     url: '/dashboards',
@@ -74,7 +76,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -147,7 +149,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -220,7 +222,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -293,7 +295,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -366,7 +368,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -436,7 +438,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -512,7 +514,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -588,7 +590,7 @@ export default {
     parentItem: {
       id: 'dashboards',
       text: 'Dashboards',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Manage dashboards and folders',
       icon: 'apps',
       url: '/dashboards',
@@ -661,7 +663,7 @@ export default {
   explore: {
     id: 'explore',
     text: 'Explore',
-    section: 'core',
+    section: NavSection.Core,
     subTitle: 'Explore your data',
     icon: 'compass',
     url: '/explore',
@@ -670,7 +672,7 @@ export default {
   alerting: {
     id: 'alerting',
     text: 'Alerting',
-    section: 'core',
+    section: NavSection.Core,
     subTitle: 'Alert rules and notifications',
     icon: 'bell',
     url: '/alerting/list',
@@ -737,7 +739,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -805,7 +807,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -873,7 +875,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -941,7 +943,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1009,7 +1011,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1077,7 +1079,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1148,7 +1150,7 @@ export default {
     parentItem: {
       id: 'alerting',
       text: 'Alerting',
-      section: 'core',
+      section: NavSection.Core,
       subTitle: 'Alert rules and notifications',
       icon: 'bell',
       url: '/alerting/list',
@@ -1211,7 +1213,7 @@ export default {
   'data-connections': {
     id: 'data-connections',
     text: 'Data Connections',
-    section: 'core',
+    section: NavSection.Core,
     icon: 'link',
     url: '/data-connections',
     sortWeight: -1500,
@@ -1259,7 +1261,7 @@ export default {
     parentItem: {
       id: 'data-connections',
       text: 'Data Connections',
-      section: 'core',
+      section: NavSection.Core,
       icon: 'link',
       url: '/data-connections',
       sortWeight: -1500,
@@ -1304,7 +1306,7 @@ export default {
     parentItem: {
       id: 'data-connections',
       text: 'Data Connections',
-      section: 'core',
+      section: NavSection.Core,
       icon: 'link',
       url: '/data-connections',
       sortWeight: -1500,
@@ -1349,7 +1351,7 @@ export default {
     parentItem: {
       id: 'data-connections',
       text: 'Data Connections',
-      section: 'core',
+      section: NavSection.Core,
       icon: 'link',
       url: '/data-connections',
       sortWeight: -1500,
@@ -1394,7 +1396,7 @@ export default {
     parentItem: {
       id: 'data-connections',
       text: 'Data Connections',
-      section: 'core',
+      section: NavSection.Core,
       icon: 'link',
       url: '/data-connections',
       sortWeight: -1500,
@@ -1433,7 +1435,7 @@ export default {
   'plugin-page-basic-app': {
     id: 'plugin-page-basic-app',
     text: 'Basic App',
-    section: 'plugin',
+    section: NavSection.Plugin,
     img: 'public/plugins/basic-app/img/logo.svg',
     url: '/a/basic-app/one',
     sortWeight: -1400,
@@ -1467,7 +1469,7 @@ export default {
     parentItem: {
       id: 'plugin-page-grafana-synthetic-monitoring-app',
       text: 'Synthetic Monitoring',
-      section: 'plugin',
+      section: NavSection.Plugin,
       img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
       url: '/a/grafana-synthetic-monitoring-app/home',
       sortWeight: -1400,
@@ -1502,7 +1504,7 @@ export default {
   'plugin-page-cloudflare-app': {
     id: 'plugin-page-cloudflare-app',
     text: 'Cloudflare Grafana App',
-    section: 'plugin',
+    section: NavSection.Plugin,
     img: 'public/plugins/cloudflare-app/img/cf_icon.png',
     sortWeight: -1400,
     children: [
@@ -1519,7 +1521,7 @@ export default {
   'plugin-page-grafana-easystart-app': {
     id: 'plugin-page-grafana-easystart-app',
     text: 'Integrations and Connections',
-    section: 'plugin',
+    section: NavSection.Plugin,
     img: 'public/plugins/grafana-easystart-app/img/logo.svg',
     url: '/a/grafana-easystart-app',
     sortWeight: -1400,
@@ -1527,7 +1529,7 @@ export default {
   'plugin-page-redis-explorer-app': {
     id: 'plugin-page-redis-explorer-app',
     text: 'Redis Explorer',
-    section: 'plugin',
+    section: NavSection.Plugin,
     img: 'public/plugins/redis-explorer-app/img/logo.svg',
     url: '/a/redis-explorer-app/',
     sortWeight: -1400,
@@ -1567,7 +1569,7 @@ export default {
   'plugin-page-grafana-synthetic-monitoring-app': {
     id: 'plugin-page-grafana-synthetic-monitoring-app',
     text: 'Synthetic Monitoring',
-    section: 'plugin',
+    section: NavSection.Plugin,
     img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
     url: '/a/grafana-synthetic-monitoring-app/home',
     sortWeight: -1400,
@@ -1601,7 +1603,7 @@ export default {
   'plugin-page-grafana-k6-app': {
     id: 'plugin-page-grafana-k6-app',
     text: 'k6 Cloud App',
-    section: 'plugin',
+    section: NavSection.Plugin,
     img: 'public/plugins/grafana-k6-app/img/logo.svg',
     url: '/a/grafana-k6-app',
     sortWeight: -1400,
@@ -1609,7 +1611,7 @@ export default {
   cfg: {
     id: 'cfg',
     text: 'Configuration',
-    section: 'config',
+    section: NavSection.Config,
     subTitle: 'Organization: Main Org.',
     icon: 'cog',
     url: '/datasources',
@@ -1668,7 +1670,7 @@ export default {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1728,7 +1730,7 @@ export default {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1788,7 +1790,7 @@ export default {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1848,7 +1850,7 @@ export default {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1908,7 +1910,7 @@ export default {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -1968,7 +1970,7 @@ export default {
     parentItem: {
       id: 'cfg',
       text: 'Configuration',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Organization: Main Org.',
       icon: 'cog',
       url: '/datasources',
@@ -2022,7 +2024,7 @@ export default {
   admin: {
     id: 'admin',
     text: 'Server Admin',
-    section: 'config',
+    section: NavSection.Config,
     subTitle: 'Manage all users and orgs',
     icon: 'shield',
     url: '/admin/users',
@@ -2069,7 +2071,7 @@ export default {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2117,7 +2119,7 @@ export default {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2165,7 +2167,7 @@ export default {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2213,7 +2215,7 @@ export default {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2261,7 +2263,7 @@ export default {
     parentItem: {
       id: 'admin',
       text: 'Server Admin',
-      section: 'config',
+      section: NavSection.Config,
       subTitle: 'Manage all users and orgs',
       icon: 'shield',
       url: '/admin/users',
@@ -2304,7 +2306,7 @@ export default {
   profile: {
     id: 'profile',
     text: 'admin',
-    section: 'config',
+    section: NavSection.Config,
     img: '/avatar/46d229b033af06a191ff2267bca9ae56',
     url: '/profile',
     sortWeight: -1100,
@@ -2345,7 +2347,7 @@ export default {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: 'config',
+      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2387,7 +2389,7 @@ export default {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: 'config',
+      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2429,7 +2431,7 @@ export default {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: 'config',
+      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2473,7 +2475,7 @@ export default {
     parentItem: {
       id: 'profile',
       text: 'admin',
-      section: 'config',
+      section: NavSection.Config,
       img: '/avatar/46d229b033af06a191ff2267bca9ae56',
       url: '/profile',
       sortWeight: -1100,
@@ -2510,7 +2512,7 @@ export default {
   help: {
     id: 'help',
     text: 'Help',
-    section: 'config',
+    section: NavSection.Config,
     subTitle: 'Grafana v9.0.0-pre (abb5c6109a)',
     icon: 'question-circle',
     url: '#',
diff --git a/public/app/features/datasources/DataSourceDashboards.tsx b/public/app/features/datasources/DataSourceDashboards.tsx
index 9673716ddc3..9033a94ecc6 100644
--- a/public/app/features/datasources/DataSourceDashboards.tsx
+++ b/public/app/features/datasources/DataSourceDashboards.tsx
@@ -1,7 +1,7 @@
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { PluginDashboard, StoreState } from 'app/types';
diff --git a/public/app/features/datasources/DataSourceList.test.tsx b/public/app/features/datasources/DataSourcesList.test.tsx
similarity index 56%
rename from public/app/features/datasources/DataSourceList.test.tsx
rename to public/app/features/datasources/DataSourcesList.test.tsx
index 3110b35a6e8..f09b772431f 100644
--- a/public/app/features/datasources/DataSourceList.test.tsx
+++ b/public/app/features/datasources/DataSourcesList.test.tsx
@@ -1,18 +1,30 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
+import { Provider } from 'react-redux';
 
 import { LayoutModes } from '@grafana/data';
+import { configureStore } from 'app/store/configureStore';
+import { DataSourcesState } from 'app/types';
 
 import DataSourcesList from './DataSourcesList';
 import { getMockDataSources } from './__mocks__/dataSourcesMocks';
+import { initialState } from './state/reducers';
 
-const setup = () => {
-  const props = {
-    dataSources: getMockDataSources(3),
-    layoutMode: LayoutModes.Grid,
-  };
+const setup = (stateOverride?: Partial<DataSourcesState>) => {
+  const store = configureStore({
+    dataSources: {
+      ...initialState,
+      dataSources: getMockDataSources(3),
+      layoutMode: LayoutModes.Grid,
+      ...stateOverride,
+    },
+  });
 
-  return render(<DataSourcesList {...props} />);
+  return render(
+    <Provider store={store}>
+      <DataSourcesList dataSources={getMockDataSources(3)} />
+    </Provider>
+  );
 };
 
 describe('DataSourcesList', () => {
diff --git a/public/app/features/datasources/DataSourcesList.tsx b/public/app/features/datasources/DataSourcesList.tsx
index 9bcca5d543c..dbdf2971194 100644
--- a/public/app/features/datasources/DataSourcesList.tsx
+++ b/public/app/features/datasources/DataSourcesList.tsx
@@ -1,17 +1,16 @@
 // Libraries
 import { css } from '@emotion/css';
-import React, { FC } from 'react';
+import React from 'react';
 
 // Types
-import { DataSourceSettings, LayoutMode } from '@grafana/data';
+import { DataSourceSettings } from '@grafana/data';
 import { Card, Tag, useStyles } from '@grafana/ui';
 
-export interface Props {
+export type Props = {
   dataSources: DataSourceSettings[];
-  layoutMode: LayoutMode;
-}
+};
 
-export const DataSourcesList: FC<Props> = ({ dataSources, layoutMode }) => {
+export const DataSourcesList = ({ dataSources }: Props) => {
   const styles = useStyles(getStyles);
 
   return (
diff --git a/public/app/features/datasources/DataSourcesListHeader.tsx b/public/app/features/datasources/DataSourcesListHeader.tsx
new file mode 100644
index 00000000000..612bb3fdfb3
--- /dev/null
+++ b/public/app/features/datasources/DataSourcesListHeader.tsx
@@ -0,0 +1,26 @@
+import React, { useCallback } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+
+import PageActionBar from 'app/core/components/PageActionBar/PageActionBar';
+import { contextSrv } from 'app/core/core';
+import { AccessControlAction, StoreState } from 'app/types';
+
+import { setDataSourcesSearchQuery } from './state/reducers';
+import { getDataSourcesSearchQuery } from './state/selectors';
+
+export const DataSourcesListHeader = () => {
+  const dispatch = useDispatch();
+  const setSearchQuery = useCallback((q: string) => dispatch(setDataSourcesSearchQuery(q)), [dispatch]);
+  const searchQuery = useSelector(({ dataSources }: StoreState) => getDataSourcesSearchQuery(dataSources));
+  const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
+
+  const linkButton = {
+    href: 'datasources/new',
+    title: 'Add data source',
+    disabled: !canCreateDataSource,
+  };
+
+  return (
+    <PageActionBar searchQuery={searchQuery} setSearchQuery={setSearchQuery} linkButton={linkButton} key="action-bar" />
+  );
+};
diff --git a/public/app/features/datasources/DataSourcesListPage.test.tsx b/public/app/features/datasources/DataSourcesListPage.test.tsx
index 34ee0dc69ac..fe992512b95 100644
--- a/public/app/features/datasources/DataSourcesListPage.test.tsx
+++ b/public/app/features/datasources/DataSourcesListPage.test.tsx
@@ -1,11 +1,15 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
+import { Provider } from 'react-redux';
 
-import { DataSourceSettings, NavModel, LayoutModes } from '@grafana/data';
+import { DataSourceSettings, LayoutModes } from '@grafana/data';
+import { configureStore } from 'app/store/configureStore';
+import { DataSourcesState } from 'app/types';
 
-import { DataSourcesListPage, Props } from './DataSourcesListPage';
+import { DataSourcesListPage } from './DataSourcesListPage';
 import { getMockDataSources } from './__mocks__/dataSourcesMocks';
-import { setDataSourcesLayoutMode, setDataSourcesSearchQuery } from './state/reducers';
+import navIndex from './__mocks__/store.navIndex.mock';
+import { initialState } from './state/reducers';
 
 jest.mock('app/core/core', () => {
   return {
@@ -15,29 +19,30 @@ jest.mock('app/core/core', () => {
   };
 });
 
-const setup = (propOverrides?: object) => {
-  const props: Props = {
-    dataSources: [] as DataSourceSettings[],
-    layoutMode: LayoutModes.Grid,
-    loadDataSources: jest.fn(),
-    navModel: {
-      main: {
-        text: 'Configuration',
-      },
-      node: {
-        text: 'Data Sources',
-      },
-    } as NavModel,
-    dataSourcesCount: 0,
-    searchQuery: '',
-    setDataSourcesSearchQuery,
-    setDataSourcesLayoutMode,
-    hasFetched: false,
-  };
+const getMock = jest.fn().mockResolvedValue([]);
 
-  Object.assign(props, propOverrides);
+jest.mock('app/core/services/backend_srv', () => ({
+  ...jest.requireActual('app/core/services/backend_srv'),
+  getBackendSrv: () => ({ get: getMock }),
+}));
 
-  return render(<DataSourcesListPage {...props} />);
+const setup = (stateOverride?: Partial<DataSourcesState>) => {
+  const store = configureStore({
+    dataSources: {
+      ...initialState,
+      dataSources: [] as DataSourceSettings[],
+      layoutMode: LayoutModes.Grid,
+      hasFetched: false,
+      ...stateOverride,
+    },
+    navIndex,
+  });
+
+  return render(
+    <Provider store={store}>
+      <DataSourcesListPage />
+    </Provider>
+  );
 };
 
 describe('Render', () => {
diff --git a/public/app/features/datasources/DataSourcesListPage.tsx b/public/app/features/datasources/DataSourcesListPage.tsx
index f03e7ede1af..b9bf34c4c1f 100644
--- a/public/app/features/datasources/DataSourcesListPage.tsx
+++ b/public/app/features/datasources/DataSourcesListPage.tsx
@@ -1,98 +1,22 @@
-import React, { PureComponent } from 'react';
-import { connect, ConnectedProps } from 'react-redux';
+import React from 'react';
+import { useSelector } from 'react-redux';
 
-import { IconName } from '@grafana/ui';
-import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import Page from 'app/core/components/Page/Page';
-import PageActionBar from 'app/core/components/PageActionBar/PageActionBar';
-import { contextSrv } from 'app/core/core';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
-import { StoreState, AccessControlAction } from 'app/types';
+import { StoreState } from 'app/types';
 
-import DataSourcesList from './DataSourcesList';
-import { loadDataSources } from './state/actions';
-import { setDataSourcesLayoutMode, setDataSourcesSearchQuery } from './state/reducers';
-import {
-  getDataSources,
-  getDataSourcesCount,
-  getDataSourcesLayoutMode,
-  getDataSourcesSearchQuery,
-} from './state/selectors';
+import { DataSourcesListPageContent } from './DataSourcesListPageContent';
 
-function mapStateToProps(state: StoreState) {
-  return {
-    navModel: getNavModel(state.navIndex, 'datasources'),
-    dataSources: getDataSources(state.dataSources),
-    layoutMode: getDataSourcesLayoutMode(state.dataSources),
-    dataSourcesCount: getDataSourcesCount(state.dataSources),
-    searchQuery: getDataSourcesSearchQuery(state.dataSources),
-    hasFetched: state.dataSources.hasFetched,
-  };
-}
+export const DataSourcesListPage = () => {
+  const navModel = useSelector(({ navIndex }: StoreState) => getNavModel(navIndex, 'datasources'));
 
-const mapDispatchToProps = {
-  loadDataSources,
-  setDataSourcesSearchQuery,
-  setDataSourcesLayoutMode,
+  return (
+    <Page navModel={navModel}>
+      <Page.Contents>
+        <DataSourcesListPageContent />
+      </Page.Contents>
+    </Page>
+  );
 };
 
-const connector = connect(mapStateToProps, mapDispatchToProps);
-
-export type Props = ConnectedProps<typeof connector>;
-
-const emptyListModel = {
-  title: 'No data sources defined',
-  buttonIcon: 'database' as IconName,
-  buttonLink: 'datasources/new',
-  buttonTitle: 'Add data source',
-  proTip: 'You can also define data sources through configuration files.',
-  proTipLink: 'http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list',
-  proTipLinkTitle: 'Learn more',
-  proTipTarget: '_blank',
-};
-
-export class DataSourcesListPage extends PureComponent<Props> {
-  componentDidMount() {
-    this.props.loadDataSources();
-  }
-
-  render() {
-    const { dataSources, dataSourcesCount, navModel, layoutMode, searchQuery, setDataSourcesSearchQuery, hasFetched } =
-      this.props;
-
-    const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
-
-    const linkButton = {
-      href: 'datasources/new',
-      title: 'Add data source',
-      disabled: !canCreateDataSource,
-    };
-
-    const emptyList = {
-      ...emptyListModel,
-      buttonDisabled: !canCreateDataSource,
-    };
-
-    return (
-      <Page navModel={navModel}>
-        <Page.Contents isLoading={!hasFetched}>
-          <>
-            {hasFetched && dataSourcesCount === 0 && <EmptyListCTA {...emptyList} />}
-            {hasFetched &&
-              dataSourcesCount > 0 && [
-                <PageActionBar
-                  searchQuery={searchQuery}
-                  setSearchQuery={(query) => setDataSourcesSearchQuery(query)}
-                  linkButton={linkButton}
-                  key="action-bar"
-                />,
-                <DataSourcesList dataSources={dataSources} layoutMode={layoutMode} key="list" />,
-              ]}
-          </>
-        </Page.Contents>
-      </Page>
-    );
-  }
-}
-
-export default connector(DataSourcesListPage);
+export default DataSourcesListPage;
diff --git a/public/app/features/datasources/DataSourcesListPageContent.tsx b/public/app/features/datasources/DataSourcesListPageContent.tsx
new file mode 100644
index 00000000000..aebe1de2c33
--- /dev/null
+++ b/public/app/features/datasources/DataSourcesListPageContent.tsx
@@ -0,0 +1,58 @@
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import { IconName } from '@grafana/ui';
+import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
+import PageLoader from 'app/core/components/PageLoader/PageLoader';
+import { contextSrv } from 'app/core/core';
+import { StoreState, AccessControlAction } from 'app/types';
+
+import DataSourcesList from './DataSourcesList';
+import { DataSourcesListHeader } from './DataSourcesListHeader';
+import { loadDataSources } from './state/actions';
+import { getDataSourcesCount, getDataSources } from './state/selectors';
+
+const buttonIcon: IconName = 'database';
+const emptyListModel = {
+  title: 'No data sources defined',
+  buttonIcon,
+  buttonLink: 'datasources/new',
+  buttonTitle: 'Add data source',
+  proTip: 'You can also define data sources through configuration files.',
+  proTipLink: 'http://docs.grafana.org/administration/provisioning/#datasources?utm_source=grafana_ds_list',
+  proTipLinkTitle: 'Learn more',
+  proTipTarget: '_blank',
+};
+
+export const DataSourcesListPageContent = () => {
+  const dispatch = useDispatch();
+  const dataSources = useSelector((state: StoreState) => getDataSources(state.dataSources));
+  const dataSourcesCount = useSelector(({ dataSources }: StoreState) => getDataSourcesCount(dataSources));
+  const hasFetched = useSelector(({ dataSources }: StoreState) => dataSources.hasFetched);
+  const canCreateDataSource = contextSrv.hasPermission(AccessControlAction.DataSourcesCreate);
+  const emptyList = {
+    ...emptyListModel,
+    buttonDisabled: !canCreateDataSource,
+  };
+
+  useEffect(() => {
+    if (!hasFetched) {
+      dispatch(loadDataSources());
+    }
+  }, [dispatch, hasFetched]);
+
+  if (!hasFetched) {
+    return <PageLoader />;
+  }
+
+  if (dataSourcesCount === 0) {
+    return <EmptyListCTA {...emptyList} />;
+  }
+
+  return (
+    <>
+      <DataSourcesListHeader />
+      <DataSourcesList dataSources={dataSources} />
+    </>
+  );
+};
diff --git a/public/app/features/datasources/NewDataSourcePage.tsx b/public/app/features/datasources/NewDataSourcePage.tsx
index b7943e8af90..2f226c69784 100644
--- a/public/app/features/datasources/NewDataSourcePage.tsx
+++ b/public/app/features/datasources/NewDataSourcePage.tsx
@@ -5,7 +5,7 @@ import { connect, ConnectedProps } from 'react-redux';
 import { DataSourcePluginMeta, GrafanaTheme2, NavModel } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { Card, LinkButton, List, PluginSignatureBadge, FilterInput, useStyles2 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { StoreState } from 'app/types';
 
 import { PluginsErrorsInfo } from '../plugins/components/PluginsErrorsInfo';
diff --git a/public/app/features/datasources/__mocks__/store.navIndex.mock.ts b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
new file mode 100644
index 00000000000..17569b14120
--- /dev/null
+++ b/public/app/features/datasources/__mocks__/store.navIndex.mock.ts
@@ -0,0 +1,2633 @@
+import { NavSection } from '@grafana/data';
+
+export default {
+  dashboards: {
+    id: 'dashboards',
+    text: 'Dashboards',
+    section: NavSection.Core,
+    subTitle: 'Manage dashboards and folders',
+    icon: 'apps',
+    url: '/dashboards',
+    sortWeight: -1800,
+    children: [
+      {
+        id: 'manage-dashboards',
+        text: 'Browse',
+        icon: 'sitemap',
+        url: '/dashboards',
+      },
+      {
+        id: 'playlists',
+        text: 'Playlists',
+        icon: 'presentation-play',
+        url: '/playlists',
+      },
+      {
+        id: 'snapshots',
+        text: 'Snapshots',
+        icon: 'camera',
+        url: '/dashboard/snapshots',
+      },
+      {
+        id: 'library-panels',
+        text: 'Library panels',
+        icon: 'library-panel',
+        url: '/library-panels',
+      },
+      {
+        id: 'divider',
+        text: 'Divider',
+        divider: true,
+        hideFromTabs: true,
+      },
+      {
+        id: 'new-dashboard',
+        text: 'New dashboard',
+        icon: 'plus',
+        url: '/dashboard/new',
+        hideFromTabs: true,
+        showIconInNavbar: true,
+      },
+      {
+        id: 'new-folder',
+        text: 'New folder',
+        subTitle: 'Create a new folder to organize your dashboards',
+        icon: 'plus',
+        url: '/dashboards/folder/new',
+        hideFromTabs: true,
+        showIconInNavbar: true,
+      },
+      {
+        id: 'import',
+        text: 'Import',
+        subTitle: 'Import dashboard from file or Grafana.com',
+        icon: 'plus',
+        url: '/dashboard/import',
+        hideFromTabs: true,
+        showIconInNavbar: true,
+      },
+    ],
+  },
+  'manage-dashboards': {
+    id: 'manage-dashboards',
+    text: 'Browse',
+    icon: 'sitemap',
+    url: '/dashboards',
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  playlists: {
+    id: 'playlists',
+    text: 'Playlists',
+    icon: 'presentation-play',
+    url: '/playlists',
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  snapshots: {
+    id: 'snapshots',
+    text: 'Snapshots',
+    icon: 'camera',
+    url: '/dashboard/snapshots',
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'library-panels': {
+    id: 'library-panels',
+    text: 'Library panels',
+    icon: 'library-panel',
+    url: '/library-panels',
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  divider: {
+    id: 'divider',
+    text: 'Divider',
+    divider: true,
+    hideFromTabs: true,
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'new-dashboard': {
+    id: 'new-dashboard',
+    text: 'New dashboard',
+    icon: 'plus',
+    url: '/dashboard/new',
+    hideFromTabs: true,
+    showIconInNavbar: true,
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'new-folder': {
+    id: 'new-folder',
+    text: 'New folder',
+    subTitle: 'Create a new folder to organize your dashboards',
+    icon: 'plus',
+    url: '/dashboards/folder/new',
+    hideFromTabs: true,
+    showIconInNavbar: true,
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  import: {
+    id: 'import',
+    text: 'Import',
+    subTitle: 'Import dashboard from file or Grafana.com',
+    icon: 'plus',
+    url: '/dashboard/import',
+    hideFromTabs: true,
+    showIconInNavbar: true,
+    parentItem: {
+      id: 'dashboards',
+      text: 'Dashboards',
+      section: NavSection.Core,
+      subTitle: 'Manage dashboards and folders',
+      icon: 'apps',
+      url: '/dashboards',
+      sortWeight: -1800,
+      children: [
+        {
+          id: 'manage-dashboards',
+          text: 'Browse',
+          icon: 'sitemap',
+          url: '/dashboards',
+        },
+        {
+          id: 'playlists',
+          text: 'Playlists',
+          icon: 'presentation-play',
+          url: '/playlists',
+        },
+        {
+          id: 'snapshots',
+          text: 'Snapshots',
+          icon: 'camera',
+          url: '/dashboard/snapshots',
+        },
+        {
+          id: 'library-panels',
+          text: 'Library panels',
+          icon: 'library-panel',
+          url: '/library-panels',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'new-dashboard',
+          text: 'New dashboard',
+          icon: 'plus',
+          url: '/dashboard/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'new-folder',
+          text: 'New folder',
+          subTitle: 'Create a new folder to organize your dashboards',
+          icon: 'plus',
+          url: '/dashboards/folder/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+        {
+          id: 'import',
+          text: 'Import',
+          subTitle: 'Import dashboard from file or Grafana.com',
+          icon: 'plus',
+          url: '/dashboard/import',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'not-found': {
+    text: 'Page not found',
+    subTitle: '404 Error',
+    icon: 'exclamation-triangle',
+  },
+  explore: {
+    id: 'explore',
+    text: 'Explore',
+    section: NavSection.Core,
+    subTitle: 'Explore your data',
+    icon: 'compass',
+    url: '/explore',
+    sortWeight: -1700,
+  },
+  alerting: {
+    id: 'alerting',
+    text: 'Alerting',
+    section: NavSection.Core,
+    subTitle: 'Alert rules and notifications',
+    icon: 'bell',
+    url: '/alerting/list',
+    sortWeight: -1600,
+    children: [
+      {
+        id: 'alert-list',
+        text: 'Alert rules',
+        icon: 'list-ul',
+        url: '/alerting/list',
+      },
+      {
+        id: 'receivers',
+        text: 'Contact points',
+        icon: 'comment-alt-share',
+        url: '/alerting/notifications',
+      },
+      {
+        id: 'am-routes',
+        text: 'Notification policies',
+        icon: 'sitemap',
+        url: '/alerting/routes',
+      },
+      {
+        id: 'silences',
+        text: 'Silences',
+        icon: 'bell-slash',
+        url: '/alerting/silences',
+      },
+      {
+        id: 'groups',
+        text: 'Alert groups',
+        icon: 'layer-group',
+        url: '/alerting/groups',
+      },
+      {
+        id: 'alerting-admin',
+        text: 'Admin',
+        icon: 'cog',
+        url: '/alerting/admin',
+      },
+      {
+        id: 'divider',
+        text: 'Divider',
+        divider: true,
+        hideFromTabs: true,
+      },
+      {
+        id: 'alert',
+        text: 'New alert rule',
+        subTitle: 'Create an alert rule',
+        icon: 'plus',
+        url: '/alerting/new',
+        hideFromTabs: true,
+        showIconInNavbar: true,
+      },
+    ],
+  },
+  'alert-list': {
+    id: 'alert-list',
+    text: 'Alert rules',
+    icon: 'list-ul',
+    url: '/alerting/list',
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  receivers: {
+    id: 'receivers',
+    text: 'Contact points',
+    icon: 'comment-alt-share',
+    url: '/alerting/notifications',
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'am-routes': {
+    id: 'am-routes',
+    text: 'Notification policies',
+    icon: 'sitemap',
+    url: '/alerting/routes',
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  silences: {
+    id: 'silences',
+    text: 'Silences',
+    icon: 'bell-slash',
+    url: '/alerting/silences',
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  groups: {
+    id: 'groups',
+    text: 'Alert groups',
+    icon: 'layer-group',
+    url: '/alerting/groups',
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'alerting-admin': {
+    id: 'alerting-admin',
+    text: 'Admin',
+    icon: 'cog',
+    url: '/alerting/admin',
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  alert: {
+    id: 'alert',
+    text: 'New alert rule',
+    subTitle: 'Create an alert rule',
+    icon: 'plus',
+    url: '/alerting/new',
+    hideFromTabs: true,
+    showIconInNavbar: true,
+    parentItem: {
+      id: 'alerting',
+      text: 'Alerting',
+      section: NavSection.Core,
+      subTitle: 'Alert rules and notifications',
+      icon: 'bell',
+      url: '/alerting/list',
+      sortWeight: -1600,
+      children: [
+        {
+          id: 'alert-list',
+          text: 'Alert rules',
+          icon: 'list-ul',
+          url: '/alerting/list',
+        },
+        {
+          id: 'receivers',
+          text: 'Contact points',
+          icon: 'comment-alt-share',
+          url: '/alerting/notifications',
+        },
+        {
+          id: 'am-routes',
+          text: 'Notification policies',
+          icon: 'sitemap',
+          url: '/alerting/routes',
+        },
+        {
+          id: 'silences',
+          text: 'Silences',
+          icon: 'bell-slash',
+          url: '/alerting/silences',
+        },
+        {
+          id: 'groups',
+          text: 'Alert groups',
+          icon: 'layer-group',
+          url: '/alerting/groups',
+        },
+        {
+          id: 'alerting-admin',
+          text: 'Admin',
+          icon: 'cog',
+          url: '/alerting/admin',
+        },
+        {
+          id: 'divider',
+          text: 'Divider',
+          divider: true,
+          hideFromTabs: true,
+        },
+        {
+          id: 'alert',
+          text: 'New alert rule',
+          subTitle: 'Create an alert rule',
+          icon: 'plus',
+          url: '/alerting/new',
+          hideFromTabs: true,
+          showIconInNavbar: true,
+        },
+      ],
+    },
+  },
+  'data-connections': {
+    id: 'data-connections',
+    text: 'Data Connections',
+    section: NavSection.Core,
+    icon: 'link',
+    url: '/data-connections',
+    sortWeight: -1500,
+    children: [
+      {
+        id: 'data-connections-datasources',
+        text: 'Data sources',
+        description: 'Add and configure data sources',
+        icon: 'database',
+        url: '/data-connections/datasources',
+      },
+      {
+        id: 'data-connections-plugins',
+        text: 'Plugins',
+        description: 'Manage plugins',
+        icon: 'plug',
+        url: '/data-connections/plugins',
+      },
+      {
+        id: 'data-connections-cloud-integrations',
+        text: 'Cloud integrations',
+        description: 'Manage your cloud integrations',
+        icon: 'bolt',
+        url: '/data-connections/cloud-integrations',
+      },
+      {
+        id: 'data-connections-recorded-queries',
+        text: 'Recorded queries',
+        description: 'Manage your recorded queries',
+        icon: 'record-audio',
+        url: '/data-connections/recorded-queries',
+      },
+    ],
+  },
+  'data-connections-datasources': {
+    id: 'data-connections-datasources',
+    text: 'Data sources',
+    description: 'Add and configure data sources',
+    icon: 'database',
+    url: '/data-connections/datasources',
+    parentItem: {
+      id: 'data-connections',
+      text: 'Data Connections',
+      section: NavSection.Core,
+      icon: 'link',
+      url: '/data-connections',
+      sortWeight: -1500,
+      children: [
+        {
+          id: 'data-connections-datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/data-connections/datasources',
+        },
+        {
+          id: 'data-connections-plugins',
+          text: 'Plugins',
+          description: 'Manage plugins',
+          icon: 'plug',
+          url: '/data-connections/plugins',
+        },
+        {
+          id: 'data-connections-cloud-integrations',
+          text: 'Cloud integrations',
+          description: 'Manage your cloud integrations',
+          icon: 'bolt',
+          url: '/data-connections/cloud-integrations',
+        },
+        {
+          id: 'data-connections-recorded-queries',
+          text: 'Recorded queries',
+          description: 'Manage your recorded queries',
+          icon: 'record-audio',
+          url: '/data-connections/recorded-queries',
+        },
+      ],
+    },
+  },
+  'data-connections-plugins': {
+    id: 'data-connections-plugins',
+    text: 'Plugins',
+    description: 'Manage plugins',
+    icon: 'plug',
+    url: '/data-connections/plugins',
+    parentItem: {
+      id: 'data-connections',
+      text: 'Data Connections',
+      section: NavSection.Core,
+      icon: 'link',
+      url: '/data-connections',
+      sortWeight: -1500,
+      children: [
+        {
+          id: 'data-connections-datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/data-connections/datasources',
+        },
+        {
+          id: 'data-connections-plugins',
+          text: 'Plugins',
+          description: 'Manage plugins',
+          icon: 'plug',
+          url: '/data-connections/plugins',
+        },
+        {
+          id: 'data-connections-cloud-integrations',
+          text: 'Cloud integrations',
+          description: 'Manage your cloud integrations',
+          icon: 'bolt',
+          url: '/data-connections/cloud-integrations',
+        },
+        {
+          id: 'data-connections-recorded-queries',
+          text: 'Recorded queries',
+          description: 'Manage your recorded queries',
+          icon: 'record-audio',
+          url: '/data-connections/recorded-queries',
+        },
+      ],
+    },
+  },
+  'data-connections-cloud-integrations': {
+    id: 'data-connections-cloud-integrations',
+    text: 'Cloud integrations',
+    description: 'Manage your cloud integrations',
+    icon: 'bolt',
+    url: '/data-connections/cloud-integrations',
+    parentItem: {
+      id: 'data-connections',
+      text: 'Data Connections',
+      section: NavSection.Core,
+      icon: 'link',
+      url: '/data-connections',
+      sortWeight: -1500,
+      children: [
+        {
+          id: 'data-connections-datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/data-connections/datasources',
+        },
+        {
+          id: 'data-connections-plugins',
+          text: 'Plugins',
+          description: 'Manage plugins',
+          icon: 'plug',
+          url: '/data-connections/plugins',
+        },
+        {
+          id: 'data-connections-cloud-integrations',
+          text: 'Cloud integrations',
+          description: 'Manage your cloud integrations',
+          icon: 'bolt',
+          url: '/data-connections/cloud-integrations',
+        },
+        {
+          id: 'data-connections-recorded-queries',
+          text: 'Recorded queries',
+          description: 'Manage your recorded queries',
+          icon: 'record-audio',
+          url: '/data-connections/recorded-queries',
+        },
+      ],
+    },
+  },
+  'data-connections-recorded-queries': {
+    id: 'data-connections-recorded-queries',
+    text: 'Recorded queries',
+    description: 'Manage your recorded queries',
+    icon: 'record-audio',
+    url: '/data-connections/recorded-queries',
+    parentItem: {
+      id: 'data-connections',
+      text: 'Data Connections',
+      section: NavSection.Core,
+      icon: 'link',
+      url: '/data-connections',
+      sortWeight: -1500,
+      children: [
+        {
+          id: 'data-connections-datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/data-connections/datasources',
+        },
+        {
+          id: 'data-connections-plugins',
+          text: 'Plugins',
+          description: 'Manage plugins',
+          icon: 'plug',
+          url: '/data-connections/plugins',
+        },
+        {
+          id: 'data-connections-cloud-integrations',
+          text: 'Cloud integrations',
+          description: 'Manage your cloud integrations',
+          icon: 'bolt',
+          url: '/data-connections/cloud-integrations',
+        },
+        {
+          id: 'data-connections-recorded-queries',
+          text: 'Recorded queries',
+          description: 'Manage your recorded queries',
+          icon: 'record-audio',
+          url: '/data-connections/recorded-queries',
+        },
+      ],
+    },
+  },
+  'plugin-page-basic-app': {
+    id: 'plugin-page-basic-app',
+    text: 'Basic App',
+    section: NavSection.Plugin,
+    img: 'public/plugins/basic-app/img/logo.svg',
+    url: '/a/basic-app/one',
+    sortWeight: -1400,
+    children: [
+      {
+        text: 'Page One',
+        url: '/a/basic-app/one',
+      },
+      {
+        text: 'Page Two',
+        url: '/a/basic-app/two',
+      },
+      {
+        text: 'Page Three',
+        url: '/a/basic-app/three',
+      },
+      {
+        text: 'Page Four',
+        url: '/a/basic-app/four',
+      },
+      {
+        text: 'Configuration',
+        icon: 'fa fa-cog',
+        url: '/plugins/basic-app',
+      },
+    ],
+  },
+  undefined: {
+    text: 'Config',
+    url: '/plugins/grafana-synthetic-monitoring-app',
+    parentItem: {
+      id: 'plugin-page-grafana-synthetic-monitoring-app',
+      text: 'Synthetic Monitoring',
+      section: NavSection.Plugin,
+      img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
+      url: '/a/grafana-synthetic-monitoring-app/home',
+      sortWeight: -1400,
+      children: [
+        {
+          text: 'Home',
+          url: '/a/grafana-synthetic-monitoring-app/home',
+        },
+        {
+          text: 'Summary',
+          url: '/a/grafana-synthetic-monitoring-app/redirect?dashboard=summary',
+        },
+        {
+          text: 'Checks',
+          url: '/a/grafana-synthetic-monitoring-app/checks',
+        },
+        {
+          text: 'Probes',
+          url: '/a/grafana-synthetic-monitoring-app/probes',
+        },
+        {
+          text: 'Alerts',
+          url: '/a/grafana-synthetic-monitoring-app/alerts',
+        },
+        {
+          text: 'Config',
+          url: '/plugins/grafana-synthetic-monitoring-app',
+        },
+      ],
+    },
+  },
+  'plugin-page-cloudflare-app': {
+    id: 'plugin-page-cloudflare-app',
+    text: 'Cloudflare Grafana App',
+    section: NavSection.Plugin,
+    img: 'public/plugins/cloudflare-app/img/cf_icon.png',
+    sortWeight: -1400,
+    children: [
+      {
+        text: 'Zones',
+        url: '/d/KAVdMAw9k',
+      },
+      {
+        text: 'DNS Firewall',
+        url: '/d/QrKttDVqu',
+      },
+    ],
+  },
+  'plugin-page-grafana-easystart-app': {
+    id: 'plugin-page-grafana-easystart-app',
+    text: 'Integrations and Connections',
+    section: NavSection.Plugin,
+    img: 'public/plugins/grafana-easystart-app/img/logo.svg',
+    url: '/a/grafana-easystart-app',
+    sortWeight: -1400,
+  },
+  'plugin-page-redis-explorer-app': {
+    id: 'plugin-page-redis-explorer-app',
+    text: 'Redis Explorer',
+    section: NavSection.Plugin,
+    img: 'public/plugins/redis-explorer-app/img/logo.svg',
+    url: '/a/redis-explorer-app/',
+    sortWeight: -1400,
+    children: [
+      {
+        text: 'Home',
+        icon: 'home-alt',
+        url: '/a/redis-explorer-app/',
+      },
+      {
+        text: 'Enterprise Clusters',
+        icon: 'apps',
+        url: '/d/1dKhTjtGk',
+      },
+      {
+        text: 'Cluster Overview',
+        icon: 'monitor',
+        url: '/d/viroIzSGz',
+      },
+      {
+        text: 'Cluster Nodes',
+        icon: 'sitemap',
+        url: '/d/hqze6rtGz',
+      },
+      {
+        text: 'Cluster Databases',
+        icon: 'database',
+        url: '/d/k_A8MjtMk',
+      },
+      {
+        text: 'Cluster Alerts',
+        icon: 'info-circle',
+        url: '/d/xESAiFcnk',
+      },
+    ],
+  },
+  'plugin-page-grafana-synthetic-monitoring-app': {
+    id: 'plugin-page-grafana-synthetic-monitoring-app',
+    text: 'Synthetic Monitoring',
+    section: NavSection.Plugin,
+    img: 'public/plugins/grafana-synthetic-monitoring-app/img/logo.svg',
+    url: '/a/grafana-synthetic-monitoring-app/home',
+    sortWeight: -1400,
+    children: [
+      {
+        text: 'Home',
+        url: '/a/grafana-synthetic-monitoring-app/home',
+      },
+      {
+        text: 'Summary',
+        url: '/a/grafana-synthetic-monitoring-app/redirect?dashboard=summary',
+      },
+      {
+        text: 'Checks',
+        url: '/a/grafana-synthetic-monitoring-app/checks',
+      },
+      {
+        text: 'Probes',
+        url: '/a/grafana-synthetic-monitoring-app/probes',
+      },
+      {
+        text: 'Alerts',
+        url: '/a/grafana-synthetic-monitoring-app/alerts',
+      },
+      {
+        text: 'Config',
+        url: '/plugins/grafana-synthetic-monitoring-app',
+      },
+    ],
+  },
+  'plugin-page-grafana-k6-app': {
+    id: 'plugin-page-grafana-k6-app',
+    text: 'k6 Cloud App',
+    section: NavSection.Plugin,
+    img: 'public/plugins/grafana-k6-app/img/logo.svg',
+    url: '/a/grafana-k6-app',
+    sortWeight: -1400,
+  },
+  cfg: {
+    id: 'cfg',
+    text: 'Configuration',
+    section: NavSection.Config,
+    subTitle: 'Organization: Main Org.',
+    icon: 'cog',
+    url: '/datasources',
+    sortWeight: -1300,
+    children: [
+      {
+        id: 'datasources',
+        text: 'Data sources',
+        description: 'Add and configure data sources',
+        icon: 'database',
+        url: '/datasources',
+      },
+      {
+        id: 'users',
+        text: 'Users',
+        description: 'Manage org members',
+        icon: 'user',
+        url: '/org/users',
+      },
+      {
+        id: 'teams',
+        text: 'Teams',
+        description: 'Manage org groups',
+        icon: 'users-alt',
+        url: '/org/teams',
+      },
+      {
+        id: 'plugins',
+        text: 'Plugins',
+        description: 'View and configure plugins',
+        icon: 'plug',
+        url: '/plugins',
+      },
+      {
+        id: 'org-settings',
+        text: 'Preferences',
+        description: 'Organization preferences',
+        icon: 'sliders-v-alt',
+        url: '/org',
+      },
+      {
+        id: 'apikeys',
+        text: 'API keys',
+        description: 'Create & manage API keys',
+        icon: 'key-skeleton-alt',
+        url: '/org/apikeys',
+      },
+      {
+        id: 'serviceaccounts',
+        text: 'Service accounts',
+        description: 'Manage service accounts',
+        icon: 'gf-service-account',
+        url: '/org/serviceaccounts',
+      },
+    ],
+  },
+  datasources: {
+    id: 'datasources',
+    text: 'Data sources',
+    description: 'Add and configure data sources',
+    icon: 'database',
+    url: '/datasources',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  users: {
+    id: 'users',
+    text: 'Users',
+    description: 'Manage org members',
+    icon: 'user',
+    url: '/org/users',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  teams: {
+    id: 'teams',
+    text: 'Teams',
+    description: 'Manage org groups',
+    icon: 'users-alt',
+    url: '/org/teams',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  plugins: {
+    id: 'plugins',
+    text: 'Plugins',
+    description: 'View and configure plugins',
+    icon: 'plug',
+    url: '/plugins',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  'org-settings': {
+    id: 'org-settings',
+    text: 'Preferences',
+    description: 'Organization preferences',
+    icon: 'sliders-v-alt',
+    url: '/org',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  apikeys: {
+    id: 'apikeys',
+    text: 'API keys',
+    description: 'Create & manage API keys',
+    icon: 'key-skeleton-alt',
+    url: '/org/apikeys',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  serviceaccounts: {
+    id: 'serviceaccounts',
+    text: 'Service accounts',
+    description: 'Manage service accounts',
+    icon: 'gf-service-account',
+    url: '/org/serviceaccounts',
+    parentItem: {
+      id: 'cfg',
+      text: 'Configuration',
+      section: NavSection.Config,
+      subTitle: 'Organization: Main Org.',
+      icon: 'cog',
+      url: '/datasources',
+      sortWeight: -1300,
+      children: [
+        {
+          id: 'datasources',
+          text: 'Data sources',
+          description: 'Add and configure data sources',
+          icon: 'database',
+          url: '/datasources',
+        },
+        {
+          id: 'users',
+          text: 'Users',
+          description: 'Manage org members',
+          icon: 'user',
+          url: '/org/users',
+        },
+        {
+          id: 'teams',
+          text: 'Teams',
+          description: 'Manage org groups',
+          icon: 'users-alt',
+          url: '/org/teams',
+        },
+        {
+          id: 'plugins',
+          text: 'Plugins',
+          description: 'View and configure plugins',
+          icon: 'plug',
+          url: '/plugins',
+        },
+        {
+          id: 'org-settings',
+          text: 'Preferences',
+          description: 'Organization preferences',
+          icon: 'sliders-v-alt',
+          url: '/org',
+        },
+        {
+          id: 'apikeys',
+          text: 'API keys',
+          description: 'Create & manage API keys',
+          icon: 'key-skeleton-alt',
+          url: '/org/apikeys',
+        },
+        {
+          id: 'serviceaccounts',
+          text: 'Service accounts',
+          description: 'Manage service accounts',
+          icon: 'gf-service-account',
+          url: '/org/serviceaccounts',
+        },
+      ],
+    },
+  },
+  admin: {
+    id: 'admin',
+    text: 'Server Admin',
+    section: NavSection.Config,
+    subTitle: 'Manage all users and orgs',
+    icon: 'shield',
+    url: '/admin/users',
+    sortWeight: -1200,
+    hideFromTabs: true,
+    children: [
+      {
+        id: 'global-users',
+        text: 'Users',
+        icon: 'user',
+        url: '/admin/users',
+      },
+      {
+        id: 'global-orgs',
+        text: 'Orgs',
+        icon: 'building',
+        url: '/admin/orgs',
+      },
+      {
+        id: 'server-settings',
+        text: 'Settings',
+        icon: 'sliders-v-alt',
+        url: '/admin/settings',
+      },
+      {
+        id: 'admin-plugins',
+        text: 'Plugins',
+        icon: 'plug',
+        url: '/admin/plugins',
+      },
+      {
+        id: 'upgrading',
+        text: 'Stats and license',
+        icon: 'unlock',
+        url: '/admin/upgrading',
+      },
+    ],
+  },
+  'global-users': {
+    id: 'global-users',
+    text: 'Users',
+    icon: 'user',
+    url: '/admin/users',
+    parentItem: {
+      id: 'admin',
+      text: 'Server Admin',
+      section: NavSection.Config,
+      subTitle: 'Manage all users and orgs',
+      icon: 'shield',
+      url: '/admin/users',
+      sortWeight: -1200,
+      hideFromTabs: true,
+      children: [
+        {
+          id: 'global-users',
+          text: 'Users',
+          icon: 'user',
+          url: '/admin/users',
+        },
+        {
+          id: 'global-orgs',
+          text: 'Orgs',
+          icon: 'building',
+          url: '/admin/orgs',
+        },
+        {
+          id: 'server-settings',
+          text: 'Settings',
+          icon: 'sliders-v-alt',
+          url: '/admin/settings',
+        },
+        {
+          id: 'admin-plugins',
+          text: 'Plugins',
+          icon: 'plug',
+          url: '/admin/plugins',
+        },
+        {
+          id: 'upgrading',
+          text: 'Stats and license',
+          icon: 'unlock',
+          url: '/admin/upgrading',
+        },
+      ],
+    },
+  },
+  'global-orgs': {
+    id: 'global-orgs',
+    text: 'Orgs',
+    icon: 'building',
+    url: '/admin/orgs',
+    parentItem: {
+      id: 'admin',
+      text: 'Server Admin',
+      section: NavSection.Config,
+      subTitle: 'Manage all users and orgs',
+      icon: 'shield',
+      url: '/admin/users',
+      sortWeight: -1200,
+      hideFromTabs: true,
+      children: [
+        {
+          id: 'global-users',
+          text: 'Users',
+          icon: 'user',
+          url: '/admin/users',
+        },
+        {
+          id: 'global-orgs',
+          text: 'Orgs',
+          icon: 'building',
+          url: '/admin/orgs',
+        },
+        {
+          id: 'server-settings',
+          text: 'Settings',
+          icon: 'sliders-v-alt',
+          url: '/admin/settings',
+        },
+        {
+          id: 'admin-plugins',
+          text: 'Plugins',
+          icon: 'plug',
+          url: '/admin/plugins',
+        },
+        {
+          id: 'upgrading',
+          text: 'Stats and license',
+          icon: 'unlock',
+          url: '/admin/upgrading',
+        },
+      ],
+    },
+  },
+  'server-settings': {
+    id: 'server-settings',
+    text: 'Settings',
+    icon: 'sliders-v-alt',
+    url: '/admin/settings',
+    parentItem: {
+      id: 'admin',
+      text: 'Server Admin',
+      section: NavSection.Config,
+      subTitle: 'Manage all users and orgs',
+      icon: 'shield',
+      url: '/admin/users',
+      sortWeight: -1200,
+      hideFromTabs: true,
+      children: [
+        {
+          id: 'global-users',
+          text: 'Users',
+          icon: 'user',
+          url: '/admin/users',
+        },
+        {
+          id: 'global-orgs',
+          text: 'Orgs',
+          icon: 'building',
+          url: '/admin/orgs',
+        },
+        {
+          id: 'server-settings',
+          text: 'Settings',
+          icon: 'sliders-v-alt',
+          url: '/admin/settings',
+        },
+        {
+          id: 'admin-plugins',
+          text: 'Plugins',
+          icon: 'plug',
+          url: '/admin/plugins',
+        },
+        {
+          id: 'upgrading',
+          text: 'Stats and license',
+          icon: 'unlock',
+          url: '/admin/upgrading',
+        },
+      ],
+    },
+  },
+  'admin-plugins': {
+    id: 'admin-plugins',
+    text: 'Plugins',
+    icon: 'plug',
+    url: '/admin/plugins',
+    parentItem: {
+      id: 'admin',
+      text: 'Server Admin',
+      section: NavSection.Config,
+      subTitle: 'Manage all users and orgs',
+      icon: 'shield',
+      url: '/admin/users',
+      sortWeight: -1200,
+      hideFromTabs: true,
+      children: [
+        {
+          id: 'global-users',
+          text: 'Users',
+          icon: 'user',
+          url: '/admin/users',
+        },
+        {
+          id: 'global-orgs',
+          text: 'Orgs',
+          icon: 'building',
+          url: '/admin/orgs',
+        },
+        {
+          id: 'server-settings',
+          text: 'Settings',
+          icon: 'sliders-v-alt',
+          url: '/admin/settings',
+        },
+        {
+          id: 'admin-plugins',
+          text: 'Plugins',
+          icon: 'plug',
+          url: '/admin/plugins',
+        },
+        {
+          id: 'upgrading',
+          text: 'Stats and license',
+          icon: 'unlock',
+          url: '/admin/upgrading',
+        },
+      ],
+    },
+  },
+  upgrading: {
+    id: 'upgrading',
+    text: 'Stats and license',
+    icon: 'unlock',
+    url: '/admin/upgrading',
+    parentItem: {
+      id: 'admin',
+      text: 'Server Admin',
+      section: NavSection.Config,
+      subTitle: 'Manage all users and orgs',
+      icon: 'shield',
+      url: '/admin/users',
+      sortWeight: -1200,
+      hideFromTabs: true,
+      children: [
+        {
+          id: 'global-users',
+          text: 'Users',
+          icon: 'user',
+          url: '/admin/users',
+        },
+        {
+          id: 'global-orgs',
+          text: 'Orgs',
+          icon: 'building',
+          url: '/admin/orgs',
+        },
+        {
+          id: 'server-settings',
+          text: 'Settings',
+          icon: 'sliders-v-alt',
+          url: '/admin/settings',
+        },
+        {
+          id: 'admin-plugins',
+          text: 'Plugins',
+          icon: 'plug',
+          url: '/admin/plugins',
+        },
+        {
+          id: 'upgrading',
+          text: 'Stats and license',
+          icon: 'unlock',
+          url: '/admin/upgrading',
+        },
+      ],
+    },
+  },
+  profile: {
+    id: 'profile',
+    text: 'admin',
+    section: NavSection.Config,
+    img: '/avatar/46d229b033af06a191ff2267bca9ae56',
+    url: '/profile',
+    sortWeight: -1100,
+    children: [
+      {
+        id: 'profile-settings',
+        text: 'Preferences',
+        icon: 'sliders-v-alt',
+        url: '/profile',
+      },
+      {
+        id: 'notifications',
+        text: 'Notification history',
+        icon: 'bell',
+        url: '/notifications',
+      },
+      {
+        id: 'change-password',
+        text: 'Change password',
+        icon: 'lock',
+        url: '/profile/password',
+      },
+      {
+        id: 'sign-out',
+        text: 'Sign out',
+        icon: 'arrow-from-right',
+        url: '/logout',
+        target: '_self',
+        hideFromTabs: true,
+      },
+    ],
+  },
+  'profile-settings': {
+    id: 'profile-settings',
+    text: 'Preferences',
+    icon: 'sliders-v-alt',
+    url: '/profile',
+    parentItem: {
+      id: 'profile',
+      text: 'admin',
+      section: NavSection.Config,
+      img: '/avatar/46d229b033af06a191ff2267bca9ae56',
+      url: '/profile',
+      sortWeight: -1100,
+      children: [
+        {
+          id: 'profile-settings',
+          text: 'Preferences',
+          icon: 'sliders-v-alt',
+          url: '/profile',
+        },
+        {
+          id: 'notifications',
+          text: 'Notification history',
+          icon: 'bell',
+          url: '/notifications',
+        },
+        {
+          id: 'change-password',
+          text: 'Change password',
+          icon: 'lock',
+          url: '/profile/password',
+        },
+        {
+          id: 'sign-out',
+          text: 'Sign out',
+          icon: 'arrow-from-right',
+          url: '/logout',
+          target: '_self',
+          hideFromTabs: true,
+        },
+      ],
+    },
+  },
+  notifications: {
+    id: 'notifications',
+    text: 'Notification history',
+    icon: 'bell',
+    url: '/notifications',
+    parentItem: {
+      id: 'profile',
+      text: 'admin',
+      section: NavSection.Config,
+      img: '/avatar/46d229b033af06a191ff2267bca9ae56',
+      url: '/profile',
+      sortWeight: -1100,
+      children: [
+        {
+          id: 'profile-settings',
+          text: 'Preferences',
+          icon: 'sliders-v-alt',
+          url: '/profile',
+        },
+        {
+          id: 'notifications',
+          text: 'Notification history',
+          icon: 'bell',
+          url: '/notifications',
+        },
+        {
+          id: 'change-password',
+          text: 'Change password',
+          icon: 'lock',
+          url: '/profile/password',
+        },
+        {
+          id: 'sign-out',
+          text: 'Sign out',
+          icon: 'arrow-from-right',
+          url: '/logout',
+          target: '_self',
+          hideFromTabs: true,
+        },
+      ],
+    },
+  },
+  'change-password': {
+    id: 'change-password',
+    text: 'Change password',
+    icon: 'lock',
+    url: '/profile/password',
+    parentItem: {
+      id: 'profile',
+      text: 'admin',
+      section: NavSection.Config,
+      img: '/avatar/46d229b033af06a191ff2267bca9ae56',
+      url: '/profile',
+      sortWeight: -1100,
+      children: [
+        {
+          id: 'profile-settings',
+          text: 'Preferences',
+          icon: 'sliders-v-alt',
+          url: '/profile',
+        },
+        {
+          id: 'notifications',
+          text: 'Notification history',
+          icon: 'bell',
+          url: '/notifications',
+        },
+        {
+          id: 'change-password',
+          text: 'Change password',
+          icon: 'lock',
+          url: '/profile/password',
+        },
+        {
+          id: 'sign-out',
+          text: 'Sign out',
+          icon: 'arrow-from-right',
+          url: '/logout',
+          target: '_self',
+          hideFromTabs: true,
+        },
+      ],
+    },
+  },
+  'sign-out': {
+    id: 'sign-out',
+    text: 'Sign out',
+    icon: 'arrow-from-right',
+    url: '/logout',
+    target: '_self',
+    hideFromTabs: true,
+    parentItem: {
+      id: 'profile',
+      text: 'admin',
+      section: NavSection.Config,
+      img: '/avatar/46d229b033af06a191ff2267bca9ae56',
+      url: '/profile',
+      sortWeight: -1100,
+      children: [
+        {
+          id: 'profile-settings',
+          text: 'Preferences',
+          icon: 'sliders-v-alt',
+          url: '/profile',
+        },
+        {
+          id: 'notifications',
+          text: 'Notification history',
+          icon: 'bell',
+          url: '/notifications',
+        },
+        {
+          id: 'change-password',
+          text: 'Change password',
+          icon: 'lock',
+          url: '/profile/password',
+        },
+        {
+          id: 'sign-out',
+          text: 'Sign out',
+          icon: 'arrow-from-right',
+          url: '/logout',
+          target: '_self',
+          hideFromTabs: true,
+        },
+      ],
+    },
+  },
+  help: {
+    id: 'help',
+    text: 'Help',
+    section: NavSection.Config,
+    subTitle: 'Grafana v9.0.0-pre (cd35366222)',
+    icon: 'question-circle',
+    url: '#',
+    sortWeight: -1000,
+  },
+};
diff --git a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
index 68e2a4f2384..3630fb0d48f 100644
--- a/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
+++ b/public/app/features/datasources/settings/DataSourceSettingsPage.tsx
@@ -6,7 +6,7 @@ import { selectors } from '@grafana/e2e-selectors';
 import { Alert, Button } from '@grafana/ui';
 import { cleanUpAction } from 'app/core/actions/cleanUp';
 import appEvents from 'app/core/app_events';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/explore/FeatureTogglePage.tsx b/public/app/features/explore/FeatureTogglePage.tsx
index 54a00691aaa..a10df73f183 100644
--- a/public/app/features/explore/FeatureTogglePage.tsx
+++ b/public/app/features/explore/FeatureTogglePage.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { useStyles2 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 
 export default function FeatureTogglePage() {
   const styles = useStyles2(
diff --git a/public/app/features/explore/TraceView/TraceView.test.tsx b/public/app/features/explore/TraceView/TraceView.test.tsx
index 3cdb9e82994..c50f6207d63 100644
--- a/public/app/features/explore/TraceView/TraceView.test.tsx
+++ b/public/app/features/explore/TraceView/TraceView.test.tsx
@@ -92,14 +92,14 @@ describe('TraceView', () => {
 
   it('toggles detailState', async () => {
     renderTraceViewNew();
-    expect(screen.queryByText(/Tags/)).toBeFalsy();
+    expect(screen.queryByText(/Attributes/)).toBeFalsy();
     const spanView = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[0];
     await userEvent.click(spanView);
-    expect(screen.queryByText(/Tags/)).toBeTruthy();
+    expect(screen.queryByText(/Attributes/)).toBeTruthy();
 
     await userEvent.click(spanView);
-    screen.debug(screen.queryAllByText(/Tags/));
-    expect(screen.queryByText(/Tags/)).toBeFalsy();
+    screen.debug(screen.queryAllByText(/Attributes/));
+    expect(screen.queryByText(/Attributes/)).toBeFalsy();
   });
 
   it('shows timeline ticks', () => {
@@ -118,21 +118,21 @@ describe('TraceView', () => {
 
     const firstSpan = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[0];
     await userEvent.click(firstSpan);
-    await userEvent.click(screen.getByText(/Process/));
+    await userEvent.click(screen.getByText(/Resource/));
     table = screen.getByText('', { selector: 'div[data-testid="KeyValueTable"]' });
     expect(table.innerHTML).toContain('client-uuid-1');
     await userEvent.click(firstSpan);
 
     const secondSpan = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[1];
     await userEvent.click(secondSpan);
-    await userEvent.click(screen.getByText(/Process/));
+    await userEvent.click(screen.getByText(/Resource/));
     table = screen.getByText('', { selector: 'div[data-testid="KeyValueTable"]' });
     expect(table.innerHTML).toContain('client-uuid-2');
     await userEvent.click(secondSpan);
 
     const thirdSpan = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[2];
     await userEvent.click(thirdSpan);
-    await userEvent.click(screen.getByText(/Process/));
+    await userEvent.click(screen.getByText(/Resource/));
     table = screen.getByText('', { selector: 'div[data-testid="KeyValueTable"]' });
     expect(table.innerHTML).toContain('client-uuid-3');
   });
@@ -142,10 +142,10 @@ describe('TraceView', () => {
     const span = screen.getAllByText('', { selector: 'div[data-testid="span-view"]' })[2];
     await userEvent.click(span);
     //Process is in detail view
-    expect(screen.getByText(/Process/)).toBeInTheDocument();
+    expect(screen.getByText(/Resource/)).toBeInTheDocument();
 
     rerender(getTraceView([frameNew]));
-    expect(screen.queryByText(/Process/)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Resource/)).not.toBeInTheDocument();
   });
 });
 
diff --git a/public/app/features/explore/TraceView/TraceView.tsx b/public/app/features/explore/TraceView/TraceView.tsx
index 360bb1f6de5..4ca6fe699da 100644
--- a/public/app/features/explore/TraceView/TraceView.tsx
+++ b/public/app/features/explore/TraceView/TraceView.tsx
@@ -18,7 +18,13 @@ import {
 } from '@grafana/data';
 import { getTemplateSrv } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
-import { Trace, TracePageHeader, TraceTimelineViewer, TTraceTimeline } from '@jaegertracing/jaeger-ui-components';
+import {
+  SpanBarOptionsData,
+  Trace,
+  TracePageHeader,
+  TraceTimelineViewer,
+  TTraceTimeline,
+} from '@jaegertracing/jaeger-ui-components';
 import { TraceToLogsData } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsData } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
 import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
@@ -118,6 +124,7 @@ export function TraceView(props: Props) {
   const instanceSettings = getDatasourceSrv().getInstanceSettings(datasource?.name);
   const traceToLogsOptions = (instanceSettings?.jsonData as TraceToLogsData)?.tracesToLogs;
   const traceToMetricsOptions = (instanceSettings?.jsonData as TraceToMetricsData)?.tracesToMetrics;
+  const spanBarOptions: SpanBarOptionsData | undefined = instanceSettings?.jsonData;
 
   const createSpanLink = useMemo(
     () =>
@@ -155,6 +162,7 @@ export function TraceView(props: Props) {
             scrollToFirstVisibleSpan={noop}
             findMatchesIDs={spanFindMatches}
             trace={traceProp}
+            spanBarOptions={spanBarOptions?.spanBar}
             traceTimeline={traceTimeline}
             updateNextViewRangeTime={updateNextViewRangeTime}
             updateViewRangeTime={updateViewRangeTime}
diff --git a/public/app/features/explore/TraceView/createSpanLink.tsx b/public/app/features/explore/TraceView/createSpanLink.tsx
index 57db5e73979..256efe998b7 100644
--- a/public/app/features/explore/TraceView/createSpanLink.tsx
+++ b/public/app/features/explore/TraceView/createSpanLink.tsx
@@ -87,10 +87,10 @@ function legacyCreateSpanLinkFactory(
   createFocusSpanLink?: (traceId: string, spanId: string) => LinkModel<Field>
 ) {
   let logsDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData> | undefined;
-  const isSplunkDS = logsDataSourceSettings?.type === 'grafana-splunk-datasource';
   if (traceToLogsOptions?.datasourceUid) {
     logsDataSourceSettings = getDatasourceSrv().getInstanceSettings(traceToLogsOptions.datasourceUid);
   }
+  const isSplunkDS = logsDataSourceSettings?.type === 'grafana-splunk-datasource';
 
   let metricsDataSourceSettings: DataSourceInstanceSettings<DataSourceJsonData> | undefined;
   if (traceToMetricsOptions?.datasourceUid) {
diff --git a/public/app/features/folders/AccessControlFolderPermissions.tsx b/public/app/features/folders/AccessControlFolderPermissions.tsx
index 7e5e1b4d3e5..325b69eb406 100644
--- a/public/app/features/folders/AccessControlFolderPermissions.tsx
+++ b/public/app/features/folders/AccessControlFolderPermissions.tsx
@@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { Permissions } from 'app/core/components/AccessControl';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/folders/FolderAlerting.tsx b/public/app/features/folders/FolderAlerting.tsx
index 939676a751c..25785b74949 100644
--- a/public/app/features/folders/FolderAlerting.tsx
+++ b/public/app/features/folders/FolderAlerting.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useAsync } from 'react-use';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
diff --git a/public/app/features/folders/FolderLibraryPanelsPage.tsx b/public/app/features/folders/FolderLibraryPanelsPage.tsx
index aa27c268d76..a645f34bb51 100644
--- a/public/app/features/folders/FolderLibraryPanelsPage.tsx
+++ b/public/app/features/folders/FolderLibraryPanelsPage.tsx
@@ -2,7 +2,8 @@ import React, { useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 import { useAsync } from 'react-use';
 
-import Page from '../../core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
+
 import { GrafanaRouteComponentProps } from '../../core/navigation/types';
 import { getNavModel } from '../../core/selectors/navModel';
 import { StoreState } from '../../types';
diff --git a/public/app/features/folders/FolderPermissions.tsx b/public/app/features/folders/FolderPermissions.tsx
index ed69935fa4f..59f9263af87 100644
--- a/public/app/features/folders/FolderPermissions.tsx
+++ b/public/app/features/folders/FolderPermissions.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { Tooltip, Icon, Button } from '@grafana/ui';
 import { SlideDown } from 'app/core/components/Animations/SlideDown';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import AddPermission from 'app/core/components/PermissionList/AddPermission';
 import PermissionList from 'app/core/components/PermissionList/PermissionList';
 import PermissionsInfo from 'app/core/components/PermissionList/PermissionsInfo';
diff --git a/public/app/features/folders/FolderSettingsPage.tsx b/public/app/features/folders/FolderSettingsPage.tsx
index 16cf9a0392a..ecb47bb0de2 100644
--- a/public/app/features/folders/FolderSettingsPage.tsx
+++ b/public/app/features/folders/FolderSettingsPage.tsx
@@ -4,7 +4,7 @@ import { connect, ConnectedProps } from 'react-redux';
 import { Button, LegacyForms } from '@grafana/ui';
 const { Input } = LegacyForms;
 import appEvents from 'app/core/app_events';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
diff --git a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
index 32186afa57a..1a334028040 100644
--- a/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
+++ b/public/app/features/folders/__snapshots__/FolderSettingsPage.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Render should enable save button 1`] = `
-<Page
+<OldPage
   navModel={Object {}}
 >
   <PageContents
@@ -54,11 +54,11 @@ exports[`Render should enable save button 1`] = `
       </form>
     </div>
   </PageContents>
-</Page>
+</OldPage>
 `;
 
 exports[`Render should render component 1`] = `
-<Page
+<OldPage
   navModel={Object {}}
 >
   <PageContents
@@ -111,5 +111,5 @@ exports[`Render should render component 1`] = `
       </form>
     </div>
   </PageContents>
-</Page>
+</OldPage>
 `;
diff --git a/public/app/features/folders/components/NewDashboardsFolder.tsx b/public/app/features/folders/components/NewDashboardsFolder.tsx
index 72617c8fbfe..cd387a79817 100644
--- a/public/app/features/folders/components/NewDashboardsFolder.tsx
+++ b/public/app/features/folders/components/NewDashboardsFolder.tsx
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { Button, Input, Form, Field } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/invites/SignupInvited.tsx b/public/app/features/invites/SignupInvited.tsx
index 4d862d6377d..d12da280e07 100644
--- a/public/app/features/invites/SignupInvited.tsx
+++ b/public/app/features/invites/SignupInvited.tsx
@@ -3,7 +3,7 @@ import { useAsync } from 'react-use';
 
 import { getBackendSrv } from '@grafana/runtime';
 import { Button, Field, Form, Input } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getConfig } from 'app/core/config';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
diff --git a/public/app/features/library-panels/LibraryPanelsPage.tsx b/public/app/features/library-panels/LibraryPanelsPage.tsx
index 09342b0e5cf..af435231e7a 100644
--- a/public/app/features/library-panels/LibraryPanelsPage.tsx
+++ b/public/app/features/library-panels/LibraryPanelsPage.tsx
@@ -1,7 +1,8 @@
 import React, { FC, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import Page from '../../core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
+
 import { GrafanaRouteComponentProps } from '../../core/navigation/types';
 import { getNavModel } from '../../core/selectors/navModel';
 import { StoreState } from '../../types';
diff --git a/public/app/features/live/pages/CloudAdminPage.tsx b/public/app/features/live/pages/CloudAdminPage.tsx
index fe3face9db2..449c4c06c33 100644
--- a/public/app/features/live/pages/CloudAdminPage.tsx
+++ b/public/app/features/live/pages/CloudAdminPage.tsx
@@ -4,7 +4,7 @@ import React, { useEffect, useState } from 'react';
 import { GrafanaTheme } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
 import { useStyles } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 
 import { GrafanaCloudBackend } from './types';
diff --git a/public/app/features/live/pages/FeatureTogglePage.tsx b/public/app/features/live/pages/FeatureTogglePage.tsx
index a1d3e635c5a..35b19509a05 100644
--- a/public/app/features/live/pages/FeatureTogglePage.tsx
+++ b/public/app/features/live/pages/FeatureTogglePage.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 
 export default function FeatureTogglePage() {
diff --git a/public/app/features/live/pages/LiveStatusPage.tsx b/public/app/features/live/pages/LiveStatusPage.tsx
index 569853591af..485aacfe8d5 100644
--- a/public/app/features/live/pages/LiveStatusPage.tsx
+++ b/public/app/features/live/pages/LiveStatusPage.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 
 export default function CloudAdminPage() {
diff --git a/public/app/features/live/pages/PipelineAdminPage.tsx b/public/app/features/live/pages/PipelineAdminPage.tsx
index 2face908dc6..7d33b38b595 100644
--- a/public/app/features/live/pages/PipelineAdminPage.tsx
+++ b/public/app/features/live/pages/PipelineAdminPage.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState, ChangeEvent } from 'react';
 
 import { getBackendSrv } from '@grafana/runtime';
 import { Input } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 
 import { AddNewRule } from './AddNewRule';
diff --git a/public/app/features/manage-dashboards/DashboardImportPage.tsx b/public/app/features/manage-dashboards/DashboardImportPage.tsx
index 1085441536a..365a7eabd1b 100644
--- a/public/app/features/manage-dashboards/DashboardImportPage.tsx
+++ b/public/app/features/manage-dashboards/DashboardImportPage.tsx
@@ -20,7 +20,7 @@ import {
   withTheme2,
 } from '@grafana/ui';
 import appEvents from 'app/core/app_events';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
diff --git a/public/app/features/manage-dashboards/SnapshotListPage.tsx b/public/app/features/manage-dashboards/SnapshotListPage.tsx
index 5aa91777a34..ae16793ca0f 100644
--- a/public/app/features/manage-dashboards/SnapshotListPage.tsx
+++ b/public/app/features/manage-dashboards/SnapshotListPage.tsx
@@ -2,7 +2,7 @@ import React, { FC } from 'react';
 import { MapStateToProps, connect } from 'react-redux';
 
 import { NavModel } from '@grafana/data';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/notifications/NotificationsPage.tsx b/public/app/features/notifications/NotificationsPage.tsx
index 04b6b192a23..22c64301384 100644
--- a/public/app/features/notifications/NotificationsPage.tsx
+++ b/public/app/features/notifications/NotificationsPage.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import Page from '../../core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
+
 import { GrafanaRouteComponentProps } from '../../core/navigation/types';
 import { getNavModel } from '../../core/selectors/navModel';
 import { StoreState } from '../../types';
diff --git a/public/app/features/org/NewOrgPage.tsx b/public/app/features/org/NewOrgPage.tsx
index 34d2619110b..6a4fc75a490 100644
--- a/public/app/features/org/NewOrgPage.tsx
+++ b/public/app/features/org/NewOrgPage.tsx
@@ -2,7 +2,7 @@ import React, { FC } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
 import { Button, Input, Field, Form } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getConfig } from 'app/core/config';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/org/OrgDetailsPage.tsx b/public/app/features/org/OrgDetailsPage.tsx
index 5059ad5dd25..57c21a83a63 100644
--- a/public/app/features/org/OrgDetailsPage.tsx
+++ b/public/app/features/org/OrgDetailsPage.tsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 
 import { NavModel } from '@grafana/data';
 import { VerticalGroup } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
 import { contextSrv } from 'app/core/core';
 import { getNavModel } from 'app/core/selectors/navModel';
diff --git a/public/app/features/org/SelectOrgPage.tsx b/public/app/features/org/SelectOrgPage.tsx
index 273f699cc65..2d39f619074 100644
--- a/public/app/features/org/SelectOrgPage.tsx
+++ b/public/app/features/org/SelectOrgPage.tsx
@@ -4,7 +4,7 @@ import { useEffectOnce } from 'react-use';
 
 import { config } from '@grafana/runtime';
 import { Button, HorizontalGroup } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { StoreState, UserOrg } from 'app/types';
 
 import { getUserOrganizations, setUserOrganization } from './state/actions';
diff --git a/public/app/features/org/UserInvitePage.tsx b/public/app/features/org/UserInvitePage.tsx
index 8afa065a0b7..097ead15a32 100644
--- a/public/app/features/org/UserInvitePage.tsx
+++ b/public/app/features/org/UserInvitePage.tsx
@@ -2,7 +2,7 @@ import React, { FC } from 'react';
 import { connect } from 'react-redux';
 
 import { NavModel } from '@grafana/data';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types/store';
diff --git a/public/app/features/playlist/PlaylistEditPage.tsx b/public/app/features/playlist/PlaylistEditPage.tsx
index c98ba7ee00d..24eb413ef12 100644
--- a/public/app/features/playlist/PlaylistEditPage.tsx
+++ b/public/app/features/playlist/PlaylistEditPage.tsx
@@ -4,7 +4,7 @@ import { connect, MapStateToProps } from 'react-redux';
 import { NavModel } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/playlist/PlaylistNewPage.tsx b/public/app/features/playlist/PlaylistNewPage.tsx
index c08d288ec99..e7ef84960b8 100644
--- a/public/app/features/playlist/PlaylistNewPage.tsx
+++ b/public/app/features/playlist/PlaylistNewPage.tsx
@@ -4,7 +4,7 @@ import { connect, MapStateToProps } from 'react-redux';
 import { NavModel } from '@grafana/data';
 import { locationService } from '@grafana/runtime';
 import { useStyles2 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/playlist/PlaylistPage.tsx b/public/app/features/playlist/PlaylistPage.tsx
index 62e85085d2f..e8a997f0232 100644
--- a/public/app/features/playlist/PlaylistPage.tsx
+++ b/public/app/features/playlist/PlaylistPage.tsx
@@ -4,7 +4,7 @@ import { useDebounce } from 'react-use';
 
 import { NavModel } from '@grafana/data';
 import { ConfirmModal } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import PageActionBar from 'app/core/components/PageActionBar/PageActionBar';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { contextSrv } from 'app/core/services/context_srv';
diff --git a/public/app/features/plugins/admin/routes.ts b/public/app/features/plugins/admin/routes.ts
index 02a54c1c6c8..53a573ccbf4 100644
--- a/public/app/features/plugins/admin/routes.ts
+++ b/public/app/features/plugins/admin/routes.ts
@@ -7,16 +7,19 @@ import { PluginAdminRoutes } from './types';
 const DEFAULT_ROUTES = [
   {
     path: '/plugins',
+    navId: 'plugins',
     routeName: PluginAdminRoutes.Home,
     component: SafeDynamicImport(() => import(/* webpackChunkName: "PluginListPage" */ './pages/Browse')),
   },
   {
     path: '/plugins/browse',
+    navId: 'plugins',
     routeName: PluginAdminRoutes.Browse,
     component: SafeDynamicImport(() => import(/* webpackChunkName: "PluginListPage" */ './pages/Browse')),
   },
   {
     path: '/plugins/:pluginId/',
+    navId: 'plugins',
     routeName: PluginAdminRoutes.Details,
     component: SafeDynamicImport(() => import(/* webpackChunkName: "PluginPage" */ './pages/PluginDetails')),
   },
@@ -25,16 +28,19 @@ const DEFAULT_ROUTES = [
 const ADMIN_ROUTES = [
   {
     path: '/admin/plugins',
+    navId: 'admin-plugins',
     routeName: PluginAdminRoutes.HomeAdmin,
     component: SafeDynamicImport(() => import(/* webpackChunkName: "PluginListPage" */ './pages/Browse')),
   },
   {
     path: '/admin/plugins/browse',
+    navId: 'admin-plugins',
     routeName: PluginAdminRoutes.BrowseAdmin,
     component: SafeDynamicImport(() => import(/* webpackChunkName: "PluginListPage" */ './pages/Browse')),
   },
   {
     path: '/admin/plugins/:pluginId/',
+    navId: 'admin-plugins',
     routeName: PluginAdminRoutes.DetailsAdmin,
     component: SafeDynamicImport(() => import(/* webpackChunkName: "PluginPage" */ './pages/PluginDetails')),
   },
diff --git a/public/app/features/plugins/admin/state/reducer.ts b/public/app/features/plugins/admin/state/reducer.ts
index 515e9536fdb..75bb63cac6c 100644
--- a/public/app/features/plugins/admin/state/reducer.ts
+++ b/public/app/features/plugins/admin/state/reducer.ts
@@ -79,7 +79,8 @@ const slice = createSlice({
       // TODO<remove once the "plugin_admin_enabled" feature flag is removed>
       .addCase(loadPluginDashboards.fulfilled, (state, action) => {
         state.isLoadingPluginDashboards = false;
-        state.dashboards = action.payload;
+        // eslint-disable-next-line
+        state.dashboards = action.payload as any; // WritableDraft<PluginDashboard>[],...>
       })
       .addMatcher(isPendingRequest, (state, action) => {
         state.requests[getOriginalActionType(action.type)] = {
diff --git a/public/app/features/plugins/components/AppPluginLoader.tsx b/public/app/features/plugins/components/AppPluginLoader.tsx
index fe263276930..37516513f1a 100644
--- a/public/app/features/plugins/components/AppPluginLoader.tsx
+++ b/public/app/features/plugins/components/AppPluginLoader.tsx
@@ -3,7 +3,7 @@ import { useLocation, useParams } from 'react-router-dom';
 
 import { NavModel } from '@grafana/data';
 import { getWarningNav } from 'app/angular/services/nav_model_srv';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
 
 import { useImportAppPlugin } from '../hooks/useImportAppPlugin';
@@ -23,13 +23,13 @@ export const AppPluginLoader = ({ id, basePath }: AppPluginLoaderProps) => {
   const { pathname } = useLocation();
 
   if (error) {
-    return <Page.Header model={getWarningNav(error.message, error.stack)} />;
+    return <Page.Header navItem={getWarningNav(error.message, error.stack).main} />;
   }
 
   return (
     <>
       {loading && <PageLoader />}
-      {nav && <Page.Header model={nav} />}
+      {nav && <Page.Header navItem={nav.main} />}
       {!loading && plugin && plugin.root && (
         <plugin.root
           meta={plugin.meta}
diff --git a/public/app/features/plugins/components/AppRootPage.tsx b/public/app/features/plugins/components/AppRootPage.tsx
index c5b7b6c20a1..a088cd3fdfd 100644
--- a/public/app/features/plugins/components/AppRootPage.tsx
+++ b/public/app/features/plugins/components/AppRootPage.tsx
@@ -4,7 +4,7 @@ import { createHtmlPortalNode, InPortal, OutPortal, HtmlPortalNode } from 'react
 
 import { AppEvents, AppPlugin, AppPluginMeta, KeyValue, NavModel, PluginType } from '@grafana/data';
 import { getNotFoundNav, getWarningNav, getExceptionNav } from 'app/angular/services/nav_model_srv';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
 import { appEvents } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
diff --git a/public/app/features/plugins/sql/components/ConfirmModal.tsx b/public/app/features/plugins/sql/components/ConfirmModal.tsx
new file mode 100644
index 00000000000..6ee12a6ce7f
--- /dev/null
+++ b/public/app/features/plugins/sql/components/ConfirmModal.tsx
@@ -0,0 +1,51 @@
+import React, { useRef, useEffect } from 'react';
+
+import { Button, Icon, Modal } from '@grafana/ui';
+
+type ConfirmModalProps = {
+  isOpen: boolean;
+  onCancel?: () => void;
+  onDiscard?: () => void;
+  onCopy?: () => void;
+};
+export function ConfirmModal({ isOpen, onCancel, onDiscard, onCopy }: ConfirmModalProps) {
+  const buttonRef = useRef<HTMLButtonElement>(null);
+
+  // Moved from grafana/ui
+  useEffect(() => {
+    // for some reason autoFocus property did no work on this button, but this does
+    if (isOpen) {
+      buttonRef.current?.focus();
+    }
+  }, [isOpen]);
+
+  return (
+    <Modal
+      title={
+        <div className="modal-header-title">
+          <Icon name="exclamation-triangle" size="lg" />
+          <span className="p-l-1">Warning</span>
+        </div>
+      }
+      onDismiss={onCancel}
+      isOpen={isOpen}
+    >
+      <p>
+        Builder mode does not display changes made in code. The query builder will display the last changes you made in
+        builder mode.
+      </p>
+      <p>Do you want to copy your code to the clipboard?</p>
+      <Modal.ButtonRow>
+        <Button type="button" variant="secondary" onClick={onCancel} fill="outline">
+          Cancel
+        </Button>
+        <Button variant="destructive" type="button" onClick={onDiscard} ref={buttonRef}>
+          Discard code and switch
+        </Button>
+        <Button variant="primary" onClick={onCopy}>
+          Copy code and switch
+        </Button>
+      </Modal.ButtonRow>
+    </Modal>
+  );
+}
diff --git a/public/app/features/plugins/sql/components/DatasetSelector.tsx b/public/app/features/plugins/sql/components/DatasetSelector.tsx
new file mode 100644
index 00000000000..031cee09594
--- /dev/null
+++ b/public/app/features/plugins/sql/components/DatasetSelector.tsx
@@ -0,0 +1,61 @@
+import React, { useEffect } from 'react';
+import { useAsync } from 'react-use';
+
+import { SelectableValue } from '@grafana/data';
+import { Select } from '@grafana/ui';
+
+import { DB, ResourceSelectorProps, toOption } from '../types';
+
+interface DatasetSelectorProps extends ResourceSelectorProps {
+  db: DB;
+  value: string | null;
+  applyDefault?: boolean;
+  disabled?: boolean;
+  onChange: (v: SelectableValue) => void;
+}
+
+export const DatasetSelector: React.FC<DatasetSelectorProps> = ({
+  db,
+  value,
+  onChange,
+  disabled,
+  className,
+  applyDefault,
+}) => {
+  const state = useAsync(async () => {
+    const datasets = await db.datasets();
+    return datasets.map(toOption);
+  }, []);
+
+  useEffect(() => {
+    if (!applyDefault) {
+      return;
+    }
+    // Set default dataset when values are fetched
+    if (!value) {
+      if (state.value && state.value[0]) {
+        onChange(state.value[0]);
+      }
+    } else {
+      if (state.value && state.value.find((v) => v.value === value) === undefined) {
+        // if value is set and newly fetched values does not contain selected value
+        if (state.value.length > 0) {
+          onChange(state.value[0]);
+        }
+      }
+    }
+  }, [state.value, value, applyDefault, onChange]);
+
+  return (
+    <Select
+      className={className}
+      aria-label="Dataset selector"
+      value={value}
+      options={state.value}
+      onChange={onChange}
+      disabled={disabled}
+      isLoading={state.loading}
+      menuShouldPortal={true}
+    />
+  );
+};
diff --git a/public/app/features/plugins/sql/components/ErrorBoundary.tsx b/public/app/features/plugins/sql/components/ErrorBoundary.tsx
new file mode 100644
index 00000000000..b9194228532
--- /dev/null
+++ b/public/app/features/plugins/sql/components/ErrorBoundary.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+
+type Props = {
+  fallBackComponent?: React.ReactNode;
+};
+
+export class ErrorBoundary extends React.Component<Props, { hasError: boolean }> {
+  constructor(props: Props) {
+    super(props);
+    this.state = { hasError: false };
+  }
+
+  static getDerivedStateFromError() {
+    return { hasError: true };
+  }
+
+  render() {
+    if (this.state.hasError) {
+      const FallBack = this.props.fallBackComponent || <div>Error</div>;
+      return FallBack;
+    }
+
+    return this.props.children;
+  }
+}
diff --git a/public/app/features/plugins/sql/components/QueryEditor.tsx b/public/app/features/plugins/sql/components/QueryEditor.tsx
new file mode 100644
index 00000000000..3556048483d
--- /dev/null
+++ b/public/app/features/plugins/sql/components/QueryEditor.tsx
@@ -0,0 +1,119 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useAsync } from 'react-use';
+
+import { QueryEditorProps } from '@grafana/data';
+import { EditorMode, Space } from '@grafana/experimental';
+
+import { SqlDatasource } from '../datasource/SqlDatasource';
+import { applyQueryDefaults } from '../defaults';
+import { SQLQuery, QueryRowFilter, SQLOptions } from '../types';
+import { haveColumns } from '../utils/sql.utils';
+
+import { QueryHeader } from './QueryHeader';
+import { RawEditor } from './query-editor-raw/RawEditor';
+import { VisualEditor } from './visual-query-builder/VisualEditor';
+
+type Props = QueryEditorProps<SqlDatasource, SQLQuery, SQLOptions>;
+
+export function SqlQueryEditor({ datasource, query, onChange, onRunQuery, range }: Props) {
+  const [isQueryRunnable, setIsQueryRunnable] = useState(true);
+  const db = datasource.getDB();
+  const { loading, error } = useAsync(async () => {
+    return () => {
+      if (datasource.getDB(datasource.id).init !== undefined) {
+        datasource.getDB(datasource.id).init!();
+      }
+    };
+  }, [datasource]);
+
+  const queryWithDefaults = applyQueryDefaults(query);
+  const [queryRowFilter, setQueryRowFilter] = useState<QueryRowFilter>({
+    filter: !!queryWithDefaults.sql?.whereString,
+    group: !!queryWithDefaults.sql?.groupBy?.[0]?.property.name,
+    order: !!queryWithDefaults.sql?.orderBy?.property.name,
+    preview: true,
+  });
+  const [queryToValidate, setQueryToValidate] = useState(queryWithDefaults);
+
+  useEffect(() => {
+    return () => {
+      if (datasource.getDB(datasource.id).dispose !== undefined) {
+        datasource.getDB(datasource.id).dispose!();
+      }
+    };
+  }, [datasource]);
+
+  const processQuery = useCallback(
+    (q: SQLQuery) => {
+      if (isQueryValid(q) && onRunQuery) {
+        onRunQuery();
+      }
+    },
+    [onRunQuery]
+  );
+
+  const onQueryChange = (q: SQLQuery, process = true) => {
+    setQueryToValidate(q);
+    onChange(q);
+
+    if (haveColumns(q.sql?.columns) && q.sql?.columns.some((c) => c.name) && !queryRowFilter.group) {
+      setQueryRowFilter({ ...queryRowFilter, group: true });
+    }
+
+    if (process) {
+      processQuery(q);
+    }
+  };
+
+  const onQueryHeaderChange = (q: SQLQuery) => {
+    setQueryToValidate(q);
+    onChange(q);
+  };
+
+  if (loading || error) {
+    return null;
+  }
+
+  return (
+    <>
+      <QueryHeader
+        db={db}
+        onChange={onQueryHeaderChange}
+        onRunQuery={onRunQuery}
+        onQueryRowChange={setQueryRowFilter}
+        queryRowFilter={queryRowFilter}
+        query={queryWithDefaults}
+        isQueryRunnable={isQueryRunnable}
+      />
+
+      <Space v={0.5} />
+
+      {queryWithDefaults.editorMode !== EditorMode.Code && (
+        <VisualEditor
+          db={db}
+          query={queryWithDefaults}
+          onChange={(q: SQLQuery) => onQueryChange(q, false)}
+          queryRowFilter={queryRowFilter}
+          onValidate={setIsQueryRunnable}
+          range={range}
+        />
+      )}
+
+      {queryWithDefaults.editorMode === EditorMode.Code && (
+        <RawEditor
+          db={db}
+          query={queryWithDefaults}
+          queryToValidate={queryToValidate}
+          onChange={onQueryChange}
+          onRunQuery={onRunQuery}
+          onValidate={setIsQueryRunnable}
+          range={range}
+        />
+      )}
+    </>
+  );
+}
+
+const isQueryValid = (q: SQLQuery) => {
+  return Boolean(q.rawSql);
+};
diff --git a/public/app/features/plugins/sql/components/QueryHeader.tsx b/public/app/features/plugins/sql/components/QueryHeader.tsx
new file mode 100644
index 00000000000..d092ccc4172
--- /dev/null
+++ b/public/app/features/plugins/sql/components/QueryHeader.tsx
@@ -0,0 +1,245 @@
+import React, { useCallback, useState } from 'react';
+import { useCopyToClipboard } from 'react-use';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorHeader, EditorMode, EditorRow, FlexItem, InlineSelect, Space } from '@grafana/experimental';
+import { Button, InlineField, InlineSwitch, RadioButtonGroup, Select, Tooltip } from '@grafana/ui';
+
+import { QueryWithDefaults } from '../defaults';
+import { SQLQuery, QueryFormat, QueryRowFilter, QUERY_FORMAT_OPTIONS, DB } from '../types';
+import { defaultToRawSql } from '../utils/sql.utils';
+
+import { ConfirmModal } from './ConfirmModal';
+import { DatasetSelector } from './DatasetSelector';
+import { ErrorBoundary } from './ErrorBoundary';
+import { TableSelector } from './TableSelector';
+
+interface QueryHeaderProps {
+  db: DB;
+  query: QueryWithDefaults;
+  onChange: (query: SQLQuery) => void;
+  onRunQuery: () => void;
+  onQueryRowChange: (queryRowFilter: QueryRowFilter) => void;
+  queryRowFilter: QueryRowFilter;
+  isQueryRunnable: boolean;
+}
+
+const editorModes = [
+  { label: 'Builder', value: EditorMode.Builder },
+  { label: 'Code', value: EditorMode.Code },
+];
+
+export function QueryHeader({
+  db,
+  query,
+  queryRowFilter,
+  onChange,
+  onRunQuery,
+  onQueryRowChange,
+  isQueryRunnable,
+}: QueryHeaderProps) {
+  const { editorMode } = query;
+  const [_, copyToClipboard] = useCopyToClipboard();
+  const [showConfirm, setShowConfirm] = useState(false);
+  const toRawSql = db.toRawSql || defaultToRawSql;
+
+  const onEditorModeChange = useCallback(
+    (newEditorMode: EditorMode) => {
+      if (editorMode === EditorMode.Code) {
+        setShowConfirm(true);
+        return;
+      }
+      onChange({ ...query, editorMode: newEditorMode });
+    },
+    [editorMode, onChange, query]
+  );
+
+  const onFormatChange = (e: SelectableValue) => {
+    const next = { ...query, format: e.value !== undefined ? e.value : QueryFormat.Table };
+    onChange(next);
+  };
+
+  const onDatasetChange = (e: SelectableValue) => {
+    if (e.value === query.dataset) {
+      return;
+    }
+
+    const next = {
+      ...query,
+      dataset: e.value,
+      table: undefined,
+      sql: undefined,
+      rawSql: '',
+    };
+
+    onChange(next);
+  };
+
+  const onTableChange = (e: SelectableValue) => {
+    if (e.value === query.table) {
+      return;
+    }
+
+    const next: SQLQuery = {
+      ...query,
+      table: e.value,
+      sql: undefined,
+      rawSql: '',
+    };
+    onChange(next);
+  };
+
+  return (
+    <>
+      <EditorHeader>
+        {/* Backward compatibility check. Inline select uses SelectContainer that was added in 8.3 */}
+        <ErrorBoundary
+          fallBackComponent={
+            <InlineField label="Format" labelWidth={15}>
+              <Select
+                placeholder="Select format"
+                value={query.format}
+                onChange={onFormatChange}
+                options={QUERY_FORMAT_OPTIONS}
+              />
+            </InlineField>
+          }
+        >
+          <InlineSelect
+            label="Format"
+            value={query.format}
+            placeholder="Select format"
+            menuShouldPortal
+            onChange={onFormatChange}
+            options={QUERY_FORMAT_OPTIONS}
+          />
+        </ErrorBoundary>
+
+        {editorMode === EditorMode.Builder && (
+          <>
+            <InlineSwitch
+              id="sql-filter"
+              label="Filter"
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.filter}
+              onChange={(ev) =>
+                ev.target instanceof HTMLInputElement &&
+                onQueryRowChange({ ...queryRowFilter, filter: ev.target.checked })
+              }
+            />
+
+            <InlineSwitch
+              id="sql-group"
+              label="Group"
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.group}
+              onChange={(ev) =>
+                ev.target instanceof HTMLInputElement &&
+                onQueryRowChange({ ...queryRowFilter, group: ev.target.checked })
+              }
+            />
+
+            <InlineSwitch
+              id="sql-order"
+              label="Order"
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.order}
+              onChange={(ev) =>
+                ev.target instanceof HTMLInputElement &&
+                onQueryRowChange({ ...queryRowFilter, order: ev.target.checked })
+              }
+            />
+
+            <InlineSwitch
+              id="sql-preview"
+              label="Preview"
+              transparent={true}
+              showLabel={true}
+              value={queryRowFilter.preview}
+              onChange={(ev) =>
+                ev.target instanceof HTMLInputElement &&
+                onQueryRowChange({ ...queryRowFilter, preview: ev.target.checked })
+              }
+            />
+          </>
+        )}
+
+        <FlexItem grow={1} />
+
+        {isQueryRunnable ? (
+          <Button icon="play" variant="primary" size="sm" onClick={() => onRunQuery()}>
+            Run query
+          </Button>
+        ) : (
+          <Tooltip
+            theme="error"
+            content={
+              <>
+                Your query is invalid. Check below for details. <br />
+                However, you can still run this query.
+              </>
+            }
+            placement="top"
+          >
+            <Button icon="exclamation-triangle" variant="secondary" size="sm" onClick={() => onRunQuery()}>
+              Run query
+            </Button>
+          </Tooltip>
+        )}
+
+        <RadioButtonGroup options={editorModes} size="sm" value={editorMode} onChange={onEditorModeChange} />
+
+        <ConfirmModal
+          isOpen={showConfirm}
+          onCopy={() => {
+            setShowConfirm(false);
+            copyToClipboard(query.rawSql!);
+            onChange({
+              ...query,
+              rawSql: toRawSql(query),
+              editorMode: EditorMode.Builder,
+            });
+          }}
+          onDiscard={() => {
+            setShowConfirm(false);
+            onChange({
+              ...query,
+              rawSql: toRawSql(query),
+              editorMode: EditorMode.Builder,
+            });
+          }}
+          onCancel={() => setShowConfirm(false)}
+        />
+      </EditorHeader>
+
+      {editorMode === EditorMode.Builder && (
+        <>
+          <Space v={0.5} />
+
+          <EditorRow>
+            <EditorField label="Dataset" width={25}>
+              <DatasetSelector
+                db={db}
+                value={query.dataset === undefined ? null : query.dataset}
+                onChange={onDatasetChange}
+              />
+            </EditorField>
+
+            <EditorField label="Table" width={25}>
+              <TableSelector
+                db={db}
+                query={query}
+                value={query.table === undefined ? null : query.table}
+                onChange={onTableChange}
+                applyDefault
+              />
+            </EditorField>
+          </EditorRow>
+        </>
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/plugins/sql/components/TableSelector.tsx b/public/app/features/plugins/sql/components/TableSelector.tsx
new file mode 100644
index 00000000000..65171e2b918
--- /dev/null
+++ b/public/app/features/plugins/sql/components/TableSelector.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { Select } from '@grafana/ui';
+
+import { QueryWithDefaults } from '../defaults';
+import { DB, ResourceSelectorProps } from '../types';
+
+interface TableSelectorProps extends ResourceSelectorProps {
+  db: DB;
+  value: string | null;
+  query: QueryWithDefaults;
+  onChange: (v: SelectableValue) => void;
+}
+
+export const TableSelector: React.FC<TableSelectorProps> = ({ db, query, value, className, onChange }) => {
+  const state = useAsync(async () => {
+    if (!query.dataset) {
+      return [];
+    }
+    const tables = await db.tables(query.dataset);
+    return tables.map(toOption);
+  }, [query.dataset]);
+
+  return (
+    <Select
+      className={className}
+      disabled={state.loading}
+      aria-label="Table selector"
+      value={value}
+      options={state.value}
+      onChange={onChange}
+      isLoading={state.loading}
+      menuShouldPortal={true}
+      placeholder={state.loading ? 'Loading tables' : 'Select table'}
+    />
+  );
+};
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx b/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx
new file mode 100644
index 00000000000..1d0e1ca6773
--- /dev/null
+++ b/public/app/features/plugins/sql/components/query-editor-raw/QueryEditorRaw.tsx
@@ -0,0 +1,47 @@
+import React, { useCallback, useEffect, useRef } from 'react';
+
+import { LanguageCompletionProvider, SQLEditor } from '@grafana/experimental';
+
+import { SQLQuery } from '../../types';
+import { formatSQL } from '../../utils/formatSQL';
+
+type Props = {
+  query: SQLQuery;
+  onChange: (value: SQLQuery, processQuery: boolean) => void;
+  children?: (props: { formatQuery: () => void }) => React.ReactNode;
+  width?: number;
+  height?: number;
+  completionProvider: LanguageCompletionProvider;
+};
+
+export function QueryEditorRaw({ children, onChange, query, width, height, completionProvider }: Props) {
+  // We need to pass query via ref to SQLEditor as onChange is executed via monacoEditor.onDidChangeModelContent callback, not onChange property
+  const queryRef = useRef<SQLQuery>(query);
+  useEffect(() => {
+    queryRef.current = query;
+  }, [query]);
+
+  const onRawQueryChange = useCallback(
+    (rawSql: string, processQuery: boolean) => {
+      const newQuery = {
+        ...queryRef.current,
+        rawQuery: true,
+        rawSql,
+      };
+      onChange(newQuery, processQuery);
+    },
+    [onChange]
+  );
+
+  return (
+    <SQLEditor
+      width={width}
+      height={height}
+      query={query.rawSql!}
+      onChange={onRawQueryChange}
+      language={{ id: 'sql', completionProvider, formatter: formatSQL }}
+    >
+      {children}
+    </SQLEditor>
+  );
+}
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryToolbox.tsx b/public/app/features/plugins/sql/components/query-editor-raw/QueryToolbox.tsx
new file mode 100644
index 00000000000..3a8f26689a0
--- /dev/null
+++ b/public/app/features/plugins/sql/components/query-editor-raw/QueryToolbox.tsx
@@ -0,0 +1,91 @@
+import { css } from '@emotion/css';
+import React, { useMemo, useState } from 'react';
+
+import { HorizontalGroup, Icon, IconButton, Tooltip, useTheme2 } from '@grafana/ui';
+
+import { QueryValidator, QueryValidatorProps } from './QueryValidator';
+
+interface QueryToolboxProps extends Omit<QueryValidatorProps, 'onValidate'> {
+  showTools?: boolean;
+  isExpanded?: boolean;
+  onFormatCode?: () => void;
+  onExpand?: (expand: boolean) => void;
+  onValidate?: (isValid: boolean) => void;
+}
+
+export function QueryToolbox({ showTools, onFormatCode, onExpand, isExpanded, ...validatorProps }: QueryToolboxProps) {
+  const theme = useTheme2();
+  const [validationResult, setValidationResult] = useState<boolean>();
+
+  const styles = useMemo(() => {
+    return {
+      container: css`
+        border: 1px solid ${theme.colors.border.medium};
+        border-top: none;
+        padding: ${theme.spacing(0.5, 0.5, 0.5, 0.5)};
+        display: flex;
+        flex-grow: 1;
+        justify-content: space-between;
+        font-size: ${theme.typography.bodySmall.fontSize};
+      `,
+      error: css`
+        color: ${theme.colors.error.text};
+        font-size: ${theme.typography.bodySmall.fontSize};
+        font-family: ${theme.typography.fontFamilyMonospace};
+      `,
+      valid: css`
+        color: ${theme.colors.success.text};
+      `,
+      info: css`
+        color: ${theme.colors.text.secondary};
+      `,
+      hint: css`
+        color: ${theme.colors.text.disabled};
+        white-space: nowrap;
+        cursor: help;
+      `,
+    };
+  }, [theme]);
+
+  let style = {};
+
+  if (!showTools && validationResult === undefined) {
+    style = { height: 0, padding: 0, visibility: 'hidden' };
+  }
+
+  return (
+    <div className={styles.container} style={style}>
+      <div>
+        {validatorProps.onValidate && (
+          <QueryValidator
+            {...validatorProps}
+            onValidate={(result: boolean) => {
+              setValidationResult(result);
+              validatorProps.onValidate!(result);
+            }}
+          />
+        )}
+      </div>
+      {showTools && (
+        <div>
+          <HorizontalGroup spacing="sm">
+            {onFormatCode && (
+              <IconButton onClick={onFormatCode} name="brackets-curly" size="xs" tooltip="Format query" />
+            )}
+            {onExpand && (
+              <IconButton
+                onClick={() => onExpand(!isExpanded)}
+                name={isExpanded ? 'angle-up' : 'angle-down'}
+                size="xs"
+                tooltip={isExpanded ? 'Collapse editor' : 'Expand editor'}
+              />
+            )}
+            <Tooltip content="Hit CTRL/CMD+Return to run query">
+              <Icon className={styles.hint} name="keyboard" />
+            </Tooltip>
+          </HorizontalGroup>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/QueryValidator.tsx b/public/app/features/plugins/sql/components/query-editor-raw/QueryValidator.tsx
new file mode 100644
index 00000000000..df8de15c515
--- /dev/null
+++ b/public/app/features/plugins/sql/components/query-editor-raw/QueryValidator.tsx
@@ -0,0 +1,110 @@
+import { css } from '@emotion/css';
+import React, { useState, useMemo, useEffect } from 'react';
+import { useAsyncFn } from 'react-use';
+import useDebounce from 'react-use/lib/useDebounce';
+
+import { formattedValueToString, getValueFormat, TimeRange } from '@grafana/data';
+import { Icon, Spinner, useTheme2 } from '@grafana/ui';
+
+import { DB, SQLQuery, ValidationResults } from '../../types';
+
+export interface QueryValidatorProps {
+  db: DB;
+  query: SQLQuery;
+  range?: TimeRange;
+  onValidate: (isValid: boolean) => void;
+}
+
+export function QueryValidator({ db, query, onValidate, range }: QueryValidatorProps) {
+  const [validationResult, setValidationResult] = useState<ValidationResults | null>();
+  const theme = useTheme2();
+  const valueFormatter = useMemo(() => getValueFormat('bytes'), []);
+
+  const styles = useMemo(() => {
+    return {
+      error: css`
+        color: ${theme.colors.error.text};
+        font-size: ${theme.typography.bodySmall.fontSize};
+        font-family: ${theme.typography.fontFamilyMonospace};
+      `,
+      valid: css`
+        color: ${theme.colors.success.text};
+      `,
+      info: css`
+        color: ${theme.colors.text.secondary};
+      `,
+    };
+  }, [theme]);
+
+  const [state, validateQuery] = useAsyncFn(
+    async (q: SQLQuery) => {
+      if (q.rawSql?.trim() === '') {
+        return null;
+      }
+
+      return await db.validateQuery(q, range);
+    },
+    [db]
+  );
+
+  const [,] = useDebounce(
+    async () => {
+      const result = await validateQuery(query);
+      if (result) {
+        setValidationResult(result);
+      }
+
+      return null;
+    },
+    1000,
+    [query, validateQuery]
+  );
+
+  useEffect(() => {
+    if (validationResult?.isError) {
+      onValidate(false);
+    }
+    if (validationResult?.isValid) {
+      onValidate(true);
+    }
+  }, [validationResult, onValidate]);
+
+  if (!state.value && !state.loading) {
+    return null;
+  }
+
+  const error = state.value?.error ? processErrorMessage(state.value.error) : '';
+
+  return (
+    <>
+      {state.loading && (
+        <div className={styles.info}>
+          <Spinner inline={true} size={12} /> Validating query...
+        </div>
+      )}
+      {!state.loading && state.value && (
+        <>
+          <>
+            {state.value.isValid && state.value.statistics && (
+              <div className={styles.valid}>
+                <Icon name="check" /> This query will process{' '}
+                <strong>{formattedValueToString(valueFormatter(state.value.statistics.TotalBytesProcessed))}</strong>{' '}
+                when run.
+              </div>
+            )}
+          </>
+
+          <>{state.value.isError && <div className={styles.error}>{error}</div>}</>
+        </>
+      )}
+    </>
+  );
+}
+
+function processErrorMessage(error: string) {
+  const splat = error.split(':');
+  if (splat.length > 2) {
+    return splat.slice(2).join(':');
+  }
+  return error;
+}
diff --git a/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx b/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx
new file mode 100644
index 00000000000..994c26267e9
--- /dev/null
+++ b/public/app/features/plugins/sql/components/query-editor-raw/RawEditor.tsx
@@ -0,0 +1,121 @@
+import { css } from '@emotion/css';
+import React, { useMemo, useState } from 'react';
+import { useMeasure } from 'react-use';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Modal, useStyles2, useTheme2 } from '@grafana/ui';
+
+import { SQLQuery, QueryEditorProps } from '../../types';
+
+import { QueryEditorRaw } from './QueryEditorRaw';
+import { QueryToolbox } from './QueryToolbox';
+
+interface RawEditorProps extends Omit<QueryEditorProps, 'onChange'> {
+  onRunQuery: () => void;
+  onChange: (q: SQLQuery, processQuery: boolean) => void;
+  onValidate: (isValid: boolean) => void;
+  queryToValidate: SQLQuery;
+}
+
+export function RawEditor({ db, query, onChange, onRunQuery, onValidate, queryToValidate, range }: RawEditorProps) {
+  const theme = useTheme2();
+  const styles = useStyles2(getStyles);
+  const [isExpanded, setIsExpanded] = useState(false);
+  const [toolboxRef, toolboxMeasure] = useMeasure<HTMLDivElement>();
+  const [editorRef, editorMeasure] = useMeasure<HTMLDivElement>();
+
+  const completionProvider = useMemo(() => db.getSqlCompletionProvider(), [db]);
+
+  const renderQueryEditor = (width?: number, height?: number) => {
+    return (
+      <QueryEditorRaw
+        completionProvider={completionProvider}
+        query={query}
+        width={width}
+        height={height ? height - toolboxMeasure.height : undefined}
+        onChange={onChange}
+      >
+        {({ formatQuery }) => {
+          return (
+            <div ref={toolboxRef}>
+              <QueryToolbox
+                db={db}
+                query={queryToValidate}
+                onValidate={onValidate}
+                onFormatCode={formatQuery}
+                showTools
+                range={range}
+                onExpand={setIsExpanded}
+                isExpanded={isExpanded}
+              />
+            </div>
+          );
+        }}
+      </QueryEditorRaw>
+    );
+  };
+
+  const renderEditor = (standalone = false) => {
+    return standalone ? (
+      <AutoSizer>
+        {({ width, height }) => {
+          return renderQueryEditor(width, height);
+        }}
+      </AutoSizer>
+    ) : (
+      <div ref={editorRef}>{renderQueryEditor()}</div>
+    );
+  };
+
+  const renderPlaceholder = () => {
+    return (
+      <div
+        style={{
+          width: editorMeasure.width,
+          height: editorMeasure.height,
+          background: theme.colors.background.primary,
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+        }}
+      >
+        Editing in expanded code editor
+      </div>
+    );
+  };
+
+  return (
+    <>
+      {isExpanded ? renderPlaceholder() : renderEditor()}
+      {isExpanded && (
+        <Modal
+          title={`Query ${query.refId}`}
+          closeOnBackdropClick={false}
+          closeOnEscape={false}
+          className={styles.modal}
+          contentClassName={styles.modalContent}
+          isOpen={isExpanded}
+          onDismiss={() => {
+            setIsExpanded(false);
+          }}
+        >
+          {renderEditor(true)}
+        </Modal>
+      )}
+    </>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    modal: css`
+      width: 95vw;
+      height: 95vh;
+    `,
+    modalContent: css`
+      height: 100%;
+      padding-top: 0;
+    `,
+  };
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx b/public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx
new file mode 100644
index 00000000000..3b3b353d425
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/AwesomeQueryBuilder.tsx
@@ -0,0 +1,259 @@
+import { List } from 'immutable';
+import { isString } from 'lodash';
+import React from 'react';
+import {
+  BasicConfig,
+  Config,
+  JsonItem,
+  JsonTree,
+  Operator,
+  Settings,
+  SimpleField,
+  Utils,
+  ValueSource,
+  Widgets,
+} from 'react-awesome-query-builder';
+
+import { dateTime, toOption } from '@grafana/data';
+import { Button, DateTimePicker, Input, Select } from '@grafana/ui';
+
+const buttonLabels = {
+  add: 'Add',
+  remove: 'Remove',
+};
+
+export const emptyInitValue: JsonItem = {
+  id: Utils.uuid(),
+  type: 'group' as const,
+  children1: {
+    [Utils.uuid()]: {
+      type: 'rule',
+      properties: {
+        field: null,
+        operator: null,
+        value: [],
+        valueSrc: [],
+      },
+    },
+  },
+};
+
+export const emptyInitTree: JsonTree = {
+  id: Utils.uuid(),
+  type: 'group' as const,
+  children1: {
+    [Utils.uuid()]: {
+      type: 'rule',
+      properties: {
+        field: null,
+        operator: null,
+        value: [],
+        valueSrc: [],
+      },
+    },
+  },
+};
+
+export const widgets: Widgets = {
+  ...BasicConfig.widgets,
+  text: {
+    ...BasicConfig.widgets.text,
+    factory: function TextInput(props) {
+      return (
+        <Input
+          value={props?.value || ''}
+          placeholder={props?.placeholder}
+          onChange={(e) => props?.setValue(e.currentTarget.value)}
+        />
+      );
+    },
+  },
+  number: {
+    ...BasicConfig.widgets.number,
+    factory: function NumberInput(props) {
+      return (
+        <Input
+          value={props?.value}
+          placeholder={props?.placeholder}
+          type="number"
+          onChange={(e) => props?.setValue(Number.parseInt(e.currentTarget.value, 10))}
+        />
+      );
+    },
+  },
+  datetime: {
+    ...BasicConfig.widgets.datetime,
+    factory: function DateTimeInput(props) {
+      return (
+        <DateTimePicker
+          onChange={(e) => {
+            props?.setValue(e.format(BasicConfig.widgets.datetime.valueFormat));
+          }}
+          date={dateTime(props?.value).utc()}
+        />
+      );
+    },
+  },
+};
+
+export const settings: Settings = {
+  ...BasicConfig.settings,
+  canRegroup: false,
+  maxNesting: 1,
+  canReorder: false,
+  showNot: false,
+  addRuleLabel: buttonLabels.add,
+  deleteLabel: buttonLabels.remove,
+  renderConjs: function Conjunctions(conjProps) {
+    return (
+      <Select
+        id={conjProps?.id}
+        aria-label="Conjunction"
+        menuShouldPortal
+        options={conjProps?.conjunctionOptions ? Object.keys(conjProps?.conjunctionOptions).map(toOption) : undefined}
+        value={conjProps?.selectedConjunction}
+        onChange={(val) => conjProps?.setConjunction(val.value!)}
+      />
+    );
+  },
+  renderField: function Field(fieldProps) {
+    const fields = fieldProps?.config?.fields || {};
+    return (
+      <Select
+        id={fieldProps?.id}
+        width={25}
+        aria-label="Field"
+        menuShouldPortal
+        options={fieldProps?.items.map((f) => {
+          // @ts-ignore
+          const icon = fields[f.key].mainWidgetProps?.customProps?.icon;
+          return {
+            label: f.label,
+            value: f.key,
+            icon,
+          };
+        })}
+        value={fieldProps?.selectedKey}
+        onChange={(val) => {
+          fieldProps?.setField(val.label!);
+        }}
+      />
+    );
+  },
+  renderButton: function RAQBButton(buttonProps) {
+    return (
+      <Button
+        type="button"
+        title={`${buttonProps?.label} filter`}
+        onClick={buttonProps?.onClick}
+        variant="secondary"
+        size="md"
+        icon={buttonProps?.label === buttonLabels.add ? 'plus' : 'times'}
+      />
+    );
+  },
+  renderOperator: function Operator(operatorProps) {
+    return (
+      <Select
+        options={operatorProps?.items.map((op) => ({ label: op.label, value: op.key }))}
+        aria-label="Operator"
+        menuShouldPortal
+        value={operatorProps?.selectedKey}
+        onChange={(val) => {
+          operatorProps?.setField(val.value || '');
+        }}
+      />
+    );
+  },
+};
+
+// add IN / NOT IN operators to text to support multi-value variables
+const enum Op {
+  IN = 'select_any_in',
+  NOT_IN = 'select_not_any_in',
+}
+// eslint-ignore
+const customOperators = getCustomOperators(BasicConfig) as typeof BasicConfig.operators;
+const textWidget = BasicConfig.types.text.widgets.text;
+const opers = [...(textWidget.operators || []), Op.IN, Op.NOT_IN];
+const customTextWidget = {
+  ...textWidget,
+  operators: opers,
+};
+
+const customTypes = {
+  ...BasicConfig.types,
+  text: {
+    ...BasicConfig.types.text,
+    widgets: {
+      ...BasicConfig.types.text.widgets,
+      text: customTextWidget,
+    },
+  },
+};
+
+export const raqbConfig: Config = {
+  ...BasicConfig,
+  widgets,
+  settings,
+  operators: customOperators as typeof BasicConfig.operators,
+  types: customTypes,
+};
+
+export type { Config };
+
+function getCustomOperators(config: BasicConfig) {
+  const { ...supportedOperators } = config.operators;
+  const noop = () => '';
+  // IN operator expects array, override IN formatter for multi-value variables
+  const sqlFormatInOp = supportedOperators[Op.IN].sqlFormatOp || noop;
+  const customSqlInFormatter = (
+    field: string,
+    op: string,
+    value: string | List<string>,
+    valueSrc: ValueSource,
+    valueType: string,
+    opDef: Operator,
+    operatorOptions: object,
+    fieldDef: SimpleField
+  ) => {
+    return sqlFormatInOp(field, op, splitIfString(value), valueSrc, valueType, opDef, operatorOptions, fieldDef);
+  };
+  // NOT IN operator expects array, override NOT IN formatter for multi-value variables
+  const sqlFormatNotInOp = supportedOperators[Op.NOT_IN].sqlFormatOp || noop;
+  const customSqlNotInFormatter = (
+    field: string,
+    op: string,
+    value: string | List<string>,
+    valueSrc: ValueSource,
+    valueType: string,
+    opDef: Operator,
+    operatorOptions: object,
+    fieldDef: SimpleField
+  ) => {
+    return sqlFormatNotInOp(field, op, splitIfString(value), valueSrc, valueType, opDef, operatorOptions, fieldDef);
+  };
+
+  const customOperators = {
+    ...supportedOperators,
+    [Op.IN]: {
+      ...supportedOperators[Op.IN],
+      sqlFormatOp: customSqlInFormatter,
+    },
+    [Op.NOT_IN]: {
+      ...supportedOperators[Op.NOT_IN],
+      sqlFormatOp: customSqlNotInFormatter,
+    },
+  };
+
+  return customOperators;
+}
+
+// value: string | List<string> but AQB uses a different version of Immutable
+// eslint-ignore
+function splitIfString(value: any) {
+  if (isString(value)) {
+    return value.split(',');
+  }
+  return value;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/GroupByRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/GroupByRow.tsx
new file mode 100644
index 00000000000..7c91147f724
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/GroupByRow.tsx
@@ -0,0 +1,59 @@
+import React, { useCallback } from 'react';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { AccessoryButton, EditorList, InputGroup } from '@grafana/experimental';
+import { Select } from '@grafana/ui';
+
+import { QueryEditorGroupByExpression } from '../../expressions';
+import { SQLExpression } from '../../types';
+import { setGroupByField } from '../../utils/sql.utils';
+
+interface GroupByRowProps {
+  sql: SQLExpression;
+  onSqlChange: (sql: SQLExpression) => void;
+  columns?: Array<SelectableValue<string>>;
+}
+
+export function GroupByRow({ sql, columns, onSqlChange }: GroupByRowProps) {
+  const onGroupByChange = useCallback(
+    (item: Array<Partial<QueryEditorGroupByExpression>>) => {
+      // As new (empty object) items come in, we need to make sure they have the correct type
+      const cleaned = item.map((v) => setGroupByField(v.property?.name));
+      const newSql = { ...sql, groupBy: cleaned };
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  return (
+    <EditorList<QueryEditorGroupByExpression>
+      items={sql.groupBy!}
+      onChange={onGroupByChange}
+      renderItem={makeRenderColumn({
+        options: columns,
+      })}
+    />
+  );
+}
+
+function makeRenderColumn({ options }: { options?: Array<SelectableValue<string>> }) {
+  const renderColumn = function (
+    item: Partial<QueryEditorGroupByExpression>,
+    onChangeItem: (item: QueryEditorGroupByExpression) => void,
+    onDeleteItem: () => void
+  ) {
+    return (
+      <InputGroup>
+        <Select
+          value={item.property?.name ? toOption(item.property.name) : null}
+          aria-label="Group by"
+          options={options}
+          menuShouldPortal
+          onChange={({ value }) => value && onChangeItem(setGroupByField(value))}
+        />
+        <AccessoryButton aria-label="Remove group by column" icon="times" variant="secondary" onClick={onDeleteItem} />
+      </InputGroup>
+    );
+  };
+  return renderColumn;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/OrderByRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/OrderByRow.tsx
new file mode 100644
index 00000000000..58c8ce3158a
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/OrderByRow.tsx
@@ -0,0 +1,92 @@
+import { uniqueId } from 'lodash';
+import React, { useCallback } from 'react';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { EditorField, InputGroup, Space } from '@grafana/experimental';
+import { Input, RadioButtonGroup, Select } from '@grafana/ui';
+
+import { SQLExpression } from '../../types';
+import { setPropertyField } from '../../utils/sql.utils';
+
+type OrderByRowProps = {
+  sql: SQLExpression;
+  onSqlChange: (sql: SQLExpression) => void;
+  columns?: Array<SelectableValue<string>>;
+  showOffset?: boolean;
+};
+
+const sortOrderOptions = [
+  { description: 'Sort by ascending', value: 'ASC', icon: 'sort-amount-up' } as const,
+  { description: 'Sort by descending', value: 'DESC', icon: 'sort-amount-down' } as const,
+];
+
+export function OrderByRow({ sql, onSqlChange, columns, showOffset }: OrderByRowProps) {
+  const onSortOrderChange = useCallback(
+    (item: 'ASC' | 'DESC') => {
+      const newSql: SQLExpression = { ...sql, orderByDirection: item };
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  const onLimitChange = useCallback(
+    (event: React.FormEvent<HTMLInputElement>) => {
+      const newSql: SQLExpression = { ...sql, limit: Number.parseInt(event.currentTarget.value, 10) };
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  const onOffsetChange = useCallback(
+    (event: React.FormEvent<HTMLInputElement>) => {
+      const newSql: SQLExpression = { ...sql, offset: Number.parseInt(event.currentTarget.value, 10) };
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  const onOrderByChange = useCallback(
+    (item: SelectableValue<string>) => {
+      const newSql: SQLExpression = { ...sql, orderBy: setPropertyField(item?.value) };
+      if (item === null) {
+        newSql.orderByDirection = undefined;
+      }
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  return (
+    <>
+      <EditorField label="Order by" width={25}>
+        <InputGroup>
+          <Select
+            aria-label="Order by"
+            options={columns}
+            value={sql.orderBy?.property.name ? toOption(sql.orderBy.property.name) : null}
+            isClearable
+            menuShouldPortal
+            onChange={onOrderByChange}
+          />
+
+          <Space h={1.5} />
+
+          <RadioButtonGroup
+            options={sortOrderOptions}
+            disabled={!sql?.orderBy?.property.name}
+            value={sql.orderByDirection}
+            onChange={onSortOrderChange}
+          />
+        </InputGroup>
+      </EditorField>
+      <EditorField label="Limit" optional width={25}>
+        <Input type="number" min={0} id={uniqueId('limit-')} value={sql.limit || ''} onChange={onLimitChange} />
+      </EditorField>
+      {showOffset && (
+        <EditorField label="Offset" optional width={25}>
+          <Input type="number" id={uniqueId('offset-')} value={sql.offset || ''} onChange={onOffsetChange} />
+        </EditorField>
+      )}
+    </>
+  );
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/Preview.tsx b/public/app/features/plugins/sql/components/visual-query-builder/Preview.tsx
new file mode 100644
index 00000000000..c5dac081086
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/Preview.tsx
@@ -0,0 +1,46 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import { useCopyToClipboard } from 'react-use';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { CodeEditor, Field, IconButton, useStyles2 } from '@grafana/ui';
+
+import { formatSQL } from '../../utils/formatSQL';
+
+type PreviewProps = {
+  rawSql: string;
+};
+
+export function Preview({ rawSql }: PreviewProps) {
+  // TODO: use zero index to give feedback about copy success
+  const [_, copyToClipboard] = useCopyToClipboard();
+  const styles = useStyles2(getStyles);
+
+  const labelElement = (
+    <div className={styles.labelWrapper}>
+      <label className={styles.label}>Preview</label>
+      <IconButton tooltip="Copy to clipboard" onClick={() => copyToClipboard(rawSql)} name="copy" />
+    </div>
+  );
+
+  return (
+    <Field label={labelElement} className={styles.grow}>
+      <CodeEditor
+        language="sql"
+        height={80}
+        value={formatSQL(rawSql)}
+        monacoOptions={{ scrollbar: { vertical: 'hidden' }, scrollBeyondLastLine: false }}
+        readOnly={true}
+        showMiniMap={false}
+      />
+    </Field>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    grow: css({ flexGrow: 1 }),
+    label: css({ fontSize: 12, fontWeight: theme.typography.fontWeightMedium }),
+    labelWrapper: css({ display: 'flex', justifyContent: 'space-between', paddingBottom: theme.spacing(0.5) }),
+  };
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLGroupByRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/SQLGroupByRow.tsx
new file mode 100644
index 00000000000..617b8fa5632
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/SQLGroupByRow.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+
+import { QueryWithDefaults } from '../../defaults';
+import { DB, SQLQuery } from '../../types';
+import { useSqlChange } from '../../utils/useSqlChange';
+
+import { GroupByRow } from './GroupByRow';
+
+interface SQLGroupByRowProps {
+  fields: SelectableValue[];
+  query: QueryWithDefaults;
+  onQueryChange: (query: SQLQuery) => void;
+  db: DB;
+}
+
+export function SQLGroupByRow({ fields, query, onQueryChange, db }: SQLGroupByRowProps) {
+  const { onSqlChange } = useSqlChange({ query, onQueryChange, db });
+
+  return <GroupByRow columns={fields} sql={query.sql!} onSqlChange={onSqlChange} />;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLOrderByRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/SQLOrderByRow.tsx
new file mode 100644
index 00000000000..80a5d50b213
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/SQLOrderByRow.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+
+import { QueryWithDefaults } from '../../defaults';
+import { DB, SQLQuery } from '../../types';
+import { useSqlChange } from '../../utils/useSqlChange';
+
+import { OrderByRow } from './OrderByRow';
+
+type SQLOrderByRowProps = {
+  fields: SelectableValue[];
+  query: QueryWithDefaults;
+  onQueryChange: (query: SQLQuery) => void;
+  db: DB;
+};
+
+export function SQLOrderByRow({ fields, query, onQueryChange, db }: SQLOrderByRowProps) {
+  const { onSqlChange } = useSqlChange({ query, onQueryChange, db });
+  let columnsWithIndices: SelectableValue[] = [];
+
+  if (fields) {
+    columnsWithIndices = [
+      {
+        value: '',
+        label: 'Selected columns',
+        options: query.sql?.columns?.map((c, i) => ({
+          value: i + 1,
+          label: c.name
+            ? `${i + 1} - ${c.name}(${c.parameters?.map((p) => `${p.name}`)})`
+            : c.parameters?.map((p) => `${i + 1} - ${p.name}`),
+        })),
+        expanded: true,
+      },
+      ...fields,
+    ];
+  }
+
+  return <OrderByRow sql={query.sql!} onSqlChange={onSqlChange} columns={columnsWithIndices} />;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx
new file mode 100644
index 00000000000..29844d0e4ce
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/SQLSelectRow.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+
+import { QueryWithDefaults } from '../../defaults';
+import { DB, SQLQuery } from '../../types';
+import { useSqlChange } from '../../utils/useSqlChange';
+
+import { SelectRow } from './SelectRow';
+
+interface SQLSelectRowProps {
+  fields: SelectableValue[];
+  query: QueryWithDefaults;
+  onQueryChange: (query: SQLQuery) => void;
+  db: DB;
+}
+
+export function SQLSelectRow({ fields, query, onQueryChange, db }: SQLSelectRowProps) {
+  const { onSqlChange } = useSqlChange({ query, onQueryChange, db });
+
+  return <SelectRow columns={fields} sql={query.sql!} onSqlChange={onSqlChange} />;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SQLWhereRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/SQLWhereRow.tsx
new file mode 100644
index 00000000000..2602a485776
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/SQLWhereRow.tsx
@@ -0,0 +1,51 @@
+import React from 'react';
+import useAsync from 'react-use/lib/useAsync';
+
+import { SelectableValue } from '@grafana/data';
+
+import { QueryWithDefaults } from '../../defaults';
+import { DB, SQLExpression, SQLQuery, SQLSelectableValue } from '../../types';
+import { useSqlChange } from '../../utils/useSqlChange';
+
+import { Config } from './AwesomeQueryBuilder';
+import { WhereRow } from './WhereRow';
+
+interface WhereRowProps {
+  query: QueryWithDefaults;
+  fields: SelectableValue[];
+  onQueryChange: (query: SQLQuery) => void;
+  db: DB;
+}
+
+export function SQLWhereRow({ query, fields, onQueryChange, db }: WhereRowProps) {
+  const state = useAsync(async () => {
+    return mapFieldsToTypes(fields);
+  }, [fields]);
+
+  const { onSqlChange } = useSqlChange({ query, onQueryChange, db });
+
+  return (
+    <WhereRow
+      // TODO: fix key that's used to force clean render or SQLWhereRow - otherwise it doesn't render operators correctly
+      key={JSON.stringify(state.value)}
+      config={{ fields: state.value || {} }}
+      sql={query.sql!}
+      onSqlChange={(val: SQLExpression) => {
+        onSqlChange(val);
+      }}
+    />
+  );
+}
+
+// needed for awesome query builder
+function mapFieldsToTypes(columns: SQLSelectableValue[]) {
+  const fields: Config['fields'] = {};
+  for (const col of columns) {
+    fields[col.value] = {
+      type: col.raqbFieldType || 'text',
+      valueSources: ['value'],
+      mainWidgetProps: { customProps: { icon: col.icon } },
+    };
+  }
+  return fields;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/SelectRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/SelectRow.tsx
new file mode 100644
index 00000000000..f340989d5ae
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/SelectRow.tsx
@@ -0,0 +1,146 @@
+import { css } from '@emotion/css';
+import { uniqueId } from 'lodash';
+import React, { useCallback } from 'react';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { EditorField, Stack } from '@grafana/experimental';
+import { Button, Select, useStyles2 } from '@grafana/ui';
+
+import { AGGREGATE_FNS } from '../../constants';
+import { QueryEditorExpressionType, QueryEditorFunctionExpression } from '../../expressions';
+import { SQLExpression } from '../../types';
+import { createFunctionField } from '../../utils/sql.utils';
+
+interface SelectRowProps {
+  sql: SQLExpression;
+  onSqlChange: (sql: SQLExpression) => void;
+  columns?: Array<SelectableValue<string>>;
+}
+
+const asteriskValue = { label: '*', value: '*' };
+
+export function SelectRow({ sql, columns, onSqlChange }: SelectRowProps) {
+  const styles = useStyles2(getStyles);
+  const columnsWithAsterisk = [asteriskValue, ...(columns || [])];
+
+  const onColumnChange = useCallback(
+    (item: QueryEditorFunctionExpression, index: number) => (column: SelectableValue<string>) => {
+      let modifiedItem = { ...item };
+      if (!item.parameters?.length) {
+        modifiedItem.parameters = [{ type: QueryEditorExpressionType.FunctionParameter, name: column.value } as const];
+      } else {
+        modifiedItem.parameters = item.parameters.map((p) =>
+          p.type === QueryEditorExpressionType.FunctionParameter ? { ...p, name: column.value } : p
+        );
+      }
+
+      const newSql: SQLExpression = {
+        ...sql,
+        columns: sql.columns?.map((c, i) => (i === index ? modifiedItem : c)),
+      };
+
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  const onAggregationChange = useCallback(
+    (item: QueryEditorFunctionExpression, index: number) => (aggregation: SelectableValue<string>) => {
+      const newItem = {
+        ...item,
+        name: aggregation?.value,
+      };
+      const newSql: SQLExpression = {
+        ...sql,
+        columns: sql.columns?.map((c, i) => (i === index ? newItem : c)),
+      };
+
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  const removeColumn = useCallback(
+    (index: number) => () => {
+      const clone = [...sql.columns!];
+      clone.splice(index, 1);
+      const newSql: SQLExpression = {
+        ...sql,
+        columns: clone,
+      };
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  const addColumn = useCallback(() => {
+    const newSql: SQLExpression = { ...sql, columns: [...sql.columns!, createFunctionField()] };
+    onSqlChange(newSql);
+  }, [onSqlChange, sql]);
+
+  return (
+    <Stack gap={2} alignItems="end" wrap direction="column">
+      {sql.columns?.map((item, index) => (
+        <div key={index}>
+          <Stack gap={2} alignItems="end">
+            <EditorField label="Column" width={25}>
+              <Select
+                value={getColumnValue(item)}
+                options={columnsWithAsterisk}
+                inputId={`select-column-${index}-${uniqueId()}`}
+                menuShouldPortal
+                allowCustomValue
+                onChange={onColumnChange(item, index)}
+              />
+            </EditorField>
+
+            <EditorField label="Aggregation" optional width={25}>
+              <Select
+                value={item.name ? toOption(item.name) : null}
+                inputId={`select-aggregation-${index}-${uniqueId()}`}
+                isClearable
+                menuShouldPortal
+                allowCustomValue
+                options={aggregateFnOptions}
+                onChange={onAggregationChange(item, index)}
+              />
+            </EditorField>
+            <Button
+              aria-label="Remove"
+              type="button"
+              icon="trash-alt"
+              variant="secondary"
+              size="md"
+              onClick={removeColumn(index)}
+            />
+          </Stack>
+        </div>
+      ))}
+      <Button
+        type="button"
+        onClick={addColumn}
+        variant="secondary"
+        size="md"
+        icon="plus"
+        aria-label="Add"
+        className={styles.addButton}
+      />
+    </Stack>
+  );
+}
+
+const getStyles = () => {
+  return { addButton: css({ alignSelf: 'flex-start' }) };
+};
+
+const aggregateFnOptions = AGGREGATE_FNS.map((v: { id: string; name: string; description: string }) =>
+  toOption(v.name)
+);
+
+function getColumnValue({ parameters }: QueryEditorFunctionExpression): SelectableValue<string> | null {
+  const column = parameters?.find((p) => p.type === QueryEditorExpressionType.FunctionParameter);
+  if (column?.name) {
+    return toOption(column.name);
+  }
+  return null;
+}
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/VisualEditor.tsx b/public/app/features/plugins/sql/components/visual-query-builder/VisualEditor.tsx
new file mode 100644
index 00000000000..81b9c1f8b58
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/VisualEditor.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import { useAsync } from 'react-use';
+
+import { EditorField, EditorRow, EditorRows } from '@grafana/experimental';
+
+import { DB, QueryEditorProps, QueryRowFilter } from '../../types';
+import { QueryToolbox } from '../query-editor-raw/QueryToolbox';
+
+import { Preview } from './Preview';
+import { SQLGroupByRow } from './SQLGroupByRow';
+import { SQLOrderByRow } from './SQLOrderByRow';
+import { SQLSelectRow } from './SQLSelectRow';
+import { SQLWhereRow } from './SQLWhereRow';
+
+interface VisualEditorProps extends QueryEditorProps {
+  db: DB;
+  queryRowFilter: QueryRowFilter;
+  onValidate: (isValid: boolean) => void;
+}
+
+export const VisualEditor: React.FC<VisualEditorProps> = ({
+  query,
+  db,
+  queryRowFilter,
+  onChange,
+  onValidate,
+  range,
+}) => {
+  const state = useAsync(async () => {
+    const fields = await db.fields(query);
+    return fields;
+  }, [db, query.dataset, query.table]);
+
+  return (
+    <>
+      <EditorRows>
+        <EditorRow>
+          <SQLSelectRow fields={state.value || []} query={query} onQueryChange={onChange} db={db} />
+        </EditorRow>
+        {queryRowFilter.filter && (
+          <EditorRow>
+            <EditorField label="Filter by column value" optional>
+              <SQLWhereRow fields={state.value || []} query={query} onQueryChange={onChange} db={db} />
+            </EditorField>
+          </EditorRow>
+        )}
+        {queryRowFilter.group && (
+          <EditorRow>
+            <EditorField label="Group by column">
+              <SQLGroupByRow fields={state.value || []} query={query} onQueryChange={onChange} db={db} />
+            </EditorField>
+          </EditorRow>
+        )}
+        {queryRowFilter.order && (
+          <EditorRow>
+            <SQLOrderByRow fields={state.value || []} query={query} onQueryChange={onChange} db={db} />
+          </EditorRow>
+        )}
+        {queryRowFilter.preview && query.rawSql && (
+          <EditorRow>
+            <Preview rawSql={query.rawSql} />
+          </EditorRow>
+        )}
+      </EditorRows>
+      <QueryToolbox db={db} query={query} onValidate={onValidate} range={range} />
+    </>
+  );
+};
diff --git a/public/app/features/plugins/sql/components/visual-query-builder/WhereRow.tsx b/public/app/features/plugins/sql/components/visual-query-builder/WhereRow.tsx
new file mode 100644
index 00000000000..573c5443b9f
--- /dev/null
+++ b/public/app/features/plugins/sql/components/visual-query-builder/WhereRow.tsx
@@ -0,0 +1,92 @@
+import { injectGlobal } from '@emotion/css';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Builder, Config, ImmutableTree, Query, Utils } from 'react-awesome-query-builder';
+
+import { SQLExpression } from '../../types';
+
+import { emptyInitTree, raqbConfig } from './AwesomeQueryBuilder';
+
+interface SQLBuilderWhereRowProps {
+  sql: SQLExpression;
+  onSqlChange: (sql: SQLExpression) => void;
+  config?: Partial<Config>;
+}
+
+export function WhereRow({ sql, config, onSqlChange }: SQLBuilderWhereRowProps) {
+  const [tree, setTree] = useState<ImmutableTree>();
+  const configWithDefaults = useMemo(() => ({ ...raqbConfig, ...config }), [config]);
+
+  useEffect(() => {
+    // Set the initial tree
+    if (!tree) {
+      const initTree = Utils.checkTree(Utils.loadTree(sql.whereJsonTree ?? emptyInitTree), configWithDefaults);
+      setTree(initTree);
+    }
+  }, [configWithDefaults, sql.whereJsonTree, tree]);
+
+  useEffect(() => {
+    if (!sql.whereJsonTree) {
+      setTree(Utils.checkTree(Utils.loadTree(emptyInitTree), configWithDefaults));
+    }
+  }, [configWithDefaults, sql.whereJsonTree]);
+
+  const onTreeChange = useCallback(
+    (changedTree: ImmutableTree, config: Config) => {
+      setTree(changedTree);
+      const newSql = {
+        ...sql,
+        whereJsonTree: Utils.getTree(changedTree),
+        whereString: Utils.sqlFormat(changedTree, config),
+      };
+
+      onSqlChange(newSql);
+    },
+    [onSqlChange, sql]
+  );
+
+  if (!tree) {
+    return null;
+  }
+
+  return (
+    <Query
+      {...configWithDefaults}
+      value={tree}
+      onChange={onTreeChange}
+      renderBuilder={(props) => <Builder {...props} />}
+    />
+  );
+}
+
+function flex(direction: string) {
+  return `
+    display: flex;
+    gap: 8px;
+    flex-direction: ${direction};`;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-expressions
+injectGlobal`
+  .group--header {
+    ${flex('row')}
+  }
+
+  .group-or-rule {
+    ${flex('column')}
+    .rule {
+      flex-direction: row;
+    }
+  }
+
+  .rule--body {
+    ${flex('row')}
+  }
+
+  .group--children {
+    ${flex('column')}
+  }
+
+  .group--conjunctions:empty {
+    display: none;
+  }
+`;
diff --git a/public/app/features/plugins/sql/constants.ts b/public/app/features/plugins/sql/constants.ts
new file mode 100644
index 00000000000..38eaff650ee
--- /dev/null
+++ b/public/app/features/plugins/sql/constants.ts
@@ -0,0 +1,112 @@
+import { OperatorType } from '@grafana/experimental';
+
+export const AGGREGATE_FNS = [
+  {
+    id: 'AVG',
+    name: 'AVG',
+    description: `AVG(
+    [DISTINCT]
+    expression
+  )
+  [OVER (...)]
+  
+  Returns the average of non-NULL input values, or NaN if the input contains a NaN.`,
+  },
+  {
+    id: 'COUNT',
+    name: 'COUNT',
+    description: `COUNT(*)  [OVER (...)]
+  Returns the number of rows in the input.
+  
+  COUNT(
+    [DISTINCT]
+    expression
+  )
+  [OVER (...)]
+  
+  Returns the number of rows with expression evaluated to any value other than NULL.
+  `,
+  },
+  {
+    id: 'MAX',
+    name: 'MAX',
+    description: `MAX(
+    expression
+  )
+  [OVER (...)]
+  
+  Returns the maximum value of non-NULL expressions. Returns NULL if there are zero input rows or expression evaluates to NULL for all rows. Returns NaN if the input contains a NaN.
+  `,
+  },
+  {
+    id: 'MIN',
+    name: 'MIN',
+    description: `MIN(
+    expression
+  )
+  [OVER (...)]
+  
+  Returns the minimum value of non-NULL expressions. Returns NULL if there are zero input rows or expression evaluates to NULL for all rows. Returns NaN if the input contains a NaN.
+  `,
+  },
+  {
+    id: 'SUM',
+    name: 'SUM',
+    description: `SUM(
+    [DISTINCT]
+    expression
+  )
+  [OVER (...)]
+  
+  Returns the sum of non-null values.
+  
+  If the expression is a floating point value, the sum is non-deterministic, which means you might receive a different result each time you use this function.
+  `,
+  },
+];
+
+export const OPERATORS = [
+  { type: OperatorType.Comparison, id: 'LESS_THAN', operator: '<', description: 'Returns TRUE if X is less than Y.' },
+  {
+    type: OperatorType.Comparison,
+    id: 'LESS_THAN_EQUAL',
+    operator: '<=',
+    description: 'Returns TRUE if X is less than or equal to Y.',
+  },
+  {
+    type: OperatorType.Comparison,
+    id: 'GREATER_THAN',
+    operator: '>',
+    description: 'Returns TRUE if X is greater than Y.',
+  },
+  {
+    type: OperatorType.Comparison,
+    id: 'GREATER_THAN_EQUAL',
+    operator: '>=',
+    description: 'Returns TRUE if X is greater than or equal to Y.',
+  },
+  { type: OperatorType.Comparison, id: 'EQUAL', operator: '=', description: 'Returns TRUE if X is equal to Y.' },
+  {
+    type: OperatorType.Comparison,
+    id: 'NOT_EQUAL',
+    operator: '!=',
+    description: 'Returns TRUE if X is not equal to Y.',
+  },
+  {
+    type: OperatorType.Comparison,
+    id: 'NOT_EQUAL_ALT',
+    operator: '<>',
+    description: 'Returns TRUE if X is not equal to Y.',
+  },
+  {
+    type: OperatorType.Comparison,
+    id: 'LIKE',
+    operator: 'LIKE',
+    description: `Checks if the STRING in the first operand X matches a pattern specified by the second operand Y. Expressions can contain these characters:
+- A percent sign "%" matches any number of characters or bytes
+- An underscore "_" matches a single character or byte
+- You can escape "\", "_", or "%" using two backslashes. For example, "\\%". If you are using raw strings, only a single backslash is required. For example, r"\%".`,
+  },
+  { type: OperatorType.Logical, id: 'AND', operator: 'AND' },
+  { type: OperatorType.Logical, id: 'OR', operator: 'OR' },
+];
diff --git a/public/app/features/plugins/sql/datasource/SqlDatasource.ts b/public/app/features/plugins/sql/datasource/SqlDatasource.ts
new file mode 100644
index 00000000000..73e18ba4b18
--- /dev/null
+++ b/public/app/features/plugins/sql/datasource/SqlDatasource.ts
@@ -0,0 +1,229 @@
+import { lastValueFrom, of } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+
+import {
+  AnnotationEvent,
+  DataFrame,
+  DataFrameView,
+  DataQueryRequest,
+  DataQueryResponse,
+  DataSourceInstanceSettings,
+  DataSourceRef,
+  MetricFindValue,
+  ScopedVars,
+} from '@grafana/data';
+import {
+  BackendDataSourceResponse,
+  DataSourceWithBackend,
+  FetchResponse,
+  getBackendSrv,
+  getTemplateSrv,
+  TemplateSrv,
+} from '@grafana/runtime';
+import { toTestingStatus } from '@grafana/runtime/src/utils/queryResponse';
+
+import { VariableWithMultiSupport } from '../../../variables/types';
+import { getSearchFilterScopedVar } from '../../../variables/utils';
+import {
+  DB,
+  SQLQuery,
+  SQLOptions,
+  SqlQueryForInterpolation,
+  ResponseParser,
+  SqlQueryModel,
+  QueryFormat,
+} from '../types';
+
+export abstract class SqlDatasource extends DataSourceWithBackend<SQLQuery, SQLOptions> {
+  id: number;
+  name: string;
+  interval: string;
+  db: DB;
+
+  constructor(
+    instanceSettings: DataSourceInstanceSettings<SQLOptions>,
+    protected readonly templateSrv: TemplateSrv = getTemplateSrv()
+  ) {
+    super(instanceSettings);
+    this.name = instanceSettings.name;
+    this.id = instanceSettings.id;
+    const settingsData = instanceSettings.jsonData || {};
+    this.interval = settingsData.timeInterval || '1m';
+    this.db = this.getDB();
+  }
+
+  abstract getDB(dsID?: number): DB;
+
+  abstract getQueryModel(target?: SQLQuery, templateSrv?: TemplateSrv, scopedVars?: ScopedVars): SqlQueryModel;
+
+  abstract getResponseParser(): ResponseParser;
+
+  interpolateVariable = (value: string | string[] | number, variable: VariableWithMultiSupport) => {
+    if (typeof value === 'string') {
+      if (variable.multi || variable.includeAll) {
+        const result = this.getQueryModel().quoteLiteral(value);
+        return result;
+      } else {
+        return value;
+      }
+    }
+
+    if (typeof value === 'number') {
+      return value;
+    }
+
+    if (Array.isArray(value)) {
+      const quotedValues = value.map((v) => this.getQueryModel().quoteLiteral(v));
+      return quotedValues.join(',');
+    }
+
+    return value;
+  };
+
+  interpolateVariablesInQueries(
+    queries: SqlQueryForInterpolation[],
+    scopedVars: ScopedVars
+  ): SqlQueryForInterpolation[] {
+    let expandedQueries = queries;
+    if (queries && queries.length > 0) {
+      expandedQueries = queries.map((query) => {
+        const expandedQuery = {
+          ...query,
+          datasource: this.getRef(),
+          rawSql: this.templateSrv.replace(query.rawSql, scopedVars, this.interpolateVariable),
+          rawQuery: true,
+        };
+        return expandedQuery;
+      });
+    }
+    return expandedQueries;
+  }
+
+  filterQuery(query: SQLQuery): boolean {
+    return !query.hide;
+  }
+
+  applyTemplateVariables(
+    target: SQLQuery,
+    scopedVars: ScopedVars
+  ): Record<string, string | DataSourceRef | SQLQuery['format']> {
+    const queryModel = this.getQueryModel(target, this.templateSrv, scopedVars);
+    const rawSql = this.clean(queryModel.interpolate());
+    return {
+      refId: target.refId,
+      datasource: this.getRef(),
+      rawSql,
+      format: target.format,
+    };
+  }
+
+  clean(value: string) {
+    return value.replace(/''/g, "'");
+  }
+
+  // eslint-ignore @typescript-eslint/no-explicit-any
+  async annotationQuery(options: any): Promise<AnnotationEvent[]> {
+    if (!options.annotation.rawQuery) {
+      return Promise.reject({
+        message: 'Query missing in annotation definition',
+      });
+    }
+
+    const query = {
+      refId: options.annotation.name,
+      datasource: this.getRef(),
+      rawSql: this.templateSrv.replace(options.annotation.rawQuery, options.scopedVars, this.interpolateVariable),
+      format: 'table',
+    };
+
+    return lastValueFrom(
+      getBackendSrv()
+        .fetch<BackendDataSourceResponse>({
+          url: '/api/ds/query',
+          method: 'POST',
+          data: {
+            from: options.range.from.valueOf().toString(),
+            to: options.range.to.valueOf().toString(),
+            queries: [query],
+          },
+          requestId: options.annotation.name,
+        })
+        .pipe(
+          map(
+            async (res: FetchResponse<BackendDataSourceResponse>) =>
+              await this.getResponseParser().transformAnnotationResponse(options, res.data)
+          )
+        )
+    );
+  }
+
+  async metricFindQuery(query: string, optionalOptions: any): Promise<MetricFindValue[]> {
+    const rawSql = this.templateSrv.replace(
+      query,
+      getSearchFilterScopedVar({ query, wildcardChar: '%', options: optionalOptions }),
+      this.interpolateVariable
+    );
+
+    const interpolatedQuery = {
+      datasourceId: this.id,
+      datasource: this.getRef(),
+      rawSql,
+      format: QueryFormat.Table,
+    };
+
+    const response = await this.runQuery(interpolatedQuery, optionalOptions);
+    return this.getResponseParser().transformMetricFindResponse(response);
+  }
+
+  async runSql<T = any>(query: string) {
+    const frame = await this.runQuery({ rawSql: query, format: QueryFormat.Table }, {});
+    return new DataFrameView<T>(frame);
+  }
+
+  private runQuery(request: Partial<SQLQuery>, options?: any): Promise<DataFrame> {
+    return new Promise((resolve) => {
+      const req = {
+        targets: [{ ...request, refId: String(Math.random()) }],
+        range: options?.range,
+      } as DataQueryRequest<SQLQuery>;
+      this.query(req).subscribe((res: DataQueryResponse) => {
+        resolve(res.data[0] || { fields: [] });
+      });
+    });
+  }
+
+  testDatasource(): Promise<any> {
+    return lastValueFrom(
+      getBackendSrv()
+        .fetch({
+          url: '/api/ds/query',
+          method: 'POST',
+          data: {
+            from: '5m',
+            to: 'now',
+            queries: [
+              {
+                refId: 'A',
+                intervalMs: 1,
+                maxDataPoints: 1,
+                datasource: this.getRef(),
+                datasourceId: this.id,
+                rawSql: 'SELECT 1',
+                format: 'table',
+              },
+            ],
+          },
+        })
+        .pipe(
+          map(() => ({ status: 'success', message: 'Database Connection OK' })),
+          catchError((err) => {
+            return of(toTestingStatus(err));
+          })
+        )
+    );
+  }
+
+  targetContainsTemplate(target: any) {
+    return this.templateSrv.containsTemplate(target.rawSql);
+  }
+}
diff --git a/public/app/features/plugins/sql/defaults.ts b/public/app/features/plugins/sql/defaults.ts
new file mode 100644
index 00000000000..6093df7adc0
--- /dev/null
+++ b/public/app/features/plugins/sql/defaults.ts
@@ -0,0 +1,29 @@
+import { EditorMode } from '@grafana/experimental';
+
+import { QueryFormat, SQLQuery } from './types';
+import { createFunctionField, setGroupByField } from './utils/sql.utils';
+
+export function applyQueryDefaults(q: SQLQuery): SQLQuery {
+  let editorMode = q.editorMode || EditorMode.Builder;
+
+  // Switching to code editor if the query was created before visual query builder was introduced.
+  if (q.editorMode === undefined && q.rawSql !== undefined) {
+    editorMode = EditorMode.Code;
+  }
+
+  const result = {
+    ...q,
+    format: q.format !== undefined ? q.format : QueryFormat.Table,
+    rawSql: q.rawSql || '',
+    editorMode,
+    sql: q.sql || {
+      columns: [createFunctionField()],
+      groupBy: [setGroupByField()],
+      limit: 50,
+    },
+  };
+
+  return result;
+}
+
+export type QueryWithDefaults = ReturnType<typeof applyQueryDefaults>;
diff --git a/public/app/features/plugins/sql/expressions.ts b/public/app/features/plugins/sql/expressions.ts
new file mode 100644
index 00000000000..b80ef9b63fc
--- /dev/null
+++ b/public/app/features/plugins/sql/expressions.ts
@@ -0,0 +1,66 @@
+export enum QueryEditorPropertyType {
+  String = 'string',
+}
+
+export interface QueryEditorProperty {
+  type: QueryEditorPropertyType;
+  name?: string;
+}
+
+export type QueryEditorOperatorType = string | boolean | number;
+type QueryEditorOperatorValueType = QueryEditorOperatorType | QueryEditorOperatorType[];
+
+export interface QueryEditorOperator<T extends QueryEditorOperatorValueType> {
+  name?: string;
+  value?: T;
+}
+
+export interface QueryEditorOperatorExpression {
+  type: QueryEditorExpressionType.Operator;
+  property: QueryEditorProperty;
+  operator: QueryEditorOperator<QueryEditorOperatorValueType>;
+}
+
+export interface QueryEditorArrayExpression {
+  type: QueryEditorExpressionType.And | QueryEditorExpressionType.Or;
+  expressions: QueryEditorExpression[] | QueryEditorArrayExpression[];
+}
+
+export interface QueryEditorPropertyExpression {
+  type: QueryEditorExpressionType.Property;
+  property: QueryEditorProperty;
+}
+
+export enum QueryEditorExpressionType {
+  Property = 'property',
+  Operator = 'operator',
+  Or = 'or',
+  And = 'and',
+  GroupBy = 'groupBy',
+  Function = 'function',
+  FunctionParameter = 'functionParameter',
+}
+
+export type QueryEditorExpression =
+  | QueryEditorArrayExpression
+  | QueryEditorPropertyExpression
+  | QueryEditorGroupByExpression
+  | QueryEditorFunctionExpression
+  | QueryEditorFunctionParameterExpression
+  | QueryEditorOperatorExpression;
+
+export interface QueryEditorGroupByExpression {
+  type: QueryEditorExpressionType.GroupBy;
+  property: QueryEditorProperty;
+}
+
+export interface QueryEditorFunctionExpression {
+  type: QueryEditorExpressionType.Function;
+  name?: string;
+  parameters?: QueryEditorFunctionParameterExpression[];
+}
+
+export interface QueryEditorFunctionParameterExpression {
+  type: QueryEditorExpressionType.FunctionParameter;
+  name?: string;
+}
diff --git a/public/app/features/plugins/sql/types.ts b/public/app/features/plugins/sql/types.ts
new file mode 100644
index 00000000000..e6869254b9a
--- /dev/null
+++ b/public/app/features/plugins/sql/types.ts
@@ -0,0 +1,161 @@
+import { JsonTree } from 'react-awesome-query-builder';
+
+import {
+  AnnotationEvent,
+  DataFrame,
+  DataQuery,
+  DataSourceJsonData,
+  MetricFindValue,
+  SelectableValue,
+  TimeRange,
+  toOption as toOptionFromData,
+} from '@grafana/data';
+import { CompletionItemKind, EditorMode, LanguageCompletionProvider } from '@grafana/experimental';
+import { BackendDataSourceResponse } from '@grafana/runtime';
+
+import { QueryWithDefaults } from './defaults';
+import {
+  QueryEditorFunctionExpression,
+  QueryEditorGroupByExpression,
+  QueryEditorPropertyExpression,
+} from './expressions';
+
+export interface SqlQueryForInterpolation {
+  dataset?: string;
+  alias?: string;
+  format?: ResultFormat;
+  rawSql?: string;
+  refId: string;
+  hide?: boolean;
+}
+
+export interface SQLOptions extends DataSourceJsonData {
+  timeInterval: string;
+  database: string;
+}
+
+export type ResultFormat = 'time_series' | 'table';
+
+export enum QueryFormat {
+  Timeseries = 'time_series',
+  Table = 'table',
+}
+
+export interface SQLQuery extends DataQuery {
+  alias?: string;
+  format?: ResultFormat | QueryFormat | string | undefined;
+  rawSql?: string;
+  dataset?: string;
+  table?: string;
+  sql?: SQLExpression;
+  editorMode?: EditorMode;
+  rawQuery?: boolean;
+}
+
+export interface NameValue {
+  name: string;
+  value: string;
+}
+
+export type SQLFilters = NameValue[];
+
+export interface SQLExpression {
+  columns?: QueryEditorFunctionExpression[];
+  whereJsonTree?: JsonTree;
+  whereString?: string;
+  filters?: SQLFilters;
+  groupBy?: QueryEditorGroupByExpression[];
+  orderBy?: QueryEditorPropertyExpression;
+  orderByDirection?: 'ASC' | 'DESC';
+  limit?: number;
+  offset?: number;
+}
+
+export interface TableSchema {
+  name?: string;
+  schema?: TableFieldSchema[];
+}
+
+export interface TableFieldSchema {
+  name: string;
+  description?: string;
+  type: string;
+  repeated: boolean;
+  schema: TableFieldSchema[];
+}
+
+export interface QueryRowFilter {
+  filter: boolean;
+  group: boolean;
+  order: boolean;
+  preview: boolean;
+}
+
+export const QUERY_FORMAT_OPTIONS = [
+  { label: 'Time series', value: QueryFormat.Timeseries },
+  { label: 'Table', value: QueryFormat.Table },
+];
+
+const backWardToOption = (value: string) => ({ label: value, value });
+
+export const toOption = toOptionFromData ?? backWardToOption;
+
+export interface ResourceSelectorProps {
+  disabled?: boolean;
+  className?: string;
+  applyDefault?: boolean;
+}
+// React Awesome Query builder field types.
+// These are responsible for rendering the correct UI for the field.
+export type RAQBFieldTypes = 'text' | 'number' | 'boolean' | 'datetime' | 'date' | 'time';
+
+export interface SQLSelectableValue extends SelectableValue {
+  type?: string;
+  raqbFieldType?: RAQBFieldTypes;
+}
+export interface DB {
+  init?: (datasourceId?: string) => Promise<boolean>;
+  datasets: () => Promise<string[]>;
+  tables: (dataset?: string) => Promise<string[]>;
+  fields: (query: SQLQuery, order?: boolean) => Promise<SQLSelectableValue[]>;
+  validateQuery: (query: SQLQuery, range?: TimeRange) => Promise<ValidationResults>;
+  dsID: () => string;
+  dispose?: (dsID?: string) => void;
+  lookup: (path?: string) => Promise<Array<{ name: string; completion: string }>>;
+  getSqlCompletionProvider: () => LanguageCompletionProvider;
+  toRawSql?: (query: SQLQuery) => string;
+}
+
+export interface QueryEditorProps {
+  db: DB;
+  query: QueryWithDefaults;
+  onChange: (query: SQLQuery) => void;
+  range?: TimeRange;
+}
+
+export interface ValidationResults {
+  query: SQLQuery;
+  rawSql: string;
+  error: string;
+  isError: boolean;
+  isValid: boolean;
+  statistics?: {
+    TotalBytesProcessed: number;
+  } | null;
+}
+
+export interface SqlQueryModel {
+  interpolate: () => string;
+  quoteLiteral: (v: string) => string;
+}
+
+export interface ResponseParser {
+  transformAnnotationResponse: (options: object, data: BackendDataSourceResponse) => Promise<AnnotationEvent[]>;
+  transformMetricFindResponse: (frame: DataFrame) => MetricFindValue[];
+}
+
+export interface MetaDefinition {
+  name: string;
+  completion?: string;
+  kind: CompletionItemKind;
+}
diff --git a/public/app/features/plugins/sql/utils/formatSQL.ts b/public/app/features/plugins/sql/utils/formatSQL.ts
new file mode 100644
index 00000000000..eb6e03feac0
--- /dev/null
+++ b/public/app/features/plugins/sql/utils/formatSQL.ts
@@ -0,0 +1,8 @@
+// @ts-ignore
+import sqlFormatter from 'sql-formatter-plus';
+
+export function formatSQL(q: string) {
+  return sqlFormatter.format(q).replace(/(\$ \{ .* \})|(\$ __)|(\$ \w+)/g, (m: string) => {
+    return m.replace(/\s/g, '');
+  });
+}
diff --git a/public/app/features/plugins/sql/utils/sql.utils.ts b/public/app/features/plugins/sql/utils/sql.utils.ts
new file mode 100644
index 00000000000..d40531e6ad1
--- /dev/null
+++ b/public/app/features/plugins/sql/utils/sql.utils.ts
@@ -0,0 +1,105 @@
+import { isEmpty } from 'lodash';
+
+import {
+  QueryEditorExpressionType,
+  QueryEditorFunctionExpression,
+  QueryEditorGroupByExpression,
+  QueryEditorPropertyExpression,
+  QueryEditorPropertyType,
+} from '../expressions';
+import { SQLQuery, SQLExpression } from '../types';
+
+export function defaultToRawSql({ sql, dataset, table }: SQLQuery): string {
+  let rawQuery = '';
+
+  // Return early with empty string if there is no sql column
+  if (!sql || !haveColumns(sql.columns)) {
+    return rawQuery;
+  }
+
+  rawQuery += createSelectClause(sql.columns);
+
+  if (dataset && table) {
+    rawQuery += `FROM ${dataset}.${table} `;
+  }
+
+  if (sql.whereString) {
+    rawQuery += `WHERE ${sql.whereString} `;
+  }
+
+  if (sql.groupBy?.[0]?.property.name) {
+    const groupBy = sql.groupBy.map((g) => g.property.name).filter((g) => !isEmpty(g));
+    rawQuery += `GROUP BY ${groupBy.join(', ')} `;
+  }
+
+  if (sql.orderBy?.property.name) {
+    rawQuery += `ORDER BY ${sql.orderBy.property.name} `;
+  }
+
+  if (sql.orderBy?.property.name && sql.orderByDirection) {
+    rawQuery += `${sql.orderByDirection} `;
+  }
+
+  // Altough LIMIT 0 doesn't make sense, it is still possible to have LIMIT 0
+  if (sql.limit !== undefined && sql.limit >= 0) {
+    rawQuery += `LIMIT ${sql.limit} `;
+  }
+  return rawQuery;
+}
+
+function createSelectClause(sqlColumns: NonNullable<SQLExpression['columns']>): string {
+  const columns = sqlColumns.map((c) => {
+    let rawColumn = '';
+    if (c.name) {
+      rawColumn += `${c.name}(${c.parameters?.map((p) => `${p.name}`)})`;
+    } else {
+      rawColumn += `${c.parameters?.map((p) => `${p.name}`)}`;
+    }
+    return rawColumn;
+  });
+  return `SELECT ${columns.join(', ')} `;
+}
+
+export const haveColumns = (columns: SQLExpression['columns']): columns is NonNullable<SQLExpression['columns']> => {
+  if (!columns) {
+    return false;
+  }
+
+  const haveColumn = columns.some((c) => c.parameters?.length || c.parameters?.some((p) => p.name));
+  const haveFunction = columns.some((c) => c.name);
+  return haveColumn || haveFunction;
+};
+
+/**
+ * Creates a GroupByExpression for a specified field
+ */
+export function setGroupByField(field?: string): QueryEditorGroupByExpression {
+  return {
+    type: QueryEditorExpressionType.GroupBy,
+    property: {
+      type: QueryEditorPropertyType.String,
+      name: field,
+    },
+  };
+}
+
+/**
+ * Creates a PropertyExpression for a specified field
+ */
+export function setPropertyField(field?: string): QueryEditorPropertyExpression {
+  return {
+    type: QueryEditorExpressionType.Property,
+    property: {
+      type: QueryEditorPropertyType.String,
+      name: field,
+    },
+  };
+}
+
+export function createFunctionField(functionName?: string): QueryEditorFunctionExpression {
+  return {
+    type: QueryEditorExpressionType.Function,
+    name: functionName,
+    parameters: [],
+  };
+}
diff --git a/public/app/features/plugins/sql/utils/useSqlChange.ts b/public/app/features/plugins/sql/utils/useSqlChange.ts
new file mode 100644
index 00000000000..d326261ef1d
--- /dev/null
+++ b/public/app/features/plugins/sql/utils/useSqlChange.ts
@@ -0,0 +1,25 @@
+import { useCallback } from 'react';
+
+import { DB, SQLExpression, SQLQuery } from '../types';
+
+import { defaultToRawSql } from './sql.utils';
+
+interface UseSqlChange {
+  db: DB;
+  query: SQLQuery;
+  onQueryChange: (query: SQLQuery) => void;
+}
+
+export function useSqlChange({ query, onQueryChange, db }: UseSqlChange) {
+  const onSqlChange = useCallback(
+    (sql: SQLExpression) => {
+      const toRawSql = db.toRawSql || defaultToRawSql;
+      const rawSql = toRawSql({ sql, dataset: query.dataset, table: query.table, refId: db.dsID() });
+      const newQuery: SQLQuery = { ...query, sql, rawSql };
+      onQueryChange(newQuery);
+    },
+    [db, onQueryChange, query]
+  );
+
+  return { onSqlChange };
+}
diff --git a/public/app/features/profile/ChangePasswordPage.tsx b/public/app/features/profile/ChangePasswordPage.tsx
index a5324bc1dbc..b375c512e9d 100644
--- a/public/app/features/profile/ChangePasswordPage.tsx
+++ b/public/app/features/profile/ChangePasswordPage.tsx
@@ -3,7 +3,7 @@ import { connect, ConnectedProps } from 'react-redux';
 import { useMount } from 'react-use';
 
 import { NavModel } from '@grafana/data';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
 
diff --git a/public/app/features/profile/FeatureTogglePage.tsx b/public/app/features/profile/FeatureTogglePage.tsx
index 6fd197166dd..3dd56e287c6 100644
--- a/public/app/features/profile/FeatureTogglePage.tsx
+++ b/public/app/features/profile/FeatureTogglePage.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { useNavModel } from 'app/core/hooks/useNavModel';
 
 export default function FeatureTogglePage() {
diff --git a/public/app/features/profile/UserProfileEditPage.tsx b/public/app/features/profile/UserProfileEditPage.tsx
index 008893323b0..446829834ad 100644
--- a/public/app/features/profile/UserProfileEditPage.tsx
+++ b/public/app/features/profile/UserProfileEditPage.tsx
@@ -4,7 +4,7 @@ import { useMount } from 'react-use';
 
 import { NavModel } from '@grafana/data';
 import { VerticalGroup } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import SharedPreferences from 'app/core/components/SharedPreferences/SharedPreferences';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState } from 'app/types';
diff --git a/public/app/features/query/state/PanelQueryRunner.ts b/public/app/features/query/state/PanelQueryRunner.ts
index a298229d44e..931954f87f8 100644
--- a/public/app/features/query/state/PanelQueryRunner.ts
+++ b/public/app/features/query/state/PanelQueryRunner.ts
@@ -362,7 +362,7 @@ async function getDataSource(
   publicDashboardAccessToken?: string
 ): Promise<DataSourceApi> {
   if (publicDashboardAccessToken) {
-    return new PublicDashboardDataSource();
+    return new PublicDashboardDataSource(datasource);
   }
 
   if (datasource && (datasource as any).query) {
diff --git a/public/app/features/sandbox/TestStuffPage.tsx b/public/app/features/sandbox/TestStuffPage.tsx
index 7d34b5a9e4e..b07b6713842 100644
--- a/public/app/features/sandbox/TestStuffPage.tsx
+++ b/public/app/features/sandbox/TestStuffPage.tsx
@@ -11,11 +11,11 @@ import {
   PanelData,
 } from '@grafana/data';
 import { Button, Table } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
 import { config } from 'app/core/config';
 import { useAppNotification } from 'app/core/copy/appNotification';
 import { QueryGroupOptions } from 'app/types';
 
-import Page from '../../core/components/Page/Page';
 import { PanelRenderer } from '../panel/components/PanelRenderer';
 import { QueryGroup } from '../query/components/QueryGroup';
 import { PanelQueryRunner } from '../query/state/PanelQueryRunner';
diff --git a/public/app/features/scenes/SceneListPage.tsx b/public/app/features/scenes/SceneListPage.tsx
new file mode 100644
index 00000000000..0ed740640f0
--- /dev/null
+++ b/public/app/features/scenes/SceneListPage.tsx
@@ -0,0 +1,31 @@
+// Libraries
+import React, { FC } from 'react';
+
+import { Stack } from '@grafana/experimental';
+import { Card } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+
+// Types
+import { getScenes } from './scenes';
+
+export interface Props {}
+
+export const SceneListPage: FC<Props> = ({}) => {
+  const scenes = getScenes();
+
+  return (
+    <Page>
+      <Page.Contents>
+        <Stack direction="column">
+          {scenes.map((scene) => (
+            <Card href={`/scenes/${scene.state.title}`} key={scene.state.title}>
+              <Card.Heading>{scene.state.title}</Card.Heading>
+            </Card>
+          ))}
+        </Stack>
+      </Page.Contents>
+    </Page>
+  );
+};
+
+export default SceneListPage;
diff --git a/public/app/features/scenes/ScenePage.tsx b/public/app/features/scenes/ScenePage.tsx
new file mode 100644
index 00000000000..14cf1133635
--- /dev/null
+++ b/public/app/features/scenes/ScenePage.tsx
@@ -0,0 +1,24 @@
+// Libraries
+import React, { FC } from 'react';
+
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+
+import { getSceneByTitle } from './scenes';
+
+export interface Props extends GrafanaRouteComponentProps<{ name: string }> {}
+
+export const ScenePage: FC<Props> = (props) => {
+  const scene = getSceneByTitle(props.match.params.name);
+
+  if (!scene) {
+    return <h2>Scene not found</h2>;
+  }
+
+  return (
+    <div style={{ height: '100%', display: 'flex', width: '100%' }}>
+      <scene.Component model={scene} />
+    </div>
+  );
+};
+
+export default ScenePage;
diff --git a/public/app/features/scenes/components/Scene.test.tsx b/public/app/features/scenes/components/Scene.test.tsx
new file mode 100644
index 00000000000..6c616ff70f6
--- /dev/null
+++ b/public/app/features/scenes/components/Scene.test.tsx
@@ -0,0 +1,15 @@
+import { Scene } from './Scene';
+import { SceneFlexLayout } from './SceneFlexLayout';
+
+describe('Scene', () => {
+  it('Simple scene', () => {
+    const scene = new Scene({
+      title: 'Hello',
+      layout: new SceneFlexLayout({
+        children: [],
+      }),
+    });
+
+    expect(scene.state.title).toBe('Hello');
+  });
+});
diff --git a/public/app/features/scenes/components/Scene.tsx b/public/app/features/scenes/components/Scene.tsx
new file mode 100644
index 00000000000..7bf37c758b5
--- /dev/null
+++ b/public/app/features/scenes/components/Scene.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+
+import { PageToolbar, ToolbarButton } from '@grafana/ui';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneComponentProps, SceneObjectState, SceneObject } from '../core/types';
+import { UrlSyncManager } from '../services/UrlSyncManager';
+
+interface SceneState extends SceneObjectState {
+  title: string;
+  layout: SceneObject;
+  actions?: SceneObject[];
+  isEditing?: boolean;
+}
+
+export class Scene extends SceneObjectBase<SceneState> {
+  static Component = SceneRenderer;
+  urlSyncManager?: UrlSyncManager;
+
+  onMount() {
+    super.onMount();
+    this.urlSyncManager = new UrlSyncManager(this);
+  }
+
+  onUnmount() {
+    super.onUnmount();
+    this.urlSyncManager!.cleanUp();
+  }
+}
+
+function SceneRenderer({ model }: SceneComponentProps<Scene>) {
+  const { title, layout, actions = [], isEditing, $editor } = model.useState();
+
+  console.log('render scene');
+
+  return (
+    <div style={{ height: '100%', display: 'flex', flexDirection: 'column', flex: '1 1 0', minHeight: 0 }}>
+      <PageToolbar title={title}>
+        {actions.map((action) => (
+          <action.Component key={action.state.key} model={action} />
+        ))}
+        {$editor && (
+          <ToolbarButton
+            icon="cog"
+            variant={isEditing ? 'primary' : 'default'}
+            onClick={() => model.setState({ isEditing: !model.state.isEditing })}
+          />
+        )}
+      </PageToolbar>
+      <div style={{ flexGrow: 1, display: 'flex', padding: '16px', gap: '8px', paddingTop: 0, overflow: 'auto' }}>
+        <layout.Component model={layout} isEditing={isEditing} />
+        {$editor && <$editor.Component model={$editor} isEditing={isEditing} />}
+      </div>
+    </div>
+  );
+}
diff --git a/public/app/features/scenes/components/SceneCanvasText.tsx b/public/app/features/scenes/components/SceneCanvasText.tsx
new file mode 100644
index 00000000000..042c86312e7
--- /dev/null
+++ b/public/app/features/scenes/components/SceneCanvasText.tsx
@@ -0,0 +1,44 @@
+import React, { CSSProperties } from 'react';
+
+import { Field, Input } from '@grafana/ui';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneComponentProps, SceneObjectState } from '../core/types';
+
+export interface SceneCanvasTextState extends SceneObjectState {
+  text: string;
+  fontSize?: number;
+  align?: 'left' | 'center' | 'right';
+}
+
+export class SceneCanvasText extends SceneObjectBase<SceneCanvasTextState> {
+  static Editor = Editor;
+  static Component = ({ model }: SceneComponentProps<SceneCanvasText>) => {
+    const { text, fontSize = 20, align = 'left' } = model.useState();
+
+    const style: CSSProperties = {
+      fontSize: fontSize,
+      display: 'flex',
+      flexGrow: 1,
+      alignItems: 'center',
+      padding: 16,
+      justifyContent: align,
+    };
+
+    return <div style={style}>{text}</div>;
+  };
+}
+
+function Editor({ model }: SceneComponentProps<SceneCanvasText>) {
+  const { fontSize } = model.useState();
+
+  return (
+    <Field label="Font size">
+      <Input
+        type="number"
+        defaultValue={fontSize}
+        onBlur={(evt) => model.setState({ fontSize: parseInt(evt.currentTarget.value, 10) })}
+      />
+    </Field>
+  );
+}
diff --git a/public/app/features/scenes/components/SceneFlexLayout.tsx b/public/app/features/scenes/components/SceneFlexLayout.tsx
new file mode 100644
index 00000000000..24691000c33
--- /dev/null
+++ b/public/app/features/scenes/components/SceneFlexLayout.tsx
@@ -0,0 +1,110 @@
+import React, { CSSProperties } from 'react';
+
+import { Field, RadioButtonGroup } from '@grafana/ui';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneObject, SceneObjectSize, SceneObjectState, SceneLayoutState, SceneComponentProps } from '../core/types';
+
+export type FlexLayoutDirection = 'column' | 'row';
+
+interface SceneFlexLayoutState extends SceneObjectState, SceneLayoutState {
+  direction?: FlexLayoutDirection;
+}
+
+export class SceneFlexLayout extends SceneObjectBase<SceneFlexLayoutState> {
+  static Component = FlexLayoutRenderer;
+  static Editor = FlexLayoutEditor;
+
+  toggleDirection() {
+    this.setState({
+      direction: this.state.direction === 'row' ? 'column' : 'row',
+    });
+  }
+}
+
+function FlexLayoutRenderer({ model, isEditing }: SceneComponentProps<SceneFlexLayout>) {
+  const { direction = 'row', children } = model.useState();
+
+  return (
+    <div style={{ flexGrow: 1, flexDirection: direction, display: 'flex', gap: '8px' }}>
+      {children.map((item) => (
+        <FlexLayoutChildComponent key={item.state.key} item={item} direction={direction} isEditing={isEditing} />
+      ))}
+    </div>
+  );
+}
+
+function FlexLayoutChildComponent({
+  item,
+  direction,
+  isEditing,
+}: {
+  item: SceneObject<SceneObjectState>;
+  direction: FlexLayoutDirection;
+  isEditing?: boolean;
+}) {
+  const { size } = item.useState();
+
+  return (
+    <div style={getItemStyles(direction, size)}>
+      <item.Component model={item} isEditing={isEditing} />
+    </div>
+  );
+}
+
+function getItemStyles(direction: FlexLayoutDirection, sizing: SceneObjectSize = {}) {
+  const { xSizing = 'fill', ySizing = 'fill' } = sizing;
+
+  const style: CSSProperties = {
+    display: 'flex',
+    flexDirection: direction,
+    minWidth: sizing.minWidth,
+    minHeight: sizing.minHeight,
+  };
+
+  if (direction === 'column') {
+    if (sizing.height) {
+      style.height = sizing.height;
+    } else {
+      style.flexGrow = ySizing === 'fill' ? 1 : 0;
+    }
+
+    if (sizing.width) {
+      style.width = sizing.width;
+    } else {
+      style.alignSelf = xSizing === 'fill' ? 'stretch' : 'flex-start';
+    }
+  } else {
+    if (sizing.height) {
+      style.height = sizing.height;
+    } else {
+      style.alignSelf = ySizing === 'fill' ? 'stretch' : 'flex-start';
+    }
+
+    if (sizing.width) {
+      style.width = sizing.width;
+    } else {
+      style.flexGrow = xSizing === 'fill' ? 1 : 0;
+    }
+  }
+
+  return style;
+}
+
+function FlexLayoutEditor({ model }: SceneComponentProps<SceneFlexLayout>) {
+  const { direction = 'row' } = model.useState();
+  const options = [
+    { icon: 'arrow-right', value: 'row' },
+    { icon: 'arrow-down', value: 'column' },
+  ];
+
+  return (
+    <Field label="Direction">
+      <RadioButtonGroup
+        options={options}
+        value={direction}
+        onChange={(value) => model.setState({ direction: value as FlexLayoutDirection })}
+      />
+    </Field>
+  );
+}
diff --git a/public/app/features/scenes/components/ScenePanelRepeater.tsx b/public/app/features/scenes/components/ScenePanelRepeater.tsx
new file mode 100644
index 00000000000..6d2ba7569e6
--- /dev/null
+++ b/public/app/features/scenes/components/ScenePanelRepeater.tsx
@@ -0,0 +1,54 @@
+import React from 'react';
+
+import { LoadingState, PanelData } from '@grafana/data';
+
+import { SceneDataNode } from '../core/SceneDataNode';
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneComponentProps, SceneObject, SceneObjectList, SceneObjectState, SceneLayoutState } from '../core/types';
+
+interface RepeatOptions extends SceneObjectState {
+  layout: SceneObject<SceneLayoutState>;
+}
+
+export class ScenePanelRepeater extends SceneObjectBase<RepeatOptions> {
+  onMount() {
+    super.onMount();
+
+    this.subs.add(
+      this.getData().subscribe({
+        next: (data) => {
+          if (data.data?.state === LoadingState.Done) {
+            this.performRepeat(data.data);
+          }
+        },
+      })
+    );
+  }
+
+  performRepeat(data: PanelData) {
+    // assume parent is a layout
+    const firstChild = this.state.layout.state.children[0]!;
+    const newChildren: SceneObjectList = [];
+
+    for (const series of data.series) {
+      const clone = firstChild.clone({
+        key: `${newChildren.length}`,
+        $data: new SceneDataNode({
+          data: {
+            ...data,
+            series: [series],
+          },
+        }),
+      });
+
+      newChildren.push(clone);
+    }
+
+    this.state.layout.setState({ children: newChildren });
+  }
+
+  static Component = ({ model, isEditing }: SceneComponentProps<ScenePanelRepeater>) => {
+    const { layout } = model.useState();
+    return <layout.Component model={layout} isEditing={isEditing} />;
+  };
+}
diff --git a/public/app/features/scenes/components/SceneTimePicker.tsx b/public/app/features/scenes/components/SceneTimePicker.tsx
new file mode 100644
index 00000000000..5ef53b264c5
--- /dev/null
+++ b/public/app/features/scenes/components/SceneTimePicker.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+
+import { RefreshPicker, ToolbarButtonRow } from '@grafana/ui';
+import { TimePickerWithHistory } from 'app/core/components/TimePicker/TimePickerWithHistory';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneComponentProps, SceneObjectState } from '../core/types';
+
+export interface SceneTimePickerState extends SceneObjectState {
+  hidePicker?: boolean;
+}
+
+export class SceneTimePicker extends SceneObjectBase<SceneTimePickerState> {
+  static Component = SceneTimePickerRenderer;
+}
+
+function SceneTimePickerRenderer({ model }: SceneComponentProps<SceneTimePicker>) {
+  const { hidePicker } = model.useState();
+  const timeRange = model.getTimeRange();
+  const timeRangeState = timeRange.useState();
+
+  if (hidePicker) {
+    return null;
+  }
+
+  return (
+    <ToolbarButtonRow>
+      <TimePickerWithHistory
+        value={timeRangeState}
+        onChange={timeRange.onTimeRangeChange}
+        timeZone={'browser'}
+        fiscalYearStartMonth={0}
+        onMoveBackward={() => {}}
+        onMoveForward={() => {}}
+        onZoom={() => {}}
+        onChangeTimeZone={() => {}}
+        onChangeFiscalYearStartMonth={() => {}}
+      />
+
+      <RefreshPicker onRefresh={timeRange.onRefresh} onIntervalChanged={timeRange.onIntervalChanged} />
+    </ToolbarButtonRow>
+  );
+}
diff --git a/public/app/features/scenes/components/SceneToolbarButton.tsx b/public/app/features/scenes/components/SceneToolbarButton.tsx
new file mode 100644
index 00000000000..a7c588a0e0e
--- /dev/null
+++ b/public/app/features/scenes/components/SceneToolbarButton.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import { IconName, Input, ToolbarButton } from '@grafana/ui';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneComponentProps, SceneObjectState } from '../core/types';
+
+export interface ToolbarButtonState extends SceneObjectState {
+  icon: IconName;
+  onClick: () => void;
+}
+
+export class SceneToolbarButton extends SceneObjectBase<ToolbarButtonState> {
+  static Component = ({ model }: SceneComponentProps<SceneToolbarButton>) => {
+    const state = model.useState();
+
+    return <ToolbarButton onClick={state.onClick} icon={state.icon} />;
+  };
+}
+
+export interface SceneToolbarInputState extends SceneObjectState {
+  value?: string;
+  onChange: (value: number) => void;
+}
+
+export class SceneToolbarInput extends SceneObjectBase<SceneToolbarInputState> {
+  static Component = ({ model }: SceneComponentProps<SceneToolbarInput>) => {
+    const state = model.useState();
+
+    return (
+      <Input
+        defaultValue={state.value}
+        onBlur={(evt) => {
+          model.state.onChange(parseInt(evt.currentTarget.value, 10));
+        }}
+      />
+    );
+  };
+}
diff --git a/public/app/features/scenes/components/VizPanel.tsx b/public/app/features/scenes/components/VizPanel.tsx
new file mode 100644
index 00000000000..dee9ef6865d
--- /dev/null
+++ b/public/app/features/scenes/components/VizPanel.tsx
@@ -0,0 +1,80 @@
+import React from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { AbsoluteTimeRange, FieldConfigSource, toUtc } from '@grafana/data';
+import { PanelRenderer } from '@grafana/runtime';
+import { Field, PanelChrome, Input } from '@grafana/ui';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneComponentProps, SceneObjectState } from '../core/types';
+
+export interface VizPanelState extends SceneObjectState {
+  title?: string;
+  pluginId: string;
+  options?: object;
+  fieldConfig?: FieldConfigSource;
+}
+
+export class VizPanel extends SceneObjectBase<VizPanelState> {
+  static Component = ScenePanelRenderer;
+  static Editor = VizPanelEditor;
+
+  onSetTimeRange = (timeRange: AbsoluteTimeRange) => {
+    const sceneTimeRange = this.getTimeRange();
+    sceneTimeRange.setState({
+      raw: {
+        from: toUtc(timeRange.from),
+        to: toUtc(timeRange.to),
+      },
+      from: toUtc(timeRange.from),
+      to: toUtc(timeRange.to),
+    });
+  };
+}
+
+function ScenePanelRenderer({ model }: SceneComponentProps<VizPanel>) {
+  const { title, pluginId, options, fieldConfig } = model.useState();
+  const { data } = model.getData().useState();
+
+  return (
+    <AutoSizer>
+      {({ width, height }) => {
+        if (width < 3 || height < 3) {
+          return null;
+        }
+
+        return (
+          <PanelChrome title={title} width={width} height={height}>
+            {(innerWidth, innerHeight) => (
+              <>
+                <PanelRenderer
+                  title="Raw data"
+                  pluginId={pluginId}
+                  width={innerWidth}
+                  height={innerHeight}
+                  data={data}
+                  options={options}
+                  fieldConfig={fieldConfig}
+                  onOptionsChange={() => {}}
+                  onChangeTimeRange={model.onSetTimeRange}
+                />
+              </>
+            )}
+          </PanelChrome>
+        );
+      }}
+    </AutoSizer>
+  );
+}
+
+ScenePanelRenderer.displayName = 'ScenePanelRenderer';
+
+function VizPanelEditor({ model }: SceneComponentProps<VizPanel>) {
+  const { title } = model.useState();
+
+  return (
+    <Field label="Title">
+      <Input defaultValue={title} onBlur={(evt) => model.setState({ title: evt.currentTarget.value })} />
+    </Field>
+  );
+}
diff --git a/public/app/features/scenes/core/SceneComponentEditWrapper.tsx b/public/app/features/scenes/core/SceneComponentEditWrapper.tsx
new file mode 100644
index 00000000000..9bbde1c2511
--- /dev/null
+++ b/public/app/features/scenes/core/SceneComponentEditWrapper.tsx
@@ -0,0 +1,82 @@
+import { css } from '@emotion/css';
+import React, { CSSProperties } from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+import { SceneObjectBase } from './SceneObjectBase';
+import { SceneComponentProps } from './types';
+
+export function SceneComponentEditWrapper<T extends SceneObjectBase<any>>({
+  model,
+  isEditing,
+}: SceneComponentProps<T>) {
+  const Component = (model as any).constructor['Component'] ?? EmptyRenderer;
+  const inner = <Component model={model} isEditing={isEditing} />;
+
+  model.useMount();
+
+  if (!isEditing) {
+    return inner;
+  }
+
+  return <SceneComponentEditingWrapper model={model}>{inner}</SceneComponentEditingWrapper>;
+}
+
+export function SceneComponentEditingWrapper<T extends SceneObjectBase<any>>({
+  model,
+  children,
+}: {
+  model: T;
+  children: React.ReactNode;
+}) {
+  const styles = useStyles2(getStyles);
+  const editor = model.getSceneEditor();
+  const { hoverObject, selectedObject } = editor.useState();
+
+  const onMouseEnter = () => editor.onMouseEnterObject(model);
+  const onMouseLeave = () => editor.onMouseLeaveObject(model);
+
+  const onClick = (evt: React.MouseEvent) => {
+    evt.stopPropagation();
+    editor.onSelectObject(model);
+  };
+
+  const style: CSSProperties = {};
+  let className = styles.wrapper;
+
+  if (hoverObject?.ref === model) {
+    className += ' ' + styles.hover;
+  }
+  if (selectedObject?.ref === model) {
+    className += ' ' + styles.selected;
+  }
+
+  return (
+    <div style={style} className={className} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} onClick={onClick}>
+      {children}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    wrapper: css({
+      display: 'flex',
+      flexGrow: 1,
+      padding: 8,
+      border: `1px dashed ${theme.colors.primary.main}`,
+      cursor: 'pointer',
+    }),
+    hover: css({
+      border: `1px solid ${theme.colors.primary.border}`,
+    }),
+    selected: css({
+      border: `1px solid ${theme.colors.error.border}`,
+    }),
+  };
+};
+
+function EmptyRenderer<T>(_: SceneComponentProps<T>): React.ReactElement | null {
+  return null;
+}
diff --git a/public/app/features/scenes/core/SceneDataNode.ts b/public/app/features/scenes/core/SceneDataNode.ts
new file mode 100644
index 00000000000..adaf6b256e4
--- /dev/null
+++ b/public/app/features/scenes/core/SceneDataNode.ts
@@ -0,0 +1,10 @@
+import { PanelData } from '@grafana/data';
+
+import { SceneObjectBase } from './SceneObjectBase';
+import { SceneObjectState } from './types';
+
+export interface SceneDataNodeState extends SceneObjectState {
+  data?: PanelData;
+}
+
+export class SceneDataNode extends SceneObjectBase<SceneDataNodeState> {}
diff --git a/public/app/features/scenes/core/SceneObjectBase.test.ts b/public/app/features/scenes/core/SceneObjectBase.test.ts
new file mode 100644
index 00000000000..2ac12132c81
--- /dev/null
+++ b/public/app/features/scenes/core/SceneObjectBase.test.ts
@@ -0,0 +1,68 @@
+import { SceneObjectBase } from './SceneObjectBase';
+import { SceneObject, SceneObjectList, SceneObjectState } from './types';
+
+interface TestSceneState extends SceneObjectState {
+  name?: string;
+  nested?: SceneObject<TestSceneState>;
+  children?: SceneObjectList;
+  actions?: SceneObjectList;
+}
+
+class TestScene extends SceneObjectBase<TestSceneState> {}
+
+describe('SceneObject', () => {
+  it('Can clone', () => {
+    const scene = new TestScene({
+      nested: new TestScene({
+        name: 'nested',
+      }),
+      children: [
+        new TestScene({
+          name: 'layout child',
+        }),
+      ],
+    });
+
+    scene.state.nested?.onMount();
+
+    const clone = scene.clone();
+    expect(clone).not.toBe(scene);
+    expect(clone.state.nested).not.toBe(scene.state.nested);
+    expect(clone.state.nested?.isMounted).toBe(undefined);
+    expect(clone.state.children![0]).not.toBe(scene.state.children![0]);
+  });
+
+  it('SceneObject should have parent when added to container', () => {
+    const scene = new TestScene({
+      nested: new TestScene({
+        name: 'nested',
+      }),
+      children: [
+        new TestScene({
+          name: 'layout child',
+        }),
+      ],
+      actions: [
+        new TestScene({
+          name: 'layout child',
+        }),
+      ],
+    });
+
+    expect(scene.parent).toBe(undefined);
+    expect(scene.state.nested?.parent).toBe(scene);
+    expect(scene.state.children![0].parent).toBe(scene);
+    expect(scene.state.actions![0].parent).toBe(scene);
+  });
+
+  it('Can clone with state change', () => {
+    const scene = new TestScene({
+      nested: new TestScene({
+        name: 'nested',
+      }),
+    });
+
+    const clone = scene.clone({ name: 'new name' });
+    expect(clone.state.name).toBe('new name');
+  });
+});
diff --git a/public/app/features/scenes/core/SceneObjectBase.tsx b/public/app/features/scenes/core/SceneObjectBase.tsx
new file mode 100644
index 00000000000..89c08b11bdd
--- /dev/null
+++ b/public/app/features/scenes/core/SceneObjectBase.tsx
@@ -0,0 +1,220 @@
+import { useEffect } from 'react';
+import { useObservable } from 'react-use';
+import { Observer, Subject, Subscription } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
+
+import { EventBusSrv } from '@grafana/data';
+
+import { SceneComponentEditWrapper } from './SceneComponentEditWrapper';
+import { SceneObjectStateChangedEvent } from './events';
+import {
+  SceneDataState,
+  SceneObject,
+  SceneLayoutState,
+  SceneObjectState,
+  SceneComponent,
+  SceneEditor,
+  SceneObjectList,
+  SceneTimeRange,
+} from './types';
+
+export abstract class SceneObjectBase<TState extends SceneObjectState = {}> implements SceneObject<TState> {
+  subject = new Subject<TState>();
+  state: TState;
+  parent?: SceneObjectBase<any>;
+  subs = new Subscription();
+  isMounted?: boolean;
+  events = new EventBusSrv();
+
+  constructor(state: TState) {
+    if (!state.key) {
+      state.key = uuidv4();
+    }
+
+    this.state = state;
+    this.subject.next(state);
+    this.setParent();
+  }
+
+  /**
+   * Used in render functions when rendering a SceneObject.
+   * Wraps the component in an EditWrapper that handles edit mode
+   */
+  get Component(): SceneComponent<this> {
+    return SceneComponentEditWrapper;
+  }
+
+  /**
+   * Temporary solution, should be replaced by declarative options
+   */
+  get Editor(): SceneComponent<this> {
+    return ((this as any).constructor['Editor'] ?? (() => null)) as SceneComponent<this>;
+  }
+
+  private setParent() {
+    for (const propValue of Object.values(this.state)) {
+      if (propValue instanceof SceneObjectBase) {
+        propValue.parent = this;
+      }
+
+      if (Array.isArray(propValue)) {
+        for (const child of propValue) {
+          if (child instanceof SceneObjectBase) {
+            child.parent = this;
+          }
+        }
+      }
+    }
+  }
+
+  /** This function implements the Subscribable<TState> interface */
+  subscribe(observer: Partial<Observer<TState>>) {
+    return this.subject.subscribe(observer);
+  }
+
+  setState(update: Partial<TState>) {
+    const prevState = this.state;
+    this.state = {
+      ...this.state,
+      ...update,
+    };
+    this.setParent();
+    this.subject.next(this.state);
+
+    // broadcast state change. This is event is subscribed to by UrlSyncManager and UndoManager
+    this.getRoot().events.publish(
+      new SceneObjectStateChangedEvent({
+        prevState,
+        newState: this.state,
+        partialUpdate: update,
+        changedObject: this,
+      })
+    );
+  }
+
+  private getRoot(): SceneObject {
+    return !this.parent ? this : this.parent.getRoot();
+  }
+
+  onMount() {
+    this.isMounted = true;
+
+    const { $data } = this.state;
+    if ($data && !$data.isMounted) {
+      $data.onMount();
+    }
+  }
+
+  onUnmount() {
+    this.isMounted = false;
+
+    const { $data } = this.state;
+    if ($data && $data.isMounted) {
+      $data.onUnmount();
+    }
+
+    this.subs.unsubscribe();
+    this.subs = new Subscription();
+  }
+
+  /**
+   * The scene object needs to know when the react component is mounted to trigger query and other lazy actions
+   */
+  useMount() {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      if (!this.isMounted) {
+        this.onMount();
+      }
+      return () => {
+        if (this.isMounted) {
+          this.onUnmount();
+        }
+      };
+    }, []);
+
+    return this;
+  }
+
+  useState() {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return useObservable(this.subject, this.state);
+  }
+
+  /**
+   * Will walk up the scene object graph to the closest $timeRange scene object
+   */
+  getTimeRange(): SceneTimeRange {
+    const { $timeRange } = this.state;
+    if ($timeRange) {
+      return $timeRange;
+    }
+
+    if (this.parent) {
+      return this.parent.getTimeRange();
+    }
+
+    throw new Error('No time range found in scene tree');
+  }
+
+  /**
+   * Will walk up the scene object graph to the closest $data scene object
+   */
+  getData(): SceneObject<SceneDataState> {
+    const { $data } = this.state;
+    if ($data) {
+      return $data;
+    }
+
+    if (this.parent) {
+      return this.parent.getData();
+    }
+
+    throw new Error('No data found in scene tree');
+  }
+
+  /**
+   * Will walk up the scene object graph to the closest $editor scene object
+   */
+  getSceneEditor(): SceneEditor {
+    const { $editor } = this.state;
+    if ($editor) {
+      return $editor;
+    }
+
+    if (this.parent) {
+      return this.parent.getSceneEditor();
+    }
+
+    throw new Error('No editor found in scene tree');
+  }
+
+  /**
+   * Will create new SceneItem with shalled cloned state, but all states items of type SceneItem are deep cloned
+   */
+  clone(withState?: Partial<TState>): this {
+    const clonedState = { ...this.state };
+
+    // Clone any SceneItems in state
+    for (const key in clonedState) {
+      const propValue = clonedState[key];
+      if (propValue instanceof SceneObjectBase) {
+        clonedState[key] = propValue.clone();
+      }
+    }
+
+    // Clone layout children
+    const layout = this.state as any as SceneLayoutState;
+    if (layout.children) {
+      const newChildren: SceneObjectList = [];
+      for (const child of layout.children) {
+        newChildren.push(child.clone());
+      }
+      (clonedState as any).children = newChildren;
+    }
+
+    Object.assign(clonedState, withState);
+
+    return new (this.constructor as any)(clonedState);
+  }
+}
diff --git a/public/app/features/scenes/core/SceneTimeRange.tsx b/public/app/features/scenes/core/SceneTimeRange.tsx
new file mode 100644
index 00000000000..595db0d864b
--- /dev/null
+++ b/public/app/features/scenes/core/SceneTimeRange.tsx
@@ -0,0 +1,29 @@
+import { TimeRange, UrlQueryMap } from '@grafana/data';
+
+import { SceneObjectBase } from './SceneObjectBase';
+import { SceneObjectWithUrlSync, SceneTimeRangeState } from './types';
+
+export class SceneTimeRange extends SceneObjectBase<SceneTimeRangeState> implements SceneObjectWithUrlSync {
+  onTimeRangeChange = (timeRange: TimeRange) => {
+    this.setState(timeRange);
+  };
+
+  onRefresh = () => {
+    // TODO re-eval time range
+    this.setState({ ...this.state });
+  };
+
+  onIntervalChanged = (_: string) => {};
+
+  /** These url sync functions are only placeholders for something more sophisticated  */
+  getUrlState() {
+    return {
+      from: this.state.raw.from,
+      to: this.state.raw.to,
+    } as any;
+  }
+
+  updateFromUrl(values: UrlQueryMap) {
+    // TODO
+  }
+}
diff --git a/public/app/features/scenes/core/events.ts b/public/app/features/scenes/core/events.ts
new file mode 100644
index 00000000000..a0113c03311
--- /dev/null
+++ b/public/app/features/scenes/core/events.ts
@@ -0,0 +1,14 @@
+import { BusEventWithPayload } from '@grafana/data';
+
+import { SceneObject } from './types';
+
+export interface SceneObjectStateChangedPayload {
+  prevState: any;
+  newState: any;
+  partialUpdate: any;
+  changedObject: SceneObject;
+}
+
+export class SceneObjectStateChangedEvent extends BusEventWithPayload<SceneObjectStateChangedPayload> {
+  static type = 'scene-object-state-change';
+}
diff --git a/public/app/features/scenes/core/types.ts b/public/app/features/scenes/core/types.ts
new file mode 100644
index 00000000000..f44bfee7b21
--- /dev/null
+++ b/public/app/features/scenes/core/types.ts
@@ -0,0 +1,122 @@
+import React from 'react';
+import { Subscribable } from 'rxjs';
+
+import { EventBus, PanelData, TimeRange, UrlQueryMap } from '@grafana/data';
+
+import { SceneVariableSet } from '../variables/types';
+
+export interface SceneObjectState {
+  key?: string;
+  size?: SceneObjectSize;
+  $timeRange?: SceneTimeRange;
+  $data?: SceneObject<SceneDataState>;
+  $editor?: SceneEditor;
+  $variables?: SceneVariableSet;
+}
+
+export interface SceneObjectSize {
+  width?: number | string;
+  height?: number | string;
+  xSizing?: 'fill' | 'content';
+  ySizing?: 'fill' | 'content';
+  x?: number;
+  y?: number;
+  minWidth?: number | string;
+  minHeight?: number | string;
+}
+
+export interface SceneComponentProps<T> {
+  model: T;
+  isEditing?: boolean;
+}
+
+export type SceneComponent<TModel> = React.FunctionComponent<SceneComponentProps<TModel>>;
+
+export interface SceneDataState extends SceneObjectState {
+  data?: PanelData;
+}
+
+export interface SceneObject<TState extends SceneObjectState = SceneObjectState> extends Subscribable<TState> {
+  /** The current state */
+  state: TState;
+
+  /** True when there is a React component mounted for this Object */
+  isMounted?: boolean;
+
+  /** SceneObject parent */
+  parent?: SceneObject;
+
+  /** Currently only used from root to broadcast events */
+  events: EventBus;
+
+  /** Utility hook that wraps useObservable. Used by React components to subscribes to state changes */
+  useState(): TState;
+
+  /** How to modify state */
+  setState(state: Partial<TState>): void;
+
+  /** Utility hook for main component so that object knows when it's mounted */
+  useMount(): this;
+
+  /** Called when component mounts. A place to register event listeners add subscribe to state changes */
+  onMount(): void;
+
+  /** Called when component unmounts. Unsubscribe to events */
+  onUnmount(): void;
+
+  /** Get the scene editor */
+  getSceneEditor(): SceneEditor;
+
+  /** Returns a deep clone this object and all it's children */
+  clone(state?: Partial<TState>): this;
+
+  /** A React component to use for rendering the object */
+  Component(props: SceneComponentProps<SceneObject<TState>>): React.ReactElement | null;
+
+  /** To be replaced by declarative method */
+  Editor(props: SceneComponentProps<SceneObject<TState>>): React.ReactElement | null;
+}
+
+export type SceneObjectList<T = SceneObjectState> = Array<SceneObject<T>>;
+
+export interface SceneLayoutState extends SceneObjectState {
+  children: SceneObjectList;
+}
+
+export type SceneLayout<T extends SceneLayoutState = SceneLayoutState> = SceneObject<T>;
+
+export interface SceneEditorState extends SceneObjectState {
+  hoverObject?: SceneObjectRef;
+  selectedObject?: SceneObjectRef;
+}
+
+export interface SceneEditor extends SceneObject<SceneEditorState> {
+  onMouseEnterObject(model: SceneObject): void;
+  onMouseLeaveObject(model: SceneObject): void;
+  onSelectObject(model: SceneObject): void;
+}
+
+export interface SceneTimeRangeState extends SceneObjectState, TimeRange {}
+export interface SceneTimeRange extends SceneObject<SceneTimeRangeState> {
+  onTimeRangeChange(timeRange: TimeRange): void;
+  onIntervalChanged(interval: string): void;
+  onRefresh(): void;
+}
+
+export interface SceneObjectRef {
+  ref: SceneObject;
+}
+
+export function isSceneObject(obj: any): obj is SceneObject {
+  return obj.useState !== undefined;
+}
+
+/** These functions are still just temporary until this get's refined */
+export interface SceneObjectWithUrlSync extends SceneObject {
+  getUrlState(): UrlQueryMap;
+  updateFromUrl(values: UrlQueryMap): void;
+}
+
+export function isSceneObjectWithUrlSync(obj: any): obj is SceneObjectWithUrlSync {
+  return obj.getUrlState !== undefined;
+}
diff --git a/public/app/features/scenes/editor/SceneEditManager.tsx b/public/app/features/scenes/editor/SceneEditManager.tsx
new file mode 100644
index 00000000000..bfa22349e71
--- /dev/null
+++ b/public/app/features/scenes/editor/SceneEditManager.tsx
@@ -0,0 +1,70 @@
+import { css } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { useStyles2 } from '@grafana/ui';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneEditorState, SceneEditor, SceneObject, SceneComponentProps, SceneComponent } from '../core/types';
+
+import { SceneObjectEditor } from './SceneObjectEditor';
+import { SceneObjectTree } from './SceneObjectTree';
+
+export class SceneEditManager extends SceneObjectBase<SceneEditorState> implements SceneEditor {
+  static Component = SceneEditorRenderer;
+
+  get Component(): SceneComponent<this> {
+    return SceneEditorRenderer;
+  }
+
+  onMouseEnterObject(model: SceneObject) {
+    this.setState({ hoverObject: { ref: model } });
+  }
+
+  onMouseLeaveObject(model: SceneObject) {
+    if (model.parent) {
+      this.setState({ hoverObject: { ref: model.parent } });
+    } else {
+      this.setState({ hoverObject: undefined });
+    }
+  }
+
+  onSelectObject(model: SceneObject) {
+    this.setState({ selectedObject: { ref: model } });
+  }
+}
+
+function SceneEditorRenderer({ model, isEditing }: SceneComponentProps<SceneEditManager>) {
+  const { selectedObject } = model.useState();
+  const styles = useStyles2(getStyles);
+
+  if (!isEditing) {
+    return null;
+  }
+
+  return (
+    <div className={styles.container}>
+      <div className={styles.tree}>
+        <SceneObjectTree node={model.parent!} selectedObject={selectedObject?.ref} />
+      </div>
+      {selectedObject && <SceneObjectEditor model={selectedObject.ref} />}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    container: css({
+      display: 'flex',
+      flexGrow: 0,
+      border: `1px solid ${theme.colors.border.weak}`,
+      background: theme.colors.background.primary,
+      width: theme.spacing(40),
+      cursor: 'pointer',
+      flexDirection: 'column',
+    }),
+    tree: css({
+      padding: theme.spacing(0.25, 1),
+    }),
+  };
+};
diff --git a/public/app/features/scenes/editor/SceneObjectEditor.tsx b/public/app/features/scenes/editor/SceneObjectEditor.tsx
new file mode 100644
index 00000000000..269303bd9a7
--- /dev/null
+++ b/public/app/features/scenes/editor/SceneObjectEditor.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import { OptionsPaneCategory } from 'app/features/dashboard/components/PanelEditor/OptionsPaneCategory';
+
+import { SceneObject } from '../core/types';
+
+export interface Props {
+  model: SceneObject;
+}
+
+export function SceneObjectEditor({ model }: Props) {
+  return (
+    <OptionsPaneCategory id="props" title="Properties" forceOpen={1}>
+      <model.Editor model={model} key={model.state.key} />
+    </OptionsPaneCategory>
+  );
+}
diff --git a/public/app/features/scenes/editor/SceneObjectTree.tsx b/public/app/features/scenes/editor/SceneObjectTree.tsx
new file mode 100644
index 00000000000..13c33b42e80
--- /dev/null
+++ b/public/app/features/scenes/editor/SceneObjectTree.tsx
@@ -0,0 +1,81 @@
+import { css, cx } from '@emotion/css';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, useStyles2 } from '@grafana/ui';
+
+import { SceneObject, SceneLayoutState, SceneObjectList, isSceneObject } from '../core/types';
+
+export interface Props {
+  node: SceneObject;
+  selectedObject?: SceneObject;
+}
+
+export function SceneObjectTree({ node, selectedObject }: Props) {
+  const styles = useStyles2(getStyles);
+  const state = node.useState();
+  let children: SceneObjectList = [];
+
+  for (const propKey of Object.keys(state)) {
+    const propValue = (state as any)[propKey];
+    if (isSceneObject(propValue)) {
+      children.push(propValue);
+    }
+  }
+
+  let layoutChildren = (state as SceneLayoutState).children;
+  if (layoutChildren) {
+    for (const child of layoutChildren) {
+      children.push(child);
+    }
+  }
+
+  const name = node.constructor.name;
+  const isSelected = selectedObject === node;
+  const onSelectNode = () => node.getSceneEditor().onSelectObject(node);
+
+  return (
+    <div className={styles.node}>
+      <div className={styles.header} onClick={onSelectNode}>
+        <div className={styles.icon}>{children.length > 0 && <Icon name="angle-down" size="sm" />}</div>
+        <div className={cx(styles.name, isSelected && styles.selected)}>{name}</div>
+      </div>
+      {children.length > 0 && (
+        <div className={styles.children}>
+          {children.map((child) => (
+            <SceneObjectTree node={child} selectedObject={selectedObject} key={child.state.key} />
+          ))}
+        </div>
+      )}
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => {
+  return {
+    node: css({
+      display: 'flex',
+      flexGrow: 0,
+      cursor: 'pointer',
+      flexDirection: 'column',
+      padding: '2px 4px',
+    }),
+    header: css({
+      display: 'flex',
+      fontWeight: 500,
+    }),
+    name: css({}),
+    selected: css({
+      color: theme.colors.error.text,
+    }),
+    icon: css({
+      width: theme.spacing(3),
+      color: theme.colors.text.secondary,
+    }),
+    children: css({
+      display: 'flex',
+      flexDirection: 'column',
+      paddingLeft: 8,
+    }),
+  };
+};
diff --git a/public/app/features/scenes/querying/SceneQueryRunner.ts b/public/app/features/scenes/querying/SceneQueryRunner.ts
new file mode 100644
index 00000000000..fb76b1c5088
--- /dev/null
+++ b/public/app/features/scenes/querying/SceneQueryRunner.ts
@@ -0,0 +1,133 @@
+import { cloneDeep } from 'lodash';
+import { Unsubscribable } from 'rxjs';
+
+import {
+  CoreApp,
+  DataQuery,
+  DataQueryRequest,
+  DataSourceApi,
+  DataSourceRef,
+  PanelData,
+  rangeUtil,
+  ScopedVars,
+  TimeRange,
+} from '@grafana/data';
+import { getDatasourceSrv } from 'app/features/plugins/datasource_srv';
+import { getNextRequestId } from 'app/features/query/state/PanelQueryRunner';
+import { runRequest } from 'app/features/query/state/runRequest';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneObjectState } from '../core/types';
+
+export interface QueryRunnerState extends SceneObjectState {
+  data?: PanelData;
+  queries: DataQueryExtended[];
+}
+
+export interface DataQueryExtended extends DataQuery {
+  [key: string]: any;
+}
+
+export class SceneQueryRunner extends SceneObjectBase<QueryRunnerState> {
+  private querySub?: Unsubscribable;
+
+  onMount() {
+    super.onMount();
+
+    const timeRange = this.getTimeRange();
+
+    this.subs.add(
+      timeRange.subscribe({
+        next: (timeRange) => {
+          this.runWithTimeRange(timeRange);
+        },
+      })
+    );
+
+    if (!this.state.data) {
+      this.runQueries();
+    }
+  }
+
+  onUnmount() {
+    super.onUnmount();
+    this.cleanUp();
+  }
+
+  cleanUp() {
+    if (this.querySub) {
+      this.querySub.unsubscribe();
+      this.querySub = undefined;
+    }
+  }
+
+  runQueries() {
+    const timeRange = this.getTimeRange();
+    this.runWithTimeRange(timeRange.state);
+  }
+
+  private async runWithTimeRange(timeRange: TimeRange) {
+    const queries = cloneDeep(this.state.queries);
+
+    const request: DataQueryRequest = {
+      app: CoreApp.Dashboard,
+      requestId: getNextRequestId(),
+      timezone: 'browser',
+      panelId: 1,
+      dashboardId: 1,
+      range: timeRange,
+      interval: '1s',
+      intervalMs: 1000,
+      targets: cloneDeep(this.state.queries),
+      maxDataPoints: 500,
+      scopedVars: {},
+      startTime: Date.now(),
+    };
+
+    try {
+      const ds = await getDataSource(queries[0].datasource!, request.scopedVars);
+
+      // Attach the data source name to each query
+      request.targets = request.targets.map((query) => {
+        if (!query.datasource) {
+          query.datasource = ds.getRef();
+        }
+        return query;
+      });
+
+      const lowerIntervalLimit = ds.interval;
+      const norm = rangeUtil.calculateInterval(timeRange, request.maxDataPoints ?? 1000, lowerIntervalLimit);
+
+      // make shallow copy of scoped vars,
+      // and add built in variables interval and interval_ms
+      request.scopedVars = Object.assign({}, request.scopedVars, {
+        __interval: { text: norm.interval, value: norm.interval },
+        __interval_ms: { text: norm.intervalMs.toString(), value: norm.intervalMs },
+      });
+
+      request.interval = norm.interval;
+      request.intervalMs = norm.intervalMs;
+
+      console.log('Query runner run');
+
+      this.querySub = runRequest(ds, request).subscribe({
+        next: (data) => {
+          console.log('set data', data, data.state);
+          this.setState({ data });
+        },
+      });
+    } catch (err) {
+      console.error('PanelQueryRunner Error', err);
+    }
+  }
+}
+
+async function getDataSource(
+  datasource: DataSourceRef | string | DataSourceApi | null,
+  scopedVars: ScopedVars
+): Promise<DataSourceApi> {
+  if (datasource && (datasource as any).query) {
+    return datasource as DataSourceApi;
+  }
+  return await getDatasourceSrv().get(datasource as string, scopedVars);
+}
diff --git a/public/app/features/scenes/scenes/demo.tsx b/public/app/features/scenes/scenes/demo.tsx
new file mode 100644
index 00000000000..fd46030217d
--- /dev/null
+++ b/public/app/features/scenes/scenes/demo.tsx
@@ -0,0 +1,140 @@
+import { getDefaultTimeRange } from '@grafana/data';
+
+import { Scene } from '../components/Scene';
+import { SceneCanvasText } from '../components/SceneCanvasText';
+import { SceneFlexLayout } from '../components/SceneFlexLayout';
+import { ScenePanelRepeater } from '../components/ScenePanelRepeater';
+import { SceneTimePicker } from '../components/SceneTimePicker';
+import { SceneToolbarInput } from '../components/SceneToolbarButton';
+import { VizPanel } from '../components/VizPanel';
+import { SceneTimeRange } from '../core/SceneTimeRange';
+import { SceneEditManager } from '../editor/SceneEditManager';
+import { SceneQueryRunner } from '../querying/SceneQueryRunner';
+
+export function getFlexLayoutTest(): Scene {
+  const scene = new Scene({
+    title: 'Flex layout test',
+    layout: new SceneFlexLayout({
+      direction: 'row',
+      children: [
+        new VizPanel({
+          pluginId: 'timeseries',
+          title: 'Dynamic height and width',
+          size: { minWidth: '70%' },
+        }),
+        new SceneFlexLayout({
+          // size: { width: 450 },
+          direction: 'column',
+          children: [
+            new VizPanel({
+              pluginId: 'timeseries',
+              title: 'Fill height',
+            }),
+            new VizPanel({
+              pluginId: 'timeseries',
+              title: 'Fill height',
+            }),
+            new SceneCanvasText({
+              text: 'Size to content',
+              fontSize: 20,
+              size: { ySizing: 'content' },
+              align: 'center',
+            }),
+            new VizPanel({
+              pluginId: 'timeseries',
+              title: 'Fixed height',
+              size: { height: 300 },
+            }),
+          ],
+        }),
+      ],
+    }),
+    $editor: new SceneEditManager({}),
+    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $data: new SceneQueryRunner({
+      queries: [
+        {
+          refId: 'A',
+          datasource: {
+            uid: 'gdev-testdata',
+            type: 'testdata',
+          },
+          scenarioId: 'random_walk',
+        },
+      ],
+    }),
+    actions: [new SceneTimePicker({})],
+  });
+
+  return scene;
+}
+
+export function getScenePanelRepeaterTest(): Scene {
+  const queryRunner = new SceneQueryRunner({
+    queries: [
+      {
+        refId: 'A',
+        datasource: {
+          uid: 'gdev-testdata',
+          type: 'testdata',
+        },
+        seriesCount: 5,
+        alias: '__server_names',
+        scenarioId: 'random_walk',
+      },
+    ],
+  });
+
+  const scene = new Scene({
+    title: 'Panel repeater test',
+    layout: new ScenePanelRepeater({
+      layout: new SceneFlexLayout({
+        direction: 'column',
+        children: [
+          new SceneFlexLayout({
+            size: { minHeight: 200 },
+            children: [
+              new VizPanel({
+                pluginId: 'timeseries',
+                title: 'Title',
+                options: {
+                  legend: { displayMode: 'hidden' },
+                },
+              }),
+              new VizPanel({
+                size: { width: 300 },
+                pluginId: 'stat',
+                fieldConfig: { defaults: { displayName: 'Last' }, overrides: [] },
+                options: {
+                  graphMode: 'none',
+                },
+              }),
+            ],
+          }),
+        ],
+      }),
+    }),
+    $editor: new SceneEditManager({}),
+    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $data: queryRunner,
+    actions: [
+      new SceneToolbarInput({
+        value: '5',
+        onChange: (newValue) => {
+          queryRunner.setState({
+            queries: [
+              {
+                ...queryRunner.state.queries[0],
+                seriesCount: newValue,
+              },
+            ],
+          });
+          queryRunner.runQueries();
+        },
+      }),
+      new SceneTimePicker({}),
+    ],
+  });
+
+  return scene;
+}
diff --git a/public/app/features/scenes/scenes/index.tsx b/public/app/features/scenes/scenes/index.tsx
new file mode 100644
index 00000000000..150d6b2b77b
--- /dev/null
+++ b/public/app/features/scenes/scenes/index.tsx
@@ -0,0 +1,23 @@
+import { Scene } from '../components/Scene';
+
+import { getFlexLayoutTest, getScenePanelRepeaterTest } from './demo';
+import { getNestedScene } from './nested';
+
+export function getScenes(): Scene[] {
+  return [getFlexLayoutTest(), getScenePanelRepeaterTest(), getNestedScene()];
+}
+
+const cache: Record<string, Scene> = {};
+
+export function getSceneByTitle(title: string) {
+  if (cache[title]) {
+    return cache[title];
+  }
+
+  const scene = getScenes().find((x) => x.state.title === title);
+  if (scene) {
+    cache[title] = scene;
+  }
+
+  return scene;
+}
diff --git a/public/app/features/scenes/scenes/nested.tsx b/public/app/features/scenes/scenes/nested.tsx
new file mode 100644
index 00000000000..64076f1ca4c
--- /dev/null
+++ b/public/app/features/scenes/scenes/nested.tsx
@@ -0,0 +1,73 @@
+import { getDefaultTimeRange } from '@grafana/data';
+
+import { Scene } from '../components/Scene';
+import { SceneFlexLayout } from '../components/SceneFlexLayout';
+import { SceneTimePicker } from '../components/SceneTimePicker';
+import { VizPanel } from '../components/VizPanel';
+import { SceneTimeRange } from '../core/SceneTimeRange';
+import { SceneQueryRunner } from '../querying/SceneQueryRunner';
+
+export function getNestedScene(): Scene {
+  const scene = new Scene({
+    title: 'Nested Scene demo',
+    layout: new SceneFlexLayout({
+      direction: 'column',
+      children: [
+        new VizPanel({
+          key: '3',
+          pluginId: 'timeseries',
+          title: 'Panel 3',
+        }),
+        getInnerScene('Inner scene'),
+      ],
+    }),
+    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $data: new SceneQueryRunner({
+      queries: [
+        {
+          refId: 'A',
+          datasource: {
+            uid: 'gdev-testdata',
+            type: 'testdata',
+          },
+          scenarioId: 'random_walk',
+        },
+      ],
+    }),
+    actions: [new SceneTimePicker({})],
+  });
+
+  return scene;
+}
+
+export function getInnerScene(title: string): Scene {
+  const scene = new Scene({
+    title: title,
+    layout: new SceneFlexLayout({
+      direction: 'row',
+      children: [
+        new VizPanel({
+          key: '3',
+          pluginId: 'timeseries',
+          title: 'Data',
+        }),
+      ],
+    }),
+    $timeRange: new SceneTimeRange(getDefaultTimeRange()),
+    $data: new SceneQueryRunner({
+      queries: [
+        {
+          refId: 'A',
+          datasource: {
+            uid: 'gdev-testdata',
+            type: 'testdata',
+          },
+          scenarioId: 'random_walk',
+        },
+      ],
+    }),
+    actions: [new SceneTimePicker({})],
+  });
+
+  return scene;
+}
diff --git a/public/app/features/scenes/services/UrlSyncManager.ts b/public/app/features/scenes/services/UrlSyncManager.ts
new file mode 100644
index 00000000000..b065d90ef49
--- /dev/null
+++ b/public/app/features/scenes/services/UrlSyncManager.ts
@@ -0,0 +1,36 @@
+import { Location } from 'history';
+import { Unsubscribable } from 'rxjs';
+
+import { locationService } from '@grafana/runtime';
+
+import { SceneObjectStateChangedEvent } from '../core/events';
+import { isSceneObjectWithUrlSync, SceneObject } from '../core/types';
+
+export class UrlSyncManager {
+  private locationListenerUnsub: () => void;
+  private stateChangeSub: Unsubscribable;
+
+  constructor(sceneRoot: SceneObject) {
+    this.stateChangeSub = sceneRoot.events.subscribe(SceneObjectStateChangedEvent, this.onStateChanged);
+    this.locationListenerUnsub = locationService.getHistory().listen(this.onLocationUpdate);
+  }
+
+  onLocationUpdate = (location: Location) => {
+    // TODO: find any scene object whose state we need to update
+  };
+
+  onStateChanged = ({ payload }: SceneObjectStateChangedEvent) => {
+    const changedObject = payload.changedObject;
+    if (!isSceneObjectWithUrlSync(changedObject)) {
+      return;
+    }
+
+    const urlUpdate = changedObject.getUrlState();
+    locationService.partial(urlUpdate, true);
+  };
+
+  cleanUp() {
+    this.stateChangeSub.unsubscribe();
+    this.locationListenerUnsub();
+  }
+}
diff --git a/public/app/features/scenes/variables/SceneVariableSet.test.ts b/public/app/features/scenes/variables/SceneVariableSet.test.ts
new file mode 100644
index 00000000000..230b49545d4
--- /dev/null
+++ b/public/app/features/scenes/variables/SceneVariableSet.test.ts
@@ -0,0 +1,43 @@
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneObjectState } from '../core/types';
+
+import { sceneTemplateInterpolator, SceneVariableManager, TextBoxSceneVariable } from './SceneVariableSet';
+
+interface TestSceneState extends SceneObjectState {
+  nested?: TestScene;
+}
+
+class TestScene extends SceneObjectBase<TestSceneState> {}
+
+describe('SceneObject with variables', () => {
+  it('Should be interpolate and use closest variable', () => {
+    const scene = new TestScene({
+      $variables: new SceneVariableManager({
+        variables: [
+          new TextBoxSceneVariable({
+            name: 'test',
+            current: { value: 'hello' },
+          }),
+          new TextBoxSceneVariable({
+            name: 'atRootOnly',
+            current: { value: 'RootValue' },
+          }),
+        ],
+      }),
+      nested: new TestScene({
+        $variables: new SceneVariableManager({
+          variables: [
+            new TextBoxSceneVariable({
+              name: 'test',
+              current: { value: 'nestedValue' },
+            }),
+          ],
+        }),
+      }),
+    });
+
+    expect(sceneTemplateInterpolator('${test}', scene)).toBe('hello');
+    expect(sceneTemplateInterpolator('${test}', scene.state.nested!)).toBe('nestedValue');
+    expect(sceneTemplateInterpolator('${atRootOnly}', scene.state.nested!)).toBe('RootValue');
+  });
+});
diff --git a/public/app/features/scenes/variables/SceneVariableSet.ts b/public/app/features/scenes/variables/SceneVariableSet.ts
new file mode 100644
index 00000000000..13e0c21862a
--- /dev/null
+++ b/public/app/features/scenes/variables/SceneVariableSet.ts
@@ -0,0 +1,50 @@
+import { variableRegex } from 'app/features/variables/utils';
+
+import { SceneObjectBase } from '../core/SceneObjectBase';
+import { SceneObject } from '../core/types';
+
+import { SceneVariable, SceneVariableSet, SceneVariableSetState, SceneVariableState } from './types';
+
+export class TextBoxSceneVariable extends SceneObjectBase<SceneVariableState> implements SceneVariable {}
+
+export class SceneVariableManager extends SceneObjectBase<SceneVariableSetState> implements SceneVariableSet {
+  getVariableByName(name: string): SceneVariable | undefined {
+    // TODO: Replace with index
+    return this.state.variables.find((x) => x.state.name === name);
+  }
+}
+
+export function sceneTemplateInterpolator(target: string, sceneObject: SceneObject) {
+  variableRegex.lastIndex = 0;
+
+  return target.replace(variableRegex, (match, var1, var2, fmt2, var3, fieldPath, fmt3) => {
+    const variableName = var1 || var2 || var3;
+    const variable = lookupSceneVariable(variableName, sceneObject);
+
+    if (!variable) {
+      return match;
+    }
+
+    return variable.state.current.value;
+  });
+}
+
+function lookupSceneVariable(name: string, sceneObject: SceneObject): SceneVariable | null | undefined {
+  const variables = sceneObject.state.$variables;
+  if (!variables) {
+    if (sceneObject.parent) {
+      return lookupSceneVariable(name, sceneObject.parent);
+    } else {
+      return null;
+    }
+  }
+
+  const found = variables.getVariableByName(name);
+  if (found) {
+    return found;
+  } else if (sceneObject.parent) {
+    return lookupSceneVariable(name, sceneObject.parent);
+  }
+
+  return null;
+}
diff --git a/public/app/features/scenes/variables/types.ts b/public/app/features/scenes/variables/types.ts
new file mode 100644
index 00000000000..b3b80e3fcd5
--- /dev/null
+++ b/public/app/features/scenes/variables/types.ts
@@ -0,0 +1,24 @@
+import { LoadingState } from '@grafana/data';
+import { VariableHide } from 'app/features/variables/types';
+
+import { SceneObject, SceneObjectState } from '../core/types';
+
+export interface SceneVariableState extends SceneObjectState {
+  name: string;
+  hide?: VariableHide;
+  skipUrlSync?: boolean;
+  state?: LoadingState;
+  error?: any | null;
+  description?: string | null;
+  current: { value: string; text?: string };
+}
+
+export interface SceneVariable extends SceneObject<SceneVariableState> {}
+
+export interface SceneVariableSetState extends SceneObjectState {
+  variables: SceneVariable[];
+}
+
+export interface SceneVariableSet extends SceneObject<SceneVariableSetState> {
+  getVariableByName(name: string): SceneVariable | undefined;
+}
diff --git a/public/app/features/search/components/ActionRow.tsx b/public/app/features/search/components/ActionRow.tsx
deleted file mode 100644
index 12b5c0a67cd..00000000000
--- a/public/app/features/search/components/ActionRow.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { css } from '@emotion/css';
-import React, { FC, ChangeEvent, FormEvent } from 'react';
-
-import { GrafanaTheme2, SelectableValue } from '@grafana/data';
-import { config } from '@grafana/runtime';
-import { HorizontalGroup, RadioButtonGroup, Checkbox, InlineSwitch, useStyles2 } from '@grafana/ui';
-import { SortPicker } from 'app/core/components/Select/SortPicker';
-import { TagFilter } from 'app/core/components/TagFilter/TagFilter';
-import { SearchSrv } from 'app/core/services/search_srv';
-
-import { DashboardQuery, SearchLayout } from '../types';
-
-export const layoutOptions = [
-  { value: SearchLayout.Folders, icon: 'folder', ariaLabel: 'View by folders' },
-  { value: SearchLayout.List, icon: 'list-ul', ariaLabel: 'View as list' },
-];
-
-const searchSrv = new SearchSrv();
-
-interface Props {
-  onLayoutChange: (layout: SearchLayout) => void;
-  setShowPreviews: (newValue: boolean) => void;
-  onSortChange: (value: SelectableValue) => void;
-  onStarredFilterChange?: (event: FormEvent<HTMLInputElement>) => void;
-  onTagFilterChange: (tags: string[]) => void;
-  query: DashboardQuery;
-  showStarredFilter?: boolean;
-  hideLayout?: boolean;
-  showPreviews?: boolean;
-}
-
-export const ActionRow: FC<Props> = ({
-  onLayoutChange,
-  setShowPreviews,
-  onSortChange,
-  onStarredFilterChange = () => {},
-  onTagFilterChange,
-  query,
-  showStarredFilter,
-  hideLayout,
-  showPreviews,
-}) => {
-  const styles = useStyles2(getStyles);
-  const previewsEnabled = config.featureToggles.dashboardPreviews;
-
-  return (
-    <div className={styles.actionRow}>
-      <div className={styles.rowContainer}>
-        <HorizontalGroup spacing="md" width="auto">
-          {!hideLayout ? (
-            <RadioButtonGroup options={layoutOptions} onChange={onLayoutChange} value={query.layout} />
-          ) : null}
-          <SortPicker onChange={onSortChange} value={query.sort?.value} />
-          {previewsEnabled && (
-            <InlineSwitch
-              id="search-show-previews"
-              label="Show previews"
-              showLabel
-              value={showPreviews}
-              onChange={(ev: ChangeEvent<HTMLInputElement>) => setShowPreviews(ev.target.checked)}
-              transparent
-            />
-          )}
-        </HorizontalGroup>
-      </div>
-      <HorizontalGroup spacing="md" width="auto">
-        {showStarredFilter && (
-          <div className={styles.checkboxWrapper}>
-            <Checkbox label="Filter by starred" onChange={onStarredFilterChange} value={query.starred} />
-          </div>
-        )}
-        <TagFilter isClearable tags={query.tag} tagOptions={searchSrv.getDashboardTags} onChange={onTagFilterChange} />
-      </HorizontalGroup>
-    </div>
-  );
-};
-
-ActionRow.displayName = 'ActionRow';
-
-export const getStyles = (theme: GrafanaTheme2) => {
-  return {
-    actionRow: css`
-      display: none;
-
-      ${theme.breakpoints.up('md')} {
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
-        padding-bottom: ${theme.spacing(2)};
-        width: 100%;
-      }
-    `,
-    rowContainer: css`
-      margin-right: ${theme.spacing(1)};
-    `,
-    checkboxWrapper: css`
-      label {
-        line-height: 1.2;
-      }
-    `,
-  };
-};
diff --git a/public/app/features/search/components/ConfirmDeleteModal.tsx b/public/app/features/search/components/ConfirmDeleteModal.tsx
deleted file mode 100644
index 2a5e7fcc61a..00000000000
--- a/public/app/features/search/components/ConfirmDeleteModal.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { css } from '@emotion/css';
-import React, { FC } from 'react';
-
-import { GrafanaTheme } from '@grafana/data';
-import { ConfirmModal, stylesFactory, useTheme } from '@grafana/ui';
-import { deleteFoldersAndDashboards } from 'app/features/manage-dashboards/state/actions';
-
-import { DashboardSection, OnDeleteItems } from '../types';
-import { getCheckedUids } from '../utils';
-
-interface Props {
-  onDeleteItems: OnDeleteItems;
-  results: DashboardSection[];
-  isOpen: boolean;
-  onDismiss: () => void;
-}
-
-export const ConfirmDeleteModal: FC<Props> = ({ results, onDeleteItems, isOpen, onDismiss }) => {
-  const theme = useTheme();
-  const styles = getStyles(theme);
-
-  const uids = getCheckedUids(results);
-  const { folders, dashboards } = uids;
-  const folderCount = folders.length;
-  const dashCount = dashboards.length;
-
-  let text = 'Do you want to delete the ';
-  let subtitle;
-  const dashEnding = dashCount === 1 ? '' : 's';
-  const folderEnding = folderCount === 1 ? '' : 's';
-
-  if (folderCount > 0 && dashCount > 0) {
-    text += `selected folder${folderEnding} and dashboard${dashEnding}?\n`;
-    subtitle = `All dashboards and alerts of the selected folder${folderEnding} will also be deleted`;
-  } else if (folderCount > 0) {
-    text += `selected folder${folderEnding} and all ${folderCount === 1 ? 'its' : 'their'} dashboards and alerts?`;
-  } else {
-    text += `selected dashboard${dashEnding}?`;
-  }
-
-  const deleteItems = () => {
-    deleteFoldersAndDashboards(folders, dashboards).then(() => {
-      onDismiss();
-      onDeleteItems(folders, dashboards);
-    });
-  };
-
-  return isOpen ? (
-    <ConfirmModal
-      isOpen={isOpen}
-      title="Delete"
-      body={
-        <>
-          {text} {subtitle && <div className={styles.subtitle}>{subtitle}</div>}
-        </>
-      }
-      confirmText="Delete"
-      onConfirm={deleteItems}
-      onDismiss={onDismiss}
-    />
-  ) : null;
-};
-
-const getStyles = stylesFactory((theme: GrafanaTheme) => {
-  return {
-    subtitle: css`
-      font-size: ${theme.typography.size.base};
-      padding-top: ${theme.spacing.md};
-    `,
-  };
-});
diff --git a/public/app/features/search/components/DashboardListPage.tsx b/public/app/features/search/components/DashboardListPage.tsx
index 3ececc199ca..bbb5b34bd17 100644
--- a/public/app/features/search/components/DashboardListPage.tsx
+++ b/public/app/features/search/components/DashboardListPage.tsx
@@ -4,15 +4,14 @@ import { connect, MapStateToProps } from 'react-redux';
 import { useAsync } from 'react-use';
 
 import { NavModel, locationUtil } from '@grafana/data';
-import { config, locationService } from '@grafana/runtime';
-import Page from 'app/core/components/Page/Page';
+import { locationService } from '@grafana/runtime';
+import { Page } from 'app/core/components/Page/Page';
 import { getNavModel } from 'app/core/selectors/navModel';
 import { FolderDTO, StoreState } from 'app/types';
 
 import { GrafanaRouteComponentProps } from '../../../core/navigation/types';
 import { loadFolderPage } from '../loaders';
 
-import ManageDashboards from './ManageDashboards';
 import ManageDashboardsNew from './ManageDashboardsNew';
 
 export interface DashboardListPageRouteParams {
@@ -46,22 +45,16 @@ export const DashboardListPage: FC<Props> = memo(({ navModel, match, location })
 
   return (
     <Page navModel={value?.pageNavModel ?? navModel}>
-      {Boolean(config.featureToggles.panelTitleSearch) ? (
-        <Page.Contents
-          isLoading={loading}
-          className={css`
-            display: flex;
-            flex-direction: column;
-            overflow: hidden;
-          `}
-        >
-          <ManageDashboardsNew folder={value?.folder} />
-        </Page.Contents>
-      ) : (
-        <Page.Contents isLoading={loading}>
-          <ManageDashboards folder={value?.folder} />
-        </Page.Contents>
-      )}
+      <Page.Contents
+        isLoading={loading}
+        className={css`
+          display: flex;
+          flex-direction: column;
+          overflow: hidden;
+        `}
+      >
+        <ManageDashboardsNew folder={value?.folder} />
+      </Page.Contents>
     </Page>
   );
 });
diff --git a/public/app/features/search/components/DashboardSearch.test.tsx b/public/app/features/search/components/DashboardSearch.test.tsx
deleted file mode 100644
index 778bf68d419..00000000000
--- a/public/app/features/search/components/DashboardSearch.test.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
-import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
-
-import { selectors } from '@grafana/e2e-selectors';
-import { locationService, setEchoSrv } from '@grafana/runtime';
-import * as MockSearchSrv from 'app/core/services/__mocks__/search_srv';
-import { Echo } from 'app/core/services/echo/Echo';
-import * as SearchSrv from 'app/core/services/search_srv';
-
-import { searchResults } from '../testData';
-import { SearchLayout } from '../types';
-
-import { DashboardSearchOLD as DashboardSearch, Props } from './DashboardSearch';
-
-jest.mock('app/core/services/search_srv');
-// Typecast the mock search so the mock import is correctly recognised by TS
-// https://stackoverflow.com/a/53222290
-const { mockSearch } = SearchSrv as typeof MockSearchSrv;
-
-beforeEach(() => {
-  jest.useFakeTimers();
-  mockSearch.mockClear();
-});
-
-afterEach(() => {
-  jest.useRealTimers();
-});
-
-const setup = (testProps?: Partial<Props>) => {
-  const props: any = {
-    onCloseSearch: () => {},
-    ...testProps,
-  };
-  render(<DashboardSearch {...props} />);
-  jest.runOnlyPendingTimers();
-};
-
-/**
- * Need to wrap component render in async act and use jest.runAllTimers to test
- * calls inside useDebounce hook
- */
-describe('DashboardSearch', () => {
-  beforeAll(() => {
-    setEchoSrv(new Echo());
-  });
-
-  it('should call search api with default query when initialised', async () => {
-    locationService.push('/');
-    setup();
-
-    await waitFor(() => screen.getByPlaceholderText('Search dashboards by name'));
-
-    expect(mockSearch).toHaveBeenCalledTimes(1);
-    expect(mockSearch).toHaveBeenCalledWith({
-      query: '',
-      tag: [],
-      skipRecent: false,
-      skipStarred: false,
-      starred: false,
-      folderIds: [],
-      layout: SearchLayout.Folders,
-      sort: undefined,
-      prevSort: null,
-    });
-  });
-
-  it('should call api with updated query on query change', async () => {
-    locationService.push('/');
-    setup();
-
-    const input = await screen.findByPlaceholderText('Search dashboards by name');
-    await act((async () => {
-      await fireEvent.input(input, { target: { value: 'Test' } });
-      jest.runOnlyPendingTimers();
-    }) as any);
-
-    expect(mockSearch).toHaveBeenCalledWith({
-      query: 'Test',
-      skipRecent: false,
-      skipStarred: false,
-      tag: [],
-      starred: false,
-      folderIds: [],
-      layout: SearchLayout.Folders,
-      sort: undefined,
-      prevSort: null,
-    });
-  });
-
-  it("should render 'No results' message when there are no dashboards", async () => {
-    locationService.push('/');
-    setup();
-
-    const message = await screen.findByText('No dashboards matching your query were found.');
-    expect(message).toBeInTheDocument();
-  });
-
-  it('should render search results', async () => {
-    mockSearch.mockResolvedValueOnce(searchResults);
-
-    locationService.push('/');
-    setup();
-
-    const section = await screen.findAllByTestId(selectors.components.Search.sectionV2);
-    expect(section).toHaveLength(2);
-    expect(screen.getAllByTestId(selectors.components.Search.itemsV2)).toHaveLength(1);
-  });
-
-  it('should call search with selected tags', async () => {
-    locationService.push('/');
-    setup();
-
-    await waitFor(() => screen.getByLabelText('Tag filter'));
-
-    const tagComponent = screen.getByLabelText('Tag filter');
-    expect(tagComponent).toBeInTheDocument();
-
-    tagComponent.focus();
-    await waitFor(() => selectOptionInTest(tagComponent, 'tag1'));
-
-    await waitFor(() =>
-      expect(mockSearch).toHaveBeenCalledWith({
-        query: '',
-        skipRecent: false,
-        skipStarred: false,
-        tag: ['tag1'],
-        starred: false,
-        folderIds: [],
-        layout: SearchLayout.Folders,
-        sort: undefined,
-        prevSort: null,
-      })
-    );
-  });
-
-  it('should call search api with provided search params', async () => {
-    locationService.partial({ query: 'test query', tag: ['tag1'], sort: 'asc' });
-    setup({});
-
-    await waitFor(() => {
-      expect(mockSearch).toHaveBeenCalledTimes(1);
-      expect(mockSearch).toHaveBeenCalledWith(
-        expect.objectContaining({
-          query: 'test query',
-          tag: ['tag1'],
-          sort: 'asc',
-        })
-      );
-    });
-  });
-});
diff --git a/public/app/features/search/components/DashboardSearch.tsx b/public/app/features/search/components/DashboardSearch.tsx
index 27c32f8d012..5f1818c3335 100644
--- a/public/app/features/search/components/DashboardSearch.tsx
+++ b/public/app/features/search/components/DashboardSearch.tsx
@@ -1,35 +1,21 @@
 import { css } from '@emotion/css';
-import React, { FC, memo, useState } from 'react';
+import React, { useState } from 'react';
 import { useDebounce, useLocalStorage } from 'react-use';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { config } from '@grafana/runtime';
-import { CustomScrollbar, IconButton, stylesFactory, useStyles2, useTheme2 } from '@grafana/ui';
+import { IconButton, stylesFactory, useStyles2 } from '@grafana/ui';
 
 import { SEARCH_PANELS_LOCAL_STORAGE_KEY } from '../constants';
-import { useDashboardSearch } from '../hooks/useDashboardSearch';
 import { useKeyNavigationListener } from '../hooks/useSearchKeyboardSelection';
 import { useSearchQuery } from '../hooks/useSearchQuery';
 import { SearchView } from '../page/components/SearchView';
 
-import { ActionRow } from './ActionRow';
-import { PreviewsSystemRequirements } from './PreviewsSystemRequirements';
-import { SearchField } from './SearchField';
-import { SearchResults } from './SearchResults';
-
 export interface Props {
   onCloseSearch: () => void;
 }
 
-export default function DashboardSearch({ onCloseSearch }: Props) {
-  if (config.featureToggles.panelTitleSearch) {
-    // TODO: "folder:current" ????
-    return <DashboardSearchNew onCloseSearch={onCloseSearch} />;
-  }
-  return <DashboardSearchOLD onCloseSearch={onCloseSearch} />;
-}
-
-function DashboardSearchNew({ onCloseSearch }: Props) {
+export function DashboardSearch({ onCloseSearch }: Props) {
   const styles = useStyles2(getStyles);
   const { query, onQueryChange } = useSearchQuery({});
 
@@ -87,59 +73,6 @@ function DashboardSearchNew({ onCloseSearch }: Props) {
   );
 }
 
-export const DashboardSearchOLD: FC<Props> = memo(({ onCloseSearch }) => {
-  const { query, onQueryChange, onTagFilterChange, onTagAdd, onSortChange, onLayoutChange } = useSearchQuery({});
-  const { results, loading, onToggleSection, onKeyDown, showPreviews, setShowPreviews } = useDashboardSearch(
-    query,
-    onCloseSearch
-  );
-  const theme = useTheme2();
-  const styles = getStyles(theme);
-
-  return (
-    <div tabIndex={0} className={styles.overlay}>
-      <div className={styles.container}>
-        <div className={styles.searchField}>
-          <SearchField query={query} onChange={onQueryChange} onKeyDown={onKeyDown} autoFocus clearable />
-          <div className={styles.closeBtn}>
-            <IconButton name="times" onClick={onCloseSearch} size="xxl" tooltip="Close search" />
-          </div>
-        </div>
-        <div className={styles.search}>
-          <ActionRow
-            {...{
-              onLayoutChange,
-              setShowPreviews,
-              onSortChange,
-              onTagFilterChange,
-              query,
-              showPreviews,
-            }}
-          />
-          <PreviewsSystemRequirements
-            bottomSpacing={3}
-            showPreviews={showPreviews}
-            onRemove={() => setShowPreviews(false)}
-          />
-          <CustomScrollbar>
-            <SearchResults
-              results={results}
-              loading={loading}
-              onTagSelected={onTagAdd}
-              editable={false}
-              onToggleSection={onToggleSection}
-              layout={query.layout}
-              showPreviews={showPreviews}
-            />
-          </CustomScrollbar>
-        </div>
-      </div>
-    </div>
-  );
-});
-
-DashboardSearchOLD.displayName = 'DashboardSearchOLD';
-
 const getStyles = stylesFactory((theme: GrafanaTheme2) => {
   return {
     overlay: css`
diff --git a/public/app/features/search/components/ManageDashboards.tsx b/public/app/features/search/components/ManageDashboards.tsx
deleted file mode 100644
index 01b201f98bc..00000000000
--- a/public/app/features/search/components/ManageDashboards.tsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import { css } from '@emotion/css';
-import React, { FC, memo, useState } from 'react';
-
-import { GrafanaTheme } from '@grafana/data';
-import { FilterInput, Spinner, stylesFactory, useTheme } from '@grafana/ui';
-import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import { contextSrv } from 'app/core/services/context_srv';
-import { FolderDTO, AccessControlAction } from 'app/types';
-
-import { useManageDashboards } from '../hooks/useManageDashboards';
-import { useSearchQuery } from '../hooks/useSearchQuery';
-import { SearchLayout } from '../types';
-
-import { ConfirmDeleteModal } from './ConfirmDeleteModal';
-import { DashboardActions } from './DashboardActions';
-import { MoveToFolderModal } from './MoveToFolderModal';
-import { SearchResults } from './SearchResults';
-import { SearchResultsFilter } from './SearchResultsFilter';
-
-export interface Props {
-  folder?: FolderDTO;
-}
-
-const { isEditor } = contextSrv;
-
-export const ManageDashboards: FC<Props> = memo(({ folder }) => {
-  const folderId = folder?.id;
-  const folderUid = folder?.uid;
-  const theme = useTheme();
-  const styles = getStyles(theme);
-  const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-  const [isMoveModalOpen, setIsMoveModalOpen] = useState(false);
-  const defaultLayout = folderId ? SearchLayout.List : SearchLayout.Folders;
-  const queryParamsDefaults = {
-    skipRecent: true,
-    skipStarred: true,
-    folderIds: folderId ? [folderId] : [],
-    layout: defaultLayout,
-  };
-
-  const {
-    query,
-    hasFilters,
-    onQueryChange,
-    onTagFilterChange,
-    onStarredFilterChange,
-    onTagAdd,
-    onSortChange,
-    onLayoutChange,
-  } = useSearchQuery(queryParamsDefaults);
-
-  const {
-    results,
-    loading,
-    initialLoading,
-    allChecked,
-    hasEditPermissionInFolders,
-    canMove,
-    canSave,
-    canDelete,
-    onToggleSection,
-    onToggleChecked,
-    onToggleAllChecked,
-    onDeleteItems,
-    onMoveItems,
-    noFolders,
-    showPreviews,
-    setShowPreviews,
-  } = useManageDashboards(query, {}, folder);
-
-  const onMoveTo = () => {
-    setIsMoveModalOpen(true);
-  };
-
-  const onItemDelete = () => {
-    setIsDeleteModalOpen(true);
-  };
-
-  if (initialLoading) {
-    return <Spinner className={styles.spinner} />;
-  }
-
-  if (noFolders && !hasFilters) {
-    return (
-      <EmptyListCTA
-        title="This folder doesn't have any dashboards yet"
-        buttonIcon="plus"
-        buttonTitle="Create Dashboard"
-        buttonLink={`dashboard/new?folderId=${folderId}`}
-        proTip="Add/move dashboards to your folder at ->"
-        proTipLink="dashboards"
-        proTipLinkTitle="Manage dashboards"
-        proTipTarget=""
-      />
-    );
-  }
-
-  return (
-    <div className={styles.container}>
-      <div className="page-action-bar">
-        <div className="gf-form gf-form--grow m-r-2">
-          <FilterInput value={query.query} onChange={onQueryChange} placeholder={'Search dashboards by name'} />
-        </div>
-        <DashboardActions
-          folderId={folderId}
-          canCreateFolders={contextSrv.hasAccess(AccessControlAction.FoldersCreate, isEditor)}
-          canCreateDashboards={contextSrv.hasAccess(
-            AccessControlAction.DashboardsCreate,
-            hasEditPermissionInFolders || !!canSave
-          )}
-        />
-      </div>
-
-      <div className={styles.results}>
-        <SearchResultsFilter
-          allChecked={allChecked}
-          canDelete={hasEditPermissionInFolders && canDelete}
-          canMove={hasEditPermissionInFolders && canMove}
-          deleteItem={onItemDelete}
-          moveTo={onMoveTo}
-          setShowPreviews={setShowPreviews}
-          onToggleAllChecked={onToggleAllChecked}
-          onStarredFilterChange={onStarredFilterChange}
-          onSortChange={onSortChange}
-          onTagFilterChange={onTagFilterChange}
-          query={query}
-          showPreviews={showPreviews}
-          hideLayout={!!folderUid}
-          onLayoutChange={onLayoutChange}
-          editable={hasEditPermissionInFolders}
-        />
-        <SearchResults
-          loading={loading}
-          results={results}
-          editable={hasEditPermissionInFolders}
-          onTagSelected={onTagAdd}
-          onToggleSection={onToggleSection}
-          onToggleChecked={onToggleChecked}
-          layout={query.layout}
-          showPreviews={showPreviews}
-        />
-      </div>
-      <ConfirmDeleteModal
-        onDeleteItems={onDeleteItems}
-        results={results}
-        isOpen={isDeleteModalOpen}
-        onDismiss={() => setIsDeleteModalOpen(false)}
-      />
-      <MoveToFolderModal
-        onMoveItems={onMoveItems}
-        results={results}
-        isOpen={isMoveModalOpen}
-        onDismiss={() => setIsMoveModalOpen(false)}
-      />
-    </div>
-  );
-});
-
-ManageDashboards.displayName = 'ManageDashboards';
-
-export default ManageDashboards;
-
-const getStyles = stylesFactory((theme: GrafanaTheme) => {
-  return {
-    container: css`
-      height: 100%;
-      display: flex;
-      flex-direction: column;
-    `,
-    results: css`
-      display: flex;
-      flex-direction: column;
-      flex: 1 1 0;
-      height: 100%;
-      padding-top: ${theme.spacing.lg};
-    `,
-    spinner: css`
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      min-height: 200px;
-    `,
-  };
-});
diff --git a/public/app/features/search/components/MoveToFolderModal.tsx b/public/app/features/search/components/MoveToFolderModal.tsx
deleted file mode 100644
index b850f9462ba..00000000000
--- a/public/app/features/search/components/MoveToFolderModal.tsx
+++ /dev/null
@@ -1,90 +0,0 @@
-import { css } from '@emotion/css';
-import React, { FC, useState } from 'react';
-
-import { GrafanaTheme } from '@grafana/data';
-import { Button, HorizontalGroup, Modal, stylesFactory, useTheme } from '@grafana/ui';
-import { FolderPicker } from 'app/core/components/Select/FolderPicker';
-import { useAppNotification } from 'app/core/copy/appNotification';
-import { moveDashboards } from 'app/features/manage-dashboards/state/actions';
-import { FolderInfo } from 'app/types';
-
-import { DashboardSection, OnMoveItems } from '../types';
-import { getCheckedDashboards } from '../utils';
-
-interface Props {
-  onMoveItems: OnMoveItems;
-  results: DashboardSection[];
-  isOpen: boolean;
-  onDismiss: () => void;
-}
-
-export const MoveToFolderModal: FC<Props> = ({ results, onMoveItems, isOpen, onDismiss }) => {
-  const [folder, setFolder] = useState<FolderInfo | null>(null);
-  const theme = useTheme();
-  const styles = getStyles(theme);
-  const selectedDashboards = getCheckedDashboards(results);
-  const notifyApp = useAppNotification();
-
-  const moveTo = () => {
-    if (folder && selectedDashboards.length) {
-      const folderTitle = folder.title ?? 'General';
-
-      moveDashboards(selectedDashboards.map((d) => d.uid) as string[], folder).then((result: any) => {
-        if (result.successCount > 0) {
-          const ending = result.successCount === 1 ? '' : 's';
-          const header = `Dashboard${ending} Moved`;
-          const msg = `${result.successCount} dashboard${ending} moved to ${folderTitle}`;
-          notifyApp.success(header, msg);
-        }
-
-        if (result.totalCount === result.alreadyInFolderCount) {
-          notifyApp.error('Error', `Dashboard already belongs to folder ${folderTitle}`);
-        } else {
-          onMoveItems(selectedDashboards, folder);
-        }
-
-        onDismiss();
-      });
-    }
-  };
-
-  return isOpen ? (
-    <Modal
-      className={styles.modal}
-      title="Choose Dashboard Folder"
-      icon="folder-plus"
-      isOpen={isOpen}
-      onDismiss={onDismiss}
-    >
-      <>
-        <div className={styles.content}>
-          <p>
-            Move the {selectedDashboards.length} selected dashboard{selectedDashboards.length === 1 ? '' : 's'} to the
-            following folder:
-          </p>
-          <FolderPicker onChange={(f) => setFolder(f as FolderInfo)} />
-        </div>
-
-        <HorizontalGroup justify="center">
-          <Button variant="primary" onClick={moveTo}>
-            Move
-          </Button>
-          <Button variant="secondary" onClick={onDismiss}>
-            Cancel
-          </Button>
-        </HorizontalGroup>
-      </>
-    </Modal>
-  ) : null;
-};
-
-const getStyles = stylesFactory((theme: GrafanaTheme) => {
-  return {
-    modal: css`
-      width: 500px;
-    `,
-    content: css`
-      margin-bottom: ${theme.spacing.lg};
-    `,
-  };
-});
diff --git a/public/app/features/search/components/SearchField.tsx b/public/app/features/search/components/SearchField.tsx
deleted file mode 100644
index 274fa528a31..00000000000
--- a/public/app/features/search/components/SearchField.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { FC } from 'react';
-
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-
-import { DashboardQuery } from '../types';
-
-type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
-
-interface SearchFieldProps extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange'> {
-  query: DashboardQuery;
-  onChange: (query: string) => void;
-  onKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
-  clearable?: boolean;
-  width?: number;
-}
-
-const getSearchFieldStyles = (theme: GrafanaTheme) => ({
-  wrapper: css`
-    width: 100%;
-    display: flex;
-    position: relative;
-    align-items: center;
-  `,
-  input: css`
-    box-sizing: border-box;
-    outline: none;
-    background-color: transparent;
-    background: transparent;
-    border-bottom: 2px solid ${theme.colors.border1};
-    font-size: 20px;
-    line-height: 38px;
-    width: 100%;
-
-    &::placeholder {
-      color: ${theme.colors.textWeak};
-    }
-  `,
-  spacer: css`
-    flex-grow: 1;
-  `,
-  icon: cx(
-    css`
-      color: ${theme.colors.textWeak};
-      padding: 0 ${theme.spacing.md};
-    `
-  ),
-  clearButton: css`
-    font-size: ${theme.typography.size.sm};
-    color: ${theme.colors.textWeak};
-    text-decoration: underline;
-
-    &:hover {
-      cursor: pointer;
-      color: ${theme.colors.textStrong};
-    }
-  `,
-});
-
-export const SearchField: FC<SearchFieldProps> = ({ query, onChange, size, clearable, className, ...inputProps }) => {
-  const styles = useStyles(getSearchFieldStyles);
-
-  return (
-    <div className={cx(styles.wrapper, className)}>
-      <input
-        type="text"
-        placeholder="Search dashboards by name"
-        value={query.query}
-        onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-          onChange(event.currentTarget.value);
-        }}
-        tabIndex={0}
-        spellCheck={false}
-        className={styles.input}
-        {...inputProps}
-      />
-
-      <div className={styles.spacer} />
-    </div>
-  );
-};
diff --git a/public/app/features/search/components/SearchResults.test.tsx b/public/app/features/search/components/SearchResults.test.tsx
deleted file mode 100644
index 2b307496b25..00000000000
--- a/public/app/features/search/components/SearchResults.test.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import React from 'react';
-
-import { selectors } from '@grafana/e2e-selectors';
-
-import { generalFolder, searchResults } from '../testData';
-import { SearchLayout } from '../types';
-
-import { Props, SearchResults } from './SearchResults';
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-const setup = (propOverrides?: Partial<Props>) => {
-  const props: Props = {
-    results: searchResults,
-    onTagSelected: (name: string) => {},
-    onToggleSection: () => {},
-    editable: false,
-    layout: SearchLayout.Folders,
-  };
-
-  Object.assign(props, propOverrides);
-
-  render(<SearchResults {...props} />);
-};
-
-describe('SearchResults', () => {
-  it('should render result items', () => {
-    setup();
-    expect(screen.getAllByTestId(selectors.components.Search.sectionV2)).toHaveLength(2);
-  });
-
-  it('should render section items for expanded section', () => {
-    setup();
-    expect(screen.getAllByText('General', { exact: false })[0]).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.itemsV2)).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.dashboardItem('Test 1'))).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.dashboardItem('Test 2'))).toBeInTheDocument();
-
-    // Check search cards aren't in the DOM
-    expect(screen.queryByTestId(selectors.components.Search.cards)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(selectors.components.Search.dashboardCard('Test 1'))).not.toBeInTheDocument();
-    expect(screen.queryByTestId(selectors.components.Search.dashboardCard('Test 2'))).not.toBeInTheDocument();
-  });
-
-  it('should render search card items for expanded section when showPreviews is enabled', () => {
-    setup({ showPreviews: true });
-    expect(screen.getAllByText('General', { exact: false })[0]).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.cards)).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.dashboardCard('Test 1'))).toBeInTheDocument();
-    expect(screen.getByTestId(selectors.components.Search.dashboardCard('Test 2'))).toBeInTheDocument();
-
-    // Check search items aren't in the DOM
-    expect(screen.queryByTestId(selectors.components.Search.itemsV2)).not.toBeInTheDocument();
-    expect(screen.queryByTestId(selectors.components.Search.dashboardItem('Test 1'))).not.toBeInTheDocument();
-    expect(screen.queryByTestId(selectors.components.Search.dashboardItem('Test 2'))).not.toBeInTheDocument();
-  });
-
-  it('should not render checkboxes for non-editable results', () => {
-    setup({ editable: false });
-    expect(screen.queryAllByRole('checkbox')).toHaveLength(0);
-  });
-
-  it('should render checkboxes for editable results', () => {
-    setup({ editable: true });
-    expect(screen.getAllByRole('checkbox')).toHaveLength(4);
-  });
-
-  it('should collapse folder item list on header click', () => {
-    const mockOnToggleSection = jest.fn();
-    setup({ onToggleSection: mockOnToggleSection });
-
-    fireEvent.click(screen.getAllByText('General', { exact: false })[0]);
-    expect(mockOnToggleSection).toHaveBeenCalledWith(generalFolder);
-  });
-
-  it('should not throw an error if the search results have an empty title', () => {
-    const mockOnToggleSection = jest.fn();
-    const searchResultsEmptyTitle = searchResults.slice();
-    searchResultsEmptyTitle[0].title = '';
-    expect(() => {
-      setup({ results: searchResultsEmptyTitle, onToggleSection: mockOnToggleSection });
-    }).not.toThrowError();
-  });
-});
diff --git a/public/app/features/search/components/SearchResults.tsx b/public/app/features/search/components/SearchResults.tsx
deleted file mode 100644
index cafddc351c3..00000000000
--- a/public/app/features/search/components/SearchResults.tsx
+++ /dev/null
@@ -1,193 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { FC, memo } from 'react';
-import AutoSizer from 'react-virtualized-auto-sizer';
-import { FixedSizeList, FixedSizeGrid } from 'react-window';
-
-import { GrafanaTheme } from '@grafana/data';
-import { selectors } from '@grafana/e2e-selectors';
-import { Spinner, stylesFactory, useTheme } from '@grafana/ui';
-
-import { SEARCH_ITEM_HEIGHT, SEARCH_ITEM_MARGIN } from '../constants';
-import { DashboardSection, OnToggleChecked, SearchLayout } from '../types';
-
-import { SearchCard } from './SearchCard';
-import { SearchItem } from './SearchItem';
-import { SectionHeader } from './SectionHeader';
-
-export interface Props {
-  editable?: boolean;
-  loading?: boolean;
-  onTagSelected: (name: string) => any;
-  onToggleChecked?: OnToggleChecked;
-  onToggleSection: (section: DashboardSection) => void;
-  results: DashboardSection[];
-  showPreviews?: boolean;
-  layout?: string;
-}
-
-const { sectionV2: sectionLabel, itemsV2: itemsLabel, cards: cardsLabel } = selectors.components.Search;
-
-export const SearchResults: FC<Props> = memo(
-  ({ editable, loading, onTagSelected, onToggleChecked, onToggleSection, results, showPreviews, layout }) => {
-    const theme = useTheme();
-    const styles = getSectionStyles(theme);
-    const itemProps = { editable, onToggleChecked, onTagSelected };
-    const renderFolders = () => {
-      const Wrapper = showPreviews ? SearchCard : SearchItem;
-      return (
-        <div className={styles.wrapper}>
-          {results.map((section) => {
-            return (
-              <div data-testid={sectionLabel} className={styles.section} key={section.id || section.title}>
-                {section.title && (
-                  <SectionHeader onSectionClick={onToggleSection} {...{ onToggleChecked, editable, section }}>
-                    <div
-                      data-testid={showPreviews ? cardsLabel : itemsLabel}
-                      className={cx(styles.sectionItems, { [styles.gridContainer]: showPreviews })}
-                    >
-                      {section.items.map((item) => (
-                        <Wrapper {...itemProps} key={item.uid} item={item} />
-                      ))}
-                    </div>
-                  </SectionHeader>
-                )}
-              </div>
-            );
-          })}
-        </div>
-      );
-    };
-    const renderDashboards = () => {
-      const items = results[0]?.items;
-      return (
-        <div className={styles.listModeWrapper}>
-          <AutoSizer>
-            {({ height, width }) => {
-              const numColumns = Math.ceil(width / 320);
-              const cellWidth = width / numColumns;
-              const cellHeight = (cellWidth - 64) * 0.75 + 56 + 8;
-              const numRows = Math.ceil(items.length / numColumns);
-              return showPreviews ? (
-                <FixedSizeGrid
-                  columnCount={numColumns}
-                  columnWidth={cellWidth}
-                  rowCount={numRows}
-                  rowHeight={cellHeight}
-                  className={styles.wrapper}
-                  innerElementType="ul"
-                  height={height}
-                  width={width}
-                >
-                  {({ columnIndex, rowIndex, style }) => {
-                    const index = rowIndex * numColumns + columnIndex;
-                    const item = items[index];
-                    // The wrapper div is needed as the inner SearchItem has margin-bottom spacing
-                    // And without this wrapper there is no room for that margin
-                    return item ? (
-                      <li style={style} className={styles.virtualizedGridItemWrapper}>
-                        <SearchCard key={item.id} {...itemProps} item={item} />
-                      </li>
-                    ) : null;
-                  }}
-                </FixedSizeGrid>
-              ) : (
-                <FixedSizeList
-                  className={styles.wrapper}
-                  innerElementType="ul"
-                  itemSize={SEARCH_ITEM_HEIGHT + SEARCH_ITEM_MARGIN}
-                  height={height}
-                  itemCount={items.length}
-                  width={width}
-                >
-                  {({ index, style }) => {
-                    const item = items[index];
-                    // The wrapper div is needed as the inner SearchItem has margin-bottom spacing
-                    // And without this wrapper there is no room for that margin
-                    return (
-                      <li style={style}>
-                        <SearchItem key={item.id} {...itemProps} item={item} />
-                      </li>
-                    );
-                  }}
-                </FixedSizeList>
-              );
-            }}
-          </AutoSizer>
-        </div>
-      );
-    };
-
-    if (loading) {
-      return <Spinner className={styles.spinner} />;
-    } else if (!results || !results.length) {
-      return <div className={styles.noResults}>No dashboards matching your query were found.</div>;
-    }
-
-    return (
-      <div className={styles.resultsContainer}>
-        {layout === SearchLayout.Folders ? renderFolders() : renderDashboards()}
-      </div>
-    );
-  }
-);
-
-SearchResults.displayName = 'SearchResults';
-
-const getSectionStyles = stylesFactory((theme: GrafanaTheme) => {
-  const { md, sm } = theme.spacing;
-
-  return {
-    virtualizedGridItemWrapper: css`
-      padding: 4px;
-    `,
-    wrapper: css`
-      display: flex;
-      flex-direction: column;
-
-      > ul {
-        list-style: none;
-      }
-    `,
-    section: css`
-      display: flex;
-      flex-direction: column;
-      background: ${theme.colors.panelBg};
-      border-bottom: solid 1px ${theme.colors.border2};
-    `,
-    sectionItems: css`
-      margin: 0 24px 0 32px;
-    `,
-    spinner: css`
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      min-height: 100px;
-    `,
-    gridContainer: css`
-      display: grid;
-      gap: ${sm};
-      grid-template-columns: repeat(auto-fill, minmax(240px, 1fr));
-      margin-bottom: ${md};
-    `,
-    resultsContainer: css`
-      position: relative;
-      flex-grow: 10;
-      margin-bottom: ${md};
-      background: ${theme.colors.bg1};
-      border: 1px solid ${theme.colors.border1};
-      border-radius: 3px;
-      height: 100%;
-    `,
-    noResults: css`
-      padding: ${md};
-      background: ${theme.colors.bg2};
-      font-style: italic;
-      margin-top: ${theme.spacing.md};
-    `,
-    listModeWrapper: css`
-      position: relative;
-      height: 100%;
-      padding: ${md};
-    `,
-  };
-});
diff --git a/public/app/features/search/components/SearchResultsFilter.test.tsx b/public/app/features/search/components/SearchResultsFilter.test.tsx
deleted file mode 100644
index 878233f4e9d..00000000000
--- a/public/app/features/search/components/SearchResultsFilter.test.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import React from 'react';
-import { selectOptionInTest } from 'test/helpers/selectOptionInTest';
-
-import { SearchLayout } from '../types';
-
-import { Props, SearchResultsFilter } from './SearchResultsFilter';
-
-jest.mock('app/core/services/search_srv');
-
-const noop = jest.fn();
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-const searchQuery = {
-  starred: false,
-  sort: null,
-  prevSort: null,
-  tag: ['tag'],
-  query: '',
-  skipRecent: true,
-  skipStarred: true,
-  folderIds: [],
-  layout: SearchLayout.Folders,
-};
-
-const setup = (propOverrides?: Partial<Props>) => {
-  const props: Props = {
-    allChecked: false,
-    canDelete: false,
-    canMove: false,
-    deleteItem: noop,
-    moveTo: noop,
-    onStarredFilterChange: noop,
-    onTagFilterChange: noop,
-    onToggleAllChecked: noop,
-    onLayoutChange: noop,
-    query: searchQuery,
-    onSortChange: noop,
-    setShowPreviews: noop,
-    editable: true,
-  };
-
-  Object.assign(props, propOverrides);
-
-  render(<SearchResultsFilter {...props} />);
-};
-
-describe('SearchResultsFilter', () => {
-  it('should render "filter by starred" and "filter by tag" filters by default', async () => {
-    setup();
-    expect(await screen.findAllByRole('checkbox')).toHaveLength(1);
-    expect(screen.queryByText('Move')).not.toBeInTheDocument();
-    expect(screen.queryByText('Delete')).not.toBeInTheDocument();
-  });
-
-  it('should render Move and Delete buttons when canDelete is true', () => {
-    setup({ canDelete: true });
-    expect(screen.getAllByRole('checkbox')).toHaveLength(1);
-    expect(screen.queryByText('Move')).toBeInTheDocument();
-    expect(screen.queryByText('Delete')).toBeInTheDocument();
-  });
-
-  it('should render Move and Delete buttons when canMove is true', () => {
-    setup({ canMove: true });
-    expect(screen.getAllByRole('checkbox')).toHaveLength(1);
-    expect(screen.queryByText('Move')).toBeInTheDocument();
-    expect(screen.queryByText('Delete')).toBeInTheDocument();
-  });
-
-  it('should call onStarredFilterChange when "filter by starred" is changed', async () => {
-    const mockFilterStarred = jest.fn();
-    setup({ onStarredFilterChange: mockFilterStarred });
-    const checkbox = await screen.findByLabelText(/filter by starred/i);
-    fireEvent.click(checkbox);
-    expect(mockFilterStarred).toHaveBeenCalledTimes(1);
-  });
-
-  it('should be called with proper filter option when "filter by tags" is changed', async () => {
-    const mockFilterByTags = jest.fn();
-    setup({
-      onTagFilterChange: mockFilterByTags,
-      query: { ...searchQuery, tag: [] },
-    });
-    const tagComponent = await screen.findByLabelText('Tag filter');
-    await tagComponent.focus();
-    await selectOptionInTest(tagComponent, 'tag1');
-
-    expect(mockFilterByTags).toHaveBeenCalledTimes(1);
-    expect(mockFilterByTags).toHaveBeenCalledWith(['tag1']);
-  });
-});
diff --git a/public/app/features/search/components/SearchResultsFilter.tsx b/public/app/features/search/components/SearchResultsFilter.tsx
deleted file mode 100644
index 51ec8d7ffcf..00000000000
--- a/public/app/features/search/components/SearchResultsFilter.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { css } from '@emotion/css';
-import React, { FC, FormEvent } from 'react';
-
-import { GrafanaTheme, SelectableValue } from '@grafana/data';
-import { Button, Checkbox, stylesFactory, useTheme, HorizontalGroup } from '@grafana/ui';
-
-import { DashboardQuery, SearchLayout } from '../types';
-
-import { ActionRow } from './ActionRow';
-import { PreviewsSystemRequirements } from './PreviewsSystemRequirements';
-
-export interface Props {
-  allChecked?: boolean;
-  canDelete?: boolean;
-  canMove?: boolean;
-  deleteItem: () => void;
-  hideLayout?: boolean;
-  moveTo: () => void;
-  onLayoutChange: (layout: SearchLayout) => void;
-  setShowPreviews: (newValue: boolean) => void;
-  onSortChange: (value: SelectableValue) => void;
-  onStarredFilterChange: (event: FormEvent<HTMLInputElement>) => void;
-  onTagFilterChange: (tags: string[]) => void;
-  onToggleAllChecked: () => void;
-  query: DashboardQuery;
-  showPreviews?: boolean;
-  editable?: boolean;
-}
-
-export const SearchResultsFilter: FC<Props> = ({
-  allChecked,
-  canDelete,
-  canMove,
-  deleteItem,
-  hideLayout,
-  moveTo,
-  onLayoutChange,
-  setShowPreviews,
-  onSortChange,
-  onStarredFilterChange,
-  onTagFilterChange,
-  onToggleAllChecked,
-  query,
-  showPreviews,
-  editable,
-}) => {
-  const showActions = canDelete || canMove;
-  const theme = useTheme();
-  const styles = getStyles(theme);
-
-  return (
-    <div className={styles.wrapper}>
-      <div className={styles.rowWrapper}>
-        {editable && (
-          <div className={styles.checkboxWrapper}>
-            <Checkbox aria-label="Select all" value={allChecked} onChange={onToggleAllChecked} />
-          </div>
-        )}
-        {showActions ? (
-          <HorizontalGroup spacing="md">
-            <Button disabled={!canMove} onClick={moveTo} icon="exchange-alt" variant="secondary">
-              Move
-            </Button>
-            <Button disabled={!canDelete} onClick={deleteItem} icon="trash-alt" variant="destructive">
-              Delete
-            </Button>
-          </HorizontalGroup>
-        ) : (
-          <ActionRow
-            {...{
-              hideLayout,
-              onLayoutChange,
-              setShowPreviews,
-              onSortChange,
-              onStarredFilterChange,
-              onTagFilterChange,
-              query,
-              showPreviews,
-            }}
-            showStarredFilter
-          />
-        )}
-      </div>
-      <PreviewsSystemRequirements
-        topSpacing={2}
-        bottomSpacing={3}
-        showPreviews={showPreviews}
-        onRemove={() => setShowPreviews(false)}
-      />
-    </div>
-  );
-};
-
-const getStyles = stylesFactory((theme: GrafanaTheme) => {
-  const { sm, md } = theme.spacing;
-  return {
-    wrapper: css`
-      display: flex;
-      flex-direction: column;
-    `,
-    rowWrapper: css`
-      height: ${theme.height.md}px;
-      display: flex;
-      justify-content: flex-start;
-      gap: ${theme.spacing.md};
-      align-items: center;
-      margin-bottom: ${sm};
-
-      > label {
-        height: 20px;
-        margin: 0 ${md} 0 ${sm};
-      }
-    `,
-    checkboxWrapper: css`
-      label {
-        line-height: 1.2;
-        width: max-content;
-      }
-    `,
-  };
-});
diff --git a/public/app/features/search/components/SearchWrapper.tsx b/public/app/features/search/components/SearchWrapper.tsx
index 506f8944ef9..7d7881edd75 100644
--- a/public/app/features/search/components/SearchWrapper.tsx
+++ b/public/app/features/search/components/SearchWrapper.tsx
@@ -4,7 +4,7 @@ import { useUrlParams } from 'app/core/navigation/hooks';
 
 import { defaultQueryParams } from '../reducers/searchQueryReducer';
 
-import DashboardSearch from './DashboardSearch';
+import { DashboardSearch } from './DashboardSearch';
 
 export const SearchWrapper: FC = memo(() => {
   const [params, updateUrlParams] = useUrlParams();
diff --git a/public/app/features/search/components/SectionHeader.tsx b/public/app/features/search/components/SectionHeader.tsx
deleted file mode 100644
index 43b418985a3..00000000000
--- a/public/app/features/search/components/SectionHeader.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import { css, cx } from '@emotion/css';
-import React, { FC, useCallback } from 'react';
-import { useLocalStorage } from 'react-use';
-
-import { GrafanaTheme } from '@grafana/data';
-import { CollapsableSection, Icon, stylesFactory, useTheme } from '@grafana/ui';
-import { useUniqueId } from 'app/plugins/datasource/influxdb/components/useUniqueId';
-
-import { DashboardSection, OnToggleChecked } from '../types';
-import { getSectionIcon, getSectionStorageKey } from '../utils';
-
-import { SearchCheckbox } from './SearchCheckbox';
-
-interface SectionHeaderProps {
-  editable?: boolean;
-  onSectionClick: (section: DashboardSection) => void;
-  onToggleChecked?: OnToggleChecked;
-  section: DashboardSection;
-  children: React.ReactNode;
-}
-
-export const SectionHeader: FC<SectionHeaderProps> = ({
-  section,
-  onSectionClick,
-  children,
-  onToggleChecked,
-  editable = false,
-}) => {
-  const theme = useTheme();
-  const styles = getSectionHeaderStyles(theme, section.selected, editable);
-  const setSectionExpanded = useLocalStorage(getSectionStorageKey(section.title), true)[1];
-
-  const onSectionExpand = () => {
-    setSectionExpanded(!section.expanded);
-    onSectionClick(section);
-  };
-
-  const handleCheckboxClick = useCallback(
-    (ev: React.MouseEvent) => {
-      ev.stopPropagation();
-      ev.preventDefault();
-
-      onToggleChecked?.(section);
-    },
-    [onToggleChecked, section]
-  );
-
-  const id = useUniqueId();
-  const labelId = `section-header-label-${id}`;
-
-  return (
-    <CollapsableSection
-      isOpen={section.expanded ?? false}
-      onToggle={onSectionExpand}
-      className={styles.wrapper}
-      contentClassName={styles.content}
-      loading={section.itemsFetching}
-      labelId={labelId}
-      label={
-        <>
-          <SearchCheckbox
-            className={styles.checkbox}
-            editable={editable}
-            checked={section.checked}
-            onClick={handleCheckboxClick}
-            aria-label="Select folder"
-          />
-
-          <div className={styles.icon}>
-            <Icon name={getSectionIcon(section)} />
-          </div>
-
-          <div className={styles.text}>
-            <span id={labelId}>{section.title}</span>
-            {section.url && (
-              <a href={section.url} className={styles.link}>
-                <span className={styles.separator}>|</span> <Icon name="folder-upload" /> Go to folder
-              </a>
-            )}
-          </div>
-        </>
-      }
-    >
-      {children}
-    </CollapsableSection>
-  );
-};
-
-const getSectionHeaderStyles = stylesFactory((theme: GrafanaTheme, selected = false, editable: boolean) => {
-  const { sm } = theme.spacing;
-  return {
-    wrapper: cx(
-      css`
-        align-items: center;
-        font-size: ${theme.typography.size.base};
-        padding: 12px;
-        border-bottom: none;
-        color: ${theme.colors.textWeak};
-        z-index: 1;
-
-        &:hover,
-        &.selected {
-          color: ${theme.colors.text};
-        }
-
-        &:hover,
-        &:focus-visible,
-        &:focus-within {
-          a {
-            opacity: 1;
-          }
-        }
-      `,
-      'pointer',
-      { selected }
-    ),
-    checkbox: css`
-      padding: 0 ${sm} 0 0;
-    `,
-    icon: css`
-      padding: 0 ${sm} 0 ${editable ? 0 : sm};
-    `,
-    text: css`
-      flex-grow: 1;
-      line-height: 24px;
-    `,
-    link: css`
-      padding: 2px 10px 0;
-      color: ${theme.colors.textWeak};
-      opacity: 0;
-      transition: opacity 150ms ease-in-out;
-    `,
-    separator: css`
-      margin-right: 6px;
-    `,
-    content: css`
-      padding-top: 0px;
-      padding-bottom: 0px;
-    `,
-  };
-});
diff --git a/public/app/features/search/constants.ts b/public/app/features/search/constants.ts
index 9563a641fea..1e6483c77f6 100644
--- a/public/app/features/search/constants.ts
+++ b/public/app/features/search/constants.ts
@@ -7,6 +7,5 @@ export const SECTION_STORAGE_KEY = 'search.sections';
 export const GENERAL_FOLDER_ID = 0;
 export const GENERAL_FOLDER_UID = 'general';
 export const GENERAL_FOLDER_TITLE = 'General';
-export const PREVIEWS_LOCAL_STORAGE_KEY = 'grafana.dashboard.previews';
 export const SEARCH_PANELS_LOCAL_STORAGE_KEY = 'grafana.search.include.panels';
 export const SEARCH_SELECTED_LAYOUT = 'grafana.search.layout';
diff --git a/public/app/features/search/hooks/useDashboardSearch.ts b/public/app/features/search/hooks/useDashboardSearch.ts
deleted file mode 100644
index 96267739453..00000000000
--- a/public/app/features/search/hooks/useDashboardSearch.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { KeyboardEvent, useReducer } from 'react';
-import { useDebounce } from 'react-use';
-
-import { locationUtil } from '@grafana/data';
-import { locationService } from '@grafana/runtime';
-
-import { MOVE_SELECTION_DOWN, MOVE_SELECTION_UP } from '../reducers/actionTypes';
-import { dashboardsSearchState, DashboardsSearchState, searchReducer } from '../reducers/dashboardSearch';
-import { DashboardQuery, DashboardSearchItemType, DashboardSection } from '../types';
-import { findSelected } from '../utils';
-
-import { reportDashboardListViewed } from './useManageDashboards';
-import { useSearch } from './useSearch';
-import { useShowDashboardPreviews } from './useShowDashboardPreviews';
-
-export const useDashboardSearch = (query: DashboardQuery, onCloseSearch: () => void) => {
-  const reducer = useReducer(searchReducer, dashboardsSearchState);
-  const { showPreviews, setShowPreviews, previewFeatureEnabled } = useShowDashboardPreviews();
-  const {
-    state: { results, loading },
-    onToggleSection,
-    dispatch,
-  } = useSearch<DashboardsSearchState>(query, reducer, { queryParsing: true });
-
-  useDebounce(
-    () => {
-      reportDashboardListViewed('dashboard_search', showPreviews, previewFeatureEnabled, {
-        layout: query.layout,
-        starred: query.starred,
-        sortValue: query.sort?.value,
-        query: query.query,
-        tagCount: query.tag?.length,
-      });
-    },
-    1000,
-    [
-      showPreviews,
-      previewFeatureEnabled,
-      query.layout,
-      query.starred,
-      query.sort?.value,
-      query.query?.length,
-      query.tag?.length,
-    ]
-  );
-
-  const onKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
-    switch (event.key) {
-      case 'Escape':
-        onCloseSearch();
-        break;
-      case 'ArrowUp':
-        dispatch({ type: MOVE_SELECTION_UP });
-        break;
-      case 'ArrowDown':
-        dispatch({ type: MOVE_SELECTION_DOWN });
-        break;
-      case 'Enter':
-        const selectedItem = findSelected(results);
-        if (selectedItem) {
-          if (selectedItem.type === DashboardSearchItemType.DashFolder) {
-            onToggleSection(selectedItem as DashboardSection);
-          } else {
-            locationService.push(locationUtil.stripBaseFromUrl(selectedItem.url));
-            // Delay closing to prevent current page flicker
-            setTimeout(onCloseSearch, 0);
-          }
-        }
-    }
-  };
-
-  return {
-    results,
-    loading,
-    onToggleSection,
-    onKeyDown,
-    showPreviews,
-    setShowPreviews,
-  };
-};
diff --git a/public/app/features/search/hooks/useManageDashboards.test.ts b/public/app/features/search/hooks/useManageDashboards.test.ts
deleted file mode 100644
index 6c2dd608b0b..00000000000
--- a/public/app/features/search/hooks/useManageDashboards.test.ts
+++ /dev/null
@@ -1,230 +0,0 @@
-import { renderHook } from '@testing-library/react-hooks';
-import { Dispatch } from 'react';
-
-import { setEchoSrv } from '@grafana/runtime/src';
-import { Echo } from 'app/core/services/echo/Echo';
-
-import { GENERAL_FOLDER_ID } from '../constants';
-import { ManageDashboardsState } from '../reducers/manageDashboards';
-import { DashboardQuery, DashboardSearchItemType, DashboardSection, SearchAction } from '../types';
-
-import { useManageDashboards } from './useManageDashboards';
-import * as useSearch from './useSearch';
-
-describe('useManageDashboards', () => {
-  const useSearchMock = jest.spyOn(useSearch, 'useSearch');
-  const toggle = async (section: DashboardSection) => section;
-
-  beforeAll(() => {
-    setEchoSrv(new Echo());
-  });
-
-  function setupTestContext({ results = [] }: { results?: DashboardSection[] } = {}) {
-    jest.clearAllMocks();
-
-    const state: ManageDashboardsState = {
-      results,
-      loading: false,
-      selectedIndex: 0,
-      initialLoading: false,
-      allChecked: false,
-    };
-    const dispatch: Dispatch<SearchAction> = null as unknown as Dispatch<SearchAction>;
-    useSearchMock.mockReturnValue({ state, dispatch, onToggleSection: toggle });
-    const dashboardQuery: DashboardQuery = {} as unknown as DashboardQuery;
-
-    const { result } = renderHook(() => useManageDashboards(dashboardQuery, {}));
-
-    return { result };
-  }
-
-  describe('when called and only General folder is selected', () => {
-    it('then canDelete should be false', () => {
-      const results: DashboardSection[] = [
-        { id: 1, checked: false, items: [], title: 'One', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-        {
-          id: GENERAL_FOLDER_ID,
-          checked: true,
-          items: [],
-          title: 'General',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        { id: 2, checked: false, items: [], title: 'Two', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-      ];
-
-      const { result } = setupTestContext({ results });
-
-      expect(result.current.canDelete).toBe(false);
-    });
-  });
-
-  describe('when called and General folder and another folder are selected', () => {
-    it('then canDelete should be false', () => {
-      const results: DashboardSection[] = [
-        {
-          id: 1,
-          checked: true,
-          items: [
-            {
-              id: 11,
-              checked: true,
-              title: 'Eleven',
-              type: DashboardSearchItemType.DashDB,
-              url: '/',
-              isStarred: false,
-              tags: [],
-              uri: '',
-            },
-          ],
-          title: 'One',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        {
-          id: GENERAL_FOLDER_ID,
-          checked: true,
-          items: [
-            {
-              id: 10,
-              checked: true,
-              title: 'Ten',
-              type: DashboardSearchItemType.DashDB,
-              url: '/',
-              isStarred: false,
-              tags: [],
-              uri: '',
-            },
-          ],
-          title: 'General',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        { id: 2, checked: false, items: [], title: 'Two', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-      ];
-
-      const { result } = setupTestContext({ results });
-
-      expect(result.current.canDelete).toBe(false);
-    });
-  });
-
-  describe('when called on an empty General folder that is not selected but another folder is selected', () => {
-    it('then canDelete should be true', () => {
-      const results: DashboardSection[] = [
-        {
-          id: 1,
-          checked: true,
-          items: [
-            {
-              id: 11,
-              checked: true,
-              title: 'Eleven',
-              type: DashboardSearchItemType.DashDB,
-              url: '/',
-              isStarred: false,
-              tags: [],
-              uri: '',
-            },
-          ],
-          title: 'One',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        {
-          id: GENERAL_FOLDER_ID,
-          checked: false,
-          items: [],
-          title: 'General',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        { id: 2, checked: false, items: [], title: 'Two', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-      ];
-
-      const { result } = setupTestContext({ results });
-
-      expect(result.current.canDelete).toBe(true);
-    });
-  });
-
-  describe('when called on a non empty General folder that is not selected dashboard in General folder is selected', () => {
-    it('then canDelete should be true', () => {
-      const results: DashboardSection[] = [
-        {
-          id: GENERAL_FOLDER_ID,
-          checked: false,
-          items: [
-            {
-              id: 10,
-              checked: true,
-              title: 'Ten',
-              type: DashboardSearchItemType.DashDB,
-              url: '/',
-              isStarred: false,
-              tags: [],
-              uri: '',
-            },
-          ],
-          title: 'General',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-      ];
-
-      const { result } = setupTestContext({ results });
-
-      expect(result.current.canDelete).toBe(true);
-    });
-  });
-
-  describe('when called and no folder is selected', () => {
-    it('then canDelete should be false', () => {
-      const results: DashboardSection[] = [
-        { id: 1, checked: false, items: [], title: 'One', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-        {
-          id: GENERAL_FOLDER_ID,
-          checked: false,
-          items: [],
-          title: 'General',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        { id: 2, checked: false, items: [], title: 'Two', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-      ];
-
-      const { result } = setupTestContext({ results });
-
-      expect(result.current.canDelete).toBe(false);
-    });
-  });
-
-  describe('when called on an empty folder', () => {
-    it('then canDelete should be true', () => {
-      const results: DashboardSection[] = [
-        { id: 1, checked: true, items: [], title: 'One', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-        {
-          id: GENERAL_FOLDER_ID,
-          checked: false,
-          items: [],
-          title: 'General',
-          type: DashboardSearchItemType.DashFolder,
-          toggle,
-          url: '/',
-        },
-        { id: 2, checked: false, items: [], title: 'Two', type: DashboardSearchItemType.DashFolder, toggle, url: '/' },
-      ];
-
-      const { result } = setupTestContext({ results });
-
-      expect(result.current.canDelete).toBe(true);
-    });
-  });
-});
diff --git a/public/app/features/search/hooks/useManageDashboards.ts b/public/app/features/search/hooks/useManageDashboards.ts
deleted file mode 100644
index bf55d4ff11f..00000000000
--- a/public/app/features/search/hooks/useManageDashboards.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-import { useCallback, useMemo, useReducer } from 'react';
-import { useDebounce } from 'react-use';
-
-import { reportInteraction } from '@grafana/runtime/src';
-import { contextSrv } from 'app/core/services/context_srv';
-import { FolderDTO } from 'app/types';
-
-import { GENERAL_FOLDER_ID } from '../constants';
-import { DELETE_ITEMS, MOVE_ITEMS, TOGGLE_ALL_CHECKED, TOGGLE_CHECKED } from '../reducers/actionTypes';
-import { manageDashboardsReducer, manageDashboardsState, ManageDashboardsState } from '../reducers/manageDashboards';
-import { DashboardQuery, DashboardSection, OnDeleteItems, OnMoveItems, OnToggleChecked, SearchLayout } from '../types';
-
-import { useSearch } from './useSearch';
-import { useShowDashboardPreviews } from './useShowDashboardPreviews';
-
-const hasChecked = (section: DashboardSection) => {
-  return section.checked || section.items.some((item) => item.checked);
-};
-
-export const reportDashboardListViewed = (
-  dashboardListType: 'manage_dashboards' | 'dashboard_search',
-  showPreviews: boolean,
-  previewsEnabled: boolean,
-  query: {
-    layout?: SearchLayout;
-    starred?: boolean;
-    sortValue?: string;
-    query?: string;
-    tagCount?: number;
-  }
-) => {
-  const previews = previewsEnabled ? (showPreviews ? 'on' : 'off') : 'feature_disabled';
-  reportInteraction(`${dashboardListType}_viewed`, {
-    previews,
-    layout: query.layout,
-    starredFilter: query.starred ?? false,
-    sort: query.sortValue ?? '',
-    tagCount: query.tagCount ?? 0,
-    queryLength: query.query?.length ?? 0,
-  });
-};
-
-export const useManageDashboards = (
-  query: DashboardQuery,
-  state: Partial<ManageDashboardsState> = {},
-  folder?: FolderDTO
-) => {
-  const reducer = useReducer(manageDashboardsReducer, {
-    ...manageDashboardsState,
-    ...state,
-  });
-
-  const { showPreviews, setShowPreviews, previewFeatureEnabled } = useShowDashboardPreviews();
-  useDebounce(
-    () => {
-      reportDashboardListViewed('manage_dashboards', showPreviews, previewFeatureEnabled, {
-        layout: query.layout,
-        starred: query.starred,
-        sortValue: query.sort?.value,
-        query: query.query,
-        tagCount: query.tag?.length,
-      });
-    },
-    1000,
-    [
-      showPreviews,
-      previewFeatureEnabled,
-      query.layout,
-      query.starred,
-      query.sort?.value,
-      query.query?.length,
-      query.tag?.length,
-    ]
-  );
-
-  const {
-    state: { results, loading, initialLoading, allChecked },
-    onToggleSection,
-    dispatch,
-  } = useSearch<ManageDashboardsState>(query, reducer, {});
-
-  const onToggleChecked: OnToggleChecked = useCallback(
-    (item) => {
-      dispatch({ type: TOGGLE_CHECKED, payload: item });
-    },
-    [dispatch]
-  );
-
-  const onToggleAllChecked = () => {
-    dispatch({ type: TOGGLE_ALL_CHECKED });
-  };
-
-  const onDeleteItems: OnDeleteItems = (folders, dashboards) => {
-    dispatch({ type: DELETE_ITEMS, payload: { folders, dashboards } });
-  };
-
-  const onMoveItems: OnMoveItems = (selectedDashboards, folder) => {
-    dispatch({ type: MOVE_ITEMS, payload: { dashboards: selectedDashboards, folder } });
-  };
-
-  const canMove = useMemo(() => results.some((result) => result.items.some((item) => item.checked)), [results]);
-
-  const canDelete = useMemo(() => {
-    const somethingChecked = results.some(hasChecked);
-    const includesGeneralFolder = results.find((result) => result.checked && result.id === GENERAL_FOLDER_ID);
-    return somethingChecked && !includesGeneralFolder;
-  }, [results]);
-
-  const canSave = folder?.canSave;
-  const hasEditPermissionInFolders = folder ? canSave : contextSrv.hasEditPermissionInFolders;
-  const noFolders = canSave && folder?.id && results.length === 0 && !loading && !initialLoading;
-
-  return {
-    results,
-    loading,
-    initialLoading,
-    canSave,
-    allChecked,
-    hasEditPermissionInFolders,
-    canMove,
-    canDelete,
-    onToggleSection,
-    onToggleChecked,
-    onToggleAllChecked,
-    onDeleteItems,
-    onMoveItems,
-    noFolders,
-    showPreviews,
-    setShowPreviews,
-  };
-};
diff --git a/public/app/features/search/hooks/useSearch.ts b/public/app/features/search/hooks/useSearch.ts
deleted file mode 100644
index fda96885d65..00000000000
--- a/public/app/features/search/hooks/useSearch.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useCallback, useEffect } from 'react';
-import { useDebounce } from 'react-use';
-
-import { backendSrv } from 'app/core/services/backend_srv';
-import { SearchSrv } from 'app/core/services/search_srv';
-
-import { FETCH_RESULTS, FETCH_ITEMS, TOGGLE_SECTION, SEARCH_START, FETCH_ITEMS_START } from '../reducers/actionTypes';
-import { DashboardSection, UseSearch } from '../types';
-import { hasId, getParsedQuery } from '../utils';
-
-const searchSrv = new SearchSrv();
-
-/**
- * Base hook for search functionality.
- * Returns state and dispatch, among others, from 'reducer' param, so it can be
- * further extended.
- * @param query
- * @param reducer - return result of useReducer
- * @param params - custom params
- */
-export const useSearch: UseSearch = (query, reducer, params = {}) => {
-  const { queryParsing } = params;
-  const [state, dispatch] = reducer;
-
-  const search = () => {
-    dispatch({ type: SEARCH_START });
-    const parsedQuery = getParsedQuery(query, queryParsing);
-    searchSrv.search(parsedQuery).then((results) => {
-      dispatch({ type: FETCH_RESULTS, payload: results });
-    });
-  };
-
-  // Set loading state before debounced search
-  useEffect(() => {
-    dispatch({ type: SEARCH_START });
-  }, [query.tag, query.sort, query.starred, query.layout, dispatch]);
-
-  useDebounce(search, 300, [query, queryParsing]);
-
-  const onToggleSection = useCallback(
-    (section: DashboardSection) => {
-      if (hasId(section.title) && !section.items.length) {
-        dispatch({ type: FETCH_ITEMS_START, payload: section.id });
-        backendSrv.search({ folderIds: [section.id] }).then((items) => {
-          dispatch({ type: FETCH_ITEMS, payload: { section, items } });
-          dispatch({ type: TOGGLE_SECTION, payload: section });
-        });
-      } else {
-        dispatch({ type: TOGGLE_SECTION, payload: section });
-      }
-    },
-    [dispatch]
-  );
-
-  return { state, dispatch, onToggleSection };
-};
diff --git a/public/app/features/search/hooks/useShowDashboardPreviews.ts b/public/app/features/search/hooks/useShowDashboardPreviews.ts
deleted file mode 100644
index 80e50f37e7b..00000000000
--- a/public/app/features/search/hooks/useShowDashboardPreviews.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { useLocalStorage } from 'react-use';
-
-import { config } from '@grafana/runtime/src';
-
-import { PREVIEWS_LOCAL_STORAGE_KEY } from '../constants';
-
-export const useShowDashboardPreviews = () => {
-  const previewFeatureEnabled = Boolean(config.featureToggles.dashboardPreviews);
-  const [showPreviews, setShowPreviews] = useLocalStorage<boolean>(PREVIEWS_LOCAL_STORAGE_KEY, false);
-
-  return { showPreviews: Boolean(showPreviews && previewFeatureEnabled), previewFeatureEnabled, setShowPreviews };
-};
diff --git a/public/app/features/search/index.ts b/public/app/features/search/index.ts
index 1bdc15141b1..b20121b3e1f 100644
--- a/public/app/features/search/index.ts
+++ b/public/app/features/search/index.ts
@@ -1,9 +1,2 @@
-export { SearchResults } from './components/SearchResults';
-export { SearchField } from './components/SearchField';
 export { SearchItem } from './components/SearchItem';
-export { SearchCheckbox } from './components/SearchCheckbox';
 export { SearchWrapper } from './components/SearchWrapper';
-export { SearchResultsFilter } from './components/SearchResultsFilter';
-export { ManageDashboards } from './components/ManageDashboards';
-export { ConfirmDeleteModal } from './components/ConfirmDeleteModal';
-export { MoveToFolderModal } from './components/MoveToFolderModal';
diff --git a/public/app/features/search/page/components/columns.tsx b/public/app/features/search/page/components/columns.tsx
index 5ff28cbb73a..12219de34ab 100644
--- a/public/app/features/search/page/components/columns.tsx
+++ b/public/app/features/search/page/components/columns.tsx
@@ -1,9 +1,8 @@
 import { cx } from '@emotion/css';
-import { isNumber } from 'lodash';
 import React from 'react';
 import SVG from 'react-inlinesvg';
 
-import { Field, getFieldDisplayName } from '@grafana/data';
+import { Field, FieldType, formattedValueToString, getDisplayProcessor, getFieldDisplayName } from '@grafana/data';
 import { config, getDataSourceSrv } from '@grafana/runtime';
 import { Checkbox, Icon, IconButton, IconName, TagList } from '@grafana/ui';
 import { PluginIconName } from 'app/features/plugins/admin/types';
@@ -15,7 +14,6 @@ import { TableColumn } from './SearchResultsTable';
 
 const TYPE_COLUMN_WIDTH = 175;
 const DATASOURCE_COLUMN_WIDTH = 200;
-const SORT_FIELD_WIDTH = 175;
 
 export const generateColumns = (
   response: QueryResponse,
@@ -32,9 +30,14 @@ export const generateColumns = (
   const access = response.view.fields;
   const uidField = access.uid;
   const kindField = access.kind;
+  let sortFieldWith = 0;
   const sortField = (access as any)[response.view.dataFrame.meta?.custom?.sortBy] as Field;
   if (sortField) {
-    availableWidth -= SORT_FIELD_WIDTH; // pre-allocate the space for the last column
+    sortFieldWith = 175;
+    if (sortField.type === FieldType.time) {
+      sortFieldWith += 25;
+    }
+    availableWidth -= sortFieldWith; // pre-allocate the space for the last column
   }
 
   let width = 50;
@@ -176,25 +179,20 @@ export const generateColumns = (
     columns.push(makeTagsColumn(access.tags, availableWidth, styles.tagList, onTagSelected));
   }
 
-  if (sortField) {
+  if (sortField && sortFieldWith) {
+    const disp = sortField.display ?? getDisplayProcessor({ field: sortField, theme: config.theme2 });
     columns.push({
       Header: () => <div className={styles.sortedHeader}>{getFieldDisplayName(sortField)}</div>,
       Cell: (p) => {
-        let value = sortField.values.get(p.row.index);
-        try {
-          if (isNumber(value)) {
-            value = Number(value).toLocaleString();
-          }
-        } catch {}
         return (
           <div {...p.cellProps} className={styles.sortedItems}>
-            {`${value}`}
+            {formattedValueToString(disp(sortField.values.get(p.row.index)))}
           </div>
         );
       },
       id: `column-sort-field`,
       field: sortField,
-      width: SORT_FIELD_WIDTH,
+      width: sortFieldWith,
     });
   }
 
diff --git a/public/app/features/search/reducers/actionTypes.ts b/public/app/features/search/reducers/actionTypes.ts
index c843c23f73a..048960c8158 100644
--- a/public/app/features/search/reducers/actionTypes.ts
+++ b/public/app/features/search/reducers/actionTypes.ts
@@ -1,17 +1,3 @@
-export const FETCH_RESULTS = 'FETCH_RESULTS';
-export const TOGGLE_SECTION = 'TOGGLE_SECTION';
-export const FETCH_ITEMS = 'FETCH_ITEMS';
-export const FETCH_ITEMS_START = 'FETCH_ITEMS_START';
-export const MOVE_SELECTION_UP = 'MOVE_SELECTION_UP';
-export const MOVE_SELECTION_DOWN = 'MOVE_SELECTION_DOWN';
-export const SEARCH_START = 'SEARCH_START';
-
-// Manage dashboards
-export const TOGGLE_ALL_CHECKED = 'TOGGLE_ALL_CHECKED';
-export const TOGGLE_CHECKED = 'TOGGLE_SECTION_CHECKED';
-export const MOVE_ITEMS = 'MOVE_ITEMS';
-export const DELETE_ITEMS = 'DELETE_ITEMS';
-
 // Search Query
 export const TOGGLE_STARRED = 'TOGGLE_STARRED';
 export const REMOVE_STARRED = 'REMOVE_STARRED';
diff --git a/public/app/features/search/reducers/dashboardSearch.test.ts b/public/app/features/search/reducers/dashboardSearch.test.ts
deleted file mode 100644
index 5f5ebf182ec..00000000000
--- a/public/app/features/search/reducers/dashboardSearch.test.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { searchResults, sections } from '../testData';
-
-import { FETCH_ITEMS, FETCH_RESULTS, TOGGLE_SECTION, MOVE_SELECTION_DOWN, MOVE_SELECTION_UP } from './actionTypes';
-import { searchReducer as reducer, dashboardsSearchState } from './dashboardSearch';
-
-const defaultState = { selectedIndex: 0, loading: false, results: sections as any[], initialLoading: false };
-describe('Dashboard Search reducer', () => {
-  it('should return the initial state', () => {
-    expect(reducer(dashboardsSearchState, {} as any)).toEqual(dashboardsSearchState);
-  });
-
-  it('should set the results and mark first item as selected', () => {
-    const newState = reducer(dashboardsSearchState, { type: FETCH_RESULTS, payload: searchResults });
-    expect(newState).toEqual({ loading: false, selectedIndex: 0, results: searchResults, initialLoading: false });
-    expect(newState.results[0].selected).toBeTruthy();
-  });
-
-  it('should toggle selected section', () => {
-    const newState = reducer(defaultState, { type: TOGGLE_SECTION, payload: sections[5] });
-    expect(newState.results[5].expanded).toBeFalsy();
-    const newState2 = reducer(defaultState, { type: TOGGLE_SECTION, payload: sections[1] });
-    expect(newState2.results[1].expanded).toBeTruthy();
-  });
-
-  it('should handle FETCH_ITEMS', () => {
-    const items = [
-      {
-        id: 4072,
-        uid: 'OzAIf_rWz',
-        title: 'New dashboard Copy 3',
-        type: 'dash-db',
-        isStarred: false,
-      },
-      {
-        id: 46,
-        uid: '8DY63kQZk',
-        title: 'Stocks',
-        type: 'dash-db',
-        isStarred: false,
-      },
-    ];
-    const newState = reducer(defaultState, {
-      type: FETCH_ITEMS,
-      payload: {
-        section: sections[2],
-        items,
-      },
-    });
-    expect(newState.results[2].items).toEqual(items);
-  });
-
-  it('should handle MOVE_SELECTION_DOWN', () => {
-    const newState = reducer(defaultState, {
-      type: MOVE_SELECTION_DOWN,
-    });
-
-    expect(newState.selectedIndex).toEqual(1);
-    expect(newState.results[0].items[0].selected).toBeTruthy();
-
-    const newState2 = reducer(newState, {
-      type: MOVE_SELECTION_DOWN,
-    });
-
-    expect(newState2.selectedIndex).toEqual(2);
-    expect(newState2.results[1].selected).toBeTruthy();
-
-    // Shouldn't go over the visible results length - 1 (9)
-    const newState3 = reducer(
-      { ...defaultState, selectedIndex: 9 },
-      {
-        type: MOVE_SELECTION_DOWN,
-      }
-    );
-    expect(newState3.selectedIndex).toEqual(9);
-  });
-
-  it('should handle MOVE_SELECTION_UP', () => {
-    // shouldn't move beyond 0
-    const newState = reducer(defaultState, {
-      type: MOVE_SELECTION_UP,
-    });
-
-    expect(newState.selectedIndex).toEqual(0);
-
-    const newState2 = reducer(
-      { ...defaultState, selectedIndex: 3 },
-      {
-        type: MOVE_SELECTION_UP,
-      }
-    );
-    expect(newState2.selectedIndex).toEqual(2);
-    expect(newState2.results[1].selected).toBeTruthy();
-  });
-});
diff --git a/public/app/features/search/reducers/dashboardSearch.ts b/public/app/features/search/reducers/dashboardSearch.ts
deleted file mode 100644
index 182b1ba4e5d..00000000000
--- a/public/app/features/search/reducers/dashboardSearch.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import { DashboardSection, SearchAction } from '../types';
-import { getFlattenedSections, getLookupField, markSelected } from '../utils';
-
-import {
-  FETCH_ITEMS,
-  FETCH_RESULTS,
-  TOGGLE_SECTION,
-  MOVE_SELECTION_DOWN,
-  MOVE_SELECTION_UP,
-  SEARCH_START,
-  FETCH_ITEMS_START,
-} from './actionTypes';
-
-export interface DashboardsSearchState {
-  results: DashboardSection[];
-  loading: boolean;
-  selectedIndex: number;
-  /** Used for first time page load */
-  initialLoading: boolean;
-}
-
-export const dashboardsSearchState: DashboardsSearchState = {
-  results: [],
-  loading: true,
-  initialLoading: true,
-  selectedIndex: 0,
-};
-
-export const searchReducer = (state: DashboardsSearchState, action: SearchAction) => {
-  switch (action.type) {
-    case SEARCH_START:
-      if (!state.loading) {
-        return { ...state, loading: true };
-      }
-      return state;
-    case FETCH_RESULTS: {
-      const results = action.payload;
-      // Highlight the first item ('Starred' folder)
-      if (results.length > 0) {
-        results[0].selected = true;
-      }
-      return { ...state, results, loading: false, initialLoading: false };
-    }
-    case TOGGLE_SECTION: {
-      const section = action.payload;
-      const lookupField = getLookupField(section.title);
-      return {
-        ...state,
-        results: state.results.map((result: DashboardSection) => {
-          if (section[lookupField] === result[lookupField]) {
-            return { ...result, expanded: !result.expanded };
-          }
-          return result;
-        }),
-      };
-    }
-    case FETCH_ITEMS: {
-      const { section, items } = action.payload;
-      return {
-        ...state,
-        itemsFetching: false,
-        results: state.results.map((result: DashboardSection) => {
-          if (section.id === result.id) {
-            return { ...result, items, itemsFetching: false };
-          }
-          return result;
-        }),
-      };
-    }
-    case FETCH_ITEMS_START: {
-      const id = action.payload;
-      if (id) {
-        return {
-          ...state,
-          results: state.results.map((result) => (result.id === id ? { ...result, itemsFetching: true } : result)),
-        };
-      }
-      return state;
-    }
-    case MOVE_SELECTION_DOWN: {
-      const flatIds = getFlattenedSections(state.results);
-      if (state.selectedIndex < flatIds.length - 1) {
-        const newIndex = state.selectedIndex + 1;
-        const selectedId = flatIds[newIndex];
-        return {
-          ...state,
-          selectedIndex: newIndex,
-          results: markSelected(state.results, selectedId),
-        };
-      }
-      return state;
-    }
-    case MOVE_SELECTION_UP:
-      if (state.selectedIndex > 0) {
-        const flatIds = getFlattenedSections(state.results);
-        const newIndex = state.selectedIndex - 1;
-        const selectedId = flatIds[newIndex];
-        return {
-          ...state,
-          selectedIndex: newIndex,
-          results: markSelected(state.results, selectedId),
-        };
-      }
-      return state;
-    default:
-      return state;
-  }
-};
diff --git a/public/app/features/search/reducers/manageDashboards.test.ts b/public/app/features/search/reducers/manageDashboards.test.ts
deleted file mode 100644
index a005996cf04..00000000000
--- a/public/app/features/search/reducers/manageDashboards.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { sections } from '../testData';
-import { DashboardSection, UidsToDelete } from '../types';
-
-import { TOGGLE_ALL_CHECKED, TOGGLE_CHECKED, DELETE_ITEMS, MOVE_ITEMS } from './actionTypes';
-import { manageDashboardsReducer as reducer, manageDashboardsState as state } from './manageDashboards';
-
-// Remove Recent and Starred sections as they're not used in manage dashboards
-const results = sections.slice(2);
-
-describe('Manage dashboards reducer', () => {
-  it('should return the initial state', () => {
-    expect(reducer(state, {} as any)).toEqual(state);
-  });
-
-  it('should handle TOGGLE_ALL_CHECKED', () => {
-    const newState = reducer({ ...state, results }, { type: TOGGLE_ALL_CHECKED });
-    expect(newState.results.every((result: any) => result.checked === true)).toBe(true);
-    expect(newState.results.every((result: any) => result.items.every((item: any) => item.checked === true))).toBe(
-      true
-    );
-    expect(newState.allChecked).toBe(true);
-
-    const newState2 = reducer({ ...newState, results }, { type: TOGGLE_ALL_CHECKED });
-    expect(newState2.results.every((result: any) => result.checked === false)).toBe(true);
-    expect(newState2.results.every((result: any) => result.items.every((item: any) => item.checked === false))).toBe(
-      true
-    );
-    expect(newState2.allChecked).toBe(false);
-  });
-
-  it('should handle TOGGLE_CHECKED sections', () => {
-    const newState = reducer({ ...state, results }, { type: TOGGLE_CHECKED, payload: results[0] });
-    expect(newState.results[0].checked).toBe(true);
-    expect(newState.results[1].checked).toBeFalsy();
-
-    const newState2 = reducer(newState, { type: TOGGLE_CHECKED, payload: results[1] });
-    expect(newState2.results[0].checked).toBe(true);
-    expect(newState2.results[1].checked).toBe(true);
-  });
-
-  it('should handle TOGGLE_CHECKED items', () => {
-    const newState = reducer({ ...state, results }, { type: TOGGLE_CHECKED, payload: { id: 4069 } });
-    expect(newState.results[3].items[0].checked).toBe(true);
-
-    const newState2 = reducer(newState, { type: TOGGLE_CHECKED, payload: { id: 1 } });
-    expect(newState2.results[3].items[0].checked).toBe(true);
-    expect(newState2.results[3].items[1].checked).toBeFalsy();
-    expect(newState2.results[3].items[2].checked).toBe(true);
-  });
-
-  it('should handle DELETE_ITEMS', () => {
-    const toDelete: UidsToDelete = { dashboards: ['OzAIf_rWz', 'lBdLINUWk'], folders: ['search-test-data'] };
-    const newState = reducer({ ...state, results }, { type: DELETE_ITEMS, payload: toDelete });
-    expect(newState.results).toHaveLength(3);
-    expect(newState.results[1].id).toEqual(4074);
-    expect(newState.results[2].items).toHaveLength(1);
-    expect(newState.results[2].items[0].id).toEqual(4069);
-  });
-
-  it('should handle MOVE_ITEMS', () => {
-    // Move 2 dashboards to a folder with id 2
-    const toMove = {
-      dashboards: [
-        {
-          id: 4072,
-          uid: 'OzAIf_rWz',
-          title: 'New dashboard Copy 3',
-          type: 'dash-db',
-          isStarred: false,
-        },
-        {
-          id: 1,
-          uid: 'lBdLINUWk',
-          title: 'Prom dash',
-          type: 'dash-db',
-          isStarred: true,
-        },
-      ],
-      folder: { id: 2 },
-    };
-    const newState = reducer({ ...state, results }, { type: MOVE_ITEMS, payload: toMove });
-    expect(newState.results[0].items).toHaveLength(2);
-    expect(newState.results[0].items[0].uid).toEqual('OzAIf_rWz');
-    expect(newState.results[0].items[1].uid).toEqual('lBdLINUWk');
-    expect(newState.results[3].items).toHaveLength(1);
-    expect(newState.results[3].items[0].uid).toEqual('LCFWfl9Zz');
-  });
-
-  it('should not display dashboards in a non-expanded folder', () => {
-    const general = results.find((res) => res.id === 0);
-    const toMove = { dashboards: general?.items, folder: { id: 4074 } };
-    const newState = reducer({ ...state, results }, { type: MOVE_ITEMS, payload: toMove });
-    expect(newState.results.find((res: DashboardSection) => res.id === 4074).items).toHaveLength(0);
-    expect(newState.results.find((res: DashboardSection) => res.id === 0).items).toHaveLength(0);
-  });
-});
diff --git a/public/app/features/search/reducers/manageDashboards.ts b/public/app/features/search/reducers/manageDashboards.ts
deleted file mode 100644
index ee58d2f422b..00000000000
--- a/public/app/features/search/reducers/manageDashboards.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { DashboardSection, DashboardSectionItem, SearchAction } from '../types';
-import { mergeReducers } from '../utils';
-
-import { TOGGLE_ALL_CHECKED, TOGGLE_CHECKED, MOVE_ITEMS, DELETE_ITEMS } from './actionTypes';
-import { dashboardsSearchState, DashboardsSearchState, searchReducer } from './dashboardSearch';
-
-export interface ManageDashboardsState extends DashboardsSearchState {
-  allChecked: boolean;
-}
-
-export const manageDashboardsState: ManageDashboardsState = {
-  ...dashboardsSearchState,
-  allChecked: false,
-};
-
-const reducer = (state: ManageDashboardsState, action: SearchAction) => {
-  switch (action.type) {
-    case TOGGLE_ALL_CHECKED:
-      const newAllChecked = !state.allChecked;
-      return {
-        ...state,
-        results: state.results.map((result) => {
-          return {
-            ...result,
-            checked: newAllChecked,
-            items: result.items.map((item) => ({ ...item, checked: newAllChecked })),
-          };
-        }),
-        allChecked: newAllChecked,
-      };
-    case TOGGLE_CHECKED:
-      const { id } = action.payload;
-      return {
-        ...state,
-        results: state.results.map((result) => {
-          if (result.id === id) {
-            return {
-              ...result,
-              checked: !result.checked,
-              items: result.items.map((item) => ({ ...item, checked: !result.checked })),
-            };
-          }
-          return {
-            ...result,
-            items: result.items.map((item) => (item.id === id ? { ...item, checked: !item.checked } : item)),
-          };
-        }),
-      };
-    case MOVE_ITEMS: {
-      const dashboards: DashboardSectionItem[] = action.payload.dashboards;
-      const folder: DashboardSection = action.payload.folder;
-      const uids = dashboards.map((db) => db.uid);
-      return {
-        ...state,
-        results: state.results.map((result) => {
-          if (folder.id === result.id) {
-            return result.expanded
-              ? {
-                  ...result,
-                  items: [...result.items, ...dashboards.map((db) => ({ ...db, checked: false }))],
-                  checked: false,
-                }
-              : result;
-          } else {
-            return { ...result, items: result.items.filter((item) => !uids.includes(item.uid)) };
-          }
-        }),
-      };
-    }
-    case DELETE_ITEMS: {
-      const { folders, dashboards } = action.payload;
-      if (!folders.length && !dashboards.length) {
-        return state;
-      }
-      return {
-        ...state,
-        results: state.results.reduce((filtered, result) => {
-          if (!folders.includes(result.uid)) {
-            return [...filtered, { ...result, items: result.items.filter((item) => !dashboards.includes(item.uid)) }];
-          }
-          return filtered;
-        }, [] as DashboardSection[]),
-      };
-    }
-    default:
-      return state;
-  }
-};
-
-export const manageDashboardsReducer = mergeReducers([searchReducer, reducer]);
diff --git a/public/app/features/search/service/bluge.ts b/public/app/features/search/service/bluge.ts
index ffbb27f2708..6d7e252fec7 100644
--- a/public/app/features/search/service/bluge.ts
+++ b/public/app/features/search/service/bluge.ts
@@ -59,6 +59,10 @@ export class BlugeSearcher implements GrafanaSearcher {
         opts.push({ value: `-${sf.name}`, label: `${sf.display} (most)` });
         opts.push({ value: `${sf.name}`, label: `${sf.display} (least)` });
       }
+      for (const sf of sortTimeFields) {
+        opts.push({ value: `-${sf.name}`, label: `${sf.display} (recent)` });
+        opts.push({ value: `${sf.name}`, label: `${sf.display} (oldest)` });
+      }
     }
 
     return Promise.resolve(opts);
@@ -197,6 +201,12 @@ const sortFields = [
   { name: 'errors_last_30_days', display: 'Errors 30 days' },
 ];
 
+// Enterprise only time sort field values for dashboards
+const sortTimeFields = [
+  { name: 'created_at', display: 'Created time' },
+  { name: 'updated_at', display: 'Updated time' },
+];
+
 /** Given the internal field name, this gives a reasonable display name for the table colum header */
 function getSortFieldDisplayName(name: string) {
   for (const sf of sortFields) {
@@ -204,5 +214,10 @@ function getSortFieldDisplayName(name: string) {
       return sf.display;
     }
   }
+  for (const sf of sortTimeFields) {
+    if (sf.name === name) {
+      return sf.display;
+    }
+  }
   return name;
 }
diff --git a/public/app/features/search/service/sql.ts b/public/app/features/search/service/sql.ts
index 4ebd6b10e5f..5ecb3096831 100644
--- a/public/app/features/search/service/sql.ts
+++ b/public/app/features/search/service/sql.ts
@@ -97,12 +97,12 @@ export class SQLSearcher implements GrafanaSearcher {
 
   // NOTE: the bluge query will find tags within the current results, the SQL based one does not
   async tags(query: SearchQuery): Promise<TermCount[]> {
-    const terms = (await backendSrv.get('/api/dashboards/tags')) as TermCount[];
+    const terms = await backendSrv.get<TermCount[]>('/api/dashboards/tags');
     return terms.sort((a, b) => b.count - a.count);
   }
 
   async doAPIQuery(query: APIQuery): Promise<QueryResponse> {
-    const rsp = (await backendSrv.get('/api/search', query)) as DashboardSearchHit[];
+    const rsp = await backendSrv.get<DashboardSearchHit[]>('/api/search', query);
 
     // Field values (columnar)
     const kind: string[] = [];
diff --git a/public/app/features/search/testData.ts b/public/app/features/search/testData.ts
deleted file mode 100644
index bf6f11315e8..00000000000
--- a/public/app/features/search/testData.ts
+++ /dev/null
@@ -1,361 +0,0 @@
-import { DashboardSearchItemType, DashboardSection, DashboardSectionItem } from './types';
-
-function makeSection(sectionPartial: Partial<DashboardSection>): DashboardSection {
-  return {
-    title: 'Default title',
-    id: Number.MAX_SAFE_INTEGER - 1,
-    score: -99,
-    expanded: true,
-    type: DashboardSearchItemType.DashFolder,
-    items: [],
-    url: '/default-url',
-    ...sectionPartial,
-  };
-}
-
-const makeSectionItem = (itemPartial: Partial<DashboardSectionItem>): DashboardSectionItem => {
-  return {
-    id: Number.MAX_SAFE_INTEGER - 2,
-    uid: 'default-uid',
-    title: 'Default dashboard title',
-    type: DashboardSearchItemType.DashDB,
-    isStarred: false,
-    tags: [],
-    uri: 'db/default-slug',
-    url: '/d/default-uid/default-slug',
-    ...itemPartial,
-  };
-};
-
-export const generalFolder: DashboardSection = {
-  id: 0,
-  title: 'General',
-  items: [
-    {
-      id: 1,
-      uid: 'lBdLINUWk',
-      title: 'Test 1',
-      uri: 'db/test1',
-      url: '/d/lBdLINUWk/test1',
-      type: DashboardSearchItemType.DashDB,
-      tags: [],
-      isStarred: false,
-      checked: true,
-    },
-    {
-      id: 46,
-      uid: '8DY63kQZk',
-      title: 'Test 2',
-      uri: 'db/test2',
-      url: '/d/8DY63kQZk/test2',
-      type: DashboardSearchItemType.DashDB,
-      tags: [],
-      isStarred: false,
-      checked: true,
-    },
-  ],
-  icon: 'folder-open',
-  score: 1,
-  expanded: true,
-  checked: false,
-  url: '',
-  type: DashboardSearchItemType.DashFolder,
-};
-
-export const searchResults: DashboardSection[] = [
-  {
-    id: 2,
-    uid: 'JB_zdOUWk',
-    title: 'gdev dashboards',
-    expanded: false,
-    items: [],
-    url: '/dashboards/f/JB_zdOUWk/gdev-dashboards',
-    icon: 'folder',
-    score: 0,
-    checked: true,
-    type: DashboardSearchItemType.DashFolder,
-  },
-  generalFolder,
-];
-
-// Search results with more info
-export const sections: DashboardSection[] = [
-  makeSection({
-    title: 'Starred',
-    score: -2,
-    expanded: true,
-    items: [
-      makeSectionItem({
-        id: 1,
-        uid: 'lBdLINUWk',
-        title: 'Prom dash',
-        type: DashboardSearchItemType.DashDB,
-      }),
-    ],
-  }),
-
-  makeSection({
-    title: 'Recent',
-    icon: 'clock-o',
-    score: -1,
-    expanded: false,
-    items: [
-      makeSectionItem({
-        id: 4072,
-        uid: 'OzAIf_rWz',
-        title: 'New dashboard Copy 3',
-
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 46,
-        uid: '8DY63kQZk',
-        title: 'Stocks',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 20,
-        uid: '7MeksYbmk',
-        title: 'Alerting with TestData',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        folderId: 2,
-      }),
-      makeSectionItem({
-        id: 4073,
-        uid: 'j9SHflrWk',
-        title: 'New dashboard Copy 4',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        folderId: 2,
-      }),
-    ],
-  }),
-
-  makeSection({
-    id: 2,
-    uid: 'JB_zdOUWk',
-    title: 'gdev dashboards',
-    expanded: true,
-    url: '/dashboards/f/JB_zdOUWk/gdev-dashboards',
-    icon: 'folder',
-    score: 2,
-    items: [],
-  }),
-
-  makeSection({
-    id: 2568,
-    uid: 'search-test-data',
-    title: 'Search test data folder',
-    expanded: false,
-    items: [],
-    url: '/dashboards/f/search-test-data/search-test-data-folder',
-    icon: 'folder',
-    score: 3,
-  }),
-
-  makeSection({
-    id: 4074,
-    uid: 'iN5TFj9Zk',
-    title: 'Test',
-    expanded: false,
-    items: [],
-    url: '/dashboards/f/iN5TFj9Zk/test',
-    icon: 'folder',
-    score: 4,
-  }),
-
-  makeSection({
-    id: 0,
-    title: 'General',
-    icon: 'folder-open',
-    score: 5,
-    expanded: true,
-    items: [
-      makeSectionItem({
-        id: 4069,
-        uid: 'LCFWfl9Zz',
-        title: 'New dashboard Copy',
-        uri: 'db/new-dashboard-copy',
-        url: '/d/LCFWfl9Zz/new-dashboard-copy',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 4072,
-        uid: 'OzAIf_rWz',
-        title: 'New dashboard Copy 3',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 1,
-        uid: 'lBdLINUWk',
-        title: 'Prom dash',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: true,
-      }),
-    ],
-  }),
-];
-
-export const checkedGeneralFolder: DashboardSection[] = [
-  makeSection({
-    id: 4074,
-    uid: 'other-folder-dash',
-    title: 'Test',
-    expanded: false,
-    type: DashboardSearchItemType.DashFolder,
-    items: [
-      makeSectionItem({
-        id: 4072,
-        uid: 'other-folder-dash-abc',
-        title: 'New dashboard Copy 3',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 46,
-        uid: 'other-folder-dash-def',
-        title: 'Stocks',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-    ],
-    url: '/dashboards/f/iN5TFj9Zk/test',
-    icon: 'folder',
-    score: 4,
-  }),
-
-  makeSection({
-    id: 0,
-    title: 'General',
-    uid: 'other-folder-abc',
-    score: 5,
-    expanded: true,
-    checked: true,
-    type: DashboardSearchItemType.DashFolder,
-    items: [
-      makeSectionItem({
-        id: 4069,
-        uid: 'general-abc',
-        title: 'New dashboard Copy',
-        uri: 'db/new-dashboard-copy',
-        url: '/d/LCFWfl9Zz/new-dashboard-copy',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        checked: true,
-      }),
-      makeSectionItem({
-        id: 4072,
-        uid: 'general-def',
-        title: 'New dashboard Copy 3',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        checked: true,
-      }),
-      makeSectionItem({
-        id: 1,
-        uid: 'general-ghi',
-        title: 'Prom dash',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: true,
-        checked: true,
-      }),
-    ],
-  }),
-];
-
-export const checkedOtherFolder: DashboardSection[] = [
-  makeSection({
-    id: 4074,
-    uid: 'other-folder-abc',
-    title: 'Test',
-    expanded: false,
-    checked: true,
-    type: DashboardSearchItemType.DashFolder,
-    items: [
-      makeSectionItem({
-        id: 4072,
-        uid: 'other-folder-dash-abc',
-        title: 'New dashboard Copy 3',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        checked: true,
-      }),
-      makeSectionItem({
-        id: 46,
-        uid: 'other-folder-dash-def',
-        title: 'Stocks',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        checked: true,
-      }),
-    ],
-    url: '/dashboards/f/iN5TFj9Zk/test',
-    icon: 'folder',
-    score: 4,
-  }),
-
-  makeSection({
-    id: 0,
-    title: 'General',
-    icon: 'folder-open',
-    score: 5,
-    expanded: true,
-    type: DashboardSearchItemType.DashFolder,
-    items: [
-      makeSectionItem({
-        id: 4069,
-        uid: 'general-abc',
-        title: 'New dashboard Copy',
-        uri: 'db/new-dashboard-copy',
-        url: '/d/LCFWfl9Zz/new-dashboard-copy',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 4072,
-        uid: 'general-def',
-        title: 'New dashboard Copy 3',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-      }),
-      makeSectionItem({
-        id: 1,
-        uid: 'general-ghi',
-        title: 'Prom dash',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: true,
-      }),
-    ],
-  }),
-];
-
-export const folderViewAllChecked: DashboardSection[] = [
-  makeSection({
-    checked: true,
-    selected: true,
-    title: '',
-    items: [
-      makeSectionItem({
-        id: 4072,
-        uid: 'other-folder-dash-abc',
-        title: 'New dashboard Copy 3',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        checked: true,
-      }),
-      makeSectionItem({
-        id: 46,
-        uid: 'other-folder-dash-def',
-        title: 'Stocks',
-        type: DashboardSearchItemType.DashDB,
-        isStarred: false,
-        checked: true,
-      }),
-    ],
-  }),
-];
diff --git a/public/app/features/search/types.ts b/public/app/features/search/types.ts
index 9f44a6c2cc1..5d16446bb9d 100644
--- a/public/app/features/search/types.ts
+++ b/public/app/features/search/types.ts
@@ -1,10 +1,7 @@
-import { Dispatch } from 'react';
 import { Action } from 'redux';
 
 import { SelectableValue, WithAccessControlMetadata } from '@grafana/data';
 
-import { FolderInfo } from '../../types';
-
 export enum DashboardSearchItemType {
   DashDB = 'dash-db',
   DashHome = 'dash-home',
@@ -56,20 +53,10 @@ export interface DashboardSectionItem {
 
 export interface DashboardSearchHit extends DashboardSectionItem, DashboardSection, WithAccessControlMetadata {}
 
-export interface DashboardTag {
-  term: string;
-  count: number;
-}
-
 export interface SearchAction extends Action {
   payload?: any;
 }
 
-export interface UidsToDelete {
-  folders: string[];
-  dashboards: string[];
-}
-
 export interface DashboardQuery {
   query: string;
   tag: string[];
@@ -84,22 +71,7 @@ export interface DashboardQuery {
   layout: SearchLayout;
 }
 
-export type SearchReducer<S> = [S, Dispatch<SearchAction>];
-interface UseSearchParams {
-  queryParsing?: boolean;
-  searchCallback?: (folderUid: string | undefined) => any;
-  folderUid?: string;
-}
-
-export type UseSearch = <S>(
-  query: DashboardQuery,
-  reducer: SearchReducer<S>,
-  params: UseSearchParams
-) => { state: S; dispatch: Dispatch<SearchAction>; onToggleSection: (section: DashboardSection) => void };
-
 export type OnToggleChecked = (item: DashboardSectionItem | DashboardSection) => void;
-export type OnDeleteItems = (folders: string[], dashboards: string[]) => void;
-export type OnMoveItems = (selectedDashboards: DashboardSectionItem[], folder: FolderInfo | null) => void;
 
 export enum SearchLayout {
   List = 'list',
diff --git a/public/app/features/search/utils.test.ts b/public/app/features/search/utils.test.ts
index cbae358ab69..209c9450855 100644
--- a/public/app/features/search/utils.test.ts
+++ b/public/app/features/search/utils.test.ts
@@ -1,168 +1,7 @@
-import { sections, searchResults, checkedGeneralFolder, checkedOtherFolder, folderViewAllChecked } from './testData';
 import { SearchQueryParams } from './types';
-import {
-  findSelected,
-  getCheckedDashboardsUids,
-  getCheckedUids,
-  getFlattenedSections,
-  markSelected,
-  mergeReducers,
-  parseRouteParams,
-} from './utils';
+import { parseRouteParams } from './utils';
 
 describe('Search utils', () => {
-  describe('getFlattenedSections', () => {
-    it('should return an array of items plus children for expanded items', () => {
-      const flatSections = getFlattenedSections(sections as any[]);
-      expect(flatSections).toHaveLength(10);
-      expect(flatSections).toEqual([
-        'Starred',
-        'Starred-1',
-        'Recent',
-        '2',
-        '2568',
-        '4074',
-        '0',
-        '0-4069',
-        '0-4072',
-        '0-1',
-      ]);
-    });
-
-    describe('markSelected', () => {
-      it('should correctly mark the section item without id as selected', () => {
-        const results = markSelected(sections as any, 'Recent');
-        //@ts-ignore
-        expect(results[1].selected).toBe(true);
-      });
-
-      it('should correctly mark the section item with id as selected', () => {
-        const results = markSelected(sections as any, '4074');
-        //@ts-ignore
-        expect(results[4].selected).toBe(true);
-      });
-
-      it('should mark all other sections as not selected', () => {
-        const results = markSelected(sections as any, 'Starred');
-        const newResults = markSelected(results as any, '0');
-        //@ts-ignore
-        expect(newResults[0].selected).toBeFalsy();
-        expect(newResults[5].selected).toBeTruthy();
-      });
-
-      it('should correctly mark an item of a section as selected', () => {
-        const results = markSelected(sections as any, '0-4072');
-        expect(results[5].items[1].selected).toBeTruthy();
-      });
-
-      it('should not mark an item as selected for non-expanded section', () => {
-        const results = markSelected(sections as any, 'Recent-4072');
-        expect(results[1].items[0].selected).toBeFalsy();
-      });
-
-      it('should mark all other items as not selected', () => {
-        const results = markSelected(sections as any, '0-4069');
-        const newResults = markSelected(results as any, '0-1');
-        //@ts-ignore
-        expect(newResults[5].items[0].selected).toBeFalsy();
-        expect(newResults[5].items[1].selected).toBeFalsy();
-        expect(newResults[5].items[2].selected).toBeTruthy();
-      });
-
-      it('should correctly select one of the same items in different sections', () => {
-        const results = markSelected(sections as any, 'Starred-1');
-        expect(results[0].items[0].selected).toBeTruthy();
-        // Same item in diff section
-        expect(results[5].items[2].selected).toBeFalsy();
-
-        // Switch order
-        const newResults = markSelected(sections as any, '0-1');
-        expect(newResults[0].items[0].selected).toBeFalsy();
-        // Same item in diff section
-        expect(newResults[5].items[2].selected).toBeTruthy();
-      });
-    });
-
-    describe('findSelected', () => {
-      it('should find selected section', () => {
-        const results = [...sections, { id: 'Test', selected: true }];
-
-        const found = findSelected(results);
-        expect(found?.id).toEqual('Test');
-      });
-
-      it('should find selected item', () => {
-        const results = [{ expanded: true, id: 'Test', items: [{ id: 1 }, { id: 2, selected: true }, { id: 3 }] }];
-
-        const found = findSelected(results);
-        expect(found?.id).toEqual(2);
-      });
-    });
-  });
-
-  describe('mergeReducers', () => {
-    const reducer1 = (state: any = { reducer1: false }, action: any) => {
-      if (action.type === 'reducer1') {
-        return { ...state, reducer1: !state.reducer1 };
-      }
-      return state;
-    };
-
-    const reducer2 = (state: any = { reducer2: false }, action: any) => {
-      if (action.type === 'reducer2') {
-        return { ...state, reducer2: !state.reducer2 };
-      }
-      return state;
-    };
-
-    const mergedReducers = mergeReducers([reducer1, reducer2]);
-
-    it('should merge state from all reducers into one without nesting', () => {
-      expect(mergedReducers({ reducer1: false }, { type: '' })).toEqual({ reducer1: false });
-    });
-
-    it('should correctly set state from multiple reducers', () => {
-      const state = { reducer1: false, reducer2: true };
-      const newState = mergedReducers(state, { type: 'reducer2' });
-      expect(newState).toEqual({ reducer1: false, reducer2: false });
-      const newState2 = mergedReducers(newState, { type: 'reducer1' });
-      expect(newState2).toEqual({ reducer1: true, reducer2: false });
-    });
-  });
-
-  describe('getCheckedUids', () => {
-    it('should not return any UIDs if no items are checked', () => {
-      expect(getCheckedUids(sections)).toEqual({ folders: [], dashboards: [] });
-    });
-
-    it('should return only dashboard UIDs if the General folder is checked', () => {
-      expect(getCheckedUids(checkedGeneralFolder)).toEqual({
-        folders: [],
-        dashboards: ['general-abc', 'general-def', 'general-ghi'],
-      });
-    });
-
-    it('should return only dashboard UIDs if all items are checked when viewing a folder', () => {
-      expect(getCheckedUids(folderViewAllChecked)).toEqual({
-        folders: [],
-        dashboards: ['other-folder-dash-abc', 'other-folder-dash-def'],
-      });
-    });
-
-    it('should return folder + dashboard UIDs when folder is checked in the root view', () => {
-      expect(getCheckedUids(checkedOtherFolder)).toEqual({
-        folders: ['other-folder-abc'],
-        dashboards: ['other-folder-dash-abc', 'other-folder-dash-def'],
-      });
-    });
-  });
-
-  describe('getCheckedDashboardsUids', () => {
-    it('should get uids of all checked dashboards', () => {
-      expect(getCheckedDashboardsUids(searchResults)).toEqual(['lBdLINUWk', '8DY63kQZk']);
-    });
-  });
-
   describe('parseRouteParams', () => {
     it('should remove all undefined keys', () => {
       const params: Partial<SearchQueryParams> = { sort: undefined, tag: undefined, query: 'test' };
diff --git a/public/app/features/search/utils.ts b/public/app/features/search/utils.ts
index 9d49cca2747..a47674f04ce 100644
--- a/public/app/features/search/utils.ts
+++ b/public/app/features/search/utils.ts
@@ -1,207 +1,7 @@
-import { parse, SearchParserResult } from 'search-query-parser';
-
 import { UrlQueryMap } from '@grafana/data';
-import { IconName } from '@grafana/ui';
 
-import { getDashboardSrv } from '../dashboard/services/DashboardSrv';
-
-import { NO_ID_SECTIONS, SECTION_STORAGE_KEY } from './constants';
-import { DashboardQuery, DashboardSection, DashboardSectionItem, SearchAction, UidsToDelete } from './types';
-
-/**
- * Check if folder has id. Only Recent and Starred folders are the ones without
- * ids so far, as they are created manually after results are fetched from API.
- * @param str
- */
-export const hasId = (str: string) => {
-  return !NO_ID_SECTIONS.includes(str);
-};
-
-/**
- * Return ids for folders concatenated with their items ids, if section is expanded.
- * For items the id format is '{folderId}-{itemId}' to allow mapping them to their folders
- * @param sections
- */
-export const getFlattenedSections = (sections: DashboardSection[]): string[] => {
-  return sections.flatMap((section) => {
-    const id = hasId(section.title) ? String(section.id) : section.title;
-
-    if (section.expanded && section.items.length) {
-      return [id, ...section.items.map((item) => `${id}-${item.id}`)];
-    }
-    return id;
-  });
-};
-
-/**
- * Get all items for currently expanded sections
- * @param sections
- */
-export const getVisibleItems = (sections: DashboardSection[]) => {
-  return sections.flatMap((section) => {
-    if (section.expanded) {
-      return section.items;
-    }
-    return [];
-  });
-};
-/**
- * Since Recent and Starred folders don't have id, title field is used as id
- * @param title - title field of the section
- */
-export const getLookupField = (title: string) => {
-  return hasId(title) ? 'id' : 'title';
-};
-
-/**
- * Go through all the folders and items in expanded folders and toggle their selected
- * prop according to currently selected index. Used for item highlighting when navigating
- * the search results list using keyboard arrows
- * @param sections
- * @param selectedId
- */
-export const markSelected = (sections: DashboardSection[], selectedId: string) => {
-  return sections.map((result: DashboardSection) => {
-    const lookupField = getLookupField(selectedId);
-    result = { ...result, selected: String(result[lookupField]) === selectedId };
-
-    if (result.expanded && result.items.length) {
-      return {
-        ...result,
-        items: result.items.map((item) => {
-          const [sectionId, itemId] = selectedId.split('-');
-          const lookup = getLookupField(sectionId);
-          return { ...item, selected: String(item.id) === itemId && String(result[lookup]) === sectionId };
-        }),
-      };
-    }
-    return result;
-  });
-};
-
-/**
- * Find items with property 'selected' set true in a list of folders and their items.
- * Does recursive search in the items list.
- * @param sections
- */
-export const findSelected = (sections: any): DashboardSection | DashboardSectionItem | null => {
-  let found = null;
-  for (const section of sections) {
-    if (section.expanded && section.items.length) {
-      found = findSelected(section.items);
-    }
-    if (section.selected) {
-      found = section;
-    }
-    if (found) {
-      return found;
-    }
-  }
-
-  return null;
-};
-
-export const parseQuery = (query: string) => {
-  const parsedQuery = parse(query, {
-    keywords: ['folder'],
-  });
-
-  if (typeof parsedQuery === 'string') {
-    return {
-      text: parsedQuery,
-    } as SearchParserResult;
-  }
-
-  return parsedQuery;
-};
-
-/**
- * Merge multiple reducers into one, keeping the state structure flat (no nested
- * separate state for each reducer). If there are multiple state slices with the same
- * key, the latest reducer's state is applied.
- * Compared to Redux's combineReducers this allows multiple reducers to operate
- * on the same state or different slices of the same state. Useful when multiple
- * components have the same structure but different or extra logic when modifying it.
- * If reducers have the same action types, the action types from the rightmost reducer
- * take precedence
- * @param reducers
- */
-export const mergeReducers = (reducers: any[]) => (prevState: any, action: SearchAction) => {
-  return reducers.reduce((nextState, reducer) => ({ ...nextState, ...reducer(nextState, action) }), prevState);
-};
-
-/**
- * Collect all the checked dashboards
- * @param sections
- */
-export const getCheckedDashboards = (sections: DashboardSection[]): DashboardSectionItem[] => {
-  if (!sections.length) {
-    return [];
-  }
-
-  return sections.reduce((uids, section) => {
-    return section.items ? [...uids, ...section.items.filter((item) => item.checked)] : uids;
-  }, [] as DashboardSectionItem[]);
-};
-
-/**
- * Collect uids of all the checked dashboards
- * @param sections
- */
-export const getCheckedDashboardsUids = (sections: DashboardSection[]) => {
-  if (!sections.length) {
-    return [];
-  }
-
-  return getCheckedDashboards(sections).map((item) => item.uid);
-};
-
-/**
- * Collect uids of all checked folders and dashboards. Used for delete operation, among others
- * @param sections
- */
-export const getCheckedUids = (sections: DashboardSection[]): UidsToDelete => {
-  const emptyResults: UidsToDelete = { folders: [], dashboards: [] };
-
-  if (!sections.length) {
-    return emptyResults;
-  }
-
-  return sections.reduce((result, section) => {
-    if (section?.id !== 0 && section.checked && section.uid) {
-      return { ...result, folders: [...result.folders, section.uid] } as UidsToDelete;
-    } else {
-      return { ...result, dashboards: getCheckedDashboardsUids(sections) } as UidsToDelete;
-    }
-  }, emptyResults);
-};
-
-/**
- * When search is done within a dashboard folder, add folder id to the search query
- * to narrow down the results to the folder
- * @param query
- * @param queryParsing
- */
-export const getParsedQuery = (query: DashboardQuery, queryParsing = false) => {
-  const parsedQuery = { ...query, sort: query.sort?.value };
-  if (!queryParsing) {
-    return parsedQuery;
-  }
-
-  let folderIds: number[] = [];
-
-  if (parseQuery(query.query).folder === 'current') {
-    try {
-      const dash = getDashboardSrv().getCurrent();
-      if (dash?.meta.folderId) {
-        folderIds = [dash?.meta.folderId];
-      }
-    } catch (e) {
-      console.error(e);
-    }
-  }
-  return { ...parsedQuery, query: parseQuery(query.query).text as string, folderIds };
-};
+import { SECTION_STORAGE_KEY } from './constants';
+import { DashboardQuery } from './types';
 
 /**
  * Check if search query has filters enabled. Excludes folderId
@@ -214,18 +14,6 @@ export const hasFilters = (query: DashboardQuery) => {
   return Boolean(query.query || query.tag?.length > 0 || query.starred || query.sort);
 };
 
-/**
- * Get section icon depending on expanded state. Currently works for folder icons only
- * @param section
- */
-export const getSectionIcon = (section: DashboardSection): IconName => {
-  if (!hasId(section.title)) {
-    return section.icon as IconName;
-  }
-
-  return section.expanded ? 'folder-open' : 'folder';
-};
-
 /**
  * Get storage key for a dashboard folder by its title
  * @param title
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
index 603a7f8c8e7..0eca4499524 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.test.tsx
@@ -2,11 +2,12 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { ServiceAccountCreatePageUnconnected, Props } from './ServiceAccountCreatePage';
+import { ServiceAccountCreatePage, Props } from './ServiceAccountCreatePage';
 
 const postMock = jest.fn().mockResolvedValue({});
 const patchMock = jest.fn().mockResolvedValue({});
 const putMock = jest.fn().mockResolvedValue({});
+
 jest.mock('@grafana/runtime', () => ({
   getBackendSrv: () => ({
     post: postMock,
@@ -26,6 +27,7 @@ jest.mock('@grafana/runtime', () => ({
       licenseUrl: '',
     },
     appSubUrl: '',
+    featureToggles: {},
   },
 }));
 
@@ -52,7 +54,7 @@ const setup = (propOverrides: Partial<Props>) => {
 
   Object.assign(props, propOverrides);
 
-  render(<ServiceAccountCreatePageUnconnected {...props} />);
+  render(<ServiceAccountCreatePage {...props} />);
 };
 
 describe('ServiceAccountCreatePage tests', () => {
diff --git a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
index dc6bf19741d..5d2faca95f7 100644
--- a/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountCreatePage.tsx
@@ -1,34 +1,24 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { connect } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 
-import { NavModel } from '@grafana/data';
 import { getBackendSrv } from '@grafana/runtime';
 import { Form, Button, Input, Field } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { UserRolePicker } from 'app/core/components/RolePicker/UserRolePicker';
 import { fetchBuiltinRoles, fetchRoleOptions, updateUserRoles } from 'app/core/components/RolePicker/api';
 import { contextSrv } from 'app/core/core';
 import { AccessControlAction, OrgRole, Role, ServiceAccountCreateApiResponse, ServiceAccountDTO } from 'app/types';
 
-import { getNavModel } from '../../core/selectors/navModel';
-import { StoreState } from '../../types';
 import { OrgRolePicker } from '../admin/OrgRolePicker';
 
-export interface Props {
-  navModel: NavModel;
-}
-
-const mapStateToProps = (state: StoreState) => ({
-  navModel: getNavModel(state.navIndex, 'serviceaccounts'),
-});
+export interface Props {}
 
 const createServiceAccount = async (sa: ServiceAccountDTO) => getBackendSrv().post('/api/serviceaccounts/', sa);
 
 const updateServiceAccount = async (id: number, sa: ServiceAccountDTO) =>
   getBackendSrv().patch(`/api/serviceaccounts/${id}`, sa);
 
-export const ServiceAccountCreatePageUnconnected = ({ navModel }: Props): JSX.Element => {
+export const ServiceAccountCreatePage = ({}: Props): JSX.Element => {
   const [roleOptions, setRoleOptions] = useState<Role[]>([]);
   const [builtinRoles, setBuiltinRoles] = useState<{ [key: string]: Role[] }>({});
   const [pendingRoles, setPendingRoles] = useState<Role[]>([]);
@@ -109,7 +99,7 @@ export const ServiceAccountCreatePageUnconnected = ({ navModel }: Props): JSX.El
   };
 
   return (
-    <Page navModel={navModel}>
+    <Page navId="serviceaccounts">
       <Page.Contents>
         <h1>Create service account</h1>
         <Form onSubmit={onSubmit} validateOn="onSubmit">
@@ -152,4 +142,4 @@ export const ServiceAccountCreatePageUnconnected = ({ navModel }: Props): JSX.El
   );
 };
 
-export default connect(mapStateToProps)(ServiceAccountCreatePageUnconnected);
+export default ServiceAccountCreatePage;
diff --git a/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx
index 142b4045507..d13d484cdc4 100644
--- a/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountPage.test.tsx
@@ -23,14 +23,6 @@ const setup = (propOverrides: Partial<Props>) => {
   const updateServiceAccountMock = jest.fn();
 
   const props: Props = {
-    navModel: {
-      main: {
-        text: 'Configuration',
-      },
-      node: {
-        text: 'Service accounts',
-      },
-    },
     serviceAccount: {} as ServiceAccountDTO,
     tokens: [],
     builtInRoles: {},
diff --git a/public/app/features/serviceaccounts/ServiceAccountPage.tsx b/public/app/features/serviceaccounts/ServiceAccountPage.tsx
index 82fed275471..75d4d9add87 100644
--- a/public/app/features/serviceaccounts/ServiceAccountPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountPage.tsx
@@ -2,12 +2,11 @@ import { css } from '@emotion/css';
 import React, { useEffect, useState } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { getTimeZone, GrafanaTheme2, NavModel } from '@grafana/data';
+import { getTimeZone, GrafanaTheme2 } from '@grafana/data';
 import { Button, ConfirmModal, IconButton, useStyles2 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
-import { getNavModel } from 'app/core/selectors/navModel';
 import { AccessControlAction, ApiKey, Role, ServiceAccountDTO, StoreState } from 'app/types';
 
 import { CreateTokenModal, ServiceAccountToken } from './components/CreateTokenModal';
@@ -24,7 +23,6 @@ import {
 } from './state/actionsServiceAccountPage';
 
 interface OwnProps extends GrafanaRouteComponentProps<{ id: string }> {
-  navModel: NavModel;
   serviceAccount?: ServiceAccountDTO;
   tokens: ApiKey[];
   isLoading: boolean;
@@ -34,7 +32,6 @@ interface OwnProps extends GrafanaRouteComponentProps<{ id: string }> {
 
 function mapStateToProps(state: StoreState) {
   return {
-    navModel: getNavModel(state.navIndex, 'serviceaccounts'),
     serviceAccount: state.serviceAccountProfile.serviceAccount,
     tokens: state.serviceAccountProfile.tokens,
     isLoading: state.serviceAccountProfile.isLoading,
@@ -58,7 +55,6 @@ const connector = connect(mapStateToProps, mapDispatchToProps);
 export type Props = OwnProps & ConnectedProps<typeof connector>;
 
 export const ServiceAccountPageUnconnected = ({
-  navModel,
   match,
   serviceAccount,
   tokens,
@@ -131,7 +127,7 @@ export const ServiceAccountPageUnconnected = ({
   };
 
   return (
-    <Page navModel={navModel}>
+    <Page navId="serviceaccounts">
       <Page.Contents isLoading={isLoading}>
         {serviceAccount && (
           <div className={styles.headerContainer}>
diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
index e2222f4f628..59a66ade42a 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.test.tsx
@@ -26,14 +26,6 @@ const setup = (propOverrides: Partial<Props>) => {
   const getApiKeysMigrationInfoMock = jest.fn();
   const closeApiKeysMigrationInfoMock = jest.fn();
   const props: Props = {
-    navModel: {
-      main: {
-        text: 'Configuration',
-      },
-      node: {
-        text: 'Service accounts',
-      },
-    },
     builtInRoles: {},
     isLoading: false,
     page: 0,
diff --git a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
index 6043c9b5e8e..1d87856501a 100644
--- a/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
+++ b/public/app/features/serviceaccounts/ServiceAccountsListPage.tsx
@@ -6,10 +6,9 @@ import { connect, ConnectedProps } from 'react-redux';
 import { GrafanaTheme2, OrgRole } from '@grafana/data';
 import { Alert, ConfirmModal, FilterInput, Icon, LinkButton, RadioButtonGroup, Tooltip, useStyles2 } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import PageLoader from 'app/core/components/PageLoader/PageLoader';
 import { contextSrv } from 'app/core/core';
-import { getNavModel } from 'app/core/selectors/navModel';
 import { StoreState, ServiceAccountDTO, AccessControlAction, ServiceAccountStateFilter } from 'app/types';
 
 import { CreateTokenModal, ServiceAccountToken } from './components/CreateTokenModal';
@@ -33,7 +32,6 @@ export type Props = OwnProps & ConnectedProps<typeof connector>;
 
 function mapStateToProps(state: StoreState) {
   return {
-    navModel: getNavModel(state.navIndex, 'serviceaccounts'),
     ...state.serviceAccounts,
   };
 }
@@ -54,7 +52,6 @@ const mapDispatchToProps = {
 const connector = connect(mapStateToProps, mapDispatchToProps);
 
 export const ServiceAccountsListPageUnconnected = ({
-  navModel,
   serviceAccounts,
   isLoading,
   roleOptions,
@@ -169,7 +166,7 @@ export const ServiceAccountsListPageUnconnected = ({
   };
 
   return (
-    <Page navModel={navModel}>
+    <Page navId="serviceaccounts">
       <Page.Contents>
         {apiKeysMigrated && showApiKeysMigrationInfo && (
           <Alert
diff --git a/public/app/features/storage/AddRootView.tsx b/public/app/features/storage/AddRootView.tsx
new file mode 100644
index 00000000000..c79a82b5c01
--- /dev/null
+++ b/public/app/features/storage/AddRootView.tsx
@@ -0,0 +1,20 @@
+import React from 'react';
+
+import { Button } from '@grafana/ui';
+
+import { StorageView } from './types';
+
+interface Props {
+  onPathChange: (p: string, v?: StorageView) => void;
+}
+
+export function AddRootView({ onPathChange }: Props) {
+  return (
+    <div>
+      <div>TODO... Add ROOT</div>
+      <Button variant="secondary" onClick={() => onPathChange('/')}>
+        Cancel
+      </Button>
+    </div>
+  );
+}
diff --git a/public/app/features/storage/Breadcrumb.tsx b/public/app/features/storage/Breadcrumb.tsx
new file mode 100644
index 00000000000..f2a824a54e4
--- /dev/null
+++ b/public/app/features/storage/Breadcrumb.tsx
@@ -0,0 +1,60 @@
+import { css } from '@emotion/css';
+import { uniqueId } from 'lodash';
+import React from 'react';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Icon, IconName, useStyles2 } from '@grafana/ui';
+
+interface Props {
+  rootIcon?: IconName;
+  pathName: string;
+  onPathChange: (path: string) => void;
+}
+
+export function Breadcrumb({ pathName, onPathChange, rootIcon }: Props) {
+  const styles = useStyles2(getStyles);
+  const paths = pathName.split('/').filter(Boolean);
+
+  return (
+    <ul className={styles.breadCrumb}>
+      {rootIcon && (
+        <li onClick={() => onPathChange('')}>
+          <Icon name={rootIcon} />
+        </li>
+      )}
+      {paths.map((path, index) => {
+        let url = '/' + paths.slice(0, index + 1).join('/');
+        const onClickBreadcrumb = () => onPathChange(url);
+        const isLastBreadcrumb = index === paths.length - 1;
+        return (
+          <li key={uniqueId(path)} onClick={isLastBreadcrumb ? undefined : onClickBreadcrumb}>
+            {path}
+          </li>
+        );
+      })}
+    </ul>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    breadCrumb: css`
+      list-style: none;
+      padding: ${theme.spacing(2, 1)};
+
+      li {
+        display: inline;
+
+        :not(:last-child) {
+          color: ${theme.colors.text.link};
+          cursor: pointer;
+        }
+        + li:before {
+          content: '>';
+          padding: ${theme.spacing(1)};
+          color: ${theme.colors.text.secondary};
+        }
+      }
+    `,
+  };
+}
diff --git a/public/app/features/storage/ExportView.tsx b/public/app/features/storage/ExportView.tsx
new file mode 100644
index 00000000000..ed983e1639c
--- /dev/null
+++ b/public/app/features/storage/ExportView.tsx
@@ -0,0 +1,127 @@
+import React, { useEffect, useState } from 'react';
+
+import { isLiveChannelMessageEvent, isLiveChannelStatusEvent, LiveChannelScope } from '@grafana/data';
+import { getBackendSrv, getGrafanaLiveSrv } from '@grafana/runtime';
+import { Button, CodeEditor, Modal } from '@grafana/ui';
+
+import { StorageView } from './types';
+
+interface ExportStatusMessage {
+  running: boolean;
+  target: string;
+  started: number;
+  finished: number;
+  update: number;
+  count: number;
+  current: number;
+  last: string;
+  status: string;
+}
+
+interface Props {
+  onPathChange: (p: string, v?: StorageView) => void;
+}
+
+export const ExportView = ({ onPathChange }: Props) => {
+  const [status, setStatus] = useState<ExportStatusMessage>();
+
+  const [open, setOpen] = useState(false);
+  const [body, setBody] = useState({
+    format: 'git',
+    git: {},
+  });
+  const onDismiss = () => setOpen(false);
+  const doStart = () => {
+    getBackendSrv()
+      .post('/api/admin/export', body)
+      .then((v) => {
+        onDismiss();
+      });
+  };
+
+  useEffect(() => {
+    const subscription = getGrafanaLiveSrv()
+      .getStream<ExportStatusMessage>({
+        scope: LiveChannelScope.Grafana,
+        namespace: 'broadcast',
+        path: 'export',
+      })
+      .subscribe({
+        next: (evt) => {
+          if (isLiveChannelMessageEvent(evt)) {
+            setStatus(evt.message);
+          } else if (isLiveChannelStatusEvent(evt)) {
+            setStatus(evt.message);
+          }
+        },
+      });
+
+    // if not running, open the thread
+    setTimeout(() => {
+      if (!status) {
+        setOpen(true);
+      }
+    }, 500);
+
+    return () => {
+      subscription.unsubscribe();
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const renderButton = () => {
+    return (
+      <>
+        <Modal title={'Export grafana instance'} isOpen={open} onDismiss={onDismiss}>
+          <div>
+            <CodeEditor
+              height={200}
+              value={JSON.stringify(body, null, 2) ?? ''}
+              showLineNumbers={false}
+              readOnly={false}
+              language="json"
+              showMiniMap={false}
+              onBlur={(text: string) => {
+                setBody(JSON.parse(text)); // force JSON?
+              }}
+            />
+          </div>
+          <Modal.ButtonRow>
+            <Button onClick={doStart}>Start</Button>
+            <Button variant="secondary" onClick={onDismiss}>
+              Cancel
+            </Button>
+          </Modal.ButtonRow>
+        </Modal>
+
+        <Button onClick={() => setOpen(true)} variant="primary">
+          Export
+        </Button>
+        <Button variant="secondary" onClick={() => onPathChange('/')}>
+          Cancel
+        </Button>
+      </>
+    );
+  };
+
+  if (!status) {
+    return <div>{renderButton()}</div>;
+  }
+
+  return (
+    <div>
+      <pre>{JSON.stringify(status, null, 2)}</pre>
+      {Boolean(!status.running) && renderButton()}
+      {Boolean(status.running) && (
+        <Button
+          variant="secondary"
+          onClick={() => {
+            getBackendSrv().post('/api/admin/export/stop');
+          }}
+        >
+          Stop
+        </Button>
+      )}
+    </div>
+  );
+};
diff --git a/public/app/features/storage/FileView.tsx b/public/app/features/storage/FileView.tsx
new file mode 100644
index 00000000000..9051b4acec2
--- /dev/null
+++ b/public/app/features/storage/FileView.tsx
@@ -0,0 +1,161 @@
+import { css } from '@emotion/css';
+import { isString } from 'lodash';
+import React, { useMemo } from 'react';
+import SVG from 'react-inlinesvg';
+import { useAsync } from 'react-use';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { DataFrame, GrafanaTheme2 } from '@grafana/data';
+import { CodeEditor, useStyles2 } from '@grafana/ui';
+
+import { getGrafanaStorage } from './helper';
+import { StorageView } from './types';
+
+interface FileDisplayInfo {
+  category?: 'svg' | 'image' | 'text';
+  language?: string; // match code editor
+}
+
+interface Props {
+  listing: DataFrame;
+  path: string;
+  onPathChange: (p: string, view?: StorageView) => void;
+  view: StorageView;
+}
+
+export function FileView({ listing, path, onPathChange, view }: Props) {
+  const styles = useStyles2(getStyles);
+  const info = useMemo(() => getFileDisplayInfo(path), [path]);
+  const body = useAsync(async () => {
+    if (info.category === 'text') {
+      const rsp = await getGrafanaStorage().get(path);
+      if (isString(rsp)) {
+        return rsp;
+      }
+      return JSON.stringify(rsp, null, 2);
+    }
+    return null;
+  }, [info, path]);
+
+  switch (view) {
+    case StorageView.Config:
+      return <div>CONFIGURE?</div>;
+    case StorageView.Perms:
+      return <div>Permissions</div>;
+    case StorageView.History:
+      return <div>TODO... history</div>;
+  }
+
+  let src = `api/storage/read/${path}`;
+  if (src.endsWith('/')) {
+    src = src.substring(0, src.length - 1);
+  }
+
+  switch (info.category) {
+    case 'svg':
+      return (
+        <div>
+          <SVG src={src} className={styles.icon} />
+        </div>
+      );
+    case 'image':
+      return (
+        <div>
+          <a target={'_self'} href={src}>
+            <img src={src} className={styles.img} />
+          </a>
+        </div>
+      );
+    case 'text':
+      return (
+        <div className={styles.tableWrapper}>
+          <AutoSizer>
+            {({ width, height }) => (
+              <CodeEditor
+                width={width}
+                height={height}
+                value={body.value ?? ''}
+                showLineNumbers={false}
+                readOnly={true}
+                language={info.language ?? 'text'}
+                showMiniMap={false}
+                onBlur={(text: string) => {
+                  console.log('CHANGED!', text);
+                }}
+              />
+            )}
+          </AutoSizer>
+        </div>
+      );
+  }
+
+  return (
+    <div>
+      FILE: <a href={src}>{path}</a>
+    </div>
+  );
+}
+
+function getFileDisplayInfo(path: string): FileDisplayInfo {
+  const idx = path.lastIndexOf('.');
+  if (idx < 0) {
+    return {};
+  }
+  const suffix = path.substring(idx + 1).toLowerCase();
+  switch (suffix) {
+    case 'svg':
+      return { category: 'svg' };
+    case 'jpg':
+    case 'jpeg':
+    case 'png':
+    case 'webp':
+    case 'gif':
+      return { category: 'image' };
+
+    case 'geojson':
+    case 'json':
+      return { category: 'text', language: 'json' };
+    case 'text':
+    case 'go':
+    case 'md':
+      return { category: 'text' };
+  }
+  return {};
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // TODO: remove `height: 90%`
+  wrapper: css`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  `,
+  tableControlRowWrapper: css`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: ${theme.spacing(2)};
+  `,
+  // TODO: remove `height: 100%`
+  tableWrapper: css`
+    border: 1px solid ${theme.colors.border.medium};
+    height: 100%;
+  `,
+  uploadSpot: css`
+    margin-left: ${theme.spacing(2)};
+  `,
+  border: css`
+    border: 1px solid ${theme.colors.border.medium};
+    padding: ${theme.spacing(2)};
+  `,
+  img: css`
+    max-width: 100%;
+    // max-height: 147px;
+    // fill: ${theme.colors.text.primary};
+  `,
+  icon: css`
+    // max-width: 100%;
+    // max-height: 147px;
+    // fill: ${theme.colors.text.primary};
+  `,
+});
diff --git a/public/app/features/storage/FolderView.tsx b/public/app/features/storage/FolderView.tsx
new file mode 100644
index 00000000000..9a10b8beaf1
--- /dev/null
+++ b/public/app/features/storage/FolderView.tsx
@@ -0,0 +1,87 @@
+import { css } from '@emotion/css';
+import React from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
+
+import { DataFrame, GrafanaTheme2 } from '@grafana/data';
+import { Table, useStyles2 } from '@grafana/ui';
+
+import { UploadView } from './UploadView';
+import { StorageView } from './types';
+
+interface Props {
+  listing: DataFrame;
+  path: string;
+  onPathChange: (p: string, view?: StorageView) => void;
+  view: StorageView;
+}
+
+export function FolderView({ listing, path, onPathChange, view }: Props) {
+  const styles = useStyles2(getStyles);
+
+  switch (view) {
+    case StorageView.Config:
+      return <div>CONFIGURE?</div>;
+    case StorageView.Perms:
+      return <div>Permissions</div>;
+    case StorageView.Upload:
+      return (
+        <UploadView
+          folder={path}
+          onUpload={(rsp) => {
+            console.log('Uploaded: ' + path);
+            if (rsp.path) {
+              onPathChange(rsp.path);
+            } else {
+              onPathChange(path); // back to data
+            }
+          }}
+        />
+      );
+  }
+
+  return (
+    <div className={styles.tableWrapper}>
+      <AutoSizer>
+        {({ width, height }) => (
+          <div style={{ width: `${width}px`, height: `${height}px` }}>
+            <Table
+              height={height}
+              width={width}
+              data={listing}
+              noHeader={false}
+              showTypeIcons={false}
+              resizable={false}
+            />
+          </div>
+        )}
+      </AutoSizer>
+    </div>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // TODO: remove `height: 90%`
+  wrapper: css`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  `,
+  tableControlRowWrapper: css`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: ${theme.spacing(2)};
+  `,
+  // TODO: remove `height: 100%`
+  tableWrapper: css`
+    border: 1px solid ${theme.colors.border.medium};
+    height: 100%;
+  `,
+  uploadSpot: css`
+    margin-left: ${theme.spacing(2)};
+  `,
+  border: css`
+    border: 1px solid ${theme.colors.border.medium};
+    padding: ${theme.spacing(2)};
+  `,
+});
diff --git a/public/app/features/storage/RootView.tsx b/public/app/features/storage/RootView.tsx
new file mode 100644
index 00000000000..04b40ad5ceb
--- /dev/null
+++ b/public/app/features/storage/RootView.tsx
@@ -0,0 +1,114 @@
+import { css } from '@emotion/css';
+import React, { useMemo, useState } from 'react';
+
+import { DataFrame, DataFrameView, GrafanaTheme2 } from '@grafana/data';
+import { config } from '@grafana/runtime';
+import { Button, Card, FilterInput, Icon, IconName, TagList, useStyles2, VerticalGroup } from '@grafana/ui';
+
+import { StorageView } from './types';
+
+interface Props {
+  root: DataFrame;
+  onPathChange: (p: string, v?: StorageView) => void;
+}
+
+interface RootFolder {
+  name: string;
+  title: string;
+  storageType: string;
+  description: string;
+  readOnly: boolean;
+  builtIn: boolean;
+}
+
+export function RootView({ root, onPathChange }: Props) {
+  const styles = useStyles2(getStyles);
+  const [searchQuery, setSearchQuery] = useState<string>('');
+  let base = location.pathname;
+  if (!base.endsWith('/')) {
+    base += '/';
+  }
+
+  const roots = useMemo(() => {
+    const view = new DataFrameView<RootFolder>(root);
+    const all = view.map((v) => ({ ...v }));
+    if (searchQuery?.length) {
+      const lower = searchQuery.toLowerCase();
+      return all.filter((v) => {
+        const isMatch = v.name.toLowerCase().indexOf(lower) >= 0 || v.description.toLowerCase().indexOf(lower) >= 0;
+        if (isMatch) {
+          return true;
+        }
+        return false;
+      });
+    }
+    return all;
+  }, [searchQuery, root]);
+
+  return (
+    <div>
+      <div className="page-action-bar">
+        <div className="gf-form gf-form--grow">
+          <FilterInput placeholder="Search Storage" value={searchQuery} onChange={setSearchQuery} />
+        </div>
+        <Button className="pull-right" onClick={() => onPathChange('', StorageView.AddRoot)}>
+          Add Root
+        </Button>
+        {config.featureToggles.export && (
+          <Button className="pull-right" onClick={() => onPathChange('', StorageView.Export)}>
+            Export
+          </Button>
+        )}
+      </div>
+      <VerticalGroup>
+        {roots.map((v) => (
+          <Card key={v.name} href={`admin/storage/${v.name}/`}>
+            <Card.Heading>{v.title ?? v.name}</Card.Heading>
+            <Card.Meta className={styles.clickable}>{v.description}</Card.Meta>
+            <Card.Tags className={styles.clickable}>
+              <TagList tags={getTags(v)} />
+            </Card.Tags>
+            <Card.Figure className={styles.clickable}>
+              <Icon name={getIconName(v.storageType)} size="xxxl" className={styles.secondaryTextColor} />
+            </Card.Figure>
+          </Card>
+        ))}
+      </VerticalGroup>
+    </div>
+  );
+}
+
+function getStyles(theme: GrafanaTheme2) {
+  return {
+    secondaryTextColor: css`
+      color: ${theme.colors.text.secondary};
+    `,
+    clickable: css`
+      pointer-events: none;
+    `,
+  };
+}
+
+function getTags(v: RootFolder) {
+  const tags: string[] = [];
+  if (v.builtIn) {
+    tags.push('Builtin');
+  }
+  if (v.readOnly) {
+    tags.push('Read only');
+  }
+  return tags;
+}
+
+export function getIconName(type: string): IconName {
+  switch (type) {
+    case 'git':
+      return 'code-branch';
+    case 'disk':
+      return 'folder-open';
+    case 'sql':
+      return 'database';
+    default:
+      return 'folder-open';
+  }
+}
diff --git a/public/app/features/storage/StoragePage.tsx b/public/app/features/storage/StoragePage.tsx
new file mode 100644
index 00000000000..4d53c6f1b2c
--- /dev/null
+++ b/public/app/features/storage/StoragePage.tsx
@@ -0,0 +1,205 @@
+import { css } from '@emotion/css';
+import React, { useMemo } from 'react';
+import { useAsync } from 'react-use';
+
+import { DataFrame, GrafanaTheme2, isDataFrame, ValueLinkConfig } from '@grafana/data';
+import { locationService } from '@grafana/runtime';
+import { useStyles2, IconName, Spinner, TabsBar, Tab, Button, HorizontalGroup } from '@grafana/ui';
+import { Page } from 'app/core/components/Page/Page';
+import { useNavModel } from 'app/core/hooks/useNavModel';
+import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
+
+import { AddRootView } from './AddRootView';
+import { Breadcrumb } from './Breadcrumb';
+import { ExportView } from './ExportView';
+import { FileView } from './FileView';
+import { FolderView } from './FolderView';
+import { RootView } from './RootView';
+import { getGrafanaStorage } from './helper';
+import { StorageView } from './types';
+
+interface RouteParams {
+  path: string;
+}
+
+interface QueryParams {
+  view: StorageView;
+}
+
+interface Props extends GrafanaRouteComponentProps<RouteParams, QueryParams> {}
+
+export default function StoragePage(props: Props) {
+  const styles = useStyles2(getStyles);
+  const navModel = useNavModel('storage');
+  const path = props.match.params.path ?? '';
+  const view = props.queryParams.view ?? StorageView.Data;
+  const setPath = (p: string, view?: StorageView) => {
+    let url = ('/admin/storage/' + p).replace('//', '/');
+    if (view && view !== StorageView.Data) {
+      url += '?view=' + view;
+    }
+    locationService.push(url);
+  };
+
+  const listing = useAsync((): Promise<DataFrame | undefined> => {
+    return getGrafanaStorage()
+      .list(path)
+      .then((frame) => {
+        if (frame) {
+          const name = frame.fields[0];
+          frame.fields[0] = {
+            ...name,
+            getLinks: (cfg: ValueLinkConfig) => {
+              const n = name.values.get(cfg.valueRowIndex ?? 0);
+              const p = path + '/' + n;
+              return [
+                {
+                  title: `Open ${n}`,
+                  href: `/admin/storage/${p}`,
+                  target: '_self',
+                  origin: name,
+                  onClick: () => {
+                    setPath(p);
+                  },
+                },
+              ];
+            },
+          };
+        }
+        return frame;
+      });
+  }, [path]);
+
+  const isFolder = useMemo(() => {
+    let isFolder = path?.indexOf('/') < 0;
+    if (listing.value) {
+      const length = listing.value.length;
+      if (length > 1) {
+        isFolder = true;
+      }
+      if (length === 1) {
+        const first = listing.value.fields[0].values.get(0) as string;
+        isFolder = !path.endsWith(first);
+      }
+    }
+    return isFolder;
+  }, [path, listing]);
+
+  const renderView = () => {
+    const isRoot = !path?.length || path === '/';
+    switch (view) {
+      case StorageView.Export:
+        if (!isRoot) {
+          setPath('');
+          return <Spinner />;
+        }
+        return <ExportView onPathChange={setPath} />;
+
+      case StorageView.AddRoot:
+        if (!isRoot) {
+          setPath('');
+          return <Spinner />;
+        }
+        return <AddRootView onPathChange={setPath} />;
+    }
+
+    const frame = listing.value;
+    if (!isDataFrame(frame)) {
+      return <></>;
+    }
+
+    if (isRoot) {
+      return <RootView root={frame} onPathChange={setPath} />;
+    }
+
+    const opts = [{ what: StorageView.Data, text: 'Data' }];
+
+    // Root folders have a config page
+    if (path.indexOf('/') < 0) {
+      opts.push({ what: StorageView.Config, text: 'Configure' });
+    }
+
+    // Lets only apply permissions to folders (for now)
+    if (isFolder) {
+      opts.push({ what: StorageView.Perms, text: 'Permissions' });
+    } else {
+      // TODO: only if the file exists in a storage engine with
+      opts.push({ what: StorageView.History, text: 'History' });
+    }
+
+    // Hardcode the uploadable folder :)
+    if (isFolder && path.startsWith('resources')) {
+      opts.push({
+        what: StorageView.Upload,
+        text: 'Upload',
+      });
+    }
+    const canAddFolder = isFolder && path.startsWith('resources');
+    const canDelete = !isFolder && path.startsWith('resources/');
+
+    return (
+      <div className={styles.wrapper}>
+        <HorizontalGroup width="100%" justify="space-between" height={25}>
+          <Breadcrumb pathName={path} onPathChange={setPath} rootIcon={navModel.node.icon as IconName} />
+          <div>
+            {canAddFolder && <Button onClick={() => alert('TODO: new folder modal')}>New Folder</Button>}
+            {canDelete && (
+              <Button variant="destructive" onClick={() => alert('TODO: confirm delete modal')}>
+                Delete
+              </Button>
+            )}
+          </div>
+        </HorizontalGroup>
+
+        <TabsBar>
+          {opts.map((opt) => (
+            <Tab
+              key={opt.what}
+              label={opt.text}
+              active={opt.what === view}
+              onChangeTab={() => setPath(path, opt.what)}
+            />
+          ))}
+        </TabsBar>
+        {isFolder ? (
+          <FolderView path={path} listing={frame} onPathChange={setPath} view={view} />
+        ) : (
+          <FileView path={path} listing={frame} onPathChange={setPath} view={view} />
+        )}
+      </div>
+    );
+  };
+
+  return (
+    <Page navModel={navModel}>
+      <Page.Contents isLoading={listing.loading}>{renderView()}</Page.Contents>
+    </Page>
+  );
+}
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  // TODO: remove `height: 90%`
+  wrapper: css`
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  `,
+  tableControlRowWrapper: css`
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: ${theme.spacing(2)};
+  `,
+  // TODO: remove `height: 100%`
+  tableWrapper: css`
+    border: 1px solid ${theme.colors.border.medium};
+    height: 100%;
+  `,
+  uploadSpot: css`
+    margin-left: ${theme.spacing(2)};
+  `,
+  border: css`
+    border: 1px solid ${theme.colors.border.medium};
+    padding: ${theme.spacing(2)};
+  `,
+});
diff --git a/public/app/features/storage/UploadView.tsx b/public/app/features/storage/UploadView.tsx
new file mode 100644
index 00000000000..370f5370666
--- /dev/null
+++ b/public/app/features/storage/UploadView.tsx
@@ -0,0 +1,136 @@
+import { css } from '@emotion/css';
+import React, { useState } from 'react';
+import SVG from 'react-inlinesvg';
+
+import { GrafanaTheme2 } from '@grafana/data';
+import { Button, ButtonGroup, Field, FileDropzone, useStyles2 } from '@grafana/ui';
+
+import { getGrafanaStorage } from './helper';
+import { UploadReponse } from './types';
+
+interface Props {
+  folder: string;
+  onUpload: (rsp: UploadReponse) => void;
+}
+
+interface ErrorResponse {
+  message: string;
+}
+
+const FileDropzoneCustomChildren = ({ secondaryText = 'Drag and drop here or browse' }) => {
+  const styles = useStyles2(getStyles);
+
+  return (
+    <div className={styles.iconWrapper}>
+      <small className={styles.small}>{secondaryText}</small>
+    </div>
+  );
+};
+
+export const UploadView = ({ folder, onUpload }: Props) => {
+  const [file, setFile] = useState<File | undefined>(undefined);
+
+  const styles = useStyles2(getStyles);
+
+  const [error, setError] = useState<ErrorResponse>({ message: '' });
+
+  const Preview = () => {
+    if (!file) {
+      return <></>;
+    }
+    const isImage = file.type?.startsWith('image/');
+    const isSvg = file.name?.endsWith('.svg');
+
+    const src = URL.createObjectURL(file);
+    return (
+      <Field label="Preview">
+        <div className={styles.iconPreview}>
+          {isSvg && <SVG src={src} className={styles.img} />}
+          {isImage && !isSvg && <img src={src} className={styles.img} />}
+        </div>
+      </Field>
+    );
+  };
+
+  const doUpload = async () => {
+    if (!file) {
+      setError({ message: 'please select a file' });
+      return;
+    }
+
+    const rsp = await getGrafanaStorage().upload(folder, file);
+    if (rsp.status !== 200) {
+      setError(rsp);
+    } else {
+      onUpload(rsp);
+    }
+  };
+
+  return (
+    <div>
+      <FileDropzone
+        readAs="readAsBinaryString"
+        onFileRemove={() => {
+          setFile(undefined);
+        }}
+        options={{
+          accept: { 'image/*': ['.jpg', '.jpeg', '.png', '.gif', '.webp'] },
+          multiple: false,
+          onDrop: (acceptedFiles: File[]) => {
+            setFile(acceptedFiles[0]);
+          },
+        }}
+      >
+        {error.message !== '' ? <p>{error.message}</p> : Boolean(file) ? <Preview /> : <FileDropzoneCustomChildren />}
+      </FileDropzone>
+
+      <ButtonGroup>
+        <Button className={styles.button} variant={'primary'} disabled={!file} onClick={doUpload}>
+          Upload
+        </Button>
+      </ButtonGroup>
+    </div>
+  );
+};
+
+const getStyles = (theme: GrafanaTheme2) => ({
+  resourcePickerPopover: css`
+    border-radius: ${theme.shape.borderRadius()};
+    box-shadow: ${theme.shadows.z3};
+    background: ${theme.colors.background.primary};
+    border: 1px solid ${theme.colors.border.medium};
+  `,
+  resourcePickerPopoverContent: css`
+    width: 315px;
+    font-size: ${theme.typography.bodySmall.fontSize};
+    min-height: 184px;
+    padding: ${theme.spacing(1)};
+    display: flex;
+    flex-direction: column;
+  `,
+  button: css`
+    margin: 12px 20px 5px;
+  `,
+  iconPreview: css`
+    width: 238px;
+    height: 198px;
+    border: 1px solid ${theme.colors.border.medium};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  `,
+  img: css`
+    width: 147px;
+    height: 147px;
+    fill: ${theme.colors.text.primary};
+  `,
+  iconWrapper: css`
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  `,
+  small: css`
+    color: ${theme.colors.text.secondary};
+    margin-bottom: ${theme.spacing(2)};
+  `,
+});
diff --git a/public/app/features/storage/helper.ts b/public/app/features/storage/helper.ts
new file mode 100644
index 00000000000..f93c15d841c
--- /dev/null
+++ b/public/app/features/storage/helper.ts
@@ -0,0 +1,66 @@
+import { DataFrame, dataFrameFromJSON, DataFrameJSON, getDisplayProcessor } from '@grafana/data';
+import { config, getBackendSrv } from '@grafana/runtime';
+
+import { UploadReponse } from './types';
+
+// Likely should be built into the search interface!
+export interface GrafanaStorage {
+  get: <T = any>(path: string) => Promise<T>;
+  list: (path: string) => Promise<DataFrame | undefined>;
+  upload: (folder: string, file: File) => Promise<UploadReponse>;
+}
+
+class SimpleStorage implements GrafanaStorage {
+  constructor() {}
+
+  async get<T = any>(path: string): Promise<T> {
+    const storagePath = `api/storage/read/${path}`.replace('//', '/');
+    return getBackendSrv().get<T>(storagePath);
+  }
+
+  async list(path: string): Promise<DataFrame | undefined> {
+    let url = 'api/storage/list/';
+    if (path) {
+      url += path + '/';
+    }
+    const rsp = await getBackendSrv().get<DataFrameJSON>(url);
+    if (rsp?.data) {
+      const f = dataFrameFromJSON(rsp);
+      for (const field of f.fields) {
+        field.display = getDisplayProcessor({ field, theme: config.theme2 });
+      }
+      return f;
+    }
+    return undefined;
+  }
+
+  async upload(folder: string, file: File): Promise<UploadReponse> {
+    const formData = new FormData();
+    formData.append('folder', folder);
+    formData.append('file', file);
+    const res = await fetch('/api/storage/upload', {
+      method: 'POST',
+      body: formData,
+    });
+
+    let body = (await res.json()) as UploadReponse;
+    if (!body) {
+      body = {} as any;
+    }
+    body.status = res.status;
+    body.statusText = res.statusText;
+    if (res.status !== 200 && !body.err) {
+      body.err = true;
+    }
+    return body;
+  }
+}
+
+let storage: GrafanaStorage | undefined;
+
+export function getGrafanaStorage() {
+  if (!storage) {
+    storage = new SimpleStorage();
+  }
+  return storage;
+}
diff --git a/public/app/features/storage/types.ts b/public/app/features/storage/types.ts
new file mode 100644
index 00000000000..9a729dee3b9
--- /dev/null
+++ b/public/app/features/storage/types.ts
@@ -0,0 +1,18 @@
+export enum StorageView {
+  Data = 'data',
+  Config = 'config',
+  Perms = 'perms',
+  Upload = 'upload',
+  Export = 'export',
+  History = 'history',
+  AddRoot = 'add',
+}
+
+export interface UploadReponse {
+  status: number;
+  statusText: string;
+
+  err?: boolean;
+  message: string;
+  path: string;
+}
diff --git a/public/app/features/teams/CreateTeam.test.tsx b/public/app/features/teams/CreateTeam.test.tsx
index 5c8c2aa5f27..404dcc23dda 100644
--- a/public/app/features/teams/CreateTeam.test.tsx
+++ b/public/app/features/teams/CreateTeam.test.tsx
@@ -2,9 +2,9 @@ import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { NavModel } from '@grafana/data';
+import { BackendSrv, setBackendSrv } from '@grafana/runtime';
 
-import { CreateTeam, Props } from './CreateTeam';
+import { CreateTeam } from './CreateTeam';
 
 beforeEach(() => {
   jest.clearAllMocks();
@@ -14,23 +14,12 @@ const mockPost = jest.fn(() => {
   return Promise.resolve({});
 });
 
-jest.mock('@grafana/runtime', () => ({
-  getBackendSrv: () => {
-    return {
-      post: mockPost,
-    };
-  },
-  config: {
-    buildInfo: {},
-    licenseInfo: {},
-  },
-}));
+setBackendSrv({
+  post: mockPost,
+} as any as BackendSrv);
 
 const setup = () => {
-  const props: Props = {
-    navModel: { node: {}, main: {} } as NavModel,
-  };
-  return render(<CreateTeam {...props} />);
+  return render(<CreateTeam />);
 };
 
 describe('Create team', () => {
diff --git a/public/app/features/teams/CreateTeam.tsx b/public/app/features/teams/CreateTeam.tsx
index 1c35b134e4b..b0fabfcef5f 100644
--- a/public/app/features/teams/CreateTeam.tsx
+++ b/public/app/features/teams/CreateTeam.tsx
@@ -1,24 +1,16 @@
 import React, { PureComponent } from 'react';
-import { connect } from 'react-redux';
 
-import { NavModel } from '@grafana/data';
 import { getBackendSrv, locationService } from '@grafana/runtime';
 import { Button, Form, Field, Input, FieldSet } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
-import { getNavModel } from 'app/core/selectors/navModel';
-import { StoreState } from 'app/types';
-
-export interface Props {
-  navModel: NavModel;
-}
 
 interface TeamDTO {
   name: string;
   email: string;
 }
 
-export class CreateTeam extends PureComponent<Props> {
+export class CreateTeam extends PureComponent {
   create = async (formModel: TeamDTO) => {
     const result = await getBackendSrv().post('/api/teams', formModel);
     if (result.teamId) {
@@ -27,10 +19,8 @@ export class CreateTeam extends PureComponent<Props> {
     }
   };
   render() {
-    const { navModel } = this.props;
-
     return (
-      <Page navModel={navModel}>
+      <Page navId="teams">
         <Page.Contents>
           <Form onSubmit={this.create}>
             {({ register, errors }) => (
@@ -58,10 +48,4 @@ export class CreateTeam extends PureComponent<Props> {
   }
 }
 
-function mapStateToProps(state: StoreState) {
-  return {
-    navModel: getNavModel(state.navIndex, 'teams'),
-  };
-}
-
-export default connect(mapStateToProps)(CreateTeam);
+export default CreateTeam;
diff --git a/public/app/features/teams/TeamList.test.tsx b/public/app/features/teams/TeamList.test.tsx
index 9575b0c1ed0..e81bd56ef65 100644
--- a/public/app/features/teams/TeamList.test.tsx
+++ b/public/app/features/teams/TeamList.test.tsx
@@ -3,7 +3,6 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 
-import { NavModel } from '@grafana/data';
 import { contextSrv, User } from 'app/core/services/context_srv';
 
 import { OrgRole, Team } from '../../types';
@@ -20,14 +19,6 @@ jest.mock('app/core/config', () => {
 
 const setup = (propOverrides?: object) => {
   const props: Props = {
-    navModel: {
-      main: {
-        text: 'Configuration',
-      },
-      node: {
-        text: 'Team List',
-      },
-    } as NavModel,
     teams: [] as Team[],
     loadTeams: jest.fn(),
     deleteTeam: jest.fn(),
diff --git a/public/app/features/teams/TeamList.tsx b/public/app/features/teams/TeamList.tsx
index 7f2cda0992b..e744fdd7993 100644
--- a/public/app/features/teams/TeamList.tsx
+++ b/public/app/features/teams/TeamList.tsx
@@ -1,13 +1,11 @@
 import React, { PureComponent } from 'react';
 
-import { NavModel } from '@grafana/data';
 import { DeleteButton, LinkButton, FilterInput, VerticalGroup, HorizontalGroup, Pagination } from '@grafana/ui';
 import EmptyListCTA from 'app/core/components/EmptyListCTA/EmptyListCTA';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { TeamRolePicker } from 'app/core/components/RolePicker/TeamRolePicker';
 import { fetchRoleOptions } from 'app/core/components/RolePicker/api';
 import { config } from 'app/core/config';
-import { getNavModel } from 'app/core/selectors/navModel';
 import { contextSrv, User } from 'app/core/services/context_srv';
 import { AccessControlAction, Role, StoreState, Team } from 'app/types';
 
@@ -20,7 +18,6 @@ import { getSearchQuery, getTeams, getTeamsCount, getTeamsSearchPage, isPermissi
 const pageLimit = 30;
 
 export interface Props {
-  navModel: NavModel;
   teams: Team[];
   searchQuery: string;
   searchPage: number;
@@ -224,10 +221,10 @@ export class TeamList extends PureComponent<Props, State> {
   }
 
   render() {
-    const { hasFetched, navModel } = this.props;
+    const { hasFetched } = this.props;
 
     return (
-      <Page navModel={navModel}>
+      <Page navId="teams">
         <Page.Contents isLoading={!hasFetched}>{this.renderList()}</Page.Contents>
       </Page>
     );
@@ -236,7 +233,6 @@ export class TeamList extends PureComponent<Props, State> {
 
 function mapStateToProps(state: StoreState) {
   return {
-    navModel: getNavModel(state.navIndex, 'teams'),
     teams: getTeams(state.teams),
     searchQuery: getSearchQuery(state.teams),
     searchPage: getTeamsSearchPage(state.teams),
diff --git a/public/app/features/teams/TeamPages.test.tsx b/public/app/features/teams/TeamPages.test.tsx
index 12d024e0fb9..7184ec3931b 100644
--- a/public/app/features/teams/TeamPages.test.tsx
+++ b/public/app/features/teams/TeamPages.test.tsx
@@ -2,7 +2,7 @@ import { render, screen } from '@testing-library/react';
 import React from 'react';
 import { Provider } from 'react-redux';
 
-import { NavModel, createTheme } from '@grafana/data';
+import { createTheme } from '@grafana/data';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
 import { User } from 'app/core/services/context_srv';
 import { configureStore } from 'app/store/configureStore';
@@ -68,7 +68,7 @@ const setup = (propOverrides?: object) => {
         },
       } as any,
     }),
-    navModel: { node: {}, main: {} } as NavModel,
+    pageNav: { text: 'Cool team ' },
     teamId: 1,
     loadTeam: jest.fn(),
     loadTeamMembers: jest.fn(),
diff --git a/public/app/features/teams/TeamPages.tsx b/public/app/features/teams/TeamPages.tsx
index f72b7f0b532..6c0968237c6 100644
--- a/public/app/features/teams/TeamPages.tsx
+++ b/public/app/features/teams/TeamPages.tsx
@@ -2,10 +2,10 @@ import { includes } from 'lodash';
 import React, { PureComponent } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { NavModel } from '@grafana/data';
+import { NavModelItem } from '@grafana/data';
 import { featureEnabled } from '@grafana/runtime';
 import { Themeable2, withTheme2 } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { UpgradeBox } from 'app/core/components/Upgrade/UpgradeBox';
 import config from 'app/core/config';
 import { GrafanaRouteComponentProps } from 'app/core/navigation/types';
@@ -51,11 +51,11 @@ function mapStateToProps(state: StoreState, props: OwnProps) {
   }
   const pageName = props.match.params.page ?? defaultPage;
   const teamLoadingNav = getTeamLoadingNav(pageName as string);
-  const navModel = getNavModel(state.navIndex, `team-${pageName}-${teamId}`, teamLoadingNav);
+  const pageNav = getNavModel(state.navIndex, `team-${pageName}-${teamId}`, teamLoadingNav).main;
   const members = getTeamMembers(state.team);
 
   return {
-    navModel,
+    pageNav,
     teamId: teamId,
     pageName: pageName,
     team,
@@ -118,20 +118,20 @@ export class TeamPages extends PureComponent<Props, State> {
     return text1.toLocaleLowerCase() === text2.toLocaleLowerCase();
   };
 
-  hideTabsFromNonTeamAdmin = (navModel: NavModel, isSignedInUserTeamAdmin: boolean) => {
+  hideTabsFromNonTeamAdmin = (pageNav: NavModelItem, isSignedInUserTeamAdmin: boolean) => {
     if (contextSrv.accessControlEnabled()) {
-      return navModel;
+      return pageNav;
     }
 
-    if (!isSignedInUserTeamAdmin && navModel.main && navModel.main.children) {
-      navModel.main.children
+    if (!isSignedInUserTeamAdmin && pageNav && pageNav.children) {
+      pageNav.children
         .filter((navItem) => !this.textsAreEqual(navItem.text, PageTypes.Members))
         .map((navItem) => {
           navItem.hideFromTabs = true;
         });
     }
 
-    return navModel;
+    return pageNav;
   };
 
   renderPage(isSignedInUserTeamAdmin: boolean): React.ReactNode {
@@ -183,11 +183,11 @@ export class TeamPages extends PureComponent<Props, State> {
   }
 
   render() {
-    const { team, navModel, members, editorsCanAdmin, signedInUser } = this.props;
+    const { team, pageNav, members, editorsCanAdmin, signedInUser } = this.props;
     const isTeamAdmin = isSignedInUserTeamAdmin({ members, editorsCanAdmin, signedInUser });
 
     return (
-      <Page navModel={this.hideTabsFromNonTeamAdmin(navModel, isTeamAdmin)}>
+      <Page navId="teams" pageNav={this.hideTabsFromNonTeamAdmin(pageNav, isTeamAdmin)}>
         <Page.Contents isLoading={this.state.isLoading}>
           {team && Object.keys(team).length !== 0 && this.renderPage(isTeamAdmin)}
         </Page.Contents>
diff --git a/public/app/features/teams/TeamPermissions.tsx b/public/app/features/teams/TeamPermissions.tsx
index 51a17bc388e..2d4d23386e8 100644
--- a/public/app/features/teams/TeamPermissions.tsx
+++ b/public/app/features/teams/TeamPermissions.tsx
@@ -18,7 +18,7 @@ const TeamPermissions = (props: TeamPermissionsProps) => {
 
   return (
     <Permissions
-      title="Members"
+      title=""
       addPermissionTitle="Add member"
       buttonLabel="Add member"
       resource="teams"
diff --git a/public/app/features/users/UsersListPage.test.tsx b/public/app/features/users/UsersListPage.test.tsx
index 48490f59539..cb999f5dd5b 100644
--- a/public/app/features/users/UsersListPage.test.tsx
+++ b/public/app/features/users/UsersListPage.test.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { mockToolkitActionCreator } from 'test/core/redux/mocks';
 
-import { NavModel } from '@grafana/data';
 import { configureStore } from 'app/store/configureStore';
 import { Invitee, OrgUser } from 'app/types';
 
@@ -25,14 +24,6 @@ jest.mock('app/core/core', () => ({
 const setup = (propOverrides?: object) => {
   const store = configureStore();
   const props: Props = {
-    navModel: {
-      main: {
-        text: 'Configuration',
-      },
-      node: {
-        text: 'Users',
-      },
-    } as NavModel,
     users: [] as OrgUser[],
     invitees: [] as Invitee[],
     searchQuery: '',
diff --git a/public/app/features/users/UsersListPage.tsx b/public/app/features/users/UsersListPage.tsx
index 6205a86a7c1..7cab296441d 100644
--- a/public/app/features/users/UsersListPage.tsx
+++ b/public/app/features/users/UsersListPage.tsx
@@ -3,9 +3,8 @@ import { connect, ConnectedProps } from 'react-redux';
 
 import { renderMarkdown } from '@grafana/data';
 import { HorizontalGroup, Pagination, VerticalGroup } from '@grafana/ui';
-import Page from 'app/core/components/Page/Page';
+import { Page } from 'app/core/components/Page/Page';
 import { contextSrv } from 'app/core/core';
-import { getNavModel } from 'app/core/selectors/navModel';
 import { OrgUser, OrgRole, StoreState } from 'app/types';
 
 import InviteesTable from '../invites/InviteesTable';
@@ -21,7 +20,6 @@ import { getUsers, getUsersSearchQuery, getUsersSearchPage } from './state/selec
 function mapStateToProps(state: StoreState) {
   const searchQuery = getUsersSearchQuery(state.users);
   return {
-    navModel: getNavModel(state.navIndex, 'users'),
     users: getUsers(state.users),
     searchQuery: getUsersSearchQuery(state.users),
     searchPage: getUsersSearchPage(state.users),
@@ -125,11 +123,11 @@ export class UsersListPage extends PureComponent<Props, State> {
   }
 
   render() {
-    const { navModel, hasFetched } = this.props;
+    const { hasFetched } = this.props;
     const externalUserMngInfoHtml = this.externalUserMngInfoHtml;
 
     return (
-      <Page navModel={navModel}>
+      <Page navId="users">
         <Page.Contents isLoading={!hasFetched}>
           <>
             <UsersActionBar onShowInvites={this.onShowInvites} showInvites={this.state.showInvites} />
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx
index 76fa6c02b4e..b9445beced0 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/AnnotationQueryEditor.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { useDebounce } from 'react-use';
 
 import { QueryEditorProps, toOption } from '@grafana/data';
+import { EditorField, EditorRows, EditorRow } from '@grafana/experimental';
 import { config } from '@grafana/runtime';
 import { Input } from '@grafana/ui';
 
@@ -79,38 +80,52 @@ export const AnnotationQueryEditor = (props: Props) => {
   );
 
   return (
-    <>
+    <EditorRows>
       {config.featureToggles.cloudMonitoringExperimentalUI ? (
-        <ExperimentalMetricQueryEditor
-          refId={query.refId}
-          variableOptionGroup={variableOptionGroup}
-          customMetaData={customMetaData}
-          onChange={handleQueryChange}
-          onRunQuery={onRunQuery}
-          datasource={datasource}
-          query={metricQuery}
-        />
+        <>
+          <ExperimentalMetricQueryEditor
+            refId={query.refId}
+            variableOptionGroup={variableOptionGroup}
+            customMetaData={customMetaData}
+            onChange={handleQueryChange}
+            onRunQuery={onRunQuery}
+            datasource={datasource}
+            query={metricQuery}
+          />
+
+          <EditorRow>
+            <EditorField label="Title" htmlFor="annotation-query-title">
+              <Input id="annotation-query-title" value={title} onChange={handleTitleChange} />
+            </EditorField>
+          </EditorRow>
+
+          <EditorRow>
+            <EditorField label="Text" htmlFor="annotation-query-text">
+              <Input id="annotation-query-text" value={text} onChange={handleTextChange} />
+            </EditorField>
+          </EditorRow>
+        </>
       ) : (
-        <MetricQueryEditor
-          refId={query.refId}
-          variableOptionGroup={variableOptionGroup}
-          customMetaData={customMetaData}
-          onChange={handleQueryChange}
-          onRunQuery={onRunQuery}
-          datasource={datasource}
-          query={metricQuery}
-        />
+        <>
+          <MetricQueryEditor
+            refId={query.refId}
+            variableOptionGroup={variableOptionGroup}
+            customMetaData={customMetaData}
+            onChange={handleQueryChange}
+            onRunQuery={onRunQuery}
+            datasource={datasource}
+            query={metricQuery}
+          />
+          <QueryEditorRow label="Title" htmlFor="annotation-query-title">
+            <Input id="annotation-query-title" value={title} width={INPUT_WIDTH} onChange={handleTitleChange} />
+          </QueryEditorRow>
+
+          <QueryEditorRow label="Text" htmlFor="annotation-query-text">
+            <Input id="annotation-query-text" value={text} width={INPUT_WIDTH} onChange={handleTextChange} />
+          </QueryEditorRow>
+        </>
       )}
-
-      <QueryEditorRow label="Title" htmlFor="annotation-query-title">
-        <Input id="annotation-query-title" value={title} width={INPUT_WIDTH} onChange={handleTitleChange} />
-      </QueryEditorRow>
-
-      <QueryEditorRow label="Text" htmlFor="annotation-query-text">
-        <Input id="annotation-query-text" value={text} width={INPUT_WIDTH} onChange={handleTextChange} />
-      </QueryEditorRow>
-
       <AnnotationsHelp />
-    </>
+    </EditorRows>
   );
 };
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/LabelFilter.test.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/LabelFilter.test.tsx
new file mode 100644
index 00000000000..afa143e7404
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/LabelFilter.test.tsx
@@ -0,0 +1,92 @@
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+import { openMenu, select } from 'react-select-event';
+
+import { LabelFilter } from './LabelFilter';
+
+const labels = {
+  'metric.label.instance_name': ['instance_name_1', 'instance_name_2'],
+  'resource.label.instance_id': ['instance_id_1', 'instance_id_2'],
+  'resource.label.project_id': ['project_id_1', 'project_id_2'],
+  'resource.label.zone': ['zone_1', 'zone_2'],
+  'resource.type': ['type_1', 'type_2'],
+};
+
+describe('LabelFilter', () => {
+  it('should render an add button with no filters passed in', () => {
+    render(<LabelFilter labels={{}} filters={[]} onChange={() => {}} variableOptionGroup={[]} />);
+    expect(screen.getByLabelText('Add')).toBeInTheDocument();
+  });
+
+  it('should render filters if any are passed in', () => {
+    const filters = ['key_1', '=', 'value_1'];
+    render(<LabelFilter labels={{}} filters={filters} onChange={() => {}} variableOptionGroup={[]} />);
+    expect(screen.getByText('key_1')).toBeInTheDocument();
+    expect(screen.getByText('value_1')).toBeInTheDocument();
+  });
+
+  it('can add filters', async () => {
+    const onChange = jest.fn();
+    render(<LabelFilter labels={{}} filters={[]} onChange={onChange} variableOptionGroup={[]} />);
+    await userEvent.click(screen.getByLabelText('Add'));
+    expect(onChange).toBeCalledWith(expect.arrayContaining(['', '=', '']));
+  });
+
+  it('should render grouped labels', async () => {
+    const filters = ['key_1', '=', 'value_1'];
+    render(<LabelFilter labels={labels} filters={filters} onChange={() => {}} variableOptionGroup={[]} />);
+
+    await openMenu(screen.getByLabelText('Filter label key'));
+
+    expect(screen.getByText('Metric Label')).toBeInTheDocument();
+    expect(screen.getByText('metric.label.instance_name')).toBeInTheDocument();
+
+    expect(screen.getByText('Resource Label')).toBeInTheDocument();
+    expect(screen.getByText('resource.label.instance_id')).toBeInTheDocument();
+    expect(screen.getByText('resource.label.project_id')).toBeInTheDocument();
+    expect(screen.getByText('resource.label.zone')).toBeInTheDocument();
+
+    expect(screen.getByText('Resource Type')).toBeInTheDocument();
+    expect(screen.getByText('resource.type')).toBeInTheDocument();
+  });
+
+  it('can select a label key to filter on', async () => {
+    const onChange = jest.fn();
+    const filters = ['key_1', '=', ''];
+    render(<LabelFilter labels={labels} filters={filters} onChange={onChange} variableOptionGroup={[]} />);
+
+    const key = screen.getByLabelText('Filter label key');
+    await select(key, 'metric.label.instance_name', { container: document.body });
+
+    expect(onChange).toBeCalledWith(expect.arrayContaining(['metric.label.instance_name', '=', '']));
+  });
+
+  it('should on render label values for the selected filter key', async () => {
+    const filters = ['metric.label.instance_name', '=', ''];
+    render(<LabelFilter labels={labels} filters={filters} onChange={() => {}} variableOptionGroup={[]} />);
+
+    await openMenu(screen.getByLabelText('Filter label value'));
+    expect(screen.getByText('instance_name_1')).toBeInTheDocument();
+    expect(screen.getByText('instance_name_2')).toBeInTheDocument();
+    expect(screen.queryByText('instance_id_1')).not.toBeInTheDocument();
+    expect(screen.queryByText('instance_id_2')).not.toBeInTheDocument();
+    expect(screen.queryByText('project_id_1')).not.toBeInTheDocument();
+    expect(screen.queryByText('project_id_2')).not.toBeInTheDocument();
+    expect(screen.queryByText('zone_1')).not.toBeInTheDocument();
+    expect(screen.queryByText('zone_2')).not.toBeInTheDocument();
+    expect(screen.queryByText('type_1')).not.toBeInTheDocument();
+    expect(screen.queryByText('type_2')).not.toBeInTheDocument();
+  });
+
+  it('can select a label value to filter on', async () => {
+    const onChange = jest.fn();
+    const filters = ['metric.label.instance_name', '=', ''];
+    render(<LabelFilter labels={labels} filters={filters} onChange={onChange} variableOptionGroup={[]} />);
+
+    const key = screen.getByLabelText('Filter label value');
+    await select(key, 'instance_name_1', { container: document.body });
+
+    expect(onChange).toBeCalledWith(expect.arrayContaining(['metric.label.instance_name', '=', 'instance_name_1']));
+  });
+});
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/LabelFilter.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/LabelFilter.tsx
new file mode 100644
index 00000000000..04cee6619b1
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/LabelFilter.tsx
@@ -0,0 +1,119 @@
+import React, { FunctionComponent, useMemo } from 'react';
+
+import { SelectableValue, toOption } from '@grafana/data';
+import { AccessoryButton, EditorRow, EditorField, EditorList } from '@grafana/experimental';
+import { HorizontalGroup, Select } from '@grafana/ui';
+
+import { labelsToGroupedOptions, stringArrayToFilters } from '../../functions';
+
+export interface Props {
+  labels: { [key: string]: string[] };
+  filters: string[];
+  onChange: (filters: string[]) => void;
+  variableOptionGroup: SelectableValue<string>;
+}
+
+interface Filter {
+  key: string;
+  operator: string;
+  value: string;
+  condition: string;
+}
+
+const DEFAULT_OPERATOR = '=';
+const DEFAULT_CONDITION = 'AND';
+
+const filtersToStringArray = (filters: Filter[]) =>
+  filters.flatMap(({ key, operator, value, condition }) => [key, operator, value, condition]).slice(0, -1);
+
+const operators = ['=', '!=', '=~', '!=~'].map(toOption);
+
+export const LabelFilter: FunctionComponent<Props> = ({
+  labels = {},
+  filters: filterArray,
+  onChange: _onChange,
+  variableOptionGroup,
+}) => {
+  const filters: Filter[] = useMemo(() => stringArrayToFilters(filterArray), [filterArray]);
+  const options = useMemo(
+    () => [variableOptionGroup, ...labelsToGroupedOptions(Object.keys(labels))],
+    [labels, variableOptionGroup]
+  );
+
+  const getOptions = ({ key = '', value = '' }: Partial<Filter>) => {
+    // Add the current key and value as options if they are manually entered
+    const keyPresent = options.some((op) => {
+      if (op.options) {
+        return options.some((opp) => opp.label === key);
+      }
+      return op.label === key;
+    });
+    if (!keyPresent) {
+      options.push({ label: key, value: key });
+    }
+
+    const valueOptions = labels.hasOwnProperty(key)
+      ? [variableOptionGroup, ...labels[key].map(toOption)]
+      : [variableOptionGroup];
+    const valuePresent = valueOptions.some((op) => op.label === value);
+    if (!valuePresent) {
+      valueOptions.push({ label: value, value });
+    }
+
+    return { options, valueOptions };
+  };
+
+  const onChange = (items: Array<Partial<Filter>>) => {
+    const filters = items.map(({ key, operator, value, condition }) => ({
+      key: key || '',
+      operator: operator || DEFAULT_OPERATOR,
+      value: value || '',
+      condition: condition || DEFAULT_CONDITION,
+    }));
+    _onChange(filtersToStringArray(filters));
+  };
+
+  const renderItem = (item: Partial<Filter>, onChangeItem: (item: Filter) => void, onDeleteItem: () => void) => {
+    const { key = '', operator = DEFAULT_OPERATOR, value = '', condition = DEFAULT_CONDITION } = item;
+    const { options, valueOptions } = getOptions(item);
+
+    return (
+      <HorizontalGroup spacing="xs" width="auto">
+        <Select
+          aria-label="Filter label key"
+          formatCreateLabel={(v) => `Use label key: ${v}`}
+          allowCustomValue
+          value={key}
+          options={options}
+          onChange={({ value: key = '' }) => onChangeItem({ key, operator, value, condition })}
+        />
+        <Select
+          value={operator}
+          options={operators}
+          onChange={({ value: operator = DEFAULT_OPERATOR }) => onChangeItem({ key, operator, value, condition })}
+        />
+        <Select
+          aria-label="Filter label value"
+          placeholder="add filter value"
+          formatCreateLabel={(v) => `Use label value: ${v}`}
+          allowCustomValue
+          value={value}
+          options={valueOptions}
+          onChange={({ value = '' }) => onChangeItem({ key, operator, value, condition })}
+        />
+        <AccessoryButton aria-label="Remove" icon="times" variant="secondary" onClick={onDeleteItem} type="button" />
+      </HorizontalGroup>
+    );
+  };
+
+  return (
+    <EditorRow>
+      <EditorField
+        label="Filter"
+        tooltip="To reduce the amount of data charted, apply a filter. A filter has three components: a label, a comparison, and a value. The comparison can be an equality, inequality, or regular expression."
+      >
+        <EditorList items={filters} renderItem={renderItem} onChange={onChange} />
+      </EditorField>
+    </EditorRow>
+  );
+};
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/MetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/MetricQueryEditor.tsx
index 06428eca88d..4b8fff207f0 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/MetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/MetricQueryEditor.tsx
@@ -16,11 +16,11 @@ import {
   SLOQuery,
   ValueTypes,
 } from '../../types';
-import { Project } from '../index';
 
 import { MQLQueryEditor } from './../MQLQueryEditor';
 import { AliasBy } from './AliasBy';
 import { GraphPeriod } from './GraphPeriod';
+import { Project } from './Project';
 import { VisualMetricQueryEditor } from './VisualMetricQueryEditor';
 
 export interface Props {
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Project.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Project.tsx
new file mode 100644
index 00000000000..caa257d16d7
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Project.tsx
@@ -0,0 +1,51 @@
+import React, { useEffect, useMemo, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorRow } from '@grafana/experimental';
+import { Select } from '@grafana/ui';
+
+import CloudMonitoringDatasource from '../../datasource';
+
+export interface Props {
+  refId: string;
+  datasource: CloudMonitoringDatasource;
+  onChange: (projectName: string) => void;
+  templateVariableOptions: Array<SelectableValue<string>>;
+  projectName: string;
+}
+
+export function Project({ refId, projectName, datasource, onChange, templateVariableOptions }: Props) {
+  const [projects, setProjects] = useState<Array<SelectableValue<string>>>([]);
+  useEffect(() => {
+    datasource.getProjects().then((projects) => setProjects(projects));
+  }, [datasource]);
+
+  const projectsWithTemplateVariables = useMemo(
+    () => [
+      projects,
+      {
+        label: 'Template Variables',
+        options: templateVariableOptions,
+      },
+      ...projects,
+    ],
+    [projects, templateVariableOptions]
+  );
+
+  return (
+    <EditorRow>
+      <EditorField label="Project">
+        <Select
+          width="auto"
+          allowCustomValue
+          formatCreateLabel={(v) => `Use project: ${v}`}
+          onChange={({ value }) => onChange(value!)}
+          options={projectsWithTemplateVariables}
+          value={{ value: projectName, label: projectName }}
+          placeholder="Select Project"
+          inputId={`${refId}-project`}
+        />
+      </EditorField>
+    </EditorRow>
+  );
+}
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/SLO.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/SLO.tsx
new file mode 100644
index 00000000000..22294300551
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/SLO.tsx
@@ -0,0 +1,57 @@
+import React, { useEffect, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorRow } from '@grafana/experimental';
+import { Select } from '@grafana/ui';
+
+import CloudMonitoringDatasource from '../../datasource';
+import { SLOQuery } from '../../types';
+
+export interface Props {
+  refId: string;
+  onChange: (query: SLOQuery) => void;
+  query: SLOQuery;
+  templateVariableOptions: Array<SelectableValue<string>>;
+  datasource: CloudMonitoringDatasource;
+}
+
+export const SLO: React.FC<Props> = ({ refId, query, templateVariableOptions, onChange, datasource }) => {
+  const [slos, setSLOs] = useState<Array<SelectableValue<string>>>([]);
+  const { projectName, serviceId } = query;
+
+  useEffect(() => {
+    if (!projectName || !serviceId) {
+      return;
+    }
+
+    datasource.getServiceLevelObjectives(projectName, serviceId).then((sloIds: Array<SelectableValue<string>>) => {
+      setSLOs([
+        {
+          label: 'Template Variables',
+          options: templateVariableOptions,
+        },
+        ...sloIds,
+      ]);
+    });
+  }, [datasource, projectName, serviceId, templateVariableOptions]);
+
+  return (
+    <EditorRow>
+      <EditorField label="SLO">
+        <Select
+          inputId={`${refId}-slo`}
+          width="auto"
+          allowCustomValue
+          value={query?.sloId && { value: query?.sloId, label: query?.sloName || query?.sloId }}
+          placeholder="Select SLO"
+          options={slos}
+          onChange={async ({ value: sloId = '', label: sloName = '' }) => {
+            const slos = await datasource.getServiceLevelObjectives(projectName, serviceId);
+            const slo = slos.find(({ value }) => value === datasource.templateSrv.replace(sloId));
+            onChange({ ...query, sloId, sloName, goal: slo?.goal });
+          }}
+        />
+      </EditorField>
+    </EditorRow>
+  );
+};
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/SLOQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/SLOQueryEditor.tsx
new file mode 100644
index 00000000000..d340138bccf
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/SLOQueryEditor.tsx
@@ -0,0 +1,99 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorFieldGroup, EditorRow, Stack } from '@grafana/experimental';
+
+import { ALIGNMENT_PERIODS } from '../../constants';
+import CloudMonitoringDatasource from '../../datasource';
+import { AlignmentTypes, CustomMetaData, SLOQuery } from '../../types';
+
+import { AliasBy } from './AliasBy';
+import { AlignmentPeriodLabel } from './AlignmentPeriodLabel';
+import { PeriodSelect } from './PeriodSelect';
+import { Project } from './Project';
+import { SLO } from './SLO';
+import { Selector } from './Selector';
+import { Service } from './Service';
+
+export interface Props {
+  refId: string;
+  customMetaData: CustomMetaData;
+  variableOptionGroup: SelectableValue<string>;
+  onChange: (query: SLOQuery) => void;
+  onRunQuery: () => void;
+  query: SLOQuery;
+  datasource: CloudMonitoringDatasource;
+}
+
+export const defaultQuery: (dataSource: CloudMonitoringDatasource) => SLOQuery = (dataSource) => ({
+  projectName: dataSource.getDefaultProject(),
+  alignmentPeriod: 'cloud-monitoring-auto',
+  perSeriesAligner: AlignmentTypes.ALIGN_MEAN,
+  aliasBy: '',
+  selectorName: 'select_slo_health',
+  serviceId: '',
+  serviceName: '',
+  sloId: '',
+  sloName: '',
+});
+
+export function SLOQueryEditor({
+  refId,
+  query,
+  datasource,
+  onChange,
+  variableOptionGroup,
+  customMetaData,
+}: React.PropsWithChildren<Props>) {
+  return (
+    <>
+      <Project
+        refId={refId}
+        templateVariableOptions={variableOptionGroup.options}
+        projectName={query.projectName}
+        datasource={datasource}
+        onChange={(projectName) => onChange({ ...query, projectName })}
+      />
+      <Service
+        refId={refId}
+        datasource={datasource}
+        templateVariableOptions={variableOptionGroup.options}
+        query={query}
+        onChange={onChange}
+      />
+      <SLO
+        refId={refId}
+        datasource={datasource}
+        templateVariableOptions={variableOptionGroup.options}
+        query={query}
+        onChange={onChange}
+      />
+      <Selector
+        refId={refId}
+        datasource={datasource}
+        templateVariableOptions={variableOptionGroup.options}
+        query={query}
+        onChange={onChange}
+      />
+
+      <EditorRow>
+        <EditorFieldGroup>
+          <EditorField label="Alignment period">
+            <PeriodSelect
+              inputId={`${refId}-alignment-period`}
+              templateVariableOptions={variableOptionGroup.options}
+              current={query.alignmentPeriod}
+              onChange={(period) => onChange({ ...query, alignmentPeriod: period })}
+              aligmentPeriods={ALIGNMENT_PERIODS}
+            />
+          </EditorField>
+          <Stack alignItems="flex-end">
+            <AlignmentPeriodLabel datasource={datasource} customMetaData={customMetaData} />
+          </Stack>
+        </EditorFieldGroup>
+      </EditorRow>
+
+      <AliasBy refId={refId} value={query.aliasBy} onChange={(aliasBy) => onChange({ ...query, aliasBy })} />
+    </>
+  );
+}
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Selector.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Selector.tsx
new file mode 100644
index 00000000000..3d2ae3909c5
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Selector.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorRow } from '@grafana/experimental';
+import { Select } from '@grafana/ui';
+
+import { SELECTORS } from '../../constants';
+import CloudMonitoringDatasource from '../../datasource';
+import { SLOQuery } from '../../types';
+
+export interface Props {
+  refId: string;
+  onChange: (query: SLOQuery) => void;
+  query: SLOQuery;
+  templateVariableOptions: Array<SelectableValue<string>>;
+  datasource: CloudMonitoringDatasource;
+}
+
+export const Selector: React.FC<Props> = ({ refId, query, templateVariableOptions, onChange, datasource }) => {
+  return (
+    <EditorRow>
+      <EditorField label="Selector" htmlFor={`${refId}-slo-selector`}>
+        <Select
+          inputId={`${refId}-slo-selector`}
+          width="auto"
+          allowCustomValue
+          value={[...SELECTORS, ...templateVariableOptions].find((s) => s.value === query?.selectorName ?? '')}
+          options={[
+            {
+              label: 'Template Variables',
+              options: templateVariableOptions,
+            },
+            ...SELECTORS,
+          ]}
+          onChange={({ value: selectorName }) => onChange({ ...query, selectorName: selectorName ?? '' })}
+        />
+      </EditorField>
+    </EditorRow>
+  );
+};
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Service.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Service.tsx
new file mode 100644
index 00000000000..c755e19976f
--- /dev/null
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/Service.tsx
@@ -0,0 +1,55 @@
+import React, { useEffect, useState } from 'react';
+
+import { SelectableValue } from '@grafana/data';
+import { EditorField, EditorRow } from '@grafana/experimental';
+import { Select } from '@grafana/ui';
+
+import CloudMonitoringDatasource from '../../datasource';
+import { SLOQuery } from '../../types';
+
+export interface Props {
+  refId: string;
+  onChange: (query: SLOQuery) => void;
+  query: SLOQuery;
+  templateVariableOptions: Array<SelectableValue<string>>;
+  datasource: CloudMonitoringDatasource;
+}
+
+export const Service: React.FC<Props> = ({ refId, query, templateVariableOptions, onChange, datasource }) => {
+  const [services, setServices] = useState<Array<SelectableValue<string>>>([]);
+  const { projectName } = query;
+
+  useEffect(() => {
+    if (!projectName) {
+      return;
+    }
+
+    datasource.getSLOServices(projectName).then((services: Array<SelectableValue<string>>) => {
+      setServices([
+        {
+          label: 'Template Variables',
+          options: templateVariableOptions,
+        },
+        ...services,
+      ]);
+    });
+  }, [datasource, projectName, templateVariableOptions]);
+
+  return (
+    <EditorRow>
+      <EditorField label="Service">
+        <Select
+          inputId={`${refId}-slo-service`}
+          width="auto"
+          allowCustomValue
+          value={query?.serviceId && { value: query?.serviceId, label: query?.serviceName || query?.serviceId }}
+          placeholder="Select service"
+          options={services}
+          onChange={({ value: serviceId = '', label: serviceName = '' }) =>
+            onChange({ ...query, serviceId, serviceName, sloId: '' })
+          }
+        />
+      </EditorField>
+    </EditorRow>
+  );
+};
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/VisualMetricQueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/VisualMetricQueryEditor.tsx
index 4e446d9739c..f2396901211 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/Experimental/VisualMetricQueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/Experimental/VisualMetricQueryEditor.tsx
@@ -4,10 +4,10 @@ import { SelectableValue } from '@grafana/data';
 
 import CloudMonitoringDatasource from '../../datasource';
 import { CustomMetaData, MetricDescriptor, MetricQuery, SLOQuery } from '../../types';
-import { LabelFilter } from '../index';
 
 import { Alignment } from './Alignment';
 import { GroupBy } from './GroupBy';
+import { LabelFilter } from './LabelFilter';
 import { Metrics } from './Metrics';
 import { Preprocessor } from './Preprocessor';
 
diff --git a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
index d3e583fb92d..6026c7ed1a8 100644
--- a/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
+++ b/public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
@@ -12,6 +12,7 @@ import { CloudMonitoringQuery, EditorMode, MetricQuery, QueryType, SLOQuery, Clo
 
 import { MetricQueryEditor as ExperimentalMetricQueryEditor } from './Experimental/MetricQueryEditor';
 import { QueryHeader } from './Experimental/QueryHeader';
+import { SLOQueryEditor as ExperimentalSLOQueryEditor } from './Experimental/SLOQueryEditor';
 import { defaultQuery } from './MetricQueryEditor';
 import { defaultQuery as defaultSLOQuery } from './SLO/SLOQueryEditor';
 
@@ -82,7 +83,7 @@ export class QueryEditor extends PureComponent<Props> {
         )}
 
         {queryType === QueryType.SLO && (
-          <SLOQueryEditor
+          <ExperimentalSLOQueryEditor
             refId={query.refId}
             variableOptionGroup={variableOptionGroup}
             customMetaData={customMetaData}
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts
index 0f7273eda6d..f1c06ce1a70 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts
@@ -1,7 +1,7 @@
 import { find, startsWith } from 'lodash';
 
 import { DataSourceInstanceSettings, ScopedVars } from '@grafana/data';
-import { DataSourceWithBackend, getTemplateSrv } from '@grafana/runtime';
+import { DataSourceWithBackend, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
 
 import { resourceTypeDisplayNames, supportedMetricNamespaces } from '../azureMetadata';
@@ -42,11 +42,13 @@ export default class AzureMonitorDatasource extends DataSourceWithBackend<AzureM
   declare resourceGroup: string;
   declare resourceName: string;
   timeSrv: TimeSrv;
+  templateSrv: TemplateSrv;
 
   constructor(private instanceSettings: DataSourceInstanceSettings<AzureDataSourceJsonData>) {
     super(instanceSettings);
 
     this.timeSrv = getTimeSrv();
+    this.templateSrv = getTemplateSrv();
     this.defaultSubscriptionId = instanceSettings.jsonData.subscriptionId;
 
     const cloud = getAzureCloud(instanceSettings);
@@ -244,7 +246,8 @@ export default class AzureMonitorDatasource extends DataSourceWithBackend<AzureM
     const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl(
       this.resourcePath,
       this.apiPreviewVersion,
-      this.replaceTemplateVariables(query)
+      this.replaceTemplateVariables(query),
+      this.templateSrv
     );
     return this.getResource(url)
       .then((result: AzureMonitorMetricNamespacesResponse) => {
@@ -273,7 +276,8 @@ export default class AzureMonitorDatasource extends DataSourceWithBackend<AzureM
     const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
       this.resourcePath,
       this.apiVersion,
-      this.replaceTemplateVariables(query)
+      this.replaceTemplateVariables(query),
+      this.templateSrv
     );
     return this.getResource(url).then((result: AzureMonitorMetricNamesResponse) => {
       return ResponseParser.parseResponseValues(result, 'name.localizedValue', 'name.value');
@@ -285,7 +289,8 @@ export default class AzureMonitorDatasource extends DataSourceWithBackend<AzureM
     const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
       this.resourcePath,
       this.apiVersion,
-      this.replaceTemplateVariables(query)
+      this.replaceTemplateVariables(query),
+      this.templateSrv
     );
     return this.getResource(url).then((result: AzureMonitorMetricsMetadataResponse) => {
       return ResponseParser.parseMetadata(result, metricName);
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.test.ts
index ed61968eed7..a7103ef1046 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.test.ts
@@ -1,19 +1,96 @@
+import { getTemplateSrv } from '@grafana/runtime';
+
 import UrlBuilder from './url_builder';
 
+let replaceMock = jest.fn().mockImplementation((s: string) => s);
+
+jest.mock('@grafana/runtime', () => {
+  const original = jest.requireActual('@grafana/runtime');
+  return {
+    ...original,
+    getTemplateSrv: () => ({
+      replace: replaceMock,
+    }),
+  };
+});
+
 describe('AzureMonitorUrlBuilder', () => {
+  let templateSrv = getTemplateSrv();
   describe('buildResourceUri', () => {
     it('builds a resource uri when the required properties are provided', () => {
-      expect(UrlBuilder.buildResourceUri('sub', 'group', 'Microsoft.NetApp/netAppAccounts', 'name')).toEqual(
-        '/subscriptions/sub/resourceGroups/group/providers/Microsoft.NetApp/netAppAccounts/name'
+      expect(
+        UrlBuilder.buildResourceUri('sub', 'group', 'Microsoft.NetApp/netAppAccounts', 'name', templateSrv)
+      ).toEqual('/subscriptions/sub/resourceGroups/group/providers/Microsoft.NetApp/netAppAccounts/name');
+    });
+
+    it('builds a resource uri correctly when a template variable is used as namespace', () => {
+      expect(UrlBuilder.buildResourceUri('sub', 'group', '$ns', 'name', templateSrv)).toEqual(
+        '/subscriptions/sub/resourceGroups/group/providers/$ns/name'
       );
     });
+
+    it('builds a resource uri correctly when the namespace includes a storage sub-resource', () => {
+      expect(
+        UrlBuilder.buildResourceUri(
+          'sub',
+          'group',
+          'Microsoft.Storage/storageAccounts/tableServices',
+          'name',
+          templateSrv
+        )
+      ).toEqual(
+        '/subscriptions/sub/resourceGroups/group/providers/Microsoft.Storage/storageAccounts/name/tableServices/default'
+      );
+    });
+
+    describe('when using template variables', () => {
+      replaceMock = jest
+        .fn()
+        .mockImplementation((s: string) =>
+          s
+            .replace('$ns', 'Microsoft.Storage/storageAccounts')
+            .replace('$ns2', 'tableServices')
+            .replace('$rs', 'name')
+            .replace('$rs2', 'default')
+        );
+      templateSrv = getTemplateSrv();
+
+      it('builds a resource uri without specifying a subresource (default)', () => {
+        expect(UrlBuilder.buildResourceUri('sub', 'group', '$ns/tableServices', 'name', templateSrv)).toEqual(
+          '/subscriptions/sub/resourceGroups/group/providers/$ns/name/tableServices/default'
+        );
+      });
+
+      it('builds a resource uri specifying a subresource (default)', () => {
+        expect(UrlBuilder.buildResourceUri('sub', 'group', '$ns/tableServices', 'name/default', templateSrv)).toEqual(
+          '/subscriptions/sub/resourceGroups/group/providers/$ns/name/tableServices/default'
+        );
+      });
+
+      it('builds a resource uri specifying a resource template variable', () => {
+        expect(UrlBuilder.buildResourceUri('sub', 'group', '$ns/tableServices', '$rs/default', templateSrv)).toEqual(
+          '/subscriptions/sub/resourceGroups/group/providers/$ns/$rs/tableServices/default'
+        );
+      });
+
+      it('builds a resource uri specifying multiple template variables', () => {
+        expect(UrlBuilder.buildResourceUri('sub', 'group', '$ns/$ns2', '$rs/$rs2', templateSrv)).toEqual(
+          '/subscriptions/sub/resourceGroups/group/providers/$ns/$rs/$ns2/$rs2'
+        );
+      });
+    });
   });
 
   describe('when a resource uri is provided', () => {
     it('builds a getMetricNamesnamespace url', () => {
-      const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl('', '2017-05-01-preview', {
-        resourceUri: '/subscriptions/sub/resource-uri/resource',
-      });
+      const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl(
+        '',
+        '2017-05-01-preview',
+        {
+          resourceUri: '/subscriptions/sub/resource-uri/resource',
+        },
+        templateSrv
+      );
       expect(url).toBe(
         '/subscriptions/sub/resource-uri/resource/providers/microsoft.insights/metricNamespaces?api-version=2017-05-01-preview'
       );
@@ -22,10 +99,15 @@ describe('AzureMonitorUrlBuilder', () => {
 
   describe('when a resource uri and metric namespace is provided', () => {
     it('builds a getMetricNames url', () => {
-      const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-        resourceUri: '/subscriptions/sub/resource-uri/resource',
-        metricNamespace: 'Microsoft.Sql/servers',
-      });
+      const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+        '',
+        '2017-05-01-preview',
+        {
+          resourceUri: '/subscriptions/sub/resource-uri/resource',
+          metricNamespace: 'Microsoft.Sql/servers',
+        },
+        templateSrv
+      );
       expect(url).toBe(
         '/subscriptions/sub/resource-uri/resource/providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=Microsoft.Sql%2Fservers'
       );
@@ -35,12 +117,17 @@ describe('AzureMonitorUrlBuilder', () => {
   describe('Legacy query object', () => {
     describe('when metric definition is Microsoft.NetApp/netAppAccounts/capacityPools/volumes', () => {
       it('should build the getMetricNamespaces url in the even longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes',
-          resourceName: 'rn1/rn2/rn3',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes',
+            resourceName: 'rn1/rn2/rn3',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.NetApp/netAppAccounts/rn1/capacityPools/rn2/volumes/rn3/' +
             'providers/microsoft.insights/metricNamespaces?api-version=2017-05-01-preview'
@@ -50,12 +137,17 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Sql/servers/databases', () => {
       it('should build the getMetricNamespaces url in the longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Sql/servers/databases',
-          resourceName: 'rn1/rn2',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Sql/servers/databases',
+            resourceName: 'rn1/rn2',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Sql/servers/rn1/databases/rn2/' +
             'providers/microsoft.insights/metricNamespaces?api-version=2017-05-01-preview'
@@ -65,12 +157,17 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Sql/servers', () => {
       it('should build the getMetricNamespaces url in the shorter format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Sql/servers',
-          resourceName: 'rn',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamespacesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Sql/servers',
+            resourceName: 'rn',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Sql/servers/rn/' +
             'providers/microsoft.insights/metricNamespaces?api-version=2017-05-01-preview'
@@ -80,13 +177,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.NetApp/netAppAccounts/capacityPools/volumes and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the even longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes',
-          resourceName: 'rn1/rn2/rn3',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes',
+            resourceName: 'rn1/rn2/rn3',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.NetApp/netAppAccounts/rn1/capacityPools/rn2/volumes/rn3/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
@@ -96,13 +198,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Sql/servers/databases and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Sql/servers/databases',
-          resourceName: 'rn1/rn2',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Sql/servers/databases',
+            resourceName: 'rn1/rn2',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Sql/servers/rn1/databases/rn2/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
@@ -112,13 +219,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Sql/servers and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the shorter format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Sql/servers',
-          resourceName: 'rn',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Sql/servers',
+            resourceName: 'rn',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Sql/servers/rn/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
@@ -128,13 +240,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Storage/storageAccounts/blobServices and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Storage/storageAccounts/blobServices',
-          resourceName: 'rn1/default',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Storage/storageAccounts/blobServices',
+            resourceName: 'rn1/default',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/blobServices/default/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
@@ -144,13 +261,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Storage/storageAccounts/fileServices and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Storage/storageAccounts/fileServices',
-          resourceName: 'rn1/default',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Storage/storageAccounts/fileServices',
+            resourceName: 'rn1/default',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/fileServices/default/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
@@ -160,13 +282,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Storage/storageAccounts/tableServices and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Storage/storageAccounts/tableServices',
-          resourceName: 'rn1/default',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Storage/storageAccounts/tableServices',
+            resourceName: 'rn1/default',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/tableServices/default/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
@@ -176,13 +303,18 @@ describe('AzureMonitorUrlBuilder', () => {
 
     describe('when metric definition is Microsoft.Storage/storageAccounts/queueServices and the metricNamespace is default', () => {
       it('should build the getMetricNames url in the longer format', () => {
-        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl('', '2017-05-01-preview', {
-          subscription: 'sub1',
-          resourceGroup: 'rg',
-          metricDefinition: 'Microsoft.Storage/storageAccounts/queueServices',
-          resourceName: 'rn1/default',
-          metricNamespace: 'default',
-        });
+        const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
+          '',
+          '2017-05-01-preview',
+          {
+            subscription: 'sub1',
+            resourceGroup: 'rg',
+            metricDefinition: 'Microsoft.Storage/storageAccounts/queueServices',
+            resourceName: 'rn1/default',
+            metricNamespace: 'default',
+          },
+          templateSrv
+        );
         expect(url).toBe(
           '/subscriptions/sub1/resourceGroups/rg/providers/Microsoft.Storage/storageAccounts/rn1/queueServices/default/' +
             'providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=default'
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.ts
index 7684a543e07..d52df58b96e 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/url_builder.ts
@@ -1,3 +1,5 @@
+import { TemplateSrv } from '@grafana/runtime';
+
 import { GetMetricNamespacesQuery, GetMetricNamesQuery } from '../types';
 
 export default class UrlBuilder {
@@ -5,12 +7,28 @@ export default class UrlBuilder {
     subscriptionId: string,
     resourceGroup: string,
     metricDefinition: string,
-    resourceName: string
+    resourceName: string,
+    templateSrv: TemplateSrv
   ) {
+    const metricDefinitionProcessed = templateSrv.replace(metricDefinition);
     const metricDefinitionArray = metricDefinition.split('/');
+    const resourceNameProcessed = templateSrv.replace(resourceName);
     const resourceNameArray = resourceName.split('/');
     const provider = metricDefinitionArray.shift();
     const urlArray = ['/subscriptions', subscriptionId, 'resourceGroups', resourceGroup, 'providers', provider];
+
+    if (
+      metricDefinitionProcessed.startsWith('Microsoft.Storage/storageAccounts/') &&
+      !resourceNameProcessed.endsWith('default')
+    ) {
+      resourceNameArray.push('default');
+    }
+
+    if (resourceNameArray.length > metricDefinitionArray.length) {
+      const parentResource = resourceNameArray.shift();
+      urlArray.push(parentResource);
+    }
+
     for (const i in metricDefinitionArray) {
       urlArray.push(metricDefinitionArray[i]);
       urlArray.push(resourceNameArray[i]);
@@ -18,20 +36,36 @@ export default class UrlBuilder {
     return urlArray.join('/');
   }
 
-  static buildAzureMonitorGetMetricNamespacesUrl(baseUrl: string, apiVersion: string, query: GetMetricNamespacesQuery) {
+  static buildAzureMonitorGetMetricNamespacesUrl(
+    baseUrl: string,
+    apiVersion: string,
+    query: GetMetricNamespacesQuery,
+    templateSrv: TemplateSrv
+  ) {
     let resourceUri: string;
 
     if ('resourceUri' in query) {
       resourceUri = query.resourceUri;
     } else {
       const { subscription, resourceGroup, metricDefinition, resourceName } = query;
-      resourceUri = UrlBuilder.buildResourceUri(subscription, resourceGroup, metricDefinition, resourceName);
+      resourceUri = UrlBuilder.buildResourceUri(
+        subscription,
+        resourceGroup,
+        metricDefinition,
+        resourceName,
+        templateSrv
+      );
     }
 
     return `${baseUrl}${resourceUri}/providers/microsoft.insights/metricNamespaces?api-version=${apiVersion}`;
   }
 
-  static buildAzureMonitorGetMetricNamesUrl(baseUrl: string, apiVersion: string, query: GetMetricNamesQuery) {
+  static buildAzureMonitorGetMetricNamesUrl(
+    baseUrl: string,
+    apiVersion: string,
+    query: GetMetricNamesQuery,
+    templateSrv: TemplateSrv
+  ) {
     let resourceUri: string;
     const { metricNamespace } = query;
 
@@ -39,7 +73,13 @@ export default class UrlBuilder {
       resourceUri = query.resourceUri;
     } else {
       const { subscription, resourceGroup, metricDefinition, resourceName } = query;
-      resourceUri = UrlBuilder.buildResourceUri(subscription, resourceGroup, metricDefinition, resourceName);
+      resourceUri = UrlBuilder.buildResourceUri(
+        subscription,
+        resourceGroup,
+        metricDefinition,
+        resourceName,
+        templateSrv
+      );
     }
 
     return (
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/usePreparedQuery.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/usePreparedQuery.ts
index 560d734cbf6..9ed96bb1103 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/usePreparedQuery.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/QueryEditor/usePreparedQuery.ts
@@ -2,6 +2,8 @@ import deepEqual from 'fast-deep-equal';
 import { defaults } from 'lodash';
 import { useEffect, useMemo } from 'react';
 
+import { getTemplateSrv } from '@grafana/runtime';
+
 import { AzureMonitorQuery, AzureQueryType } from '../../types';
 import migrateQuery from '../../utils/migrateQuery';
 
@@ -12,7 +14,7 @@ const DEFAULT_QUERY = {
 const prepareQuery = (query: AzureMonitorQuery) => {
   // Note: _.defaults does not apply default values deeply.
   const withDefaults = defaults({}, query, DEFAULT_QUERY);
-  const migratedQuery = migrateQuery(withDefaults);
+  const migratedQuery = migrateQuery(withDefaults, getTemplateSrv());
 
   // If we didn't make any changes to the object, then return the original object to keep the
   // identity the same, and not trigger any other useEffects or anything.
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json
index be3d125d7c4..333257194b9 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/adx.json
@@ -3389,172 +3389,6 @@
         "y": 46
       },
       "hiddenSeries": false,
-      "id": 34,
-      "legend": {
-        "avg": true,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "alertThreshold": true
-      },
-      "percentage": false,
-      "pluginVersion": "7.4.3",
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "appInsights": {
-            "dimension": [],
-            "metricName": "select",
-            "timeGrain": "auto"
-          },
-          "azureLogAnalytics": {
-            "query": "//change this example to create your own time series query\n<table name>                                                              //the table to query (e.g. Usage, Heartbeat, Perf)\n| where $__timeFilter(TimeGenerated)                                      //this is a macro used to show the full chart’s time range, choose the datetime column here\n| summarize count() by <group by column>, bin(TimeGenerated, $__interval) //change “group by column” to a column in your table, such as “Computer”. The $__interval macro is used to auto-select the time grain. Can also use 1h, 5m etc.\n| order by TimeGenerated asc",
-            "resultFormat": "time_series",
-            "workspace": "657b3e91-7c0b-438b-86a5-f769445e237d"
-          },
-          "azureMonitor": {
-            "aggOptions": ["None", "Average", "Minimum", "Maximum", "Total", "Count"],
-            "aggregation": "None",
-            "allowedTimeGrainsMs": [60000, 300000, 900000, 1800000, 3600000, 21600000, 43200000, 86400000],
-            "dimensionFilter": "*",
-            "dimensionFilters": [],
-            "dimensions": [],
-            "metricDefinition": "$ns",
-            "metricName": "SteamingIngestRequestRate",
-            "metricNamespace": "Microsoft.Kusto/clusters",
-            "resourceGroup": "$rg",
-            "resourceName": "$resource",
-            "timeGrain": "auto",
-            "timeGrains": [
-              {
-                "text": "auto",
-                "value": "auto"
-              },
-              {
-                "text": "1 minute",
-                "value": "PT1M"
-              },
-              {
-                "text": "5 minutes",
-                "value": "PT5M"
-              },
-              {
-                "text": "15 minutes",
-                "value": "PT15M"
-              },
-              {
-                "text": "30 minutes",
-                "value": "PT30M"
-              },
-              {
-                "text": "1 hour",
-                "value": "PT1H"
-              },
-              {
-                "text": "6 hours",
-                "value": "PT6H"
-              },
-              {
-                "text": "12 hours",
-                "value": "PT12H"
-              },
-              {
-                "text": "1 day",
-                "value": "P1D"
-              }
-            ],
-            "top": "10"
-          },
-          "insightsAnalytics": {
-            "query": "",
-            "resultFormat": "time_series"
-          },
-          "queryType": "Azure Monitor",
-          "refId": "A",
-          "subscription": "$sub"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Streaming Ingest Request Rate",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ms",
-          "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
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "$ds",
-      "fieldConfig": {
-        "defaults": {
-          "color": {},
-          "custom": {},
-          "thresholds": {
-            "mode": "absolute",
-            "steps": []
-          }
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 10,
-        "w": 6,
-        "x": 18,
-        "y": 46
-      },
-      "hiddenSeries": false,
       "id": 35,
       "legend": {
         "avg": true,
@@ -8484,5 +8318,5 @@
   "timezone": "",
   "title": "Azure / Insights / Data Explorer Clusters",
   "uid": "8UDB1s3Gk",
-  "version": 10
+  "version": 11
 }
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json
index af4f775a4ac..bc4be8330cd 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/dashboards/storage.json
@@ -6426,5 +6426,5 @@
   "timezone": "",
   "title": "Azure / Insights / Storage Accounts",
   "uid": "3n2E8CrGk",
-  "version": 28
+  "version": 29
 }
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
index 6110e9d2ae3..9906180e042 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
@@ -70,7 +70,7 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
 
     for (const baseTarget of options.targets) {
       // Migrate old query structures
-      const target = datasourceMigrations(baseTarget);
+      const target = datasourceMigrations(baseTarget, this.templateSrv);
 
       // Skip hidden or invalid queries or ones without properties
       if (!target.queryType || target.hide || !hasQueryForType(target)) {
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
index 8f60f71fab7..b9ef2a6f01f 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
@@ -1,7 +1,22 @@
+import { getTemplateSrv } from '@grafana/runtime';
+
 import { AzureMetricDimension, AzureMonitorQuery, AzureQueryType } from '../types';
 
 import migrateQuery from './migrateQuery';
 
+let replaceMock = jest.fn().mockImplementation((s: string) => s);
+jest.mock('@grafana/runtime', () => {
+  const original = jest.requireActual('@grafana/runtime');
+  return {
+    ...original,
+    getTemplateSrv: () => ({
+      replace: replaceMock,
+    }),
+  };
+});
+
+let templateSrv = getTemplateSrv();
+
 const azureMonitorQueryV7 = {
   appInsights: { dimension: [], metricName: 'select', timeGrain: 'auto' },
   azureLogAnalytics: {
@@ -82,7 +97,7 @@ const modernMetricsQuery: AzureMonitorQuery = {
 
 describe('AzureMonitor: migrateQuery', () => {
   it('modern queries should not change', () => {
-    const result = migrateQuery(modernMetricsQuery);
+    const result = migrateQuery(modernMetricsQuery, templateSrv);
 
     // MUST use .toBe because we want to assert that the identity of unmigrated queries remains the same
     expect(modernMetricsQuery).toBe(result);
@@ -90,7 +105,7 @@ describe('AzureMonitor: migrateQuery', () => {
 
   describe('migrating from a v7 query to the latest query version', () => {
     it('should build a resource uri', () => {
-      const result = migrateQuery(azureMonitorQueryV7);
+      const result = migrateQuery(azureMonitorQueryV7, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
@@ -104,7 +119,7 @@ describe('AzureMonitor: migrateQuery', () => {
 
   describe('migrating from a v8 query to the latest query version', () => {
     it('should build a resource uri', () => {
-      const result = migrateQuery(azureMonitorQueryV8);
+      const result = migrateQuery(azureMonitorQueryV8, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
@@ -114,6 +129,20 @@ describe('AzureMonitor: migrateQuery', () => {
         })
       );
     });
+
+    it('should not build a resource uri with an unsupported template variable', () => {
+      replaceMock = jest.fn().mockImplementation((s: string) => s.replace('$ns', 'Microsoft.Storage/storageAccounts'));
+      templateSrv = getTemplateSrv();
+      const query = {
+        ...azureMonitorQueryV8,
+        azureMonitor: {
+          ...azureMonitorQueryV8,
+          metricDefinition: '$ns',
+        },
+      };
+      const result = migrateQuery(query, templateSrv);
+      expect(result.azureMonitor?.resourceUri).toBeUndefined();
+    });
   });
 
   describe('migrating from a v9 query to the latest query version', () => {
@@ -121,7 +150,7 @@ describe('AzureMonitor: migrateQuery', () => {
       const dimensionFilters: AzureMetricDimension[] = [
         { dimension: 'TestDimension', operator: 'eq', filters: ['testFilter'] },
       ];
-      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } });
+      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } }, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
@@ -132,7 +161,7 @@ describe('AzureMonitor: migrateQuery', () => {
     });
     it('correctly updates old filter containing wildcard', () => {
       const dimensionFilters: AzureMetricDimension[] = [{ dimension: 'TestDimension', operator: 'eq', filter: '*' }];
-      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } });
+      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } }, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
@@ -145,7 +174,7 @@ describe('AzureMonitor: migrateQuery', () => {
     });
     it('correctly updates old filter containing value', () => {
       const dimensionFilters: AzureMetricDimension[] = [{ dimension: 'TestDimension', operator: 'eq', filter: 'test' }];
-      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } });
+      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } }, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
@@ -160,7 +189,7 @@ describe('AzureMonitor: migrateQuery', () => {
       const dimensionFilters: AzureMetricDimension[] = [
         { dimension: 'TestDimension', operator: 'eq', filter: '*', filters: ['testFilter'] },
       ];
-      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } });
+      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } }, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
@@ -179,7 +208,7 @@ describe('AzureMonitor: migrateQuery', () => {
       const dimensionFilters: AzureMetricDimension[] = [
         { dimension: 'TestDimension', operator: 'eq', filter: 'testFilter', filters: ['testFilter'] },
       ];
-      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } });
+      const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { dimensionFilters } }, templateSrv);
       expect(result).toMatchObject(
         expect.objectContaining({
           azureMonitor: expect.objectContaining({
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
index ca4ba9e8337..54d569302b4 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
@@ -1,3 +1,5 @@
+import { TemplateSrv } from '@grafana/runtime';
+
 import UrlBuilder from '../azure_monitor/url_builder';
 import { setKustoQuery } from '../components/LogsQueryEditor/setQueryValue';
 import {
@@ -9,7 +11,7 @@ import { AzureMetricDimension, AzureMonitorQuery, AzureQueryType } from '../type
 
 const OLD_DEFAULT_DROPDOWN_VALUE = 'select';
 
-export default function migrateQuery(query: AzureMonitorQuery): AzureMonitorQuery {
+export default function migrateQuery(query: AzureMonitorQuery, templateSrv: TemplateSrv): AzureMonitorQuery {
   let workingQuery = query;
 
   // The old angular controller also had a `migrateApplicationInsightsKeys` migraiton that
@@ -21,7 +23,7 @@ export default function migrateQuery(query: AzureMonitorQuery): AzureMonitorQuer
   workingQuery = migrateLogAnalyticsToFromTimes(workingQuery);
   workingQuery = migrateToDefaultNamespace(workingQuery);
   workingQuery = migrateDimensionToDimensionFilter(workingQuery);
-  workingQuery = migrateResourceUri(workingQuery);
+  workingQuery = migrateResourceUri(workingQuery, templateSrv);
   workingQuery = migrateDimensionFilterToArray(workingQuery);
 
   return workingQuery;
@@ -96,7 +98,7 @@ function migrateDimensionToDimensionFilter(query: AzureMonitorQuery): AzureMonit
 // Azure Monitor metric queries prior to Grafana version 9 did not include a `resourceUri`.
 // The resourceUri was previously constructed with the subscription id, resource group,
 // metric definition (a.k.a. resource type), and the resource name.
-function migrateResourceUri(query: AzureMonitorQuery): AzureMonitorQuery {
+function migrateResourceUri(query: AzureMonitorQuery, templateSrv: TemplateSrv): AzureMonitorQuery {
   const azureMonitorQuery = query.azureMonitor;
 
   if (!azureMonitorQuery || azureMonitorQuery.resourceUri) {
@@ -109,7 +111,28 @@ function migrateResourceUri(query: AzureMonitorQuery): AzureMonitorQuery {
     return query;
   }
 
-  const resourceUri = UrlBuilder.buildResourceUri(subscription, resourceGroup, metricDefinition, resourceName);
+  const metricDefinitionArray = metricDefinition.split('/');
+  if (metricDefinitionArray.some((p) => templateSrv.replace(p).split('/').length > 2)) {
+    // If a metric definition includes template variable with a subresource e.g.
+    // Microsoft.Storage/storageAccounts/libraries, it's not possible to generate a valid
+    // resource URI
+    return query;
+  }
+
+  const resourceNameArray = resourceName.split('/');
+  if (resourceNameArray.some((p) => templateSrv.replace(p).split('/').length > 1)) {
+    // If a resource name includes template variable with a subresource e.g.
+    // abc123/def456, it's not possible to generate a valid resource URI
+    return query;
+  }
+
+  const resourceUri = UrlBuilder.buildResourceUri(
+    subscription,
+    resourceGroup,
+    metricDefinition,
+    resourceName,
+    templateSrv
+  );
 
   return {
     ...query,
@@ -159,7 +182,7 @@ function migrateDimensionFilterToArray(query: AzureMonitorQuery): AzureMonitorQu
 
 // datasource.ts also contains some migrations, which have been moved to here. Unsure whether
 // they should also do all the other migrations...
-export function datasourceMigrations(query: AzureMonitorQuery): AzureMonitorQuery {
+export function datasourceMigrations(query: AzureMonitorQuery, templateSrv: TemplateSrv): AzureMonitorQuery {
   let workingQuery = query;
 
   if (!workingQuery.queryType) {
@@ -171,7 +194,7 @@ export function datasourceMigrations(query: AzureMonitorQuery): AzureMonitorQuer
 
   if (workingQuery.queryType === AzureQueryType.AzureMonitor && workingQuery.azureMonitor) {
     workingQuery = migrateDimensionToDimensionFilter(workingQuery);
-    workingQuery = migrateResourceUri(workingQuery);
+    workingQuery = migrateResourceUri(workingQuery, templateSrv);
     workingQuery = migrateDimensionFilterToArray(workingQuery);
   }
 
diff --git a/public/app/plugins/datasource/graphite/datasource.test.ts b/public/app/plugins/datasource/graphite/datasource.test.ts
index 54ce71f387a..b0c271bbdeb 100644
--- a/public/app/plugins/datasource/graphite/datasource.test.ts
+++ b/public/app/plugins/datasource/graphite/datasource.test.ts
@@ -113,7 +113,7 @@ describe('graphiteDatasource', () => {
     const query = {
       panelId: 3,
       dashboardId: 5,
-      range: { raw: { from: 'now-1h', to: 'now' } },
+      range: { from: dateTime('2022-04-01T00:00:00'), to: dateTime('2022-07-01T00:00:00') },
       targets: [{ target: 'prod1.count' }, { target: 'prod2.count' }],
       maxDataPoints: 500,
     };
@@ -157,8 +157,8 @@ describe('graphiteDatasource', () => {
       const params = requestOptions.data.split('&');
       expect(params).toContain('target=prod1.count');
       expect(params).toContain('target=prod2.count');
-      expect(params).toContain('from=-1h');
-      expect(params).toContain('until=now');
+      expect(params).toContain('from=1648789200');
+      expect(params).toContain('until=1656655200');
     });
 
     it('should exclude undefined params', () => {
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index a83b90b2380..51d0a691a57 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -179,8 +179,8 @@ export class GraphiteDatasource
 
   query(options: DataQueryRequest<GraphiteQuery>): Observable<DataQueryResponse> {
     const graphOptions = {
-      from: this.translateTime(options.range.raw.from, false, options.timezone),
-      until: this.translateTime(options.range.raw.to, true, options.timezone),
+      from: this.translateTime(options.range.from, false, options.timezone),
+      until: this.translateTime(options.range.to, true, options.timezone),
       targets: options.targets,
       format: (options as any).format,
       cacheTimeout: options.cacheTimeout || this.cacheTimeout,
diff --git a/public/app/plugins/datasource/influxdb/datasource.ts b/public/app/plugins/datasource/influxdb/datasource.ts
index 3001fcd2467..20c72684e2c 100644
--- a/public/app/plugins/datasource/influxdb/datasource.ts
+++ b/public/app/plugins/datasource/influxdb/datasource.ts
@@ -5,6 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import {
   AnnotationEvent,
+  AnnotationQueryRequest,
   ArrayVector,
   DataFrame,
   DataQueryError,
@@ -21,7 +22,6 @@ import {
   TIME_SERIES_TIME_FIELD_NAME,
   TIME_SERIES_VALUE_FIELD_NAME,
   TimeSeries,
-  AnnotationQueryRequest,
 } from '@grafana/data';
 import {
   BackendDataSourceResponse,
@@ -240,7 +240,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
     if (this.isFlux) {
       return {
         ...query,
-        query: this.templateSrv.replace(query.query ?? '', rest), // The raw query text
+        query: this.templateSrv.replace(query.query ?? '', rest, 'regex'), // The raw query text
       };
     }
 
@@ -368,7 +368,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
       const target: InfluxQuery = {
         refId: 'metricFindQuery',
         datasource: this.getRef(),
-        query: this.templateSrv.replace(options.annotation.query ?? ''),
+        query: this.templateSrv.replace(options.annotation.query ?? '', undefined, 'regex'),
         rawQuery: true,
       };
 
@@ -426,7 +426,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
         return {
           ...query,
           datasource: this.getRef(),
-          query: this.templateSrv.replace(query.query ?? '', scopedVars), // The raw query text
+          query: this.templateSrv.replace(query.query ?? '', scopedVars, 'regex'), // The raw query text
         };
       }
 
@@ -475,7 +475,7 @@ export default class InfluxDatasource extends DataSourceWithBackend<InfluxQuery,
 
     return {
       ...expandedQuery,
-      query: this.templateSrv.replace(query.query ?? '', rest), // The raw query text
+      query: this.templateSrv.replace(query.query ?? '', rest, 'regex'), // The raw query text
       alias: this.templateSrv.replace(query.alias ?? '', scopedVars),
       limit: this.templateSrv.replace(query.limit?.toString() ?? '', scopedVars, 'regex'),
       measurement: this.templateSrv.replace(query.measurement ?? '', scopedVars, 'regex'),
diff --git a/public/app/plugins/datasource/influxdb/specs/datasource.test.ts b/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
index 4c0f58ca288..5cb4ead529c 100644
--- a/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
+++ b/public/app/plugins/datasource/influxdb/specs/datasource.test.ts
@@ -1,6 +1,7 @@
 import { lastValueFrom, of } from 'rxjs';
 import { TemplateSrvStub } from 'test/specs/helpers';
 
+import { ScopedVars } from '@grafana/data/src';
 import { FetchResponse } from '@grafana/runtime';
 import config from 'app/core/config';
 import { backendSrv } from 'app/core/services/backend_srv'; // will use the version in __mocks__
@@ -179,15 +180,31 @@ describe('InfluxDataSource', () => {
   });
 
   describe('Variables should be interpolated correctly', () => {
-    const templateSrv: any = { replace: jest.fn() };
     const instanceSettings: any = {};
-    const ds = new InfluxDatasource(instanceSettings, templateSrv);
     const text = 'interpolationText';
-    templateSrv.replace.mockReturnValue(text);
+    const text2 = 'interpolationText2';
+    const textWithoutFormatRegex = 'interpolationText,interpolationText2';
+    const textWithFormatRegex = 'interpolationText|interpolationText2';
+    const variableMap: Record<string, string> = {
+      $interpolationVar: text,
+      $interpolationVar2: text2,
+    };
+    const templateSrv: any = {
+      replace: jest.fn((target?: string, scopedVars?: ScopedVars, format?: string | Function): string => {
+        if (!format) {
+          return variableMap[target!] || '';
+        }
+        if (format === 'regex') {
+          return textWithFormatRegex;
+        }
+        return textWithoutFormatRegex;
+      }),
+    };
+    const ds = new InfluxDatasource(instanceSettings, templateSrv);
 
     const fluxQuery = {
       refId: 'x',
-      query: '$interpolationVar',
+      query: '$interpolationVar,$interpolationVar2',
     };
 
     const influxQuery = {
@@ -202,7 +219,7 @@ describe('InfluxDataSource', () => {
         {
           key: 'cpu',
           operator: '=~',
-          value: '/^$interpolationVar$/',
+          value: '/^$interpolationVar,$interpolationVar2$/',
         },
       ],
       groupBy: [
@@ -223,20 +240,20 @@ describe('InfluxDataSource', () => {
 
     function fluxChecks(query: any) {
       expect(templateSrv.replace).toBeCalledTimes(1);
-      expect(query).toBe(text);
+      expect(query).toBe(textWithFormatRegex);
     }
 
     function influxChecks(query: any) {
       expect(templateSrv.replace).toBeCalledTimes(10);
       expect(query.alias).toBe(text);
-      expect(query.measurement).toBe(text);
-      expect(query.policy).toBe(text);
-      expect(query.limit).toBe(text);
-      expect(query.slimit).toBe(text);
+      expect(query.measurement).toBe(textWithFormatRegex);
+      expect(query.policy).toBe(textWithFormatRegex);
+      expect(query.limit).toBe(textWithFormatRegex);
+      expect(query.slimit).toBe(textWithFormatRegex);
       expect(query.tz).toBe(text);
-      expect(query.tags![0].value).toBe(text);
-      expect(query.groupBy![0].params![0]).toBe(text);
-      expect(query.select![0][0].params![0]).toBe(text);
+      expect(query.tags![0].value).toBe(textWithFormatRegex);
+      expect(query.groupBy![0].params![0]).toBe(textWithFormatRegex);
+      expect(query.select![0][0].params![0]).toBe(textWithFormatRegex);
     }
 
     describe('when interpolating query variables for dashboard->explore', () => {
@@ -244,6 +261,7 @@ describe('InfluxDataSource', () => {
         ds.isFlux = true;
         const queries = ds.interpolateVariablesInQueries([fluxQuery], {
           interpolationVar: { text: text, value: text },
+          interpolationVar2: { text: text2, value: text2 },
         });
         fluxChecks(queries[0].query);
       });
@@ -252,6 +270,7 @@ describe('InfluxDataSource', () => {
         ds.isFlux = false;
         const queries = ds.interpolateVariablesInQueries([influxQuery], {
           interpolationVar: { text: text, value: text },
+          interpolationVar2: { text: text2, value: text2 },
         });
         influxChecks(queries[0]);
       });
@@ -260,7 +279,12 @@ describe('InfluxDataSource', () => {
     describe('when interpolating template variables', () => {
       it('should apply all template variables with Flux mode', () => {
         ds.isFlux = true;
-        const query = ds.applyTemplateVariables(fluxQuery, { interpolationVar: { text: text, value: text } });
+        const query = ds.applyTemplateVariables(fluxQuery, {
+          interpolationVar: {
+            text: text,
+            value: text,
+          },
+        });
         fluxChecks(query.query);
       });
 
@@ -268,7 +292,10 @@ describe('InfluxDataSource', () => {
         ds.isFlux = false;
         ds.access = 'proxy';
         config.featureToggles.influxdbBackendMigration = true;
-        const query = ds.applyTemplateVariables(influxQuery, { interpolationVar: { text: text, value: text } });
+        const query = ds.applyTemplateVariables(influxQuery, {
+          interpolationVar: { text: text, value: text },
+          interpolationVar2: { text: 'interpolationText2', value: 'interpolationText2' },
+        });
         influxChecks(query);
       });
     });
diff --git a/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx b/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx
index 46fcb204394..a4ba733a55a 100644
--- a/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/jaeger/components/ConfigEditor.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { DataSourceHttpSettings } from '@grafana/ui';
+import { SpanBarSettings } from '@jaegertracing/jaeger-ui-components';
 import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
@@ -32,6 +33,10 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
       <div className="gf-form-group">
         <NodeGraphSettings options={options} onOptionsChange={onOptionsChange} />
       </div>
+
+      <div className="gf-form-group">
+        <SpanBarSettings options={options} onOptionsChange={onOptionsChange} />
+      </div>
     </>
   );
 };
diff --git a/public/app/plugins/datasource/jaeger/datasource.ts b/public/app/plugins/datasource/jaeger/datasource.ts
index ec991e7ed63..bc8be4bc02a 100644
--- a/public/app/plugins/datasource/jaeger/datasource.ts
+++ b/public/app/plugins/datasource/jaeger/datasource.ts
@@ -15,6 +15,7 @@ import {
   ScopedVars,
 } from '@grafana/data';
 import { BackendSrvRequest, getBackendSrv, getTemplateSrv, TemplateSrv } from '@grafana/runtime';
+import { SpanBarOptions } from '@jaegertracing/jaeger-ui-components';
 import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
 import { serializeParams } from 'app/core/utils/fetch';
 import { getTimeSrv, TimeSrv } from 'app/features/dashboard/services/TimeSrv';
@@ -32,6 +33,7 @@ export interface JaegerJsonData extends DataSourceJsonData {
 export class JaegerDatasource extends DataSourceApi<JaegerQuery, JaegerJsonData> {
   uploadedJson: string | ArrayBuffer | null = null;
   nodeGraph?: NodeGraphOptions;
+  spanBar?: SpanBarOptions;
   constructor(
     private instanceSettings: DataSourceInstanceSettings<JaegerJsonData>,
     private readonly timeSrv: TimeSrv = getTimeSrv(),
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
index 13fff38993b..ed8f544e0b5 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/LokiQueryBuilder.tsx
@@ -19,10 +19,9 @@ export interface Props {
   datasource: LokiDatasource;
   onChange: (update: LokiVisualQuery) => void;
   onRunQuery: () => void;
-  nested?: boolean;
 }
 
-export const LokiQueryBuilder = React.memo<Props>(({ datasource, query, nested, onChange, onRunQuery }) => {
+export const LokiQueryBuilder = React.memo<Props>(({ datasource, query, onChange, onRunQuery }) => {
   const onChangeLabels = (labels: QueryBuilderLabelFilter[]) => {
     onChange({ ...query, labels });
   };
diff --git a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx
index fbd4ed2074f..c4431109680 100644
--- a/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx
+++ b/public/app/plugins/datasource/loki/querybuilder/components/NestedQuery.tsx
@@ -76,7 +76,6 @@ export const NestedQuery = React.memo<Props>(({ nestedQuery, index, datasource,
           <LokiQueryBuilder
             query={nestedQuery.query}
             datasource={datasource}
-            nested={true}
             onRunQuery={onRunQuery}
             onChange={(update) => {
               onChange(index, { ...nestedQuery, query: update });
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
index 2bf6c16c66c..8656301af53 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/NestedQuery.tsx
@@ -76,7 +76,6 @@ export const NestedQuery = React.memo<Props>(({ nestedQuery, index, datasource,
           <PromQueryBuilder
             query={nestedQuery.query}
             datasource={datasource}
-            nested={true}
             onRunQuery={onRunQuery}
             onChange={(update) => {
               onChange(index, { ...nestedQuery, query: update });
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
index 3fba042d304..078f02d0b69 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/components/PromQueryBuilder.tsx
@@ -21,7 +21,6 @@ export interface Props {
   datasource: PrometheusDatasource;
   onChange: (update: PromVisualQuery) => void;
   onRunQuery: () => void;
-  nested?: boolean;
   data?: PanelData;
 }
 
diff --git a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
index 7ca2d4630d4..f6acf54caae 100644
--- a/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
+++ b/public/app/plugins/datasource/prometheus/querybuilder/shared/OperationHeader.tsx
@@ -79,7 +79,16 @@ export const OperationHeader = React.memo<Props>(
                 if (value.value) {
                   // Operation should exist if it is selectable
                   const newDef = queryModeller.getOperationDef(value.value.id)!;
-                  let changedOp = { ...operation, id: value.value.id };
+
+                  // copy default params, and override with all current params
+                  const newParams = [...newDef.defaultParams];
+                  for (let i = 0; i < Math.min(operation.params.length, newParams.length); i++) {
+                    if (newDef.params[i].type === def.params[i].type) {
+                      newParams[i] = operation.params[i];
+                    }
+                  }
+
+                  const changedOp = { ...operation, params: newParams, id: value.value.id };
                   onChange(index, def.changeTypeHandler ? def.changeTypeHandler(changedOp, newDef) : changedOp);
                 }
               }}
diff --git a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
index 98140dee30f..ee2763991d5 100644
--- a/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/tempo/configuration/ConfigEditor.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { DataSourceHttpSettings } from '@grafana/ui';
+import { SpanBarSettings } from '@jaegertracing/jaeger-ui-components';
 import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
@@ -50,6 +51,10 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
       <div className="gf-form-group">
         <LokiSearchSettings options={options} onOptionsChange={onOptionsChange} />
       </div>
+
+      <div className="gf-form-group">
+        <SpanBarSettings options={options} onOptionsChange={onOptionsChange} />
+      </div>
     </>
   );
 };
diff --git a/public/app/plugins/datasource/tempo/datasource.ts b/public/app/plugins/datasource/tempo/datasource.ts
index 0c70376010a..dec0213a80d 100644
--- a/public/app/plugins/datasource/tempo/datasource.ts
+++ b/public/app/plugins/datasource/tempo/datasource.ts
@@ -24,6 +24,7 @@ import {
   TemplateSrv,
   getTemplateSrv,
 } from '@grafana/runtime';
+import { SpanBarOptions } from '@jaegertracing/jaeger-ui-components';
 import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsOptions } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { serializeParams } from 'app/core/utils/fetch';
@@ -65,6 +66,9 @@ export interface TempoJsonData extends DataSourceJsonData {
   lokiSearch?: {
     datasourceUid?: string;
   };
+  spanBar?: {
+    tag: string;
+  };
 }
 
 export interface TempoQuery extends DataQuery {
@@ -105,6 +109,7 @@ export class TempoDatasource extends DataSourceWithBackend<TempoQuery, TempoJson
     datasourceUid?: string;
   };
   uploadedJson?: string | ArrayBuffer | null = null;
+  spanBar?: SpanBarOptions;
 
   constructor(
     private instanceSettings: DataSourceInstanceSettings<TempoJsonData>,
diff --git a/public/app/plugins/datasource/testdata/components/CSVWaveEditor.tsx b/public/app/plugins/datasource/testdata/components/CSVWaveEditor.tsx
index b1090c2d6c1..585112ec037 100644
--- a/public/app/plugins/datasource/testdata/components/CSVWaveEditor.tsx
+++ b/public/app/plugins/datasource/testdata/components/CSVWaveEditor.tsx
@@ -1,9 +1,9 @@
-import React, { ChangeEvent, PureComponent } from 'react';
+import React, { PureComponent, useState } from 'react';
 
 import { Button, InlineField, InlineFieldRow, Input } from '@grafana/ui';
 
 import { defaultCSVWaveQuery } from '../constants';
-import { CSVWave } from '../types';
+import type { CSVWave } from '../types';
 
 interface WavesProps {
   waves?: CSVWave[];
@@ -18,59 +18,74 @@ interface WaveProps {
   onAdd: () => void;
 }
 
-class CSVWaveEditor extends PureComponent<WaveProps> {
-  onFieldChange = (field: keyof CSVWave) => (e: ChangeEvent<HTMLInputElement>) => {
-    const { value } = e.target as HTMLInputElement;
-
-    this.props.onChange(this.props.index, {
-      ...this.props.wave,
-      [field]: value,
-    });
-  };
-
-  onNameChange = this.onFieldChange('name');
-  onLabelsChange = this.onFieldChange('labels');
-  onCSVChange = this.onFieldChange('valuesCSV');
-  onTimeStepChange = (e: ChangeEvent<HTMLInputElement>) => {
-    const timeStep = e.target.valueAsNumber;
-    this.props.onChange(this.props.index, {
-      ...this.props.wave,
-      timeStep,
-    });
-  };
-
-  render() {
-    const { wave, last } = this.props;
-    let action = this.props.onAdd;
-    if (!last) {
-      action = () => {
-        this.props.onChange(this.props.index, undefined); // remove
-      };
+const CSVWaveEditor = (props: WaveProps) => {
+  const { wave, last, index, onAdd, onChange } = props;
+  const [valuesCSV, setValuesCSV] = useState(wave.valuesCSV || '');
+  const [labels, setLabels] = useState(wave.labels || '');
+  const [name, setName] = useState(wave.name || '');
+  const onAction = () => {
+    if (last) {
+      onAdd();
+    } else {
+      onChange(index, undefined);
     }
+  };
+  const onValueChange = <K extends keyof CSVWave, V extends CSVWave[K]>(key: K, value: V) => {
+    onChange(index, { ...wave, [key]: value });
+  };
+  const onKeyDown = (evt: React.KeyboardEvent<HTMLInputElement>) => {
+    if (evt.key === 'Enter') {
+      onValueChange('valuesCSV', valuesCSV);
+    }
+  };
 
-    return (
-      <InlineFieldRow>
-        <InlineField
-          label={'Values'}
-          grow
-          tooltip="Comma separated values. Each value may be an int, float, or null and must not be empty. Whitespace and trailing commas are removed"
-        >
-          <Input value={wave.valuesCSV} placeholder={'CSV values'} onChange={this.onCSVChange} autoFocus={true} />
-        </InlineField>
-        <InlineField label={'Step'} tooltip="The number of seconds between datapoints.">
-          <Input value={wave.timeStep} type="number" placeholder={'60'} width={6} onChange={this.onTimeStepChange} />
-        </InlineField>
-        <InlineField label={'Labels'}>
-          <Input value={wave.labels} placeholder={'labels'} width={12} onChange={this.onLabelsChange} />
-        </InlineField>
-        <InlineField label={'Name'}>
-          <Input value={wave.name} placeholder={'name'} width={10} onChange={this.onNameChange} />
-        </InlineField>
-        <Button icon={last ? 'plus' : 'minus'} variant="secondary" onClick={action} />
-      </InlineFieldRow>
-    );
-  }
-}
+  return (
+    <InlineFieldRow>
+      <InlineField
+        label={'Values'}
+        grow
+        tooltip="Comma separated values. Each value may be an int, float, or null and must not be empty. Whitespace and trailing commas are removed"
+      >
+        <Input
+          value={valuesCSV}
+          placeholder={'CSV values'}
+          onChange={(e) => setValuesCSV(e.currentTarget.value)}
+          autoFocus={true}
+          onBlur={() => onValueChange('valuesCSV', valuesCSV)}
+          onKeyDown={onKeyDown}
+        />
+      </InlineField>
+      <InlineField label={'Step'} tooltip="The number of seconds between datapoints.">
+        <Input
+          value={wave.timeStep}
+          type="number"
+          placeholder={'60'}
+          width={10}
+          onChange={(e) => onValueChange('timeStep', e.currentTarget.valueAsNumber)}
+        />
+      </InlineField>
+      <InlineField label={'Name'}>
+        <Input
+          value={name}
+          placeholder={'name'}
+          width={10}
+          onChange={(e) => setName(e.currentTarget.value)}
+          onBlur={() => onValueChange('name', name)}
+        />
+      </InlineField>
+      <InlineField label={'Labels'}>
+        <Input
+          value={labels}
+          placeholder={'labels'}
+          width={12}
+          onChange={(e) => setLabels(e.currentTarget.value)}
+          onBlur={() => onValueChange('labels', labels)}
+        />
+      </InlineField>
+      <Button icon={last ? 'plus' : 'minus'} variant="secondary" onClick={onAction} />
+    </InlineFieldRow>
+  );
+};
 
 export class CSVWavesEditor extends PureComponent<WavesProps> {
   onChange = (index: number, wave?: CSVWave) => {
diff --git a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
index fc876e5a91e..c864748c688 100644
--- a/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
+++ b/public/app/plugins/datasource/zipkin/ConfigEditor.tsx
@@ -3,6 +3,7 @@ import React from 'react';
 import { DataSourcePluginOptionsEditorProps } from '@grafana/data';
 import { config } from '@grafana/runtime';
 import { DataSourceHttpSettings } from '@grafana/ui';
+import { SpanBarSettings } from '@jaegertracing/jaeger-ui-components';
 import { NodeGraphSettings } from 'app/core/components/NodeGraphSettings';
 import { TraceToLogsSettings } from 'app/core/components/TraceToLogs/TraceToLogsSettings';
 import { TraceToMetricsSettings } from 'app/core/components/TraceToMetrics/TraceToMetricsSettings';
@@ -32,6 +33,10 @@ export const ConfigEditor: React.FC<Props> = ({ options, onOptionsChange }) => {
       <div className="gf-form-group">
         <NodeGraphSettings options={options} onOptionsChange={onOptionsChange} />
       </div>
+
+      <div className="gf-form-group">
+        <SpanBarSettings options={options} onOptionsChange={onOptionsChange} />
+      </div>
     </>
   );
 };
diff --git a/public/app/plugins/datasource/zipkin/datasource.ts b/public/app/plugins/datasource/zipkin/datasource.ts
index 81af519b902..4c088c4548c 100644
--- a/public/app/plugins/datasource/zipkin/datasource.ts
+++ b/public/app/plugins/datasource/zipkin/datasource.ts
@@ -11,6 +11,7 @@ import {
   MutableDataFrame,
 } from '@grafana/data';
 import { BackendSrvRequest, FetchResponse, getBackendSrv } from '@grafana/runtime';
+import { SpanBarOptions } from '@jaegertracing/jaeger-ui-components';
 import { NodeGraphOptions } from 'app/core/components/NodeGraphSettings';
 
 import { serializeParams } from '../../../core/utils/fetch';
@@ -27,6 +28,7 @@ export interface ZipkinJsonData extends DataSourceJsonData {
 export class ZipkinDatasource extends DataSourceApi<ZipkinQuery, ZipkinJsonData> {
   uploadedJson: string | ArrayBuffer | null = null;
   nodeGraph?: NodeGraphOptions;
+  spanBar?: SpanBarOptions;
   constructor(private instanceSettings: DataSourceInstanceSettings<ZipkinJsonData>) {
     super(instanceSettings);
     this.nodeGraph = instanceSettings.jsonData.nodeGraph;
diff --git a/public/app/plugins/panel/barchart/models.gen.ts b/public/app/plugins/panel/barchart/models.gen.ts
index 8068fa61aa3..1653e84f877 100644
--- a/public/app/plugins/panel/barchart/models.gen.ts
+++ b/public/app/plugins/panel/barchart/models.gen.ts
@@ -45,5 +45,4 @@ export const defaultBarChartFieldConfig: BarChartFieldConfig = {
   lineWidth: 1,
   fillOpacity: 80,
   gradientMode: GraphGradientMode.None,
-  axisSoftMin: 0,
 };
diff --git a/public/app/plugins/panel/barchart/utils.ts b/public/app/plugins/panel/barchart/utils.ts
index 1a45b42a2bb..9d24655bf16 100644
--- a/public/app/plugins/panel/barchart/utils.ts
+++ b/public/app/plugins/panel/barchart/utils.ts
@@ -173,6 +173,18 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
     const scaleColor = getFieldSeriesColor(field, theme);
     const seriesColor = scaleColor.color;
 
+    // make barcharts start at 0 unless explicitly overridden
+    let softMin = customConfig.axisSoftMin;
+    let softMax = customConfig.axisSoftMax;
+
+    if (softMin == null && field.config.min == null) {
+      softMin = 0;
+    }
+
+    if (softMax == null && field.config.max == null) {
+      softMax = 0;
+    }
+
     builder.addSeries({
       scaleKey,
       pxAlign: true,
@@ -187,8 +199,8 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
       thresholds: field.config.thresholds,
       hardMin: field.config.min,
       hardMax: field.config.max,
-      softMin: customConfig.axisSoftMin,
-      softMax: customConfig.axisSoftMax,
+      softMin,
+      softMax,
 
       // The following properties are not used in the uPlot config, but are utilized as transport for legend config
       // PlotLegend currently gets unfiltered DataFrame[], so index must be into that field array, not the prepped frame's which we're iterating here
@@ -207,8 +219,8 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn<BarChartOptionsEX> = ({
       scaleKey,
       min: field.config.min,
       max: field.config.max,
-      softMin: customConfig.axisSoftMin,
-      softMax: customConfig.axisSoftMax,
+      softMin,
+      softMax,
       orientation: vizOrientation.yOri,
       direction: vizOrientation.yDir,
       distribution: customConfig.scaleDistribution?.type,
diff --git a/public/app/plugins/panel/geomap/GeomapPanel.tsx b/public/app/plugins/panel/geomap/GeomapPanel.tsx
index 92203974659..0647d99a707 100644
--- a/public/app/plugins/panel/geomap/GeomapPanel.tsx
+++ b/public/app/plugins/panel/geomap/GeomapPanel.tsx
@@ -7,11 +7,10 @@ import Attribution from 'ol/control/Attribution';
 import ScaleLine from 'ol/control/ScaleLine';
 import Zoom from 'ol/control/Zoom';
 import { Coordinate } from 'ol/coordinate';
-import { createEmpty, extend, isEmpty } from 'ol/extent';
+import { isEmpty } from 'ol/extent';
 import { defaults as interactionDefaults } from 'ol/interaction';
 import MouseWheelZoom from 'ol/interaction/MouseWheelZoom';
 import BaseLayer from 'ol/layer/Base';
-import VectorLayer from 'ol/layer/Vector';
 import { fromLonLat, toLonLat } from 'ol/proj';
 import React, { Component, ReactNode } from 'react';
 import { Subject, Subscription } from 'rxjs';
@@ -40,6 +39,7 @@ import { getGlobalStyles } from './globalStyles';
 import { defaultMarkersConfig, MARKERS_LAYER_ID } from './layers/data/markersLayer';
 import { DEFAULT_BASEMAP_CONFIG, geomapLayerRegistry } from './layers/registry';
 import { ControlsOptions, GeomapPanelOptions, MapLayerState, MapViewConfig, TooltipMode } from './types';
+import { getLayersExtent } from './utils/getLayersExtent';
 import { centerPointRegistry, MapCenterID } from './view';
 
 // Allows multiple panels to share the same view instance
@@ -590,11 +590,7 @@ export class GeomapPanel extends Component<Props, State> {
         if (v.id === MapCenterID.Coordinates) {
           coord = [config.lon ?? 0, config.lat ?? 0];
         } else if (v.id === MapCenterID.Fit) {
-          var extent = layers
-            .getArray()
-            .filter((l) => l instanceof VectorLayer)
-            .map((l) => (l as VectorLayer<any>).getSource().getExtent() ?? [])
-            .reduce(extend, createEmpty());
+          const extent = getLayersExtent(layers);
           if (!isEmpty(extent)) {
             view.fit(extent, {
               padding: [30, 30, 30, 30],
diff --git a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
index 29f4840eed4..23ad642e9f0 100644
--- a/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
+++ b/public/app/plugins/panel/geomap/layers/data/routeLayer.tsx
@@ -6,10 +6,15 @@ import {
   FrameGeometrySourceMode,
   PluginState,
   EventBus,
+  DataHoverEvent,
+  DataHoverClearEvent,
+  DataFrame,
+  TIME_SERIES_TIME_FIELD_NAME,
 } from '@grafana/data';
 import Map from 'ol/Map';
 import { FeatureLike } from 'ol/Feature';
-import { getLocationMatchers } from 'app/features/geo/utils/location';
+import { Subscription, throttleTime } from 'rxjs';
+import { getGeometryField, getLocationMatchers } from 'app/features/geo/utils/location';
 import { getColorDimension } from 'app/features/dimensions';
 import { defaultStyleConfig, StyleConfig, StyleDimensions } from '../../style/types';
 import { StyleEditor } from './StyleEditor';
@@ -18,6 +23,11 @@ import VectorLayer from 'ol/layer/Vector';
 import { isNumber } from 'lodash';
 import { routeStyle } from '../../style/markers';
 import { FrameVectorSource } from 'app/features/geo/utils/frameVectorSource';
+import { Group as LayerGroup } from 'ol/layer';
+import VectorSource from 'ol/source/Vector';
+import { Fill, Stroke, Style, Circle } from 'ol/style';
+import Feature from 'ol/Feature';
+import { alpha } from '@grafana/data/src/themes/colorManipulator';
 
 // Configuration options for Circle overlays
 export interface RouteConfig {
@@ -70,9 +80,7 @@ export const routeLayer: MapLayerRegistryItem<RouteConfig> = {
     const style = await getStyleConfigState(config.style);
     const location = await getLocationMatchers(options.location);
     const source = new FrameVectorSource(location);
-    const vectorLayer = new VectorLayer({
-      source,
-    });
+    const vectorLayer = new VectorLayer({ source });
 
     if (!style.fields) {
       // Set a global style
@@ -94,8 +102,70 @@ export const routeLayer: MapLayerRegistryItem<RouteConfig> = {
       });
     }
 
+    // Crosshair layer
+    const crosshairFeature = new Feature({});
+    const crosshairRadius = (style.base.lineWidth || 6) + 2;
+    const crosshairStyle = new Style({
+      image: new Circle({
+        radius: crosshairRadius,
+        stroke: new Stroke({
+          color: alpha(style.base.color, 0.4),
+          width: crosshairRadius + 2
+        }),
+        fill: new Fill({color: style.base.color}),
+      })
+    });
+
+    const crosshairLayer = new VectorLayer({
+      source: new VectorSource({
+        features: [crosshairFeature],
+      }),
+      style: crosshairStyle,
+    });
+
+    const layer = new LayerGroup({
+      layers: [vectorLayer, crosshairLayer]
+    });
+
+    // Crosshair sharing subscriptions
+    const subscriptions = new Subscription();
+
+    subscriptions.add(
+      eventBus
+        .getStream(DataHoverEvent)
+        .pipe(throttleTime(8))
+        .subscribe({
+          next: (event) => {
+            const feature = source.getFeatures()[0];
+            const frame = feature?.get('frame') as DataFrame;
+            const time = event.payload?.point?.time as number;
+            if (frame && time) {
+              const timeField = frame.fields.find((f) => f.name === TIME_SERIES_TIME_FIELD_NAME);
+              if (timeField) {
+                const timestamps: number[] = timeField.values.toArray();
+                const pointIdx = findNearestTimeIndex(timestamps, time);
+                if (pointIdx !== null) {
+                  const out = getGeometryField(frame, location);
+                  if (out.field) {
+                    crosshairFeature.setGeometry(out.field.values.get(pointIdx));
+                    crosshairFeature.setStyle(crosshairStyle);
+                  }
+                }
+              }
+            }
+          },
+        })
+    );
+
+    subscriptions.add(
+      eventBus.subscribe(DataHoverClearEvent, (event) => {
+        crosshairFeature.setStyle(new Style({}));
+      })
+    );
+
     return {
-      init: () => vectorLayer,
+      init: () => layer,
+      dispose: () => subscriptions.unsubscribe(),
       update: (data: PanelData) => {
         if (!data.series?.length) {
           return; // ignore empty
@@ -145,3 +215,34 @@ export const routeLayer: MapLayerRegistryItem<RouteConfig> = {
   // fill in the default values
   defaultOptions,
 };
+
+function findNearestTimeIndex(timestamps: number[], time: number): number | null {
+  if (timestamps.length === 0) {
+    return null;
+  } else if (timestamps.length === 1) {
+    return 0;
+  }
+  const lastIdx = timestamps.length - 1;
+  if (time < timestamps[0]) {
+    return 0;
+  } else if (time > timestamps[lastIdx]) {
+    return lastIdx;
+  }
+
+  const probableIdx = Math.abs(Math.round(lastIdx * (time - timestamps[0]) / (timestamps[lastIdx] - timestamps[0])));
+  if (time < timestamps[probableIdx]) {
+    for (let i = probableIdx; i > 0; i--) {
+      if (time > timestamps[i]) {
+        return i;
+      }
+    }
+    return 0;
+  } else {
+    for (let i = probableIdx; i < lastIdx; i++) {
+      if (time < timestamps[i]) {
+        return i;
+      }
+    }
+    return lastIdx;
+  }
+}
diff --git a/public/app/plugins/panel/geomap/utils/getLayersExtent.ts b/public/app/plugins/panel/geomap/utils/getLayersExtent.ts
new file mode 100644
index 00000000000..fe73c991a6a
--- /dev/null
+++ b/public/app/plugins/panel/geomap/utils/getLayersExtent.ts
@@ -0,0 +1,33 @@
+import { Collection } from 'ol';
+import { createEmpty, extend, Extent } from 'ol/extent';
+import BaseLayer from 'ol/layer/Base';
+import LayerGroup from 'ol/layer/Group';
+import VectorLayer from 'ol/layer/Vector';
+
+export function getLayersExtent(layers: Collection<BaseLayer>): Extent {
+  return layers
+    .getArray()
+    .filter((l) => l instanceof VectorLayer || l instanceof LayerGroup)
+    .flatMap((l) => {
+      if (l instanceof LayerGroup) {
+        return getLayerGroupExtent(l);
+      } else if (l instanceof VectorLayer) {
+        return l.getSource().getExtent() ?? [];
+      }
+    })
+    .reduce(extend, createEmpty());
+}
+
+export function getLayerGroupExtent(lg: LayerGroup) {
+  return lg
+    .getLayers()
+    .getArray()
+    .filter((l) => l instanceof VectorLayer)
+    .map((l) => {
+      if (l instanceof VectorLayer) {
+        return l.getSource().getExtent() ?? [];
+      } else {
+        return [];
+      }
+    });
+}
diff --git a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
index 09746ba56c8..d65827d48a9 100644
--- a/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
+++ b/public/app/plugins/panel/state-timeline/StateTimelinePanel.tsx
@@ -4,6 +4,9 @@ import { DataFrame, FieldType, PanelProps } from '@grafana/data';
 import { TooltipPlugin, useTheme2, ZoomPlugin, usePanelContext } from '@grafana/ui';
 import { getLastStreamingDataFramePacket } from 'app/features/live/data/StreamingDataFrame';
 
+import { AnnotationEditorPlugin } from '../timeseries/plugins/AnnotationEditorPlugin';
+import { AnnotationsPlugin } from '../timeseries/plugins/AnnotationsPlugin';
+import { ContextMenuPlugin } from '../timeseries/plugins/ContextMenuPlugin';
 import { OutsideRangePlugin } from '../timeseries/plugins/OutsideRangePlugin';
 
 import { StateTimelineTooltip } from './StateTimelineTooltip';
@@ -23,10 +26,11 @@ export const StateTimelinePanel: React.FC<TimelinePanelProps> = ({
   options,
   width,
   height,
+  replaceVariables,
   onChangeTimeRange,
 }) => {
   const theme = useTheme2();
-  const { sync } = usePanelContext();
+  const { sync, canAddAnnotations } = usePanelContext();
 
   const { frames, warn } = useMemo(
     () => prepareTimelineFields(data?.series, options.mergeValues ?? true, timeRange, theme),
@@ -92,6 +96,7 @@ export const StateTimelinePanel: React.FC<TimelinePanelProps> = ({
       // console.log('STREAM Packet', packet);
     }
   }
+  const enableAnnotationCreation = Boolean(canAddAnnotations && canAddAnnotations());
 
   return (
     <TimelineChart
@@ -119,6 +124,42 @@ export const StateTimelinePanel: React.FC<TimelinePanelProps> = ({
               renderTooltip={renderCustomTooltip}
             />
             <OutsideRangePlugin config={config} onChangeTimeRange={onChangeTimeRange} />
+
+            {data.annotations && (
+              <AnnotationsPlugin annotations={data.annotations} config={config} timeZone={timeZone} />
+            )}
+
+            {enableAnnotationCreation && (
+              <AnnotationEditorPlugin data={alignedFrame} timeZone={timeZone} config={config}>
+                {({ startAnnotating }) => {
+                  return (
+                    <ContextMenuPlugin
+                      data={alignedFrame}
+                      config={config}
+                      timeZone={timeZone}
+                      replaceVariables={replaceVariables}
+                      defaultItems={[
+                        {
+                          items: [
+                            {
+                              label: 'Add annotation',
+                              ariaLabel: 'Add annotation',
+                              icon: 'comment-alt',
+                              onClick: (e, p) => {
+                                if (!p) {
+                                  return;
+                                }
+                                startAnnotating({ coords: p.coords });
+                              },
+                            },
+                          ],
+                        },
+                      ]}
+                    />
+                  );
+                }}
+              </AnnotationEditorPlugin>
+            )}
           </>
         );
       }}
diff --git a/public/app/plugins/panel/state-timeline/module.tsx b/public/app/plugins/panel/state-timeline/module.tsx
index b807fb42f4a..5fdd2ab1bbb 100644
--- a/public/app/plugins/panel/state-timeline/module.tsx
+++ b/public/app/plugins/panel/state-timeline/module.tsx
@@ -107,4 +107,5 @@ export const plugin = new PanelPlugin<TimelineOptions, TimelineFieldConfig>(Stat
     commonOptionsBuilder.addLegendOptions(builder, false);
     commonOptionsBuilder.addTooltipOptions(builder, true);
   })
-  .setSuggestionsSupplier(new StatTimelineSuggestionsSupplier());
+  .setSuggestionsSupplier(new StatTimelineSuggestionsSupplier())
+  .setDataSupport({ annotations: true });
diff --git a/public/app/plugins/panel/state-timeline/utils.test.ts b/public/app/plugins/panel/state-timeline/utils.test.ts
index 92bdc05f3f7..d4cc5208b38 100644
--- a/public/app/plugins/panel/state-timeline/utils.test.ts
+++ b/public/app/plugins/panel/state-timeline/utils.test.ts
@@ -72,6 +72,18 @@ describe('prepare timeline graph', () => {
       ]
     `);
   });
+  it('should try to sort time fields', () => {
+    const frames = [
+      toDataFrame({
+        fields: [
+          { name: 'a', type: FieldType.time, values: [4, 3, 1, 2] },
+          { name: 'b', values: [1, 1, 2, 2] },
+        ],
+      }),
+    ];
+    const result = prepareTimelineFields(frames, true, timeRange, theme);
+    expect(result.frames?.[0].fields[0].values.toArray()).toEqual([1, 2, 3, 4]);
+  });
 });
 
 describe('findNextStateIndex', () => {
diff --git a/public/app/plugins/panel/state-timeline/utils.ts b/public/app/plugins/panel/state-timeline/utils.ts
index c6e7756a061..83246e541cf 100644
--- a/public/app/plugins/panel/state-timeline/utils.ts
+++ b/public/app/plugins/panel/state-timeline/utils.ts
@@ -23,6 +23,7 @@ import {
   ThresholdsMode,
   TimeRange,
 } from '@grafana/data';
+import { maybeSortFrame } from '@grafana/data/src/transformations/transformers/joinDataFrames';
 import { VizLegendOptions, AxisPlacement, ScaleDirection, ScaleOrientation } from '@grafana/schema';
 import {
   FIXED_UNIT,
@@ -394,9 +395,13 @@ export function prepareTimelineFields(
   for (let frame of series) {
     let isTimeseries = false;
     let changed = false;
+    let maybeSortedFrame = maybeSortFrame(
+      frame,
+      frame.fields.findIndex((f) => f.type === FieldType.time)
+    );
 
     let nulledFrame = applyNullInsertThreshold({
-      frame,
+      frame: maybeSortedFrame,
       refFieldPseudoMin: timeRange.from.valueOf(),
       refFieldPseudoMax: timeRange.to.valueOf(),
     });
@@ -445,11 +450,11 @@ export function prepareTimelineFields(
       hasTimeseries = true;
       if (changed) {
         frames.push({
-          ...frame,
+          ...maybeSortedFrame,
           fields,
         });
       } else {
-        frames.push(frame);
+        frames.push(maybeSortedFrame);
       }
     }
   }
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index c3a59ffeb04..b05e107eb9c 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -33,7 +33,6 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/d/:uid/:slug?',
-      navId: 'dashboards',
       pageClass: 'page-dashboard',
       routeName: DashboardRoutes.Normal,
       component: SafeDynamicImport(
@@ -91,7 +90,6 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/datasources',
-      navId: 'datasources',
       component: SafeDynamicImport(
         () => import(/* webpackChunkName: "DataSourcesListPage"*/ 'app/features/datasources/DataSourcesListPage')
       ),
@@ -193,7 +191,6 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/org/users',
-      navId: 'users',
       component: SafeDynamicImport(
         () => import(/* webpackChunkName: "UsersListPage" */ 'app/features/users/UsersListPage')
       ),
@@ -206,7 +203,6 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/org/apikeys',
-      navId: 'apikeys',
       roles: () => contextSrv.evaluatePermission(() => ['Admin'], [AccessControlAction.ActionAPIKeysRead]),
       component: SafeDynamicImport(
         () => import(/* webpackChunkName: "ApiKeysPage" */ 'app/features/api-keys/ApiKeysPage')
@@ -235,7 +231,6 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/org/teams',
-      navId: 'teams',
       roles: () =>
         contextSrv.evaluatePermission(
           () => (config.editorsCanAdmin ? ['Editor', 'Admin'] : ['Admin']),
@@ -306,6 +301,13 @@ export function getAppRoutes(): RouteDescriptor[] {
         () => import(/* webpackChunkName: "AdminEditOrgPage" */ 'app/features/admin/AdminEditOrgPage')
       ),
     },
+    {
+      path: '/admin/storage/:path*',
+      roles: () => ['Admin'],
+      component: SafeDynamicImport(
+        () => import(/* webpackChunkName: "StoragePage" */ 'app/features/storage/StoragePage')
+      ),
+    },
     {
       path: '/admin/stats',
       component: SafeDynamicImport(
@@ -321,7 +323,7 @@ export function getAppRoutes(): RouteDescriptor[] {
       path: '/login',
       component: LoginPage,
       pageClass: 'login-page sidemenu-hidden',
-      navHidden: true,
+      chromeless: true,
     },
     {
       path: '/invite/:code',
@@ -329,7 +331,7 @@ export function getAppRoutes(): RouteDescriptor[] {
         () => import(/* webpackChunkName: "SignupInvited" */ 'app/features/invites/SignupInvited')
       ),
       pageClass: 'sidemenu-hidden',
-      navHidden: true,
+      chromeless: true,
     },
     {
       path: '/verify',
@@ -339,7 +341,7 @@ export function getAppRoutes(): RouteDescriptor[] {
             () => import(/* webpackChunkName "VerifyEmailPage"*/ 'app/core/components/Signup/VerifyEmailPage')
           ),
       pageClass: 'login-page sidemenu-hidden',
-      navHidden: true,
+      chromeless: true,
     },
     {
       path: '/signup',
@@ -347,12 +349,12 @@ export function getAppRoutes(): RouteDescriptor[] {
         ? () => <Redirect to="/login" />
         : SafeDynamicImport(() => import(/* webpackChunkName "SignupPage"*/ 'app/core/components/Signup/SignupPage')),
       pageClass: 'sidemenu-hidden login-page',
-      navHidden: true,
+      chromeless: true,
     },
     {
       path: '/user/password/send-reset-email',
       pageClass: 'sidemenu-hidden',
-      navHidden: true,
+      chromeless: true,
       component: SafeDynamicImport(
         () =>
           import(/* webpackChunkName: "SendResetMailPage" */ 'app/core/components/ForgottenPassword/SendResetMailPage')
@@ -367,7 +369,7 @@ export function getAppRoutes(): RouteDescriptor[] {
           )
       ),
       pageClass: 'sidemenu-hidden login-page',
-      navHidden: true,
+      chromeless: true,
     },
     {
       path: '/dashboard/snapshots',
@@ -437,6 +439,7 @@ export function getAppRoutes(): RouteDescriptor[] {
         () => import(/* webpackChunkName: "NotificationsPage"*/ 'app/features/notifications/NotificationsPage')
       ),
     },
+    ...getDynamicDashboardRoutes(),
     ...getPluginCatalogRoutes(),
     ...getLiveRoutes(),
     ...getAlertingRoutes(),
@@ -452,3 +455,19 @@ export function getAppRoutes(): RouteDescriptor[] {
     // ...playlistRoutes,
   ];
 }
+
+export function getDynamicDashboardRoutes(cfg = config): RouteDescriptor[] {
+  if (!cfg.featureToggles.scenes) {
+    return [];
+  }
+  return [
+    {
+      path: '/scenes',
+      component: SafeDynamicImport(() => import(/* webpackChunkName: "scenes"*/ 'app/features/scenes/SceneListPage')),
+    },
+    {
+      path: '/scenes/:name',
+      component: SafeDynamicImport(() => import(/* webpackChunkName: "scenes"*/ 'app/features/scenes/ScenePage')),
+    },
+  ];
+}
diff --git a/scripts/drone/pipelines/main.star b/scripts/drone/pipelines/main.star
index baad293a3be..1080a2f2fd0 100644
--- a/scripts/drone/pipelines/main.star
+++ b/scripts/drone/pipelines/main.star
@@ -126,7 +126,7 @@ def get_steps(edition):
         build_backend_step(edition=edition, ver_mode=ver_mode),
         build_frontend_step(edition=edition, ver_mode=ver_mode),
         build_frontend_package_step(edition=edition, ver_mode=ver_mode),
-        build_plugins_step(edition=edition, sign=True),
+        build_plugins_step(edition=edition, ver_mode=ver_mode),
     ]
     integration_test_steps = [
         postgres_integration_tests_step(edition=edition, ver_mode=ver_mode),
@@ -233,7 +233,7 @@ def main_pipelines(edition):
         template=drone_change_template, secret='drone-changes-webhook',
     ), pipeline(
         name='main-publish', edition=edition, trigger=dict(trigger, repo=['grafana/grafana']),
-        steps=[download_grabpl_step(), identify_runner_step(),] + store_steps,
+        steps=[download_grabpl_step(), gen_version_step(ver_mode), identify_runner_step(),] + store_steps,
         depends_on=['main-test-frontend', 'main-test-backend', 'main-build-e2e-publish', 'main-integration-tests', 'main-windows', ],
     ), notify_pipeline(
         name='main-notify', slack_channel='grafana-ci-notifications', trigger=dict(trigger, status=['failure']),
diff --git a/scripts/drone/pipelines/pr.star b/scripts/drone/pipelines/pr.star
index fd10cc3e749..522675b1f3a 100644
--- a/scripts/drone/pipelines/pr.star
+++ b/scripts/drone/pipelines/pr.star
@@ -123,10 +123,10 @@ def pr_pipelines(edition):
     ]
     build_steps = [
         enterprise_downstream_step(edition=edition, ver_mode=ver_mode),
-        build_backend_step(edition=edition, ver_mode=ver_mode, variants=variants),
+        build_backend_step(edition=edition, ver_mode=ver_mode),
         build_frontend_step(edition=edition, ver_mode=ver_mode),
         build_frontend_package_step(edition=edition, ver_mode=ver_mode),
-        build_plugins_step(edition=edition),
+        build_plugins_step(edition=edition, ver_mode=ver_mode),
     ]
     integration_test_steps = [
         postgres_integration_tests_step(edition=edition, ver_mode=ver_mode),
diff --git a/scripts/drone/pipelines/release.star b/scripts/drone/pipelines/release.star
index 8094c8f0ab6..22b2237024d 100644
--- a/scripts/drone/pipelines/release.star
+++ b/scripts/drone/pipelines/release.star
@@ -180,7 +180,7 @@ def get_steps(edition, ver_mode):
         build_backend_step(edition=edition, ver_mode=ver_mode),
         build_frontend_step(edition=edition, ver_mode=ver_mode),
         build_frontend_package_step(edition=edition, ver_mode=ver_mode),
-        build_plugins_step(edition=edition, sign=True),
+        build_plugins_step(edition=edition, ver_mode=ver_mode),
     ]
 
     integration_test_steps = [
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 6b8d21d2481..2a9fabe105c 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1,6 +1,6 @@
 load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
 
-grabpl_version = 'v2.9.50'
+grabpl_version = 'v2.9.52'
 build_image = 'grafana/build-container:1.5.7'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 deploy_docker_image = 'us.gcr.io/kubernetes-dev/drone/plugins/deploy-image'
@@ -367,7 +367,7 @@ def upload_cdn_step(edition, ver_mode, trigger=None):
             'PRERELEASE_BUCKET': from_secret(prerelease_bucket)
         },
         'commands': [
-            './bin/grabpl upload-cdn --edition {} --src-bucket "{}"{}'.format(edition, bucket, src_dir),
+            './bin/grabpl upload-cdn --edition {}'.format(edition),
         ],
     }
     if trigger and ver_mode in ("release-branch", "main"):
@@ -477,15 +477,13 @@ def build_frontend_docs_step(edition):
     }
 
 
-def build_plugins_step(edition, sign=False):
-    if sign:
+def build_plugins_step(edition, ver_mode):
+    if ver_mode!='pr':
         env = {
             'GRAFANA_API_KEY': from_secret('grafana_api_key'),
         }
-        sign_args = ' --sign --signing-admin'
     else:
         env = None
-        sign_args = ''
     return {
         'name': 'build-plugins',
         'image': build_image,
@@ -496,7 +494,7 @@ def build_plugins_step(edition, sign=False):
         ],
         'commands': [
             # TODO: Use percentage for num jobs
-            './bin/grabpl build-plugins --jobs 8 --edition {}{}'.format(edition, sign_args),
+            './bin/grabpl build-plugins --jobs 8 --edition {}'.format(edition),
         ],
     }
 
@@ -978,13 +976,12 @@ def upload_packages_step(edition, ver_mode, trigger=None):
         return None
 
     if ver_mode == 'release':
-        packages_bucket = '$${{PRERELEASE_BUCKET}}/artifacts/downloads{}'.format(enterprise2_suffix(edition))
-        cmd = './bin/grabpl upload-packages --edition {} --packages-bucket {}'.format(edition, packages_bucket)
+        cmd = './bin/grabpl upload-packages --edition {}'.format(edition)
     elif edition == 'enterprise2':
-        cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads-enterprise2'.format(
+        cmd = './bin/grabpl upload-packages --edition {}'.format(
             edition)
     else:
-        cmd = './bin/grabpl upload-packages --edition {} --packages-bucket grafana-downloads'.format(edition)
+        cmd = './bin/grabpl upload-packages --edition {}'.format(edition)
 
     deps = []
     if edition in 'enterprise2' or not end_to_end_tests_deps(edition):
diff --git a/yarn.lock b/yarn.lock
index 617dd19823f..9dc73ae3d45 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4096,6 +4096,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@date-io/core@npm:^1.3.13":
+  version: 1.3.13
+  resolution: "@date-io/core@npm:1.3.13"
+  checksum: 5a9e9d1de20f0346a3c7d2d5946190caef4bfb0b64d82ba1f4c566657a9192667c94ebe7f438d11d4286d9c190974daad4fb2159294225cd8af4d9a140239879
+  languageName: node
+  linkType: hard
+
+"@date-io/moment@npm:^1.3.13":
+  version: 1.3.13
+  resolution: "@date-io/moment@npm:1.3.13"
+  dependencies:
+    "@date-io/core": ^1.3.13
+  peerDependencies:
+    moment: ^2.24.0
+  checksum: c4847f9d1bf09bb22c1acc5806fc50825c0bdb52408c9fec8cc5f9a65f16a8014870b5890a0eeb73b2c53a6487c35acbd2ab2a5c49068ff5a5dccbcb5c9e654b
+  languageName: node
+  linkType: hard
+
 "@daybrush/utils@npm:1.6.0, @daybrush/utils@npm:^1.0.0, @daybrush/utils@npm:^1.1.1, @daybrush/utils@npm:^1.3.1, @daybrush/utils@npm:^1.4.0":
   version: 1.6.0
   resolution: "@daybrush/utils@npm:1.6.0"
@@ -4783,14 +4801,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@grafana/lezer-logql@npm:^0.0.12":
-  version: 0.0.12
-  resolution: "@grafana/lezer-logql@npm:0.0.12"
+"@grafana/lezer-logql@npm:^0.0.13":
+  version: 0.0.13
+  resolution: "@grafana/lezer-logql@npm:0.0.13"
   dependencies:
     lezer: ^0.13.5
   peerDependencies:
     "@lezer/lr": ^0.15.8
-  checksum: d28780b41a97b69a427390ef746e09a131e6a151be0894763e5cfe26fa16ae37fa5fe7409ea956f5e29974a5966162318a51bcd47422e9a3e609ca43340bbdcb
+  checksum: 417ab91c4fa8317789435bafbadd0bc24a6b9d8494a87614f14dc8cbe5f05bf94f529eadc0b2643ff71a3a3fee45cbf588538d8224abe2f4134ff5cc2c2b0055
   languageName: node
   linkType: hard
 
@@ -6934,14 +6952,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@microsoft/api-extractor-model@npm:7.20.3":
-  version: 7.20.3
-  resolution: "@microsoft/api-extractor-model@npm:7.20.3"
+"@microsoft/api-extractor-model@npm:7.21.0":
+  version: 7.21.0
+  resolution: "@microsoft/api-extractor-model@npm:7.21.0"
   dependencies:
     "@microsoft/tsdoc": 0.14.1
     "@microsoft/tsdoc-config": ~0.16.1
     "@rushstack/node-core-library": 3.49.0
-  checksum: d5721794e9f98348933fcdc5922e5d8ec681e1250ba03764873c4a864478c815ee86bac877ec4430bbeb4f2ffa980b8ae71cf8edd6b822f3dc937c810804fdab
+  checksum: 9e0cb0cd2d344ee23f32294103856e413fd998ceefc5ea26427b603ef7a6dc155ff6710bf3a30d0c426b9928118e8f56e080f0c0aa9685f3e825e7e154340f62
   languageName: node
   linkType: hard
 
@@ -7184,14 +7202,14 @@ __metadata:
   linkType: hard
 
 "@npmcli/metavuln-calculator@npm:^3.0.1":
-  version: 3.1.0
-  resolution: "@npmcli/metavuln-calculator@npm:3.1.0"
+  version: 3.1.1
+  resolution: "@npmcli/metavuln-calculator@npm:3.1.1"
   dependencies:
     cacache: ^16.0.0
     json-parse-even-better-errors: ^2.3.1
     pacote: ^13.0.3
     semver: ^7.3.5
-  checksum: 39fb474e239d3f221178f0c2f6089cd4a2fce8183343b7f52f8f9fe0b3cb0a98b386b15c9afe63a0b0dc2ae5302497d00eb2de2f4b3431953dbf05e69d613c9a
+  checksum: dc9846fdb82a1f4274ff8943f81452c75615bd9bca523c862956ea2c32e18c5a4be5572e169104d3a0eb262b7ede72c8dbbc202a4ab3b3f4946fa55f226dcc64
   languageName: node
   linkType: hard
 
@@ -7260,14 +7278,15 @@ __metadata:
   linkType: hard
 
 "@npmcli/run-script@npm:^4.1.0":
-  version: 4.1.3
-  resolution: "@npmcli/run-script@npm:4.1.3"
+  version: 4.1.5
+  resolution: "@npmcli/run-script@npm:4.1.5"
   dependencies:
     "@npmcli/node-gyp": ^2.0.0
     "@npmcli/promise-spawn": ^3.0.0
     node-gyp: ^9.0.0
     read-package-json-fast: ^2.0.3
-  checksum: 62fb1a0e126561514d9202db5fa25ede128fc9ab8d15a307e232137ec89882e9196ba08eadc0635ea49adb308300b197d83eb3cb7c6edbc26ec6f3999cc1e7bb
+    which: ^2.0.2
+  checksum: a71736c628c747edd3275861a60bf8d76f8e954d0ab9561f0364d07f7a24ebf81159d0826a2c85705eae6391ffae6328bae6ca581264b5b3f3ca029510201387
   languageName: node
   linkType: hard
 
@@ -7281,17 +7300,17 @@ __metadata:
   linkType: hard
 
 "@octokit/core@npm:^3.5.1":
-  version: 3.5.1
-  resolution: "@octokit/core@npm:3.5.1"
+  version: 3.6.0
+  resolution: "@octokit/core@npm:3.6.0"
   dependencies:
     "@octokit/auth-token": ^2.4.4
     "@octokit/graphql": ^4.5.8
-    "@octokit/request": ^5.6.0
+    "@octokit/request": ^5.6.3
     "@octokit/request-error": ^2.0.5
     "@octokit/types": ^6.0.3
     before-after-hook: ^2.2.0
     universal-user-agent: ^6.0.0
-  checksum: 67179739fc9712b201f2400f132287a2c56a18506e00900bc9d2a3f742b74f1ba69ad998e42f28f3964c0bd1d5478232c1ec7b485c97702b821fbe22b76afa90
+  checksum: f81160129037bd8555d47db60cd5381637b7e3602ad70735a7bdf8f3d250c7b7114a666bb12ef7a8746a326a5d72ed30a1b8f8a5a170007f7285c8e217bef1f0
   languageName: node
   linkType: hard
 
@@ -7317,10 +7336,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/openapi-types@npm:^11.2.0":
-  version: 11.2.0
-  resolution: "@octokit/openapi-types@npm:11.2.0"
-  checksum: eb373ea496bc96bf0233505a0916eb38cb193d1829cab935e1cf1fd21839c402a1d835d3c0326290c756c0ed980a64d0ae73ad3c5d5decde9000f0828aa7ff52
+"@octokit/openapi-types@npm:^12.7.0":
+  version: 12.8.0
+  resolution: "@octokit/openapi-types@npm:12.8.0"
+  checksum: 66058ebb9aabfeafaf61cd205487edd14b8f3eac7c6aa796cd7489fe948657912514d9b02918c1bca9d88a07dbb2deed5763e2ca61a6a8f6503caee32429a7b1
   languageName: node
   linkType: hard
 
@@ -7332,13 +7351,13 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-paginate-rest@npm:^2.16.8":
-  version: 2.17.0
-  resolution: "@octokit/plugin-paginate-rest@npm:2.17.0"
+  version: 2.21.1
+  resolution: "@octokit/plugin-paginate-rest@npm:2.21.1"
   dependencies:
-    "@octokit/types": ^6.34.0
+    "@octokit/types": ^6.38.2
   peerDependencies:
     "@octokit/core": ">=2"
-  checksum: c8753cda6f7ede79d0e9df43a54e56020aa1c9c6887684e0e0d45cb6ee0dcabf460c3e4b8a18edabef711bb269fd826616e99e78dc29fb30d47c210c562603a0
+  checksum: 2941d0320ec6891cbb0248afe8f8ba019e2971704c6b975a01b99358c432ed84c2920f52d095fc912616e43a59ef582c1df6b868d59a39e2bf095476306ba6f1
   languageName: node
   linkType: hard
 
@@ -7352,14 +7371,14 @@ __metadata:
   linkType: hard
 
 "@octokit/plugin-rest-endpoint-methods@npm:^5.12.0":
-  version: 5.13.0
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.13.0"
+  version: 5.16.2
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.16.2"
   dependencies:
-    "@octokit/types": ^6.34.0
+    "@octokit/types": ^6.39.0
     deprecation: ^2.3.1
   peerDependencies:
     "@octokit/core": ">=3"
-  checksum: f331457e4317130adb456b27df2a99609fb54a4dc2da6f87009e567c7325680c901abf18ad08483535bab4ec1c892e4236f4135a2804603aebb12c0698c678c8
+  checksum: 30fcc50c335d1093f03573d9fa3a4b7d027fc98b215c43e07e82ee8dabfa0af0cf1b963feb542312ae32d897a2f68dc671577206f30850215517bebedc5a2c73
   languageName: node
   linkType: hard
 
@@ -7374,17 +7393,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/request@npm:^5.6.0":
-  version: 5.6.2
-  resolution: "@octokit/request@npm:5.6.2"
+"@octokit/request@npm:^5.6.0, @octokit/request@npm:^5.6.3":
+  version: 5.6.3
+  resolution: "@octokit/request@npm:5.6.3"
   dependencies:
     "@octokit/endpoint": ^6.0.1
     "@octokit/request-error": ^2.1.0
     "@octokit/types": ^6.16.1
     is-plain-object: ^5.0.0
-    node-fetch: ^2.6.1
+    node-fetch: ^2.6.7
     universal-user-agent: ^6.0.0
-  checksum: 51ef3ad244b3d89ffd6d997fa0ed3e13a7a93b4c868ce5c53b0fcc93a654965135528e62d0720ebfeb7dfd586448a4a45d08fd75ba2e170cfa19d37834e49f1f
+  checksum: c0b4542eb4baaf880d673c758d3e0b5c4a625a4ae30abf40df5548b35f1ff540edaac74625192b1aff42a79ac661e774da4ab7d5505f1cb4ef81239b1e8510c5
   languageName: node
   linkType: hard
 
@@ -7400,12 +7419,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.34.0":
-  version: 6.34.0
-  resolution: "@octokit/types@npm:6.34.0"
+"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.38.2, @octokit/types@npm:^6.39.0":
+  version: 6.39.0
+  resolution: "@octokit/types@npm:6.39.0"
   dependencies:
-    "@octokit/openapi-types": ^11.2.0
-  checksum: f122b9aee8f6baddd515e34a0913e73b21d4bc82d6ee59d77a8aaf01b4a02c10867dd013003d087a83dc96db23511893669015af6d30c27cece185e21cf1df89
+    "@octokit/openapi-types": ^12.7.0
+  checksum: 0e3d55e4bdef41e652a2e99a304cebada90f23a90619c49ab892a76ae908c4281316738453348c9ba30b32250ef5eda0a939c2af3aec5ca808acdf9922da420c
   languageName: node
   linkType: hard
 
@@ -8314,15 +8333,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rushstack/ts-command-line@npm:4.11.0":
-  version: 4.11.0
-  resolution: "@rushstack/ts-command-line@npm:4.11.0"
+"@rushstack/ts-command-line@npm:4.12.1":
+  version: 4.12.1
+  resolution: "@rushstack/ts-command-line@npm:4.12.1"
   dependencies:
     "@types/argparse": 1.0.38
     argparse: ~1.0.9
     colors: ~1.2.1
     string-argv: ~0.3.1
-  checksum: 966692b5738d198130d6a8f01f819dfa95dccaf7a8e4c2f9d76d36205790584e827afb18f837703f07bfe93faa3b705c81e682888a4aef0da350758c7c6582d1
+  checksum: e9479bd001f4f206d207c867ec7b91444727cf8a1c685dac7589c6a33b54f47200deabc450d6831a1cc38501f0322eb7003c1f78f1fa43230541c4b7ddc4718d
   languageName: node
   linkType: hard
 
@@ -8448,13 +8467,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sindresorhus/is@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@sindresorhus/is@npm:0.14.0"
-  checksum: 971e0441dd44ba3909b467219a5e242da0fc584048db5324cfb8048148fa8dcc9d44d71e3948972c4f6121d24e5da402ef191420d1266a95f713bb6d6e59c98a
-  languageName: node
-  linkType: hard
-
 "@sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.7.0, @sinonjs/commons@npm:^1.8.3":
   version: 1.8.3
   resolution: "@sinonjs/commons@npm:1.8.3"
@@ -9979,15 +9991,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@szmarczak/http-timer@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@szmarczak/http-timer@npm:1.1.2"
-  dependencies:
-    defer-to-connect: ^1.0.1
-  checksum: 4d9158061c5f397c57b4988cde33a163244e4f02df16364f103971957a32886beb104d6180902cbe8b38cb940e234d9f98a4e486200deca621923f62f50a06fe
-  languageName: node
-  linkType: hard
-
 "@testing-library/dom@npm:8.13.0, @testing-library/dom@npm:>=7, @testing-library/dom@npm:^8.0.0":
   version: 8.13.0
   resolution: "@testing-library/dom@npm:8.13.0"
@@ -11059,15 +11062,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/keyv@npm:^3.1.1":
-  version: 3.1.3
-  resolution: "@types/keyv@npm:3.1.3"
-  dependencies:
-    "@types/node": "*"
-  checksum: b5f8aa592cc21c16d99e69aec0976f12b893b055e4456d90148a610a6b6088e297b2ba5f38f8c8280cef006cfd8f9ec99e069905020882619dc5fc8aa46f5f27
-  languageName: node
-  linkType: hard
-
 "@types/lingui__macro@npm:^3":
   version: 3.0.0
   resolution: "@types/lingui__macro@npm:3.0.0"
@@ -11671,15 +11665,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/responselike@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@types/responselike@npm:1.0.0"
-  dependencies:
-    "@types/node": "*"
-  checksum: e99fc7cc6265407987b30deda54c1c24bb1478803faf6037557a774b2f034c5b097ffd65847daa87e82a61a250d919f35c3588654b0fdaa816906650f596d1b0
-  languageName: node
-  linkType: hard
-
 "@types/retry@npm:^0.12.0":
   version: 0.12.1
   resolution: "@types/retry@npm:0.12.1"
@@ -13294,9 +13279,9 @@ __metadata:
   linkType: hard
 
 "ansi-regex@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "ansi-regex@npm:3.0.0"
-  checksum: 2ad11c416f81c39f5c65eafc88cf1d71aa91d76a2f766e75e457c2a3c43e8a003aadbf2966b61c497aa6a6940a36412486c975b3270cdfc3f413b69826189ec3
+  version: 3.0.1
+  resolution: "ansi-regex@npm:3.0.1"
+  checksum: 09daf180c5f59af9850c7ac1bd7fda85ba596cc8cbeb210826e90755f06c818af86d9fa1e6e8322fab2c3b9e9b03f56c537b42241139f824dd75066a1e7257cc
   languageName: node
   linkType: hard
 
@@ -13753,11 +13738,11 @@ __metadata:
   linkType: hard
 
 "async@npm:^2.6.2":
-  version: 2.6.3
-  resolution: "async@npm:2.6.3"
+  version: 2.6.4
+  resolution: "async@npm:2.6.4"
   dependencies:
     lodash: ^4.17.14
-  checksum: 5e5561ff8fca807e88738533d620488ac03a5c43fce6c937451f7e35f943d33ad06c24af3f681a48cca3d2b0002b3118faff0a128dc89438a9bf0226f712c499
+  checksum: a52083fb32e1ebe1d63e5c5624038bb30be68ff07a6c8d7dfe35e47c93fc144bd8652cbec869e0ac07d57dde387aa5f1386be3559cdee799cb1f789678d88e19
   languageName: node
   linkType: hard
 
@@ -14517,7 +14502,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"boxen@npm:^5.0.0, boxen@npm:^5.1.2":
+"boxen@npm:^5.1.2":
   version: 5.1.2
   resolution: "boxen@npm:5.1.2"
   dependencies:
@@ -14981,21 +14966,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacheable-request@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "cacheable-request@npm:6.1.0"
-  dependencies:
-    clone-response: ^1.0.2
-    get-stream: ^5.1.0
-    http-cache-semantics: ^4.0.0
-    keyv: ^3.0.0
-    lowercase-keys: ^2.0.0
-    normalize-url: ^4.1.0
-    responselike: ^1.0.2
-  checksum: b510b237b18d17e89942e9ee2d2a077cb38db03f12167fd100932dfa8fc963424bfae0bfa1598df4ae16c944a5484e43e03df8f32105b04395ee9495e9e4e9f1
-  languageName: node
-  linkType: hard
-
 "cachedir@npm:^2.3.0":
   version: 2.3.0
   resolution: "cachedir@npm:2.3.0"
@@ -15338,7 +15308,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2":
+"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.1, chokidar@npm:^3.4.2":
   version: 3.5.2
   resolution: "chokidar@npm:3.5.2"
   dependencies:
@@ -15591,15 +15561,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clone-response@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "clone-response@npm:1.0.2"
-  dependencies:
-    mimic-response: ^1.0.0
-  checksum: 2d0e61547fc66276e0903be9654ada422515f5a15741691352000d47e8c00c226061221074ce2c0064d12e975e84a8687cfd35d8b405750cb4e772f87b256eda
-  languageName: node
-  linkType: hard
-
 "clone@npm:^1.0.2":
   version: 1.0.4
   resolution: "clone@npm:1.0.4"
@@ -15607,6 +15568,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"clone@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "clone@npm:2.1.2"
+  checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
+  languageName: node
+  linkType: hard
+
 "clsx@npm:^1.1.1":
   version: 1.1.1
   resolution: "clsx@npm:1.1.1"
@@ -16017,20 +15985,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"configstore@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "configstore@npm:5.0.1"
-  dependencies:
-    dot-prop: ^5.2.0
-    graceful-fs: ^4.1.2
-    make-dir: ^3.0.0
-    unique-string: ^2.0.0
-    write-file-atomic: ^3.0.0
-    xdg-basedir: ^4.0.0
-  checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e
-  languageName: node
-  linkType: hard
-
 "connect-history-api-fallback@npm:^1.6.0":
   version: 1.6.0
   resolution: "connect-history-api-fallback@npm:1.6.0"
@@ -16124,12 +16078,12 @@ __metadata:
   linkType: hard
 
 "conventional-changelog-writer@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "conventional-changelog-writer@npm:5.0.0"
+  version: 5.0.1
+  resolution: "conventional-changelog-writer@npm:5.0.1"
   dependencies:
     conventional-commits-filter: ^2.0.7
     dateformat: ^3.0.0
-    handlebars: ^4.7.6
+    handlebars: ^4.7.7
     json-stringify-safe: ^5.0.1
     lodash: ^4.17.15
     meow: ^8.0.0
@@ -16138,7 +16092,7 @@ __metadata:
     through2: ^4.0.0
   bin:
     conventional-changelog-writer: cli.js
-  checksum: c310b949d354688b971f576c92cac77f11540fee56dccb990169e94e4fc42e40245d2c381f826b7d781deb04d4f7e01701cc29bdd1c3d3cdf8817e8b7a80ea18
+  checksum: 5c0129db44577f14b1f8de225b62a392a9927ba7fe3422cb21ad71a771b8472bd03badb7c87cb47419913abc3f2ce3759b69f59550cdc6f7a7b0459015b3b44c
   languageName: node
   linkType: hard
 
@@ -16153,8 +16107,8 @@ __metadata:
   linkType: hard
 
 "conventional-commits-parser@npm:^3.2.0":
-  version: 3.2.3
-  resolution: "conventional-commits-parser@npm:3.2.3"
+  version: 3.2.4
+  resolution: "conventional-commits-parser@npm:3.2.4"
   dependencies:
     JSONStream: ^1.0.4
     is-text-path: ^1.0.1
@@ -16164,7 +16118,7 @@ __metadata:
     through2: ^4.0.0
   bin:
     conventional-commits-parser: cli.js
-  checksum: 0f57b5cb7cb359eb49e6807cfd82b27cbe9ac30ec580b20ad7e79575561183110532a6c2e6328ce6c4cd05c01458b9bb781f1f6653b14560f7c509b87b0e9ac7
+  checksum: 1627ff203bc9586d89e47a7fe63acecf339aba74903b9114e23d28094f79d4e2d6389bf146ae561461dcba8fc42e7bc228165d2b173f15756c43f1d32bc50bfd
   languageName: node
   linkType: hard
 
@@ -16535,13 +16489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-random-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "crypto-random-string@npm:2.0.0"
-  checksum: 0283879f55e7c16fdceacc181f87a0a65c53bc16ffe1d58b9d19a6277adcd71900d02bb2c4843dd55e78c51e30e89b0fec618a7f170ebcc95b33182c28f05fd6
-  languageName: node
-  linkType: hard
-
 "css-animation@npm:^1.3.2":
   version: 1.6.1
   resolution: "css-animation@npm:1.6.1"
@@ -17684,15 +17631,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decompress-response@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "decompress-response@npm:3.3.0"
-  dependencies:
-    mimic-response: ^1.0.0
-  checksum: 952552ac3bd7de2fc18015086b09468645c9638d98a551305e485230ada278c039c91116e946d07894b39ee53c0f0d5b6473f25a224029344354513b412d7380
-  languageName: node
-  linkType: hard
-
 "dedent@npm:^0.7.0":
   version: 0.7.0
   resolution: "dedent@npm:0.7.0"
@@ -17700,13 +17638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-extend@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "deep-extend@npm:0.6.0"
-  checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7
-  languageName: node
-  linkType: hard
-
 "deep-freeze@npm:^0.0.1":
   version: 0.0.1
   resolution: "deep-freeze@npm:0.0.1"
@@ -17753,13 +17684,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"defer-to-connect@npm:^1.0.1":
-  version: 1.1.3
-  resolution: "defer-to-connect@npm:1.1.3"
-  checksum: 9491b301dcfa04956f989481ba7a43c2231044206269eb4ab64a52d6639ee15b1252262a789eb4239fb46ab63e44d4e408641bae8e0793d640aee55398cb3930
-  languageName: node
-  linkType: hard
-
 "define-lazy-prop@npm:^2.0.0":
   version: 2.0.0
   resolution: "define-lazy-prop@npm:2.0.0"
@@ -17927,12 +17851,12 @@ __metadata:
   linkType: hard
 
 "dezalgo@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "dezalgo@npm:1.0.3"
+  version: 1.0.4
+  resolution: "dezalgo@npm:1.0.4"
   dependencies:
     asap: ^2.0.0
     wrappy: 1
-  checksum: 8b26238db91423b2702a7a6d9629d0019c37c415e7b6e75d4b3e8d27e9464e21cac3618dd145f4d4ee96c70cc6ff034227b5b8a0e9c09015a8bdbe6dace3cfb9
+  checksum: 895389c6aead740d2ab5da4d3466d20fa30f738010a4d3f4dcccc9fc645ca31c9d10b7e1804ae489b1eb02c7986f9f1f34ba132d409b043082a86d9a4e745624
   languageName: node
   linkType: hard
 
@@ -18209,7 +18133,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dot-prop@npm:^5.1.0, dot-prop@npm:^5.2.0":
+"dot-prop@npm:^5.1.0":
   version: 5.3.0
   resolution: "dot-prop@npm:5.3.0"
   dependencies:
@@ -18256,13 +18180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer3@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "duplexer3@npm:0.1.4"
-  checksum: c2fd6969314607d23439c583699aaa43c4100d66b3e161df55dccd731acc57d5c81a64bb4f250805fbe434ddb1d2623fee2386fb890f5886ca1298690ec53415
-  languageName: node
-  linkType: hard
-
 "duplexer@npm:^0.1.1, duplexer@npm:^0.1.2":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
@@ -18756,13 +18673,13 @@ __metadata:
   linkType: hard
 
 "es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.50":
-  version: 0.10.53
-  resolution: "es5-ext@npm:0.10.53"
+  version: 0.10.61
+  resolution: "es5-ext@npm:0.10.61"
   dependencies:
-    es6-iterator: ~2.0.3
-    es6-symbol: ~3.1.3
-    next-tick: ~1.0.0
-  checksum: 24ec22369260cf98605cb2f51eae9d7df5dc621bc5d3b311f6f5c3d0fcdb7bafae888270f3083ee6e9af27350a5ea49f1fe2dd6406a9017247ca40f091f529b2
+    es6-iterator: ^2.0.3
+    es6-symbol: ^3.1.3
+    next-tick: ^1.1.0
+  checksum: 2f2034e91e77fe247d94f0fd13a94bcf113273b7cc4650794d6795e377267ffb2425d3a891bd8c4d9c8b990e16e17dd7c28f12dbd3fa4b0909d0874892f491bf
   languageName: node
   linkType: hard
 
@@ -18773,7 +18690,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-iterator@npm:~2.0.3":
+"es6-iterator@npm:^2.0.3":
   version: 2.0.3
   resolution: "es6-iterator@npm:2.0.3"
   dependencies:
@@ -18798,7 +18715,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es6-symbol@npm:^3.1.1, es6-symbol@npm:~3.1.3":
+"es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3":
   version: 3.1.3
   resolution: "es6-symbol@npm:3.1.3"
   dependencies:
@@ -18815,13 +18732,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escape-goat@npm:^2.0.0":
-  version: 2.1.1
-  resolution: "escape-goat@npm:2.1.1"
-  checksum: ce05c70c20dd7007b60d2d644b625da5412325fdb57acf671ba06cb2ab3cd6789e2087026921a05b665b0a03fadee2955e7fc0b9a67da15a6551a980b260eba7
-  languageName: node
-  linkType: hard
-
 "escape-html@npm:^1.0.3, escape-html@npm:~1.0.3":
   version: 1.0.3
   resolution: "escape-html@npm:1.0.3"
@@ -20030,13 +19940,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0":
-  version: 1.14.4
-  resolution: "follow-redirects@npm:1.14.4"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.8":
+  version: 1.14.8
+  resolution: "follow-redirects@npm:1.14.8"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: d4ce74cf5c6f363168b97e706b914eb9ffb6bf4d4c6d8f8330b93088d9b90e566611ddbcf0e42c8ed5fd17598dfeda1d19230d3e9d6d6c6b4d1c10ec3a0b99be
+  checksum: 40c67899c2e3149a27e8b6498a338ff27f39fe138fde8d7f0756cb44b073ba0bfec3d52af28f20c5bdd67263d564d0d8d7b5efefd431de95c18c42f7b4aef457
   languageName: node
   linkType: hard
 
@@ -20050,16 +19960,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.14.8":
-  version: 1.14.8
-  resolution: "follow-redirects@npm:1.14.8"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: 40c67899c2e3149a27e8b6498a338ff27f39fe138fde8d7f0756cb44b073ba0bfec3d52af28f20c5bdd67263d564d0d8d7b5efefd431de95c18c42f7b4aef457
-  languageName: node
-  linkType: hard
-
 "follow-redirects@npm:^1.14.9":
   version: 1.15.0
   resolution: "follow-redirects@npm:1.15.0"
@@ -20635,7 +20535,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-stream@npm:^4.0.0, get-stream@npm:^4.1.0":
+"get-stream@npm:^4.0.0":
   version: 4.1.0
   resolution: "get-stream@npm:4.1.0"
   dependencies:
@@ -20714,8 +20614,8 @@ __metadata:
   linkType: hard
 
 "git-raw-commits@npm:^2.0.8":
-  version: 2.0.10
-  resolution: "git-raw-commits@npm:2.0.10"
+  version: 2.0.11
+  resolution: "git-raw-commits@npm:2.0.11"
   dependencies:
     dargs: ^7.0.0
     lodash: ^4.17.15
@@ -20724,7 +20624,7 @@ __metadata:
     through2: ^4.0.0
   bin:
     git-raw-commits: cli.js
-  checksum: 66e2d7b4cdeff946ac639e1bba37f5dcbd9f5c9245348b31e027e4529f6b6733d23f75768d285d5f29c1f08d3485705a4932300a81a45b77b660fe3ce6089c29
+  checksum: c178af43633684106179793b6e3473e1d2bb50bb41d04e2e285ea4eef342ca4090fee6bc8a737552fde879d22346c90de5c49f18c719a0f38d4c934f258a0f79
   languageName: node
   linkType: hard
 
@@ -21005,25 +20905,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"got@npm:^9.6.0":
-  version: 9.6.0
-  resolution: "got@npm:9.6.0"
-  dependencies:
-    "@sindresorhus/is": ^0.14.0
-    "@szmarczak/http-timer": ^1.1.2
-    cacheable-request: ^6.0.0
-    decompress-response: ^3.3.0
-    duplexer3: ^0.1.4
-    get-stream: ^4.1.0
-    lowercase-keys: ^1.0.1
-    mimic-response: ^1.0.1
-    p-cancelable: ^1.0.0
-    to-readable-stream: ^1.0.0
-    url-parse-lax: ^3.0.0
-  checksum: 941807bd9704bacf5eb401f0cc1212ffa1f67c6642f2d028fd75900471c221b1da2b8527f4553d2558f3faeda62ea1cf31665f8b002c6137f5de8732f07370b0
-  languageName: node
-  linkType: hard
-
 "graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.15, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6":
   version: 4.2.8
   resolution: "graceful-fs@npm:4.2.8"
@@ -21071,7 +20952,7 @@ __metadata:
     "@grafana/eslint-config": 4.0.0
     "@grafana/experimental": ^0.0.2-canary.32
     "@grafana/google-sdk": 0.0.3
-    "@grafana/lezer-logql": ^0.0.12
+    "@grafana/lezer-logql": ^0.0.13
     "@grafana/runtime": "workspace:*"
     "@grafana/schema": "workspace:*"
     "@grafana/slate-react": 0.22.10-grafana
@@ -21273,7 +21154,6 @@ __metadata:
     mutationobserver-shim: 0.3.7
     ngtemplate-loader: 2.1.0
     node-notifier: 10.0.1
-    nodemon: 2.0.16
     ol: 6.14.1
     ol-ext: ^3.2.25
     papaparse: 5.3.2
@@ -21292,6 +21172,7 @@ __metadata:
     rc-time-picker: 3.7.3
     re-resizable: 6.9.9
     react: 17.0.2
+    react-awesome-query-builder: ^5.1.2
     react-beautiful-dnd: 13.1.0
     react-diff-viewer: ^3.1.1
     react-dom: 17.0.2
@@ -21329,7 +21210,6 @@ __metadata:
     rxjs: 7.5.5
     sass: 1.52.3
     sass-loader: 13.0.0
-    search-query-parser: 1.6.0
     selecto: 1.16.2
     semver: 7.3.7
     sinon: 14.0.0
@@ -21394,7 +21274,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"handlebars@npm:^4.7.6, handlebars@npm:^4.7.7":
+"handlebars@npm:^4.7.7":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
   dependencies:
@@ -21535,13 +21415,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-yarn@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "has-yarn@npm:2.1.0"
-  checksum: 5eb1d0bb8518103d7da24532bdbc7124ffc6d367b5d3c10840b508116f2f1bcbcf10fd3ba843ff6e2e991bdf9969fd862d42b2ed58aade88343326c950b7e7f7
-  languageName: node
-  linkType: hard
-
 "has@npm:^1.0.0, has@npm:^1.0.3":
   version: 1.0.3
   resolution: "has@npm:1.0.3"
@@ -21734,7 +21607,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^4.0.0, hosted-git-info@npm:^4.0.1":
+"hosted-git-info@npm:^4.0.0":
+  version: 4.1.0
+  resolution: "hosted-git-info@npm:4.1.0"
+  dependencies:
+    lru-cache: ^6.0.0
+  checksum: c3f87b3c2f7eb8c2748c8f49c0c2517c9a95f35d26f4bf54b2a8cba05d2e668f3753548b6ea366b18ec8dadb4e12066e19fa382a01496b0ffa0497eb23cbe461
+  languageName: node
+  linkType: hard
+
+"hosted-git-info@npm:^4.0.1":
   version: 4.0.2
   resolution: "hosted-git-info@npm:4.0.2"
   dependencies:
@@ -21929,7 +21811,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.0.0, http-cache-semantics@npm:^4.1.0":
+"http-cache-semantics@npm:^4.1.0":
   version: 4.1.0
   resolution: "http-cache-semantics@npm:4.1.0"
   checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42
@@ -22223,13 +22105,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore-by-default@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "ignore-by-default@npm:1.0.1"
-  checksum: 441509147b3615e0365e407a3c18e189f78c07af08564176c680be1fabc94b6c789cad1342ad887175d4ecd5225de86f73d376cec8e06b42fd9b429505ffcf8a
-  languageName: node
-  linkType: hard
-
 "ignore-walk@npm:^3.0.3":
   version: 3.0.4
   resolution: "ignore-walk@npm:3.0.4"
@@ -22323,13 +22198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-lazy@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "import-lazy@npm:2.1.0"
-  checksum: 05294f3b9dd4971d3a996f0d2f176410fb6745d491d6e73376429189f5c1c3d290548116b2960a7cf3e89c20cdf11431739d1d2d8c54b84061980795010e803a
-  languageName: node
-  linkType: hard
-
 "import-lazy@npm:^4.0.0, import-lazy@npm:~4.0.0":
   version: 4.0.0
   resolution: "import-lazy@npm:4.0.0"
@@ -22415,7 +22283,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.5, ini@npm:~1.3.0":
+"ini@npm:^1.3.2, ini@npm:^1.3.4, ini@npm:^1.3.5":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
   checksum: dfd98b0ca3a4fc1e323e38a6c8eb8936e31a97a918d3b377649ea15bdb15d481207a0dda1021efbd86b464cae29a0d33c1d7dcaf6c5672bee17fa849bc50a1b3
@@ -22919,7 +22787,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-installed-globally@npm:^0.4.0, is-installed-globally@npm:~0.4.0":
+"is-installed-globally@npm:~0.4.0":
   version: 0.4.0
   resolution: "is-installed-globally@npm:0.4.0"
   dependencies:
@@ -22981,13 +22849,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-npm@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "is-npm@npm:5.0.0"
-  checksum: 9baff02b0c69a3d3c79b162cb2f9e67fb40ef6d172c16601b2e2471c21e9a4fa1fc9885a308d7bc6f3a3cd2a324c27fa0bf284c133c3349bb22571ab70d041cc
-  languageName: node
-  linkType: hard
-
 "is-number-object@npm:^1.0.4":
   version: 1.0.6
   resolution: "is-number-object@npm:1.0.6"
@@ -23142,11 +23003,11 @@ __metadata:
   linkType: hard
 
 "is-ssh@npm:^1.3.0":
-  version: 1.3.3
-  resolution: "is-ssh@npm:1.3.3"
+  version: 1.4.0
+  resolution: "is-ssh@npm:1.4.0"
   dependencies:
-    protocols: ^1.1.0
-  checksum: 7a751facad3c61abf080eefe4f5df488d37f690ac2b130a8012001ecee4d7991306561bcb25896894d19268ea0512b20497f243e74d21c5901187a8f55f1c08c
+    protocols: ^2.0.1
+  checksum: 75eaa17b538bee24b661fbeb0f140226ac77e904a6039f787bea418431e2162f1f9c4c4ccad3bd169e036cd701cc631406e8c505d9fa7e20164e74b47f86f40f
   languageName: node
   linkType: hard
 
@@ -23294,13 +23155,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-yarn-global@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "is-yarn-global@npm:0.3.0"
-  checksum: bca013d65fee2862024c9fbb3ba13720ffca2fe750095174c1c80922fdda16402b5c233f5ac9e265bc12ecb5446e7b7f519a32d9541788f01d4d44e24d2bf481
-  languageName: node
-  linkType: hard
-
 "isarray@npm:0.0.1":
   version: 0.0.1
   resolution: "isarray@npm:0.0.1"
@@ -24822,13 +24676,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-buffer@npm:3.0.0":
-  version: 3.0.0
-  resolution: "json-buffer@npm:3.0.0"
-  checksum: 0cecacb8025370686a916069a2ff81f7d55167421b6aa7270ee74e244012650dd6bce22b0852202ea7ff8624fce50ff0ec1bdf95914ccb4553426e290d5a63fa
-  languageName: node
-  linkType: hard
-
 "json-markup@npm:^1.1.0":
   version: 1.1.3
   resolution: "json-markup@npm:1.1.3"
@@ -24864,14 +24711,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-schema@npm:0.2.3":
-  version: 0.2.3
-  resolution: "json-schema@npm:0.2.3"
-  checksum: bbc2070988fb5f2a2266a31b956f1b5660e03ea7eaa95b33402901274f625feb586ae0c485e1df854fde40a7f0dc679f3b3ca8e5b8d31f8ea07a0d834de785c7
-  languageName: node
-  linkType: hard
-
-"json-schema@npm:0.4.0":
+"json-schema@npm:0.2.3, json-schema@npm:0.4.0":
   version: 0.4.0
   resolution: "json-schema@npm:0.4.0"
   checksum: 66389434c3469e698da0df2e7ac5a3281bcff75e797a5c127db7c5b56270e01ae13d9afa3c03344f76e32e81678337a8c912bdbb75101c62e487dc3778461d72
@@ -25123,15 +24963,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keyv@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "keyv@npm:3.1.0"
-  dependencies:
-    json-buffer: 3.0.0
-  checksum: bb7e8f3acffdbafbc2dd5b63f377fe6ec4c0e2c44fc82720449ef8ab54f4a7ce3802671ed94c0f475ae0a8549703353a2124561fcf3317010c141b32ca1ce903
-  languageName: node
-  linkType: hard
-
 "kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0":
   version: 3.2.2
   resolution: "kind-of@npm:3.2.2"
@@ -25204,15 +25035,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"latest-version@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "latest-version@npm:5.1.0"
-  dependencies:
-    package-json: ^6.3.0
-  checksum: fbc72b071eb66c40f652441fd783a9cca62f08bf42433651937f078cd9ef94bf728ec7743992777826e4e89305aef24f234b515e6030503a2cbee7fc9bdc2c0f
-  languageName: node
-  linkType: hard
-
 "lazy-ass@npm:^1.6.0":
   version: 1.6.0
   resolution: "lazy-ass@npm:1.6.0"
@@ -25769,20 +25591,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lowercase-keys@npm:^1.0.0, lowercase-keys@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "lowercase-keys@npm:1.0.1"
-  checksum: 4d045026595936e09953e3867722e309415ff2c80d7701d067546d75ef698dac218a4f53c6d1d0e7368b47e45fd7529df47e6cb56fbb90523ba599f898b3d147
-  languageName: node
-  linkType: hard
-
-"lowercase-keys@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "lowercase-keys@npm:2.0.0"
-  checksum: 24d7ebd56ccdf15ff529ca9e08863f3c54b0b9d1edb97a3ae1af34940ae666c01a1e6d200707bce730a8ef76cb57cc10e65f245ecaaf7e6bc8639f2fb460ac23
-  languageName: node
-  linkType: hard
-
 "lowlight@npm:^1.14.0":
   version: 1.20.0
   resolution: "lowlight@npm:1.20.0"
@@ -25819,9 +25627,9 @@ __metadata:
   linkType: hard
 
 "lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
-  version: 7.10.2
-  resolution: "lru-cache@npm:7.10.2"
-  checksum: b8f98064c981ce98e2a3b82903726dd28d842f54b7f53e1d6029c6836546243d4157b8495a405c062209715c612050150bdf30b5fa8200d5a3559fb0fd4072c1
+  version: 7.12.0
+  resolution: "lru-cache@npm:7.12.0"
+  checksum: fdb62262978393df7a4bd46a072bc5c3808c50ca5a347a82bb9459410efd841b7bae50655c3cf9004c70d12c756cf6d018f6bff155a16cdde9eba9a82899b5eb
   languageName: node
   linkType: hard
 
@@ -26439,13 +26247,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-response@npm:^1.0.0, mimic-response@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "mimic-response@npm:1.0.1"
-  checksum: 034c78753b0e622bc03c983663b1cdf66d03861050e0c8606563d149bc2b02d63f62ce4d32be4ab50d0553ae0ffe647fc34d1f5281184c6e1e8cf4d85e8d9823
-  languageName: node
-  linkType: hard
-
 "min-document@npm:^2.19.0":
   version: 2.19.0
   resolution: "min-document@npm:2.19.0"
@@ -26631,11 +26432,11 @@ __metadata:
   linkType: hard
 
 "minipass@npm:^3.1.6":
-  version: 3.3.3
-  resolution: "minipass@npm:3.3.3"
+  version: 3.3.4
+  resolution: "minipass@npm:3.3.4"
   dependencies:
     yallist: ^4.0.0
-  checksum: 523a338f42140c2e62bff3429f236cc44a32ddd29a70d5221e0570ace237057190981cad406fd3a420f03a95cc001ad58a388d902b9519038e27f190bb88a6e7
+  checksum: 5d95a7738c54852ba78d484141e850c792e062666a2d0c681a5ac1021275beb7e1acb077e59f9523ff1defb80901aea4e30fac10ded9a20a25d819a42916ef1b
   languageName: node
   linkType: hard
 
@@ -26688,7 +26489,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3, mkdirp@npm:^0.5.5":
+"mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.3":
   version: 0.5.5
   resolution: "mkdirp@npm:0.5.5"
   dependencies:
@@ -26699,6 +26500,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mkdirp@npm:^0.5.5":
+  version: 0.5.6
+  resolution: "mkdirp@npm:0.5.6"
+  dependencies:
+    minimist: ^1.2.6
+  bin:
+    mkdirp: bin/cmd.js
+  checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
+  languageName: node
+  linkType: hard
+
 "mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
   version: 1.0.4
   resolution: "mkdirp@npm:1.0.4"
@@ -26766,7 +26578,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moment@npm:2.29.3, moment@npm:2.x, moment@npm:>= 2.9.0, moment@npm:^2.19.4, moment@npm:^2.20.1":
+"moment@npm:2.29.3, moment@npm:2.x, moment@npm:>= 2.9.0, moment@npm:^2.19.4, moment@npm:^2.20.1, moment@npm:^2.29.1":
   version: 2.29.3
   resolution: "moment@npm:2.29.3"
   checksum: 2e780e36d9a1823c08a1b6313cbb08bd01ecbb2a9062095820a34f42c878991ccba53abaa6abb103fd5c01e763724f295162a8c50b7e95b4f1c992ef0772d3f0
@@ -27060,10 +26872,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"next-tick@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "next-tick@npm:1.0.0"
-  checksum: 83fcb3d4f8d9380210b1c2b8a610463602d80283f0c0c8571c1688e1ad6cbf3a16b345f5bb7212617d4898bedcfa10dff327dc09ec20a112a5bf43a0271375fb
+"next-tick@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "next-tick@npm:1.1.0"
+  checksum: 83b5cf36027a53ee6d8b7f9c0782f2ba87f4858d977342bfc3c20c21629290a2111f8374d13a81221179603ffc4364f38374b5655d17b6a8f8a8c77bdea4fe8b
   languageName: node
   linkType: hard
 
@@ -27286,26 +27098,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nodemon@npm:2.0.16":
-  version: 2.0.16
-  resolution: "nodemon@npm:2.0.16"
-  dependencies:
-    chokidar: ^3.5.2
-    debug: ^3.2.7
-    ignore-by-default: ^1.0.1
-    minimatch: ^3.0.4
-    pstree.remy: ^1.1.8
-    semver: ^5.7.1
-    supports-color: ^5.5.0
-    touch: ^3.1.0
-    undefsafe: ^2.0.5
-    update-notifier: ^5.1.0
-  bin:
-    nodemon: bin/nodemon.js
-  checksum: ff818aa91b283bd0f1f6cfb8fdc9b5c3e74d5efa0cb72276dc242b742dc35d3f0720d35d99dbe85ecf6df7185f083ef9b1f7908094e43fd4e2508b6805d644dc
-  languageName: node
-  linkType: hard
-
 "nopt@npm:^5.0.0":
   version: 5.0.0
   resolution: "nopt@npm:5.0.0"
@@ -27317,17 +27109,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nopt@npm:~1.0.10":
-  version: 1.0.10
-  resolution: "nopt@npm:1.0.10"
-  dependencies:
-    abbrev: 1
-  bin:
-    nopt: ./bin/nopt.js
-  checksum: f62575aceaa3be43f365bf37a596b89bbac2e796b001b6d2e2a85c2140a4e378ff919e2753ccba959c4fd344776fc88c29b393bc167fa939fb1513f126f4cd45
-  languageName: node
-  linkType: hard
-
 "normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0":
   version: 2.5.0
   resolution: "normalize-package-data@npm:2.5.0"
@@ -27387,13 +27168,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-url@npm:^4.1.0":
-  version: 4.5.1
-  resolution: "normalize-url@npm:4.5.1"
-  checksum: 9a9dee01df02ad23e171171893e56e22d752f7cff86fb96aafeae074819b572ea655b60f8302e2d85dbb834dc885c972cc1c573892fea24df46b2765065dd05a
-  languageName: node
-  linkType: hard
-
 "normalize-url@npm:^6.0.1, normalize-url@npm:^6.1.0":
   version: 6.1.0
   resolution: "normalize-url@npm:6.1.0"
@@ -27464,8 +27238,8 @@ __metadata:
   linkType: hard
 
 "npm-packlist@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "npm-packlist@npm:5.1.0"
+  version: 5.1.1
+  resolution: "npm-packlist@npm:5.1.1"
   dependencies:
     glob: ^8.0.1
     ignore-walk: ^5.0.1
@@ -27473,7 +27247,7 @@ __metadata:
     npm-normalize-package-bin: ^1.0.1
   bin:
     npm-packlist: bin/index.js
-  checksum: aeeed530858bd760236e49f42f36174a437e632406d71ee8af91f15ad42e3a49332365c3dfa3dc0686599506e3a3701d8c7eab157480993ad8634dbc5af27adc
+  checksum: 28dab153744ceb4695b82a9032d14aa2bfb855d38344a09052673d07860a4d8725f808ed23996e6f2792c48e11f5d147632c159f798d2c24dac92b51a884f0c6
   languageName: node
   linkType: hard
 
@@ -27966,13 +27740,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-cancelable@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "p-cancelable@npm:1.1.0"
-  checksum: 2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece
-  languageName: node
-  linkType: hard
-
 "p-defer@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-defer@npm:1.0.0"
@@ -28166,18 +27933,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"package-json@npm:^6.3.0":
-  version: 6.5.0
-  resolution: "package-json@npm:6.5.0"
-  dependencies:
-    got: ^9.6.0
-    registry-auth-token: ^4.0.0
-    registry-url: ^5.0.0
-    semver: ^6.2.0
-  checksum: cc9f890d3667d7610e6184decf543278b87f657d1ace0deb4a9c9155feca738ef88f660c82200763d3348010f4e42e9c7adc91e96ab0f86a770955995b5351e2
-  languageName: node
-  linkType: hard
-
 "pacote@npm:^13.0.3, pacote@npm:^13.0.5, pacote@npm:^13.4.1":
   version: 13.6.1
   resolution: "pacote@npm:13.6.1"
@@ -28348,27 +28103,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-path@npm:^4.0.0":
-  version: 4.0.3
-  resolution: "parse-path@npm:4.0.3"
+"parse-path@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "parse-path@npm:4.0.4"
   dependencies:
     is-ssh: ^1.3.0
     protocols: ^1.4.0
     qs: ^6.9.4
     query-string: ^6.13.8
-  checksum: d1704c0027489b64838c608c3f075fe3599c18a7413fa92e7074a0157e5bcc1a4ef73e7ae9bd9dbf5fad1809137437310cc69a57e5f5130ea17226165f3e942a
+  checksum: 909e628c35baebeb3bdcaa376e2c5a21632a9094079ac55e04b3311db28219b15e517e10987dd49a13a904f2605b747b6368b0092130e0f2ff9bc5ffc40ceb63
   languageName: node
   linkType: hard
 
 "parse-url@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "parse-url@npm:6.0.0"
+  version: 6.0.2
+  resolution: "parse-url@npm:6.0.2"
   dependencies:
     is-ssh: ^1.3.0
     normalize-url: ^6.1.0
-    parse-path: ^4.0.0
+    parse-path: ^4.0.4
     protocols: ^1.4.0
-  checksum: 6b680d1fdfba15fc54106c1130540bf61a415bc3085351b8609a213b2fdf551c53ec8d32703d8ea9b6c5fbf2da92ee1593c99f682032512b15ce87f9013d2a39
+  checksum: cbd11ad5e5100821aaee8ef2d05df339209e8bc87b2bdccc213bf27b85c0b50c5aee6ab96ad7401f18e0982ba913107c940bab30a8982db08337a056e667d917
   languageName: node
   linkType: hard
 
@@ -29878,13 +29633,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prepend-http@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "prepend-http@npm:2.0.0"
-  checksum: 7694a9525405447662c1ffd352fcb41b6410c705b739b6f4e3a3e21cf5fdede8377890088e8934436b8b17ba55365a615f153960f30877bf0d0392f9e93503ea
-  languageName: node
-  linkType: hard
-
 "prettier@npm:2.6.0":
   version: 2.6.0
   resolution: "prettier@npm:2.6.0"
@@ -30190,13 +29938,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"protocols@npm:^1.1.0, protocols@npm:^1.4.0":
+"protocols@npm:^1.4.0":
   version: 1.4.8
   resolution: "protocols@npm:1.4.8"
   checksum: 2d555c013df0b05402970f67f7207c9955a92b1d13ffa503c814b5fe2f6dde7ac6a03320e0975c1f5832b0113327865e0b3b28bfcad023c25ddb54b53fab8684
   languageName: node
   linkType: hard
 
+"protocols@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "protocols@npm:2.0.1"
+  checksum: 4a9bef6aa0449a0245ded319ac3cbfd032c3e76ebb562777037a3a832c99253d0e8bc2847f7be350236df620a11f7d4fe683ea7f59a2cc14c69f746b6259eda4
+  languageName: node
+  linkType: hard
+
 "proxy-addr@npm:~2.0.5, proxy-addr@npm:~2.0.7":
   version: 2.0.7
   resolution: "proxy-addr@npm:2.0.7"
@@ -30237,13 +29992,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pstree.remy@npm:^1.1.8":
-  version: 1.1.8
-  resolution: "pstree.remy@npm:1.1.8"
-  checksum: 5cb53698d6bb34dfb278c8a26957964aecfff3e161af5fbf7cee00bbe9d8547c7aced4bd9cb193bce15fb56e9e4220fc02a5bf9c14345ffb13a36b858701ec2d
-  languageName: node
-  linkType: hard
-
 "public-encrypt@npm:^4.0.0":
   version: 4.0.3
   resolution: "public-encrypt@npm:4.0.3"
@@ -30310,15 +30058,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pupa@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "pupa@npm:2.1.1"
-  dependencies:
-    escape-goat: ^2.0.0
-  checksum: 49529e50372ffdb0cccf0efa0f3b3cb0a2c77805d0d9cc2725bd2a0f6bb414631e61c93a38561b26be1259550b7bb6c2cb92315aa09c8bf93f3bdcb49f2b2fb7
-  languageName: node
-  linkType: hard
-
 "q@npm:^1.5.1":
   version: 1.5.1
   resolution: "q@npm:1.5.1"
@@ -30349,7 +30088,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qs@npm:^6.4.0, qs@npm:^6.9.4":
+"qs@npm:^6.4.0":
   version: 6.10.1
   resolution: "qs@npm:6.10.1"
   dependencies:
@@ -30358,6 +30097,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"qs@npm:^6.9.4":
+  version: 6.11.0
+  resolution: "qs@npm:6.11.0"
+  dependencies:
+    side-channel: ^1.0.4
+  checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
+  languageName: node
+  linkType: hard
+
 "qs@npm:~6.5.2":
   version: 6.5.2
   resolution: "qs@npm:6.5.2"
@@ -30833,20 +30581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "rc@npm:1.2.8"
-  dependencies:
-    deep-extend: ^0.6.0
-    ini: ~1.3.0
-    minimist: ^1.2.0
-    strip-json-comments: ~2.0.1
-  bin:
-    rc: ./cli.js
-  checksum: 2e26e052f8be2abd64e6d1dabfbd7be03f80ec18ccbc49562d31f617d0015fbdbcf0f9eed30346ea6ab789e0fdfe4337f033f8016efdbee0df5354751842080e
-  languageName: node
-  linkType: hard
-
 "re-resizable@npm:6.9.9":
   version: 6.9.9
   resolution: "re-resizable@npm:6.9.9"
@@ -30857,6 +30591,45 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-awesome-query-builder@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "react-awesome-query-builder@npm:5.1.2"
+  dependencies:
+    "@date-io/moment": ^1.3.13
+    classnames: ^2.3.1
+    clone: ^2.1.2
+    immutable: ^3.8.2
+    lodash: ^4.17.21
+    moment: ^2.29.1
+    prop-types: ^15.7.2
+    react-redux: ^7.2.2
+    redux: ^4.1.0
+    spel2js: ^0.2.8
+    sqlstring: ^2.3.2
+  peerDependencies:
+    "@ant-design/icons": ^4.0.0
+    "@emotion/react": ^11.7.1
+    "@emotion/styled": ^11.6.0
+    "@fortawesome/fontawesome-svg-core": ^1.2.36
+    "@fortawesome/free-solid-svg-icons": ^5.15.4
+    "@fortawesome/react-fontawesome": ^0.1.16
+    "@material-ui/core": ^4.12.3
+    "@material-ui/icons": ^4.0.0
+    "@material-ui/lab": ^4.0.0-alpha.57
+    "@material-ui/pickers": ^3.2.10
+    "@mui/icons-material": ^5.2.4
+    "@mui/lab": ^5.0.0-alpha.60
+    "@mui/material": ^5.2.4
+    antd: ^4.0.0
+    bootstrap: ^5.1.3
+    material-ui-confirm: ^2.0.1 || ^3.0.0
+    react: ^16.8.4 || ^17.0.1
+    react-dom: ^16.8.4 || ^17.0.1
+    reactstrap: ^9.0.0
+  checksum: 6efab0fcbb98d4843fbe3b5036a7831fd097774869fc0e175ca40c4770d7939dd3efcb2c3365c6fe539c8ba6b6bb19ddef55d93f491770a9bfdc3f1355cc5e4e
+  languageName: node
+  linkType: hard
+
 "react-beautiful-dnd@npm:13.1.0":
   version: 13.1.0
   resolution: "react-beautiful-dnd@npm:13.1.0"
@@ -31441,6 +31214,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-redux@npm:^7.2.2":
+  version: 7.2.8
+  resolution: "react-redux@npm:7.2.8"
+  dependencies:
+    "@babel/runtime": ^7.15.4
+    "@types/react-redux": ^7.1.20
+    hoist-non-react-statics: ^3.3.2
+    loose-envify: ^1.4.0
+    prop-types: ^15.7.2
+    react-is: ^17.0.2
+  peerDependencies:
+    react: ^16.8.3 || ^17 || ^18
+  peerDependenciesMeta:
+    react-dom:
+      optional: true
+    react-native:
+      optional: true
+  checksum: ecf1933e91013f2d41bfc781515b536bf81eb1f70ff228607841094c8330fe77d522372b359687e51c0b52b9888dba73db9ac0486aace1896ab9eb9daec102d5
+  languageName: node
+  linkType: hard
+
 "react-refresh@npm:0.14.0":
   version: 0.14.0
   resolution: "react-refresh@npm:0.14.0"
@@ -31864,14 +31658,14 @@ __metadata:
   linkType: hard
 
 "read-package-json@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "read-package-json@npm:4.1.1"
+  version: 4.1.2
+  resolution: "read-package-json@npm:4.1.2"
   dependencies:
     glob: ^7.1.1
     json-parse-even-better-errors: ^2.3.0
     normalize-package-data: ^3.0.0
     npm-normalize-package-bin: ^1.0.0
-  checksum: d95f6e9747bcce9bdbfae8442a86c41cde3a73691a8a8cdc46e0711e7768718e1f0955a38cbde01a6e571f490bbdc9d6a83713a89eca85646a816e659a78f6f4
+  checksum: 729acda12fdbff6cee8cee7b6023a16e85c02406e2427b3cd091948d945940cfb6a6ebe7a8b4df967d483f360d0ec12fb83ab80de3e7bbb2ba2c426d07fd774e
   languageName: node
   linkType: hard
 
@@ -32065,7 +31859,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redux@npm:4.2.0":
+"redux@npm:4.2.0, redux@npm:^4.1.0":
   version: 4.2.0
   resolution: "redux@npm:4.2.0"
   dependencies:
@@ -32222,24 +32016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"registry-auth-token@npm:^4.0.0":
-  version: 4.2.1
-  resolution: "registry-auth-token@npm:4.2.1"
-  dependencies:
-    rc: ^1.2.8
-  checksum: aa72060b573a50607cfd2dee16d0e51e13ca58b6a80442e74545325dc24d2c38896e6bad229bdcc1fc9759fa81b4066be8693d4d6f45927318e7c793a93e9cd0
-  languageName: node
-  linkType: hard
-
-"registry-url@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "registry-url@npm:5.1.0"
-  dependencies:
-    rc: ^1.2.8
-  checksum: bcea86c84a0dbb66467b53187fadebfea79017cddfb4a45cf27530d7275e49082fe9f44301976eb0164c438e395684bcf3dae4819b36ff9d1640d8cc60c73df9
-  languageName: node
-  linkType: hard
-
 "regjsgen@npm:^0.5.2":
   version: 0.5.2
   resolution: "regjsgen@npm:0.5.2"
@@ -32662,15 +32438,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"responselike@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "responselike@npm:1.0.2"
-  dependencies:
-    lowercase-keys: ^1.0.0
-  checksum: 2e9e70f1dcca3da621a80ce71f2f9a9cad12c047145c6ece20df22f0743f051cf7c73505e109814915f23f9e34fb0d358e22827723ee3d56b623533cab8eafcd
-  languageName: node
-  linkType: hard
-
 "restore-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
@@ -33161,13 +32928,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"search-query-parser@npm:1.6.0":
-  version: 1.6.0
-  resolution: "search-query-parser@npm:1.6.0"
-  checksum: 6ce290e1d1602401ab5e4561f2a9744d1ffd75da5759cc8ead162153258d8470dd86757a3be577772e883d48673dec42b26843fc4aa5155f1ec902112ce92225
-  languageName: node
-  linkType: hard
-
 "secure-compare@npm:3.0.1":
   version: 3.0.1
   resolution: "secure-compare@npm:3.0.1"
@@ -33216,16 +32976,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver-diff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "semver-diff@npm:3.1.1"
-  dependencies:
-    semver: ^6.3.0
-  checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe
-  languageName: node
-  linkType: hard
-
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0, semver@npm:^5.7.1":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0":
   version: 5.7.1
   resolution: "semver@npm:5.7.1"
   bin:
@@ -33243,7 +32994,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.3.7, semver@npm:^7.0.0, semver@npm:^7.3.7":
+"semver@npm:7.3.7, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.3.7":
   version: 7.3.7
   resolution: "semver@npm:7.3.7"
   dependencies:
@@ -33254,7 +33005,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:7.x, semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:~7.3.0":
+"semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:~7.3.0":
   version: 7.3.5
   resolution: "semver@npm:7.3.5"
   dependencies:
@@ -33265,7 +33016,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.2.0, semver@npm:^6.3.0":
+"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
   version: 6.3.0
   resolution: "semver@npm:6.3.0"
   bin:
@@ -33820,17 +33571,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks@npm:^2.3.3, socks@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "socks@npm:2.6.1"
-  dependencies:
-    ip: ^1.1.5
-    smart-buffer: ^4.1.0
-  checksum: 2ca9d616e424f645838ebaabb04f85d94ea999e0f8393dc07f86c435af22ed88cb83958feeabd1bb7bc537c635ed47454255635502c6808a6df61af1f41af750
-  languageName: node
-  linkType: hard
-
-"socks@npm:^2.6.2":
+"socks@npm:^2.3.3, socks@npm:^2.6.2":
   version: 2.6.2
   resolution: "socks@npm:2.6.2"
   dependencies:
@@ -33840,6 +33581,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"socks@npm:^2.6.1":
+  version: 2.6.1
+  resolution: "socks@npm:2.6.1"
+  dependencies:
+    ip: ^1.1.5
+    smart-buffer: ^4.1.0
+  checksum: 2ca9d616e424f645838ebaabb04f85d94ea999e0f8393dc07f86c435af22ed88cb83958feeabd1bb7bc537c635ed47454255635502c6808a6df61af1f41af750
+  languageName: node
+  linkType: hard
+
 "sort-asc@npm:^0.1.0":
   version: 0.1.0
   resolution: "sort-asc@npm:0.1.0"
@@ -34073,6 +33824,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"spel2js@npm:^0.2.8":
+  version: 0.2.8
+  resolution: "spel2js@npm:0.2.8"
+  checksum: a81f30b90438c6fef27627d8f91e2ce9040cc3743918846e535e44bdbf76be4d404d281e83b1be8287f36c1566a22e20d711532b941838f9ca7673e5caebf75f
+  languageName: node
+  linkType: hard
+
 "split-on-first@npm:^1.0.0":
   version: 1.1.0
   resolution: "split-on-first@npm:1.1.0"
@@ -34123,6 +33881,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sqlstring@npm:^2.3.2":
+  version: 2.3.3
+  resolution: "sqlstring@npm:2.3.3"
+  checksum: 1e7e2d51c38a0cf7372e875408ca100b6e0c9a941ab7773975ea41fb36e5528e404dc787689be855780cf6d0a829ff71027964ae3a05a7446e91dce26672fda7
+  languageName: node
+  linkType: hard
+
 "sshpk@npm:^1.14.1, sshpk@npm:^1.7.0":
   version: 1.16.1
   resolution: "sshpk@npm:1.16.1"
@@ -34593,13 +34358,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-json-comments@npm:~2.0.1":
-  version: 2.0.1
-  resolution: "strip-json-comments@npm:2.0.1"
-  checksum: 1074ccb63270d32ca28edfb0a281c96b94dc679077828135141f27d52a5a398ef5e78bcf22809d23cadc2b81dfbe345eb5fd8699b385c8b1128907dec4a7d1e1
-  languageName: node
-  linkType: hard
-
 "strong-log-transformer@npm:^2.1.0":
   version: 2.1.0
   resolution: "strong-log-transformer@npm:2.1.0"
@@ -34800,7 +34558,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^5.3.0, supports-color@npm:^5.5.0":
+"supports-color@npm:^5.3.0":
   version: 5.5.0
   resolution: "supports-color@npm:5.5.0"
   dependencies:
@@ -35351,13 +35109,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"to-readable-stream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "to-readable-stream@npm:1.0.0"
-  checksum: 2bd7778490b6214a2c40276065dd88949f4cf7037ce3964c76838b8cb212893aeb9cceaaf4352a4c486e3336214c350270f3263e1ce7a0c38863a715a4d9aeb5
-  languageName: node
-  linkType: hard
-
 "to-regex-range@npm:^2.1.0":
   version: 2.1.1
   resolution: "to-regex-range@npm:2.1.1"
@@ -35426,17 +35177,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"touch@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "touch@npm:3.1.0"
-  dependencies:
-    nopt: ~1.0.10
-  bin:
-    nodetouch: ./bin/nodetouch.js
-  checksum: e0be589cb5b0e6dbfce6e7e077d4a0d5f0aba558ef769c6d9c33f635e00d73d5be49da6f8631db302ee073919d82b5b7f56da2987feb28765c95a7673af68647
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^4.0.0":
   version: 4.0.0
   resolution: "tough-cookie@npm:4.0.0"
@@ -35519,9 +35259,9 @@ __metadata:
   linkType: hard
 
 "trim@npm:0.0.1":
-  version: 0.0.1
-  resolution: "trim@npm:0.0.1"
-  checksum: 2b4646dff99a222e8e1526edd4e3a43bbd925af0b8e837c340455d250157e7deefaa4da49bb891ab841e5c27b1afc5e9e32d4b57afb875d2dfcabf4e319b8f7f
+  version: 0.0.3
+  resolution: "trim@npm:0.0.3"
+  checksum: 9a059ba56d5e22c9e571798a7c63640cb25478c495d8a9d001f6352927207c6bd224018751a0c5145fbedc943ee2ebab1d7cc2e8ccba3121a51a7d3428dd879c
   languageName: node
   linkType: hard
 
@@ -35923,9 +35663,9 @@ __metadata:
   linkType: hard
 
 "type@npm:^2.5.0":
-  version: 2.5.0
-  resolution: "type@npm:2.5.0"
-  checksum: 0fe1bb4e8ba298b2b245fdc6bca6178887e29e2134d231e468366615b3adffd651d464eb51d8b15f8cfd168577c282a17e19bf80f036a60d4df16308a83a93c4
+  version: 2.6.0
+  resolution: "type@npm:2.6.0"
+  checksum: 80da01fcc0f6ed5a253dc326530e134000a8f66ea44b6d9687cde2f894f0d0b2486595b0cd040a64f7f79dc3120784236f8c9ef667a8aef03984e049b447cfb4
   languageName: node
   linkType: hard
 
@@ -36033,13 +35773,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undefsafe@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "undefsafe@npm:2.0.5"
-  checksum: f42ab3b5770fedd4ada175fc1b2eb775b78f609156f7c389106aafd231bfc210813ee49f54483d7191d7b76e483bc7f537b5d92d19ded27156baf57592eb02cc
-  languageName: node
-  linkType: hard
-
 "underscore@npm:1.13.3":
   version: 1.13.3
   resolution: "underscore@npm:1.13.3"
@@ -36148,15 +35881,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-string@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unique-string@npm:2.0.0"
-  dependencies:
-    crypto-random-string: ^2.0.0
-  checksum: ef68f639136bcfe040cf7e3cd7a8dff076a665288122855148a6f7134092e6ed33bf83a7f3a9185e46c98dddc445a0da6ac25612afa1a7c38b8b654d6c02498e
-  languageName: node
-  linkType: hard
-
 "unist-builder@npm:2.0.3, unist-builder@npm:^2.0.0":
   version: 2.0.3
   resolution: "unist-builder@npm:2.0.3"
@@ -36312,28 +36036,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-notifier@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "update-notifier@npm:5.1.0"
-  dependencies:
-    boxen: ^5.0.0
-    chalk: ^4.1.0
-    configstore: ^5.0.1
-    has-yarn: ^2.1.0
-    import-lazy: ^2.1.0
-    is-ci: ^2.0.0
-    is-installed-globally: ^0.4.0
-    is-npm: ^5.0.0
-    is-yarn-global: ^0.3.0
-    latest-version: ^5.1.0
-    pupa: ^2.1.1
-    semver: ^7.3.4
-    semver-diff: ^3.1.1
-    xdg-basedir: ^4.0.0
-  checksum: 461e5e5b002419296d3868ee2abe0f9ab3e1846d9db642936d0c46f838872ec56069eddfe662c45ce1af0a8d6d5026353728de2e0a95ab2e3546a22ea077caf1
-  languageName: node
-  linkType: hard
-
 "uplot@npm:1.6.21":
   version: 1.6.21
   resolution: "uplot@npm:1.6.21"
@@ -36381,15 +36083,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-parse-lax@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "url-parse-lax@npm:3.0.0"
-  dependencies:
-    prepend-http: ^2.0.0
-  checksum: 1040e357750451173132228036aff1fd04abbd43eac1fb3e4fca7495a078bcb8d33cb765fe71ad7e473d9c94d98fd67adca63bd2716c815a2da066198dd37217
-  languageName: node
-  linkType: hard
-
 "url@npm:^0.11.0":
   version: 0.11.0
   resolution: "url@npm:0.11.0"
@@ -37631,13 +37324,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xdg-basedir@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "xdg-basedir@npm:4.0.0"
-  checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c
-  languageName: node
-  linkType: hard
-
 "xml-name-validator@npm:^3.0.0":
   version: 3.0.0
   resolution: "xml-name-validator@npm:3.0.0"