"Release: Updated versions in package to 8.5.4" (#358 )

Fix typo in curl command (#46729 ) (#49818 )
* Fix typo in curl command Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> Signed-off-by: Jack Baldry <jack.baldry@grafana.com> * Fix typo in another curl command Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> Signed-off-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> (cherry picked from commit 0a23299878) Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
2022-05-30 10:55:03 -03:00 · 2022-05-30 14:24:10 +02:00 · 2022-05-30 09:19:39 +00:00 · 2022-05-30 09:38:15 +02:00 · 2022-05-26 19:00:24 +02:00 · 2022-05-26 12:38:05 -04:00
5985 changed files with 289176 additions and 93860 deletions
--- a/.betterer.results
+++ b/.betterer.results
@@ -0,0 +1,342 @@
+// BETTERER RESULTS V2.
+// 
+// If this file contains merge conflicts, use `betterer merge` to automatically resolve them:
+// https://phenomnomnominal.github.io/betterer/docs/results-file/#merge
+//
+exports[`no enzyme tests`] = {
+  value: `{
+    "packages/grafana-ui/src/components/BarGauge/BarGauge.test.tsx:4199795290": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx:3311646309": [
+      [0, 31, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/FormField/FormField.test.tsx:3429087660": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx:3129955645": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Gauge/Gauge.test.tsx:2525939157": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Graph/Graph.test.tsx:1664091255": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx:1865444105": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/List/AbstractList.test.tsx:2972876749": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogLabels.test.tsx:1029448019": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx:1630730648": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx:2719724375": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogRows.test.tsx:3121815234": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:375894800": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Slider/Slider.test.tsx:751112695": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Typeahead/PartialHighlighter.test.tsx:1751923376": [
+      [0, 31, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Typeahead/Typeahead.test.tsx:972524250": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.test.tsx:3512289373": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/braces.test.tsx:1440546721": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/clear.test.tsx:1085648664": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/runner.test.tsx:446043290": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/suggestions.test.tsx:3654981205": [
+      [0, 18, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.test.js:1974748555": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/GraphTicks.test.js:940336852": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.test.js:4256741694": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/TickLabels.test.js:2931161174": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.test.js:1676554632": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.test.js:186764954": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.test.js:3242042907": [
+      [14, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/TracePageSearchBar.test.js:2807329716": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.test.js:1734982398": [
+      [14, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.test.js:3807792910": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.test.js:1478502145": [
+      [14, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js:3826510429": [
+      [14, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.js:2408389970": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js:3960703835": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.test.js:2429764318": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.test.js:1966455998": [
+      [14, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js:3813002651": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.js:3006381933": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js:3097530078": [
+      [16, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js:2623922632": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.js:1117377794": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.test.js:743308415": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.test.js:4018342820": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.js:2286101708": [
+      [15, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.test.js:2106409544": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.js:1423129438": [
+      [15, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.js:2326471104": [
+      [13, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/index.test.js:381298544": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/common/CopyIcon.test.js:187212136": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/common/NewWindowIcon.test.js:1750458349": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/common/UiFindInput.test.js:2207118020": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/url/ReferenceLink.test.js:3249503373": [
+      [14, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/PageActionBar/PageActionBar.test.tsx:1251504193": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx:3032694716": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx:2026575657": [
+      [0, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/Select/FolderPicker.test.tsx:993468764": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/Select/MetricSelect.test.tsx:3351544014": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/alerting/AlertRuleList.test.tsx:2998938420": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/alerting/TestRuleResult.test.tsx:2358420489": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/api-keys/ApiKeysAddedModal.test.tsx:3246264379": [
+      [0, 20, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:1463123173": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx:1969004590": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx:948029434": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:2357087833": [
+      [0, 35, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx:2723773538": [
+      [0, 35, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.test.tsx:2851646279": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/DashboardsTable.test.tsx:1950355032": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/DataSourceDashboards.test.tsx:1369048021": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/DataSourcesListPage.test.tsx:2960099202": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/settings/BasicSettings.test.tsx:625016324": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/settings/ButtonRow.test.tsx:1422996720": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.test.tsx:4164297658": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/LiveLogs.test.tsx:156663779": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistory.test.tsx:193587232": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistoryCard.test.tsx:4263002507": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx:3770907760": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistorySettings.test.tsx:4065084278": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx:3750328521": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RunButton.test.tsx:4267530266": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/SecondaryActions.test.tsx:1177396128": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/TimeSyncButton.test.tsx:853739820": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/folders/FolderSettingsPage.test.tsx:1109052730": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/invites/InviteesTable.test.tsx:3612992381": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/org/OrgDetailsPage.test.tsx:3835042085": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/org/OrgProfile.test.tsx:623809345": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/CreateTeam.test.tsx:1750035593": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamGroupSync.test.tsx:2526985933": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamList.test.tsx:854193970": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamMemberRow.test.tsx:1649328210": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamMembers.test.tsx:4089428239": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamPages.test.tsx:3990420214": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamSettings.test.tsx:2043271249": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/users/UsersActionBar.test.tsx:3740177621": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/users/UsersListPage.test.tsx:3908145117": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/users/UsersTable.test.tsx:263958312": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx:3822406835": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx:1224072551": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx:2097436158": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx:3481855642": [
+      [0, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx:248699332": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/grafana-azure-monitor-datasource/components/deprecated/components/InsightsConfig.test.tsx:1107283234": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/ConfigEditor.test.tsx:3456478975": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx:1488067923": [
+      [0, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx:146069464": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx:3658171175": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx:1551927716": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx:3570129984": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx:2402631398": [
+      [0, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.test.tsx:3424320489": [
+      [0, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/panel/bargauge/BarGaugePanel.test.tsx:1597135392": [
+      [0, 31, 13, "RegExp match", "2409514259"]
+    ]
+  }`
+};
--- a/.betterer.ts
+++ b/.betterer.ts
@@ -0,0 +1,5 @@
+import { regexp } from '@betterer/regexp';
+
+export default {
+  'no enzyme tests': () => regexp(/from 'enzyme'/g).include('**/*.test.*'),
+};
--- a/.bra.toml
+++ b/.bra.toml
@@ -1,8 +1,8 @@
 [run]
 init_cmds = [
  ["make", "gen-go"],
-  ["go", "run", "build.go", "-dev", "build-cli"],
-  ["go", "run", "build.go", "-dev", "build-server"],
+  ["GO_BUILD_DEV=1", "make", "build-cli"],
+  ["GO_BUILD_DEV=1", "make", "build-server"],
  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
@@ -13,8 +13,10 @@ watch_dirs = [
  "$WORKDIR/conf",
 ]
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
+ignore_files = ["wire_gen.go"]
 build_delay = 1500
 cmds = [
-  ["go", "run", "build.go", "-dev", "build-server"],
+  ["make", "gen-go"],
+  ["GO_BUILD_DEV=1", "make", "build-server"],
  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +0,0 @@
-version: 2.1
-jobs:
-  build:
-    docker:
-      - image: alpine:3.7
-    steps:
-      - run:
-          name: The First Step
-          command: |
-            echo 'Fake step!'
-
--- a/.drone.star
+++ b/.drone.star
@@ -6,7 +6,8 @@

 load('scripts/drone/pipelines/pr.star', 'pr_pipelines')
 load('scripts/drone/pipelines/main.star', 'main_pipelines')
-load('scripts/drone/pipelines/release.star', 'release_pipelines', 'test_release_pipelines')
+load('scripts/drone/pipelines/docs.star', 'docs_pipelines')
+load('scripts/drone/pipelines/release.star', 'release_pipelines', 'publish_image_pipelines', 'publish_artifacts_pipelines', 'publish_npm_pipelines', 'publish_packages_pipeline')
 load('scripts/drone/version.star', 'version_branch_pipelines')
 load('scripts/drone/pipelines/cron.star', 'cronjobs')
 load('scripts/drone/vault.star', 'secrets')
@@ -14,4 +15,7 @@ load('scripts/drone/vault.star', 'secrets')
 def main(ctx):
    edition = 'oss'
    return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \
-        test_release_pipelines() + version_branch_pipelines() + cronjobs(edition=edition) + secrets()
+        publish_image_pipelines('public') + publish_image_pipelines('security') + \
+        publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \
+        publish_npm_pipelines('public') + publish_packages_pipeline() + \
+        version_branch_pipelines() + cronjobs(edition=edition) + secrets()
--- a/.drone.yml
+++ b/.drone.yml
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,9 +1,25 @@
-node_modules
-compiled
+.git
+.github
+.yarn
 build
-vendor
-devenv
+compiled
 data
+deployment_tools_config.json
+devenv
 dist
 e2e/tmp
+node_modules
+pkg
 public/lib/monaco
+scripts/grafana-server/tmp
+vendor
+
+# TS generate from cue by cuetsy
+**/*.gen.ts
+
+# Auto-generated localisation files
+public/locales/_build/
+public/locales/**/*.js
+
+# Auto-generated icon file
+packages/grafana-ui/src/components/Icon/iconBundle.ts
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,12 +1,24 @@
 {
  "extends": ["@grafana/eslint-config"],
  "root": true,
-  "plugins": ["no-only-tests", "@emotion", "lodash"],
+  "plugins": ["@emotion", "lodash", "jest", "import"],
+  "settings": {
+    "import/internal-regex": "^(app/)|(@grafana)",
+    "import/external-module-folders": ["node_modules", ".yarn"]
+  },
  "rules": {
-    "no-only-tests/no-only-tests": "error",
    "react/prop-types": "off",
    "@emotion/jsx-import": "error",
-    "lodash/import-scope": [2, "member"]
+    "lodash/import-scope": [2, "member"],
+    "jest/no-focused-tests": "error",
+    "import/order": [
+      "error",
+      {
+        "groups": [["builtin", "external"], "internal", "parent", "sibling", "index"],
+        "newlines-between": "always",
+        "alphabetize": { "order": "asc" }
+      }
+    ]
  },
  "overrides": [
    {
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,7 +14,7 @@
 # Documentation owner: Jita Chatterjee
 /docs/ @grafana/docs-squad @pkolyvas
 /contribute/ @marcusolsson @grafana/docs-squad @pkolyvas
-/docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad @grafana/plugins-platform
+/docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
 /docs/sources/developers/plugins/backend @marcusolsson @grafana/docs-squad @grafana/plugins-platform-backend
 /docs/sources/enterprise/ @osg-grafana @grafana/docs-squad

@@ -30,29 +30,41 @@ go.sum @grafana/backend-platform
 /scripts/drone/ @grafana/grafana-release-eng

 # Cloud Datasources backend code
-/pkg/tsdb/cloudwatch @grafana/cloud-datasources @grafana/observability-squad
+/pkg/tsdb/cloudwatch @grafana/cloud-datasources
 /pkg/tsdb/azuremonitor @grafana/cloud-datasources
 /pkg/tsdb/cloudmonitoring @grafana/cloud-datasources

 # Observability backend code
-/pkg/tsdb/influxdb @grafana/observability-squad
-/pkg/tsdb/elasticsearch @grafana/observability-squad
-/pkg/tsdb/graphite @grafana/observability-squad
-/pkg/tsdb/jaeger @grafana/observability-squad
-/pkg/tsdb/loki @grafana/observability-squad
-/pkg/tsdb/zipkin @grafana/observability-squad
-/pkg/tsdb/tempo @grafana/observability-squad
+/pkg/tsdb/prometheus @grafana/observability-metrics
+/pkg/tsdb/influxdb @grafana/observability-metrics
+/pkg/tsdb/elasticsearch @grafana/observability-logs-and-traces
+/pkg/tsdb/graphite @grafana/observability-metrics
+/pkg/tsdb/jaeger @grafana/observability-logs-and-traces
+/pkg/tsdb/loki @grafana/observability-logs-and-traces
+/pkg/tsdb/zipkin @grafana/observability-logs-and-traces
+/pkg/tsdb/tempo @grafana/observability-logs-and-traces
+
+# BI backend code
+/pkg/tsdb/mysql @grafana/grafana-bi-squad
+/pkg/tsdb/postgres @grafana/grafana-bi-squad
+/pkg/tsdb/mssql @grafana/grafana-bi-squad

 # Database migrations
 /pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team
 *_mig.go @grafana/backend-platform @grafana/hosted-grafana-team

-# Grafana live
+# Grafana edge
 /pkg/services/live/ @grafana/grafana-edge-squad
+/pkg/services/searchV2/ @grafana/grafana-edge-squad
+/pkg/services/store/ @grafana/grafana-edge-squad
+/pkg/infra/filestore/ @grafana/grafana-edge-squad

-# Unified Alerting
-/pkg/services/ngalert @grafana/alerting-squad
-/pkg/services/sqlstore/migrations/ualert @grafana/alerting-squad
+# Alerting
+/pkg/services/ngalert @grafana/alerting-squad-backend
+/pkg/services/sqlstore/migrations/ualert @grafana/alerting-squad-backend
+/pkg/services/alerting @grafana/alerting-squad-backend
+/pkg/tests/api/alerting @grafana/alerting-squad-backend
+/public/app/features/alerting @grafana/alerting-squad-frontend

 # Library Services
 /pkg/services/libraryelements @grafana/user-essentials
@@ -64,6 +76,9 @@ go.sum @grafana/backend-platform
 /pkg/services/datasourceproxy @grafana/plugins-platform-backend
 /pkg/services/datasources @grafana/plugins-platform-backend

+# Dashboard previews / crawler (behind feature flag)
+/pkg/services/thumbs @grafana/grafana-edge-squad
+
 # Backend code docs
 /contribute/style-guides/backend.md @grafana/backend-platform
 /contribute/architecture/backend @grafana/backend-platform
@@ -81,20 +96,25 @@ go.sum @grafana/backend-platform
 /packages/grafana-ui/src/components/TimeSeries @grafana/grafana-bi-squad
 /packages/grafana-ui/src/components/uPlot @grafana/grafana-bi-squad
 /packages/grafana-ui/src/utils/storybook @grafana/plugins-platform-frontend
-/packages/jaeger-ui-components/ @grafana/observability-squad
+/packages/jaeger-ui-components/ @grafana/observability-logs-and-traces
 /plugins-bundled @grafana/plugins-platform-frontend
-/public @grafana/user-essentials
+# public folder
 /public/app/core/components/TimePicker @grafana/grafana-bi-squad
+/public/app/core/components/Layers @grafana/grafana-edge-squad
 /public/app/features/canvas/ @grafana/grafana-edge-squad
+/public/app/features/comments/ @grafana/grafana-edge-squad
 /public/app/features/dimensions/ @grafana/grafana-edge-squad
+/public/app/features/geo/ @grafana/grafana-edge-squad
 /public/app/features/live/ @grafana/grafana-edge-squad
-/public/app/features/explore/ @grafana/observability-squad
+/public/app/features/explore/ @grafana/observability-experience-squad
 /public/app/features/plugins @grafana/plugins-platform-frontend
+/public/app/features/transformers/spatial @grafana/grafana-edge-squad
 /public/app/plugins/panel/alertlist @grafana/alerting-squad
 /public/app/plugins/panel/barchart @grafana/grafana-bi-squad
 /public/app/plugins/panel/heatmap @grafana/grafana-bi-squad
 /public/app/plugins/panel/histogram @grafana/grafana-bi-squad
-/public/app/plugins/panel/nodeGraph @grafana/observability-squad
+/public/app/plugins/panel/logs @grafana/observability-logs-and-traces
+/public/app/plugins/panel/nodeGraph @grafana/observability-logs-and-traces
 /public/app/plugins/panel/piechart @grafana/grafana-bi-squad
 /public/app/plugins/panel/state-timeline @grafana/grafana-bi-squad
 /public/app/plugins/panel/status-history @grafana/grafana-bi-squad
@@ -125,22 +145,22 @@ lerna.json @grafana/frontend-ops
 *.mdx @marcusolsson @jessover9000 @grafana/plugins-platform-frontend

 # Core datasources
-/public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources @grafana/observability-squad
-/public/app/plugins/datasource/elasticsearch @grafana/observability-squad
+/public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources
+/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/graphite @grafana/observability-squad
-/public/app/plugins/datasource/influxdb @grafana/observability-squad
-/public/app/plugins/datasource/jaeger @grafana/observability-squad
-/public/app/plugins/datasource/loki @grafana/observability-squad
-/public/app/plugins/datasource/mssql @grafana/backend-platform
-/public/app/plugins/datasource/mysql @grafana/backend-platform
+/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
+/public/app/plugins/datasource/loki @grafana/observability-logs-and-traces
+/public/app/plugins/datasource/mssql @grafana/grafana-bi-squad
+/public/app/plugins/datasource/mysql @grafana/grafana-bi-squad
 /public/app/plugins/datasource/opentsdb @grafana/backend-platform
-/public/app/plugins/datasource/postgres @grafana/backend-platform
-/public/app/plugins/datasource/prometheus @grafana/observability-squad
+/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/zipkin @grafana/observability-squad
-/public/app/plugins/datasource/tempo @grafana/observability-squad
+/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

 # Cloud middleware
-/grafana-mixin/ @grafana/cloud-middleware
+/grafana-mixin/ @grafana/hosted-grafana-team
--- a/.github/commands.json
+++ b/.github/commands.json
@@ -1,53 +1,221 @@
 [
  {
-    "type": "label",
-    "name": "bot/question",
-    "addLabel": "type/question",
-    "removeLabel": "bot/question",
-    "action": "close",
-    "comment": "Please ask your question on [community.grafana.com/](https://community.grafana.com/). To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
+    "type":"label",
+    "name":"bot/question",
+    "addLabel":"type/question",
+    "removeLabel":"bot/question",
+    "action":"close",
+    "comment":"Please ask your question on [community.grafana.com/](https://community.grafana.com/). To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
  },
  {
-    "type": "comment",
-    "name": "duplicate",
-    "allowUsers": [],
-    "action": "updateLabels",
-    "addLabel": "type/duplicate"
+    "type":"comment",
+    "name":"duplicate",
+    "allowUsers":[],
+    "action":"updateLabels",
+    "addLabel":"type/duplicate"
+  },
+  {
+    "type":"label",
+    "name":"bot/duplicate",
+    "addLabel":"type/duplicate",
+    "removeLabel":"bot/duplicate",
+    "action":"close",
+    "comment":"Thanks for creating this issue! It looks like this has already been reported by another user. We’ve closed this in favor of the existing one. Please consider adding any details you think is missing to that issue.\n\nTo avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
+  },
+  {
+    "type":"comment",
+    "name":"needsMoreInfo",
+    "allowUsers":[],
+    "action":"updateLabels",
+    "addLabel":"bot/needs more info"
+  },
+  {
+    "type":"label",
+    "name":"bot/needs more info",
+    "action":"updateLabels",
+    "addLabel":"needs more info",
+    "removeLabel":"bot/needs more info",
+    "comment":"Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication, provisioning and alerting issues, Grafana server logs are useful. \r\n\r\nHappy graphing!"
+  },
+  {
+    "type":"label",
+    "name":"bot/no new info",
+    "action":"close",
+    "comment":"We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
+  },
+  {
+    "type":"label",
+    "name":"bot/close feature request",
+    "action":"close",
+    "addLabel":"not implemented",
+    "comment":"This feature request has been open for a long time with few received upvotes or comments, so we are closing it. We're trying to limit open GitHub issues in order to better track planned work and features.  \r\n\r\nThis doesn't mean that we'll never ever implement it or that we will never accept a PR for it. A closed issue can still attract upvotes and act as a ticket to track feature demand\/interest. \r\n\r\nThank You to you for taking the time to create this issue!"
+  },
+  {
+    "type":"label",
+    "name":"oss-user-essentials",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/78"
+    }
+  },
+  {
+    "type":"label",
+    "name":"area/plugins-catalog",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/76"
+    }
+  },
+  {
+    "type":"label",
+    "name":"type/docs",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/69"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Azure",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/97"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/CloudWatch",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/97"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/CloudWatch Logs",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/97"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/GoogleCloudMonitoring",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/97"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Prometheus",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/112"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/InfluxDB",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/112"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Graphite",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/112"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/OpenTSDB",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/112"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/OpenSearch",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Loki",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Tempo",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Elasticsearch",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Jaeger",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
+  {
+    "type":"label",
+    "name":"datasource/Zipkin",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
+  {
+    "type":"label",
+    "name":"area/explore",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/111"
+    }
+  },
+  {
+    "type":"label",
+    "name":"oss-user-essentials",
+    "action":"removeFromProject",
+    "removeFromProject":{
+      "url":"https://github.com/orgs/grafana/projects/78"
+    }
+  },
+  {
+    "type":"label",
+    "name":"oss-user-essentials",
+    "action":"removeFromProject",
+    "removeFromProject":{
+      "url":"https://github.com/grafana/grafana/projects/33"
+    }
  },
  {
    "type": "label",
-    "name": "bot/duplicate",
-    "addLabel": "type/duplicate",
-    "removeLabel": "bot/duplicate",
-    "action": "close",
-    "comment": "Thanks for creating this issue! It looks like this has already been reported by another user. We’ve closed this in favor of the existing one. Please consider adding any details you think is missing to that issue.\n\nTo avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
-  },
-  {
-    "type": "comment",
-    "name": "needsMoreInfo",
-    "allowUsers": [],
-    "action": "updateLabels",
-    "addLabel": "bot/needs more info"
-  },
-  {
-    "type": "label",
-    "name": "bot/needs more info",
-    "action": "updateLabels",
-    "addLabel": "needs more info",
-    "removeLabel": "bot/needs more info",
-    "comment": "Thanks for creating this issue! We think it's missing some basic information. \r\n\r\nFollow the issue template and add additional information that will help us replicate the problem. \r\nFor data visualization issues: \r\n- Query results from the inspect drawer (data tab & query inspector)\r\n- Panel settings can be extracted in the panel inspect drawer JSON tab\r\n\r\nFor dashboard related issues: \r\n- Dashboard JSON can be found in the dashboard settings JSON model view\r\n\r\nFor authentication, provisioning and alerting issues, Grafana server logs are useful. \r\n\r\nHappy graphing!"
-  },
-  {
-    "type": "label",
-    "name": "bot/no new info",
-    "action": "close",
-    "comment": "We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
-  },
-  {
-    "type": "label",
-    "name": "bot/close feature request",
-    "action": "close",
-    "addLabel": "not implemented",
-    "comment": "This feature request has been open for a long time with few received upvotes or comments, so we are closing it. We're trying to limit open GitHub issues in order to better track planned work and features.  \r\n\r\nThis doesn't mean that we'll never ever implement it or that we will never accept a PR for it. A closed issue can still attract upvotes and act as a ticket to track feature demand\/interest. \r\n\r\nThank You to you for taking the time to create this issue!"
+    "name": "team/grafana-partners",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/87"
+    }
  }
 ]
--- a/.github/pr-checks.json
+++ b/.github/pr-checks.json
@@ -0,0 +1,18 @@
+[
+  {
+    "type": "check-milestone",
+    "title": "Milestone Check",
+    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#assign-a-milestone",
+    "success": "Milestone set",
+    "failure": "Milestone not set"
+  },
+  {
+    "type": "check-backport",
+    "title": "Backport Check",
+    "backportEnabled": "Backport enabled",
+    "backportSkipped": "Backport skipped",
+    "failure": "Backport decision needed",
+    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported",
+    "skipLabels": [ "backport", "no-backport"]
+  }
+]
--- a/.github/pr-commands.json
+++ b/.github/pr-commands.json
@@ -179,10 +179,17 @@
    "action": "updateLabel",
    "addLabel": "area/dashboard/templating"
  },
+  {
+    "type": "changedfiles",
+    "matches": ["/pkg/services/ngalert/**/*", "/pkg/services/sqlstore/migrations/ualert/**/*", "/pkg/services/alerting/**/*", "/public/app/features/alerting/**/*", "/pkg/tests/api/alerting/**/*"],
+    "action": "updateLabel",
+    "addLabel": "area/alerting"
+  },
  {
    "type": "author",
    "name": "pr/external",
    "notMemberOf": { "org": "grafana" },
+    "ignoreList": ["renovate[bot]","dependabot[bot]"],
    "action": "updateLabel",
    "addLabel": "pr/external"
  }
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -4,30 +4,48 @@
  ],
  "enabledManagers": ["npm"],
  "ignoreDeps": [
+    "@grafana/slate-react", // should be updated when the `slate` package is updated
    "@types/systemjs",
    "@types/d3-force", // we should bump this once we move to esm modules
    "@types/d3-interpolate", // we should bump this once we move to esm modules
    "@types/d3-scale-chromatic", // we should bump this once we move to esm modules
+    "@types/grafana__slate-react", // should be updated when the `slate` package is updated
+    "@types/react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
+    "commander", // we are planning to remove this, so no need to update it
    "d3",
    "d3-force", // we should bump this once we move to esm modules
    "d3-interpolate", // we should bump this once we move to esm modules
    "d3-scale-chromatic", // we should bump this once we move to esm modules
-    "eslint", // wait until `eslint-plugin-react-hooks>4.2.0` is released
-    "globby", // we should bump this once we move to esm modules
+    "execa", // we should bump this once we move to esm modules
+    "history", // we should bump this together with react-router-dom
+    "@mdx-js/react", // storybook peer-depends on it's 1.x version, we should upgrade this when we upgrade storybook
+    "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
+    "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
+    "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
+    "react-router-dom", // we should bump this together with history
    "slate",
    "slate-plain-serializer",
    "systemjs",
+    "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
    "ts-loader", // we should remove ts-loader and use babel-loader instead
+    "typescript", // >4.5.x doesn't seem to work on windows with pnp currently. probably similar to https://github.com/yarnpkg/berry/issues/3722
    "ora" // we should bump this once we move to esm modules
  ],
  "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
  "labels": ["area/frontend", "dependencies"],
-  "minor": {
-    "enabled": false
-  },
-  "patch": {
-    "enabled": false
-  },
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["patch"],
+      "excludePackagePatterns": ["@storybook"],
+      "extends": ["schedule:monthly"],
+      "groupName": "Monthly patch updates"
+    },
+    {
+      "matchPackagePatterns": ["@storybook"],
+      "extends": ["schedule:monthly"],
+      "groupName": "Storybook updates"
+    }
+  ],
  "pin": {
    "enabled": false
  },
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,47 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# General configuration
-# Label to use when marking as stale
-staleLabel: stale
-
-# Pull request specific configuration
-pulls:
-  # Number of days of inactivity before an Issue or Pull Request becomes stale
-  daysUntilStale: 14
-  # Number of days of inactivity before a stale Issue or Pull Request is closed.
-  # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-  daysUntilClose: 30
-  # Comment to post when marking as stale. Set to `false` to disable
-  markComment: >
-    This pull request has been automatically marked as stale because it has not had
-    activity in the last 2 weeks. It will be closed in 30 days if no further activity occurs. Please
-    feel free to give a status update now, ping for review, or re-open when it's ready.
-    Thank you for your contributions!
-  # Comment to post when closing a stale Issue or Pull Request.
-  closeComment: >
-     This pull request has been automatically closed because it has not had
-     activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
-     Thank you for your contributions!
-  # Limit the number of actions per hour, from 1-30. Default is 30
-  limitPerRun: 1
-
-exemptLabels:
-  - help wanted
-  - type/bug
-  - type/feature-request
-  - Epic
-  - no stalebot
-
-# Issue specific configuration
-issues:
-  limitPerRun: 1
-  daysUntilStale: 100000
-  daysUntilClose: 100000
-  markComment: >
-    This issue has been automatically marked as stale because it has not had activity in the
-    last 100 days. It will be closed in the next 100 days if no activity occurs.
-    Thank you for your contributions.
-  closeComment: >
-    This issue has been automatically closed because it has not had activity in the
-    last month and a half. If this issue is still valid, please ping a maintainer and ask them to check this again.
-    Thank you for your contributions.
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -5,24 +5,51 @@ on:
      version:
        required: true
        default: '7.x.x'
+  workflow_call:
+    inputs:
+      version_call:
+        description: Needs to match, exactly, the name of a version
+        required: true
+        type: string
+    secrets:
+        token:
+          required: true
+        metricsWriteAPIKey:
+          required: true
+env:
+    YARN_ENABLE_IMMUTABLE_INSTALLS: false
 jobs:
  main:
    runs-on: ubuntu-latest
    steps:
    # This is a basic workflow to help you get started with Actions
      - uses: actions-ecosystem/action-regex-match@v2.0.2
+        if: ${{ github.event.inputs.version != '' }}
        id: regex-match
        with:
          text: ${{ github.event.inputs.version }}
          regex: '^(\d+.\d+).\d+(?:-beta.\d+)?$'
-
+      - uses: actions-ecosystem/action-regex-match@v2.0.2
+        if: ${{ inputs.version_call != '' }}
+        id: regex-match-version-call
+        with:
+          text: ${{ inputs.version_call }}
+          regex: '^(\d+.\d+).\d+(?:-beta\d+)?$'
      - name: Validate input version
-        if: ${{ steps.regex-match.outputs.match == '' }}
+        if: ${{ steps.regex-match.outputs.match == '' && github.event.inputs.version != '' }}
        run: |
          echo "The input version format is not correct, please respect:\
          major.minor.patch or major.minor.patch-beta.number format. \
          example: 7.4.3 or 7.4.3-beta.1"
          exit 1
+      - name: Validate input version call
+        if: ${{ inputs.version_call != '' && steps.regex-match-version-call.outputs.match == '' }}
+        run: |
+          echo "The input version format is not correct, please respect:\
+          major.minor.patch or major.minor.patch-beta<number> format. \
+          example: 7.4.3 or 7.4.3-beta1"
+          exit 1
+
      - uses: actions/checkout@v2

      - name: Set intermedia variables
@@ -33,14 +60,8 @@ jobs:
          echo "::set-output name=branch_name::v${{steps.regex-match.outputs.group1}}"
          echo "::set-output name=branch_exist::$(git ls-remote --heads https://github.com/grafana/grafana.git v${{ steps.regex-match.outputs.group1 }}.x | wc -l)"

-      - name: Check input version is aligned with branch(not main)
-        if: steps.intermedia.outputs.branch_exist != '0' && !contains(steps.intermedia.outputs.short_ref, steps.intermedia.outputs.branch_name)
-        run: |
-          echo " You need to run the workflow on branch v${{steps.regex-match.outputs.group1}}.x
-          exit 1
-
      - name: Check input version is aligned with branch(main)
-        if: steps.intermedia.outputs.branch_exist == '0' && !contains(steps.intermedia.outputs.short_ref, 'main')
+        if: ${{ github.event.inputs.version != '' && steps.intermedia.outputs.branch_exist == '0' && !contains(steps.intermedia.outputs.short_ref, 'main') }}
        run: |
          echo "When you want to deliver a new new minor version, you might want to create a new branch first \
          with naming convention v[major].[minor].x, and just run the workflow on that branch. \
@@ -53,13 +74,21 @@ jobs:
          repository: "grafana/grafana-github-actions"
          path: ./actions
          ref: main
-      - uses: actions/setup-node@v2.4.1
+      - uses: actions/setup-node@v2.5.1
        with:
-          node-version: '14'
+          node-version: '16'
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: Run bump version
+      - name: Run bump version (manually invoked)
+        if: ${{ github.event.inputs.version != '' }}
        uses: ./actions/bump-version
        with:
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
-          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+      - name: Run bump version (workflow invoked)
+        if: ${{ inputs.version_call != '' }}
+        uses: ./actions/bump-version
+        with:
+          version_call: ${{ inputs.version_call }}
+          token: ${{ secrets.token }}
+          metricsWriteAPIKey: ${{ secrets.metricsWriteAPIKey }}
--- a/.github/workflows/close-milestone.yml
+++ b/.github/workflows/close-milestone.yml
@@ -0,0 +1,39 @@
+name: Close milestone
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        description: Needs to match, exactly, the name of a milestone
+  workflow_call:
+    inputs:
+      version_call:
+        description: Needs to match, exactly, the name of a milestone
+        required: true
+        type: string
+    secrets:
+      token:
+        required: true
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Close milestone (manually invoked)
+        if: ${{ github.event.inputs.version != '' }}
+        uses: ./actions/close-milestone
+        with:
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+      - name: Close milestone (workflow invoked)
+        if: ${{ inputs.version_call != '' }}
+        uses: ./actions/close-milestone
+        with:
+          version_call: ${{ inputs.version_call }}
+          token: ${{ secrets.token }}
--- a/.github/workflows/cloud-data-sources-code-coverage.yml
+++ b/.github/workflows/cloud-data-sources-code-coverage.yml
@@ -0,0 +1,17 @@
+name: Cloud data sources test code coverage
+on:
+  pull_request:
+    paths:
+      - 'pkg/tsdb/azuremonitor/**'
+      - 'pkg/tsdb/cloudwatch/**'
+      - 'pkg/tsdb/cloudmonitoring/**'
+      - 'public/app/plugins/datasource/grafana-azure-monitor-datasource/**'
+      - 'public/app/plugins/datasource/cloudwatch/**'
+      - 'public/app/plugins/datasource/cloud-monitoring/**'
+    branches-ignore:
+      - dependabot/**
+      - backport-**
+
+jobs:
+  workflow-call:
+    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.2
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -8,9 +8,12 @@ name: "CodeQL"
 on:
  push:
    branches: [main, v1.8.x, v2.0.x, v2.1.x, v2.6.x, v3.0.x, v3.1.x, v4.0.x, v4.1.x, v4.2.x, v4.3.x, v4.4.x, v4.5.x, v4.6.x, v4.7.x, v5.0.x, v5.1.x, v5.2.x, v5.3.x, v5.4.x, v6.0.x, v6.1.x, v6.2.x, v6.3.x, v6.4.x, v6.5.x, v6.6.x, v6.7.x, v7.0.x, v7.1.x, v7.2.x]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [main]
+    paths-ignore:
+      - '**/*.cue'
+      - '**/*.json'
+      - '**/*.md'
+      - '**/*.txt'
+      - '**/*.yml'
  schedule:
    - cron: '0 4 * * 6'

@@ -46,21 +49,5 @@ jobs:
        # Prefix the list here with "+" to use these queries and those in the config file.
        # queries: ./path/to/local/query, your-org/your-repo/queries@main

-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
    - name: Perform CodeQL Analysis
      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -1,10 +1,11 @@
 name: Run commands when issues are labeled or comments added
 on:
  issues:
-    types: [labeled]
+    types: [labeled, unlabeled]
  issue_comment:
    types: [created]
-
+concurrency:
+  group: issue-commands-${{ github.event.issue.number }}
 jobs:
  main:
    runs-on: ubuntu-latest
--- a/.github/workflows/detect-breaking-changes-build.yml
+++ b/.github/workflows/detect-breaking-changes-build.yml
@@ -0,0 +1,141 @@
+name: Levitate / Detect breaking changes
+
+on: pull_request
+
+jobs:
+  buildPR:
+    name: Build PR
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './pr'
+
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        path: './pr'
+
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+    
+    - name: Restore yarn cache
+      uses: actions/cache@v2
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+      
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Build packages
+      run: yarn packages:build
+
+    - name: Zip built packages
+      run: zip -r ./pr_built_packages.zip ./packages/**/dist
+
+    - name: Upload build output as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: buildPr
+        path: './pr/pr_built_packages.zip'
+
+  buildBase:
+    name: Build Base
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: './base'
+
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        path: './base'
+        ref: ${{ github.event.pull_request.base.ref }}
+
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+    
+    - name: Restore yarn cache
+      uses: actions/cache@v2
+      id: yarn-cache
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
+        restore-keys: |
+          yarn-cache-folder-
+      
+    - name: Install dependencies
+      run: yarn install --immutable
+
+    - name: Build packages
+      run: yarn packages:build
+
+    - name: Zip built packages
+      run: zip -r ./base_built_packages.zip ./packages/**/dist
+
+    - name: Upload build output as artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: buildBase
+        path: './base/base_built_packages.zip'
+
+  Detect:
+    name: Detect breaking changes
+    runs-on: ubuntu-latest
+    needs: ['buildPR', 'buildBase']
+    env:
+      GITHUB_STEP_NUMBER: 7
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get built packages from pr
+        uses: actions/download-artifact@v2
+        with:
+          name: buildPr
+
+      - name: Get built packages from base
+        uses: actions/download-artifact@v2
+        with:
+          name: buildBase
+      
+      - name: Unzip artifact from pr
+        run: unzip pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
+
+      - name: Unzip artifact from base
+        run: unzip base_built_packages.zip -d ./base && rm base_built_packages.zip
+
+      - name: Get link for the Github Action job
+        id: job
+        uses: actions/github-script@v6
+        with:
+          script: |
+              const script = require('./.github/workflows/scripts/pr-get-job-link.js')
+              await script({github, context, core})
+
+      - name: Detect breaking changes
+        id: breaking-changes
+        run: ./scripts/check-breaking-changes.sh 
+        env:
+          FORCE_COLOR: 3
+          GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
+
+      - name: Persisting the check output
+        run: |
+            mkdir -p ./levitate
+            echo "{ \"exit_code\": ${{ steps.breaking-changes.outputs.is_breaking }}, \"message\": \"${{ steps.breaking-changes.outputs.message }}\", \"job_link\": \"${{ steps.job.outputs.link }}#step:${GITHUB_STEP_NUMBER}:1\", \"pr_number\": \"${{ github.event.pull_request.number }}\" }" > ./levitate/result.json
+
+      - name: Upload check output as artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: levitate
+          path: levitate/
+        
+      - name: Exit
+        run: exit ${{ steps.breaking-changes.outputs.is_breaking }}
+        shell: bash
--- a/.github/workflows/detect-breaking-changes-report.yml
+++ b/.github/workflows/detect-breaking-changes-report.yml
@@ -0,0 +1,184 @@
+name: Levitate / Report breaking changes
+
+on:
+  workflow_run:
+    workflows: ["Levitate / Detect breaking changes"]
+    types: [completed]
+
+jobs:
+  notify:
+    name: Report
+    runs-on: ubuntu-latest
+    env:
+      ARTIFACT_FOLDER: '${{ github.workspace }}/tmp'
+      ARTIFACT_NAME: 'levitate'
+
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: 'Download artifact'
+      uses: actions/github-script@v6
+      env:
+        RUN_ID: ${{ github.event.workflow_run.id }}
+      with:
+        script: |
+          const fs = require('fs');
+
+          const { owner, repo } = context.repo;
+          const runId = process.env.RUN_ID;
+          const artifactName = process.env.ARTIFACT_NAME;
+          const artifactFolder = process.env.ARTIFACT_FOLDER;
+          const artifacts = await github.rest.actions.listWorkflowRunArtifacts({
+              owner,
+              repo,
+              run_id: runId,
+          });
+          const artifact = artifacts.data.artifacts.find(a => a.name === artifactName);
+        
+          if (!artifact) {
+              throw new Error(`Could not find artifact ${ artifactName } in workflow (${ runId })`);
+          }
+
+          const download = await github.rest.actions.downloadArtifact({
+              owner,
+              repo,
+              artifact_id: artifact.id,
+              archive_format: 'zip',
+          });
+
+          fs.mkdirSync(artifactFolder, { recursive: true });
+          fs.writeFileSync(`${ artifactFolder }/${ artifactName }.zip`, Buffer.from(download.data));
+        
+    - name: Unzip artifact
+      run: unzip "${ARTIFACT_FOLDER}/${ARTIFACT_NAME}.zip" -d "${ARTIFACT_FOLDER}"
+    
+    - name: Parsing levitate result
+      uses: actions/github-script@v6
+      id: levitate-run
+      with:
+        script: |
+          const filePath = `${ process.env.ARTIFACT_FOLDER }/result.json`;
+          const script = require('./.github/workflows/scripts/json-file-to-job-output.js');
+          await script({ core, filePath });
+
+    - name: Check if "breaking change" label exists
+      id: does-label-exist
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+      with:
+        script: |
+          const { data } = await github.rest.issues.listLabelsOnIssue({
+            issue_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+          });
+          const labels = data.map(({ name }) => name);
+          const doesExist = labels.includes('breaking change');
+
+          return doesExist ? 1 : 0;
+
+    - name: Comment on PR
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 }}
+      uses: marocchino/sticky-pull-request-comment@v2
+      with:
+        number: ${{ steps.levitate-run.outputs.pr_number }}
+        message: |
+          ⚠️ &nbsp;&nbsp;**Possible breaking changes**
+
+          _(Open the links below in a new tab to go to the correct steps)_
+
+          ${{ steps.levitate-run.outputs.message }}
+
+          [Console output](${{ steps.levitate-run.outputs.job_link }})
+          [Read our guideline](https://github.com/grafana/grafana/blob/main/contribute/breaking-changes-guide.md)
+
+    - name: Remove comment on PR
+      if: ${{ steps.levitate-run.outputs.exit_code == 0 }}
+      uses: marocchino/sticky-pull-request-comment@v2
+      with:
+        number: ${{ steps.levitate-run.outputs.pr_number }}
+        delete: true
+
+    # Posts a notification to Slack if a PR has a breaking change and it did not have a breaking change before
+    - name: Post to Slack
+      id: slack
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 }}
+      uses: slackapi/slack-github-action@v1.18.0
+      with:
+        payload: |
+          {
+            "pr_link": "https://github.com/grafana/grafana/pull/${{ steps.levitate-run.outputs.pr_number }}",
+            "pr_number": "${{ steps.levitate-run.outputs.pr_number }}",
+            "job_link": "${{ steps.levitate-run.outputs.job_link }}",
+            "reporting_job_link": "${{ github.event.workflow_run.html_url }}",
+            "message": "${{ steps.levitate-run.outputs.message }}"
+          }
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_LEVITATE_WEBHOOK_URL }}
+
+    - name: Add "breaking change" label
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 && steps.does-label-exist.outputs.result == 0 }}
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+        script: |
+          await github.rest.issues.addLabels({
+            issue_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            labels: ['breaking change']
+          })
+
+    - name: Remove "breaking change" label
+      if: ${{ steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 }}
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+        script: |
+          await github.rest.issues.removeLabel({
+            issue_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            name: 'breaking change'
+          })
+
+    # This is very weird, the actual request goes through (comes back with a 201), but does not assign the team.
+    # Related issue: https://github.com/renovatebot/renovate/issues/1908
+    - name: Add "grafana/plugins-platform-frontend" as a reviewer
+      if: ${{ steps.levitate-run.outputs.exit_code == 1 }}
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+        script: |
+          await github.rest.pulls.requestReviewers({
+            pull_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            reviewers: [],
+            team_reviewers: ['grafana/plugins-platform-frontend']
+          });
+
+    - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
+      if: ${{ steps.levitate-run.outputs.exit_code == 0 }}
+      uses: actions/github-script@v6
+      env:
+        PR_NUMBER: ${{ steps.levitate-run.outputs.pr_number }}
+      with:
+        github-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+        script: |
+          await github.rest.pulls.removeRequestedReviewers({
+            pull_number: process.env.PR_NUMBER,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            reviewers: [],
+            team_reviewers: ['grafana/plugins-platform-frontend']
+          });
+
+
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -0,0 +1,21 @@
+name: Close Milestone
+on:
+  workflow_dispatch:
+    inputs:
+      version_input:
+        description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+        required: true
+jobs:
+  call-remove-milestone:
+    uses: grafana/grafana/.github/workflows/remove-milestone.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+  call-close-milestone:
+    uses: grafana/grafana/.github/workflows/close-milestone.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+    needs: call-remove-milestone
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -0,0 +1,34 @@
+name: PR Checks
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review      
+      - labeled
+      - unlabeled
+  issues:
+    types:
+      - milestoned
+      - demilestoned
+concurrency:
+  group: pr-checks-${{ github.event.number }}
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.draft == false
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Run PR Checks
+        uses: ./actions/pr-checks
+        with:
+          token: ${{secrets.GITHUB_TOKEN}}
+          configPath: pr-checks
--- a/.github/workflows/pr-codeql-analysis-go.yml
+++ b/.github/workflows/pr-codeql-analysis-go.yml
@@ -0,0 +1,29 @@
+name: "CodeQL for PR / go"
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - '**/*.go'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: "go"
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/pr-codeql-analysis-javascript.yml
+++ b/.github/workflows/pr-codeql-analysis-javascript.yml
@@ -0,0 +1,31 @@
+name: "CodeQL for PR / javascript"
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - '**/*.js'
+      - '**/*.ts'
+      - '**/*.tsx'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: "javascript"
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/pr-codeql-analysis-python.yml
+++ b/.github/workflows/pr-codeql-analysis-python.yml
@@ -0,0 +1,29 @@
+name: "CodeQL for PR / python"
+
+on:
+  pull_request:
+    branches: [main]
+    paths:
+      - '**/*.py'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: "python"
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
--- a/.github/workflows/pr-commands-closed.yml
+++ b/.github/workflows/pr-commands-closed.yml
@@ -0,0 +1,18 @@
+name: Run when PRs are closed
+on:
+  pull_request:
+    types:
+      - closed      
+concurrency:
+  group: pr-commands-closed-${{ github.event.number }}
+jobs:
+  close_job:
+    # this job will only run if the PR has been closed without being merged
+    if: github.event.pull_request.merged == false
+    runs-on: ubuntu-latest
+    steps:
+    - run: |
+        echo PR #${{ github.event.number }} has been closed without being merged, removing milestone.
+        gh pr edit ${{ github.event.number }} --milestone "" --repo $GITHUB_REPOSITORY
+      env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/pr-commands.yml
+++ b/.github/workflows/pr-commands.yml
@@ -4,7 +4,8 @@ on:
    types:
      - opened
      - synchronize
-
+concurrency:
+  group: pr-commands-${{ github.event.number }}
 jobs:
  main:
    runs-on: ubuntu-latest
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -0,0 +1,23 @@
+name: Prepare release
+on:
+  workflow_dispatch:
+    inputs:
+      version_input:
+        description: 'The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+        required: true
+jobs:
+  call-bump-version:
+    uses: grafana/grafana/.github/workflows/bump-version.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+      metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+  call-update-changelog:
+    uses: grafana/grafana/.github/workflows/update-changelog.yml@main
+    with:
+      version_call: ${{ github.event.inputs.version_input }}
+    secrets:
+      token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+      metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+    needs: call-bump-version
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -3,7 +3,7 @@ name: publish_docs
 on:
  push:
    branches:
-    - main
+    - v8.5.x
    paths:
    - 'docs/sources/**'
    - 'packages/grafana-*/**'
@@ -17,14 +17,14 @@ jobs:
    - uses: actions/checkout@v1
    - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
    - name: generate-packages-docs
-      uses: actions/setup-node@v2.4.1
+      uses: actions/setup-node@v2.5.1
      id: generate-docs
      with:
-        node-version: '14'
+        node-version: '16'
    - name: Get yarn cache directory path
      id: yarn-cache-dir-path
      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-    - uses: actions/cache@v2.1.6
+    - uses: actions/cache@v2.1.7
      with:
        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
        key: yarn-${{ hashFiles('**/yarn.lock') }}
@@ -41,7 +41,7 @@ jobs:
        host: github.com
        github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
        source_folder: docs/sources
-        target_folder: content/docs/grafana/next
+        target_folder: content/docs/grafana/latest
        allow_no_changes: 'true'
    - shell: bash
      run: |
--- a/.github/workflows/remove-milestone.yml
+++ b/.github/workflows/remove-milestone.yml
@@ -0,0 +1,39 @@
+name: Remove milestone
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        description: Needs to match, exactly, the name of a milestone
+  workflow_call:
+    inputs:
+      version_call:
+        description: Needs to match, exactly, the name of a milestone
+        required: true
+        type: string
+    secrets:
+      token:
+        required: true
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Remove milestone from open issues (manually invoked)
+        if: ${{ github.event.inputs.version != '' }}
+        uses: ./actions/remove-milestone
+        with:
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+      - name: Remove milestone from open issues (workflow invoked)
+        if: ${{ inputs.version_call != '' }}
+        uses: ./actions/remove-milestone
+        with:
+          version_call: ${{ inputs.version_call }}
+          token: ${{ secrets.token }}
--- a/.github/workflows/scripts/json-file-to-job-output.js
+++ b/.github/workflows/scripts/json-file-to-job-output.js
@@ -0,0 +1,27 @@
+module.exports = async ({ core, filePath }) => {
+    try {
+        const fs = require('fs');
+        const content = await readFile(fs, filePath);
+        const result = JSON.parse(content);
+    
+        core.startGroup('Parsing json file...');
+
+        for (const property in result) {
+            core.info(`${property} <- ${result[property]}`);
+            core.setOutput(property, result[property]);
+        }
+
+        core.endGroup();
+    } catch (error) {
+        core.restFailed(error.message);
+    }
+}
+
+async function readFile(fs, path) {
+    return new Promise((resolve, reject) => {
+        fs.readFile(path, (error, data) => {
+            if (error) return reject(error);
+            return resolve(data);
+        });
+    });
+}
--- a/.github/workflows/scripts/pr-get-job-link.js
+++ b/.github/workflows/scripts/pr-get-job-link.js
@@ -0,0 +1,9 @@
+
+module.exports = async ({ github, context, core }) => {
+    const { owner, repo } = context.repo;
+    const url = `https://api.github.com/repos/${owner}/${repo}/actions/runs/${context.runId}/jobs`
+    const result = await github.request(url)
+    const link = `https://github.com/grafana/grafana/runs/${result.data.jobs[0].id}?check_suite_focus=true`;
+
+    core.setOutput('link', link);
+}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,33 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          repo-token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          # Number of days of inactivity before a stale Issue or Pull Request is closed.
+          # Set to -1 to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+          days-before-close: 14
+          # Number of days of inactivity before an Issue or Pull Request becomes stale
+          days-before-stale: 30
+          # We don't want any Issues to be marked as stale for now.
+          days-before-issue-stale: -1
+          exempt-issue-labels: no stalebot
+          exempt-pr-labels: no stalebot
+          operations-per-run: 500
+          stale-issue-label: stale
+          stale-pr-label: stale
+          stale-pr-message: >
+            This pull request has been automatically marked as stale because it has not had
+            activity in the last 30 days. It will be closed in 2 weeks if no further activity occurs. Please
+            feel free to give a status update now, ping for review, or re-open when it's ready.
+            Thank you for your contributions!
+          close-pr-message: >
+            This pull request has been automatically closed because it has not had
+            activity in the last 2 weeks. Please feel free to give a status update now, ping for review, or re-open when it's ready.
+            Thank you for your contributions!
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -3,8 +3,19 @@ on:
  workflow_dispatch:
    inputs:
      version:
-        required: true        
+        required: true
        description: Needs to match, exactly, the name of a milestone
+  workflow_call:
+    inputs:
+      version_call:
+        description: Needs to match, exactly, the name of a milestone
+        required: true
+        type: string
+    secrets:
+        token:
+          required: true
+        metricsWriteAPIKey:
+          required: true
 jobs:
  main:
    runs-on: ubuntu-latest
@@ -14,11 +25,19 @@ jobs:
        with:
          repository: "grafana/grafana-github-actions"
          path: ./actions
-          ref: main      
+          ref: main
      - name: Install Actions
        run: npm install --production --prefix ./actions
-      - name: Run update changelog
+      - name: Run update changelog (manually invoked)
+        if: ${{ github.event.inputs.version != '' }}
        uses: ./actions/update-changelog
        with:
-          token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
-          metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          metricsWriteAPIKey: ${{ secrets.GRAFANA_MISC_STATS_API_KEY }}
+      - name: Run update changelog (workflow invoked)
+        if: ${{ inputs.version_call != '' }}
+        uses: ./actions/update-changelog
+        with:
+          version_call: ${{ inputs.version_call }}
+          token: ${{ secrets.token }}
+          metricsWriteAPIKey: ${{ secrets.metricsWriteAPIKey }}
--- a/.gitignore
+++ b/.gitignore
@@ -7,15 +7,16 @@ awsconfig
 /.awcache
 /dist
 /public/build
-public/dist/tsconfig.tsbuildinfo
 /public/views/index.html
 /public/views/error.html
 /emails/dist
 /reports
 /e2e/tmp
+/scripts/grafana-server/tmp
 vendor/
 /docs/menu.yaml
 /requests
+tsconfig.tsbuildinfo

 # Yarn
 .yarn/*
@@ -38,6 +39,7 @@ vendor/

 # Enterprise devenv
 /devenv/docker/blocks/grafana-enterprise
+/devenv/docker/blocks/saml-enterprise

 /tmp
 tools/phantomjs/phantomjs
@@ -136,6 +138,12 @@ compilation-stats.json
 /e2e/**/screenshots
 !/e2e/**/screenshots/expected/*
 /e2e/**/videos/*
+/e2e/benchmarks/**/results/*
+/e2e/benchmarks/**/results
+/e2e/build_results.zip
+
+# grafana server
+/scripts/grafana-server/server.log

 # a11y tests
 /pa11y-ci-results.json
@@ -149,3 +157,11 @@ compilation-stats.json

 # auto generated Go files
 *_gen.go
+!pkg/services/featuremgmt/toggles_gen.go
+
+# Auto-generated localisation files
+public/locales/_build/
+public/locales/**/*.js
+
+deployment_tools_config.json
+
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,8 @@
 #!/bin/sh
+
+# Ignore husky hooks if no frontend code has been changed
+git diff --cached --name-only | grep -v --quiet "^pkg/" || exit 0
+
 . "$(dirname "$0")/_/husky.sh"

 yarn run precommit
--- a/.linguirc
+++ b/.linguirc
@@ -0,0 +1,32 @@
+{
+  "locales": [
+    "en",
+    "fr",
+    "es",
+    "pseudo-LOCALE"
+  ],
+  "catalogs": [
+    {
+      "path": "public/locales/{locale}/messages",
+      "include": [
+        "public/app"
+      ],
+      "exclude": [
+        "**/*.d.ts",
+        "**/*.test.ts",
+        "**/node_modules/**",
+        "public/app/plugins"
+      ]
+    }
+  ],
+  "fallbackLocales": {
+    "pseudo-LOCALE": "en",
+    "default": "en"
+  },
+  "pseudoLocale": "pseudo-LOCALE",
+  "sourceLocale": "en",
+  "format": "po",
+  "formatOptions": {
+    "lineNumbers": false
+  }
+}
--- a/.nvmrc
+++ b/.nvmrc
@@ -0,0 +1 @@
+v16.14.0
--- a/.pa11yci-pr.conf.js
+++ b/.pa11yci-pr.conf.js
@@ -6,6 +6,9 @@ var config = {
    chromeLaunchConfig: {
      args: ['--no-sandbox'],
    },
+    // see https://github.com/grafana/grafana/pull/41693#issuecomment-979921463 for context
+    // on why we're ignoring singleValue/react-select-*-placeholder elements
+    hideElements: '#updateVersion, [class*="-singleValue"], [id^="react-select-"][id$="-placeholder"]',
  },

  urls: [
--- a/.pa11yci.conf.js
+++ b/.pa11yci.conf.js
@@ -6,6 +6,9 @@ var config = {
    chromeLaunchConfig: {
      args: ['--no-sandbox'],
    },
+    // see https://github.com/grafana/grafana/pull/41693#issuecomment-979921463 for context
+    // on why we're ignoring singleValue/react-select-*-placeholder elements
+    hideElements: '#updateVersion, [class*="-singleValue"], [id^="react-select-"][id$="-placeholder"]',
  },

  urls: [
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,13 +1,23 @@
 .git
 .github
-dist/
-pkg/
-node_modules
-public/vendor/
-vendor/
-/data/
+.yarn
+build
+compiled
+data
+deployment_tools_config.json
+devenv
+dist
 e2e/tmp
-public/build/
-public/sass/*.generated.scss
-devenv/
+node_modules
+pkg
 public/lib/monaco
+public/sass/*.generated.scss
+scripts/grafana-server/tmp
+vendor
+
+# TS generate from cue by cuetsy
+**/*.gen.ts
+
+# Auto-generated localisation files
+public/locales/_build/
+public/locales/**/*.js
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -0,0 +1,6 @@
+{
+  "eslint.packageManager": "yarn",
+  "eslint.nodePath": ".yarn/sdks",
+  "workspace.workspaceFolderCheckCwd": false,
+  "tsserver.tsdk": ".yarn/sdks/typescript/lib"
+}
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -8,13 +8,15 @@
      "mode": "auto",
      "program": "${workspaceFolder}/pkg/cmd/grafana-server/",
      "env": {},
+      "cwd": "${workspaceFolder}",
      "args": ["--homepath", "${workspaceFolder}", "--packaging", "dev"]
    },
    {
      "name": "Debug Jest test",
      "type": "node",
      "request": "launch",
-      "runtimeArgs": ["--inspect-brk", "${workspaceRoot}/node_modules/.bin/jest", "--runInBand", "${file}"],
+      "runtimeExecutable": "yarn",
+      "runtimeArgs": ["run", "jest", "--runInBand", "${file}"],
      "console": "integratedTerminal",
      "internalConsoleOptions": "neverOpen",
      "port": 9229
--- a/.yarn/releases/yarn-3.1.0.cjs
+++ b/.yarn/releases/yarn-3.1.0.cjs
--- a/.yarn/releases/yarn-3.2.0.cjs
+++ b/.yarn/releases/yarn-3.2.0.cjs
--- a/.yarn/sdks/eslint/lib/api.js
+++ b/.yarn/sdks/eslint/lib/api.js
@@ -11,10 +11,10 @@ const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);

 if (existsSync(absPnpApiPath)) {
  if (!process.versions.pnp) {
-    // Setup the environment to be able to require eslint/lib/api.js
+    // Setup the environment to be able to require eslint
    require(absPnpApiPath).setup();
  }
 }

-// Defer to the real eslint/lib/api.js your application uses
-module.exports = absRequire(`eslint/lib/api.js`);
+// Defer to the real eslint your application uses
+module.exports = absRequire(`eslint`);
--- a/.yarn/sdks/eslint/package.json
+++ b/.yarn/sdks/eslint/package.json
@@ -1,6 +1,6 @@
 {
  "name": "eslint",
-  "version": "7.21.0-sdk",
+  "version": "8.11.0-sdk",
  "main": "./lib/api.js",
  "type": "commonjs"
 }
--- a/.yarn/sdks/integrations.yml
+++ b/.yarn/sdks/integrations.yml
@@ -2,5 +2,5 @@
 # Manual changes might be lost!

 integrations:
-  - vim
  - vscode
+  - vim
--- a/.yarn/sdks/prettier/package.json
+++ b/.yarn/sdks/prettier/package.json
@@ -1,6 +1,6 @@
 {
  "name": "prettier",
-  "version": "2.2.1-sdk",
+  "version": "2.5.1-sdk",
  "main": "./index.js",
  "type": "commonjs"
 }
--- a/.yarn/sdks/stylelint/bin/stylelint.js
+++ b/.yarn/sdks/stylelint/bin/stylelint.js
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require stylelint/bin/stylelint.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real stylelint/bin/stylelint.js your application uses
-module.exports = absRequire(`stylelint/bin/stylelint.js`);
--- a/.yarn/sdks/stylelint/lib/index.js
+++ b/.yarn/sdks/stylelint/lib/index.js
@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require stylelint/lib/index.js
-    require(absPnpApiPath).setup();
-  }
-}
-
-// Defer to the real stylelint/lib/index.js your application uses
-module.exports = absRequire(`stylelint/lib/index.js`);
--- a/.yarn/sdks/stylelint/package.json
+++ b/.yarn/sdks/stylelint/package.json
@@ -1,6 +0,0 @@
-{
-  "name": "stylelint",
-  "version": "13.13.1-sdk",
-  "main": "lib/index.js",
-  "type": "commonjs"
-}
--- a/.yarn/sdks/typescript/lib/tsserver.js
+++ b/.yarn/sdks/typescript/lib/tsserver.js
@@ -18,6 +18,7 @@ const moduleWrapper = tsserver => {
  const pnpApi = require(`pnpapi`);

  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);

  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
@@ -44,7 +45,7 @@ const moduleWrapper = tsserver => {
      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
      if (resolved) {
        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
          str = resolved;
        }
      }
@@ -85,7 +86,7 @@ const moduleWrapper = tsserver => {
          // everything else is up to neovim
          case `neovim`: {
            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile:${str}`;
+            str = `zipfile://${str}`;
          } break;

          default: {
@@ -100,8 +101,7 @@ const moduleWrapper = tsserver => {

  function fromEditorPath(str) {
    switch (hostInfo) {
-      case `coc-nvim`:
-      case `neovim`: {
+      case `coc-nvim`: {
        str = str.replace(/\.zip::/, `.zip/`);
        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
        // So in order to convert it back, we use .* to match all the thing
@@ -111,6 +111,12 @@ const moduleWrapper = tsserver => {
          : str.replace(/^.*zipfile:/, ``);
      } break;

+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
      case `vscode`:
      default: {
        return process.platform === `win32`
@@ -143,8 +149,9 @@ const moduleWrapper = tsserver => {
  let hostInfo = `unknown`;

  Object.assign(Session.prototype, {
-    onMessage(/** @type {string} */ message) {
-      const parsedMessage = JSON.parse(message)
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;

      if (
        parsedMessage != null &&
@@ -158,9 +165,14 @@ const moduleWrapper = tsserver => {
        }
      }

-      return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === `string` ? fromEditorPath(value) : value;
-      }));
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
    },

    send(/** @type {any} */ msg) {
--- a/.yarn/sdks/typescript/lib/tsserverlibrary.js
+++ b/.yarn/sdks/typescript/lib/tsserverlibrary.js
@@ -18,6 +18,7 @@ const moduleWrapper = tsserver => {
  const pnpApi = require(`pnpapi`);

  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);

  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
@@ -44,7 +45,7 @@ const moduleWrapper = tsserver => {
      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
      if (resolved) {
        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && dependencyTreeRoots.has(`${locator.name}@${locator.reference}`)) {
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
          str = resolved;
        }
      }
@@ -85,7 +86,7 @@ const moduleWrapper = tsserver => {
          // everything else is up to neovim
          case `neovim`: {
            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile:${str}`;
+            str = `zipfile://${str}`;
          } break;

          default: {
@@ -100,8 +101,7 @@ const moduleWrapper = tsserver => {

  function fromEditorPath(str) {
    switch (hostInfo) {
-      case `coc-nvim`:
-      case `neovim`: {
+      case `coc-nvim`: {
        str = str.replace(/\.zip::/, `.zip/`);
        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
        // So in order to convert it back, we use .* to match all the thing
@@ -111,6 +111,12 @@ const moduleWrapper = tsserver => {
          : str.replace(/^.*zipfile:/, ``);
      } break;

+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
      case `vscode`:
      default: {
        return process.platform === `win32`
@@ -143,8 +149,9 @@ const moduleWrapper = tsserver => {
  let hostInfo = `unknown`;

  Object.assign(Session.prototype, {
-    onMessage(/** @type {string} */ message) {
-      const parsedMessage = JSON.parse(message)
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;

      if (
        parsedMessage != null &&
@@ -158,9 +165,14 @@ const moduleWrapper = tsserver => {
        }
      }

-      return originalOnMessage.call(this, JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === `string` ? fromEditorPath(value) : value;
-      }));
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
    },

    send(/** @type {any} */ msg) {
--- a/.yarn/sdks/typescript/package.json
+++ b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
 {
  "name": "typescript",
-  "version": "4.4.3-sdk",
+  "version": "4.4.4-sdk",
  "main": "./lib/typescript.js",
  "type": "commonjs"
 }
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,5 +1,6 @@
 enableTelemetry: false
-nodeLinker: "pnp"
+
+nodeLinker: pnp

 packageExtensions:
  "@grafana/slate-react@0.22.10-grafana":
@@ -8,36 +9,35 @@ packageExtensions:
  "@mdx-js/loader@1.6.22":
    peerDependencies:
      react: 17.0.1
-  "@storybook/addon-essentials@6.3.7":
+  "@storybook/addon-docs@6.4.15":
    peerDependencies:
-      "@storybook/components": 6.3.7
-      "@storybook/core-events": 6.3.7
-      "@storybook/theming": 6.3.7
-  "@storybook/addon-knobs@6.3.0":
-    dependencies:
-      copy-to-clipboard: ^3.3.1
-  "@storybook/core-server@6.3.7":
+      "@storybook/manager-webpack5": 6.4.15
+  "@storybook/addon-essentials@6.4.15":
+    peerDependencies:
+      "@storybook/components": 6.4.15
+      "@storybook/core-events": 6.4.15
+      "@storybook/manager-webpack5": 6.4.15
+      "@storybook/theming": 6.4.15
+  "@storybook/core-server@6.4.15":
    peerDependencies:
      "@babel/core": ^7.0.0
-  "@storybook/core@6.3.7":
+  "@storybook/core@6.4.15":
    peerDependencies:
      "@babel/core": ^7.0.0
-      "@storybook/manager-webpack5": 6.3.7
-      webpack: 5.51.1
-  "@storybook/csf-tools@6.3.7":
+      "@storybook/manager-webpack5": 6.4.15
+  "@storybook/csf-tools@6.4.15":
    peerDependencies:
      "@babel/core": ^7.0.0
-  "@storybook/react@6.3.7":
+  "@storybook/react@6.4.15":
    peerDependencies:
-      "@storybook/manager-webpack5": 6.3.7
+      "@storybook/manager-webpack5": 6.4.15
  doctrine@3.0.0:
    dependencies:
      assert: 2.0.0
-  moveable@0.26.0:
+  moveable@0.28.0:
    dependencies:
      "@daybrush/utils": 1.6.0
      framework-utils: ^1.1.0
-      react-simple-compat: 1.2.1
  rc-time-picker@3.7.3:
    peerDependencies:
      react: 17.0.1
@@ -46,20 +46,20 @@ packageExtensions:
    peerDependencies:
      react: 17.0.1
      react-dom: 17.0.1
-  react-compat-moveable@0.14.0:
+  react-compat-css-styled@1.0.8:
+    dependencies:
+      react-simple-compat: 1.2.1
+  react-compat-moveable@0.16.0:
    dependencies:
      "@egjs/agent": ^2.2.1
      "@egjs/children-differ": ^1.0.1
      "@scena/matrix": 1.1.1
      css-to-mat: ^1.0.3
-      gesto: ^1.4.0
+      gesto: ^1.7.0
      overlap-area: ^1.0.0
+      react-simple-compat: 1.2.1
    peerDependencies:
      framework-utils: ^1.1.0
-  react-dev-utils@11.0.4:
-    peerDependencies:
-      typescript: 4.4.3
-      webpack: 5.51.1
  react-docgen-typescript-loader@3.7.2:
    peerDependencies:
      webpack: 4.41.5
@@ -78,4 +78,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
    spec: "https://mskelton.dev/yarn-outdated/v2"

-yarnPath: .yarn/releases/yarn-3.1.0.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,662 @@
+<!-- 8.5.3 START -->
+
+# 8.5.3
+
+### Bug fixes
+
+- **Security:** fixes CVE-2022-29170. [#49240](https://github.com/grafana/grafana/pull/49240), [@xlson](https://github.com/xlson)
+
+<!-- 8.5.3 END -->
+<!-- 8.5.2 START -->
+
+# 8.5.2 (2022-05-03)
+
+### Features and enhancements
+
+- **Alerting:** Add safeguard for migrations that might cause dataloss. [#48526](https://github.com/grafana/grafana/pull/48526), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **AzureMonitor:** Add support for not equals and startsWith operators when creating Azure Metrics dimension filters. [#48077](https://github.com/grafana/grafana/pull/48077), [@aangelisc](https://github.com/aangelisc)
+- **Elasticsearch:** Add deprecation notice for < 7.10 versions. [#48506](https://github.com/grafana/grafana/pull/48506), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Traces:** Filter by service/span name and operation in Tempo and Jaeger. [#48209](https://github.com/grafana/grafana/pull/48209), [@joey-grafana](https://github.com/joey-grafana)
+
+### Bug fixes
+
+- **AzureAd Oauth:** Fix strictMode to reject users without an assigned role. [#48474](https://github.com/grafana/grafana/pull/48474), [@kyschouv](https://github.com/kyschouv)
+- **CloudWatch:** Fix variable query tag migration. [#48587](https://github.com/grafana/grafana/pull/48587), [@iwysiu](https://github.com/iwysiu)
+- **Plugins:** Ensure catching all appropriate 4xx api/ds/query scenarios. [#47565](https://github.com/grafana/grafana/pull/47565), [@wbrowne](https://github.com/wbrowne)
+
+<!-- 8.5.2 END -->
+<!-- 8.5.1 START -->
+
+# 8.5.1 (2022-04-27)
+
+### Bug fixes
+
+- **Azure Monitor:** Fix space character encoding for metrics query link to Azure Portal. [#48139](https://github.com/grafana/grafana/pull/48139), [@kevinwcyu](https://github.com/kevinwcyu)
+- **CloudWatch:** Prevent log groups from being removed on query change. [#47994](https://github.com/grafana/grafana/pull/47994), [@asimpson](https://github.com/asimpson)
+- **Cloudwatch:** Fix template variables in variable queries. [#48140](https://github.com/grafana/grafana/pull/48140), [@iwysiu](https://github.com/iwysiu)
+- **Explore:** Prevent direct access to explore if disabled via feature toggle. [#47714](https://github.com/grafana/grafana/pull/47714), [@Elfo404](https://github.com/Elfo404)
+- **InfluxDB:** Fixes invalid no data alerts. [#48295](https://github.com/grafana/grafana/pull/48295), [@yesoreyeram](https://github.com/yesoreyeram)
+- **Navigation:** Prevent navbar briefly showing on login. [#47968](https://github.com/grafana/grafana/pull/47968), [@ashharrison90](https://github.com/ashharrison90)
+- **Plugins Catalog:** Fix styling of hyperlinks. [#48196](https://github.com/grafana/grafana/pull/48196), [@marefr](https://github.com/marefr)
+- **Table:** Fix filter crashes table. [#48258](https://github.com/grafana/grafana/pull/48258), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TimeSeries:** Properly stack series with missing datapoints. [#48321](https://github.com/grafana/grafana/pull/48321), [@leeoniya](https://github.com/leeoniya)
+
+<!-- 8.5.1 END -->
+<!-- 8.5.0 START -->
+
+# 8.5.0 (2022-04-21)
+
+### Features and enhancements
+
+- **Alerting:** Add contact points provisioning API. [#47197](https://github.com/grafana/grafana/pull/47197), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **Alerting:** Add resolved count to notification title when both firing and resolved present. [#46697](https://github.com/grafana/grafana/pull/46697), [@JacobsonMT](https://github.com/JacobsonMT)
+- **Alerting:** Alert rule should wait For duration when execution error state is Alerting. [#47052](https://github.com/grafana/grafana/pull/47052), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Classic conditions can now display multiple values. [#46971](https://github.com/grafana/grafana/pull/46971), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Display query from grafana-managed alert rules on `/api/v1/rules`. [#45969](https://github.com/grafana/grafana/pull/45969), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Enhance support for arbitrary group names in managed alerts. [#47785](https://github.com/grafana/grafana/pull/47785), [@gillesdemey](https://github.com/gillesdemey)
+- **Alerting:** add field for custom slack endpoint. [#45751](https://github.com/grafana/grafana/pull/45751), [@nathanrodman](https://github.com/nathanrodman)
+- **Azure Monitor :** Adding json formatting of error messages in Panel Header Corner and Inspect Error Tab. [#44877](https://github.com/grafana/grafana/pull/44877), [@yaelleC](https://github.com/yaelleC)
+- **Azure Monitor:** Add 2 more Curated Dashboards for VM Insights. [#45187](https://github.com/grafana/grafana/pull/45187), [@jcolladokuri](https://github.com/jcolladokuri)
+- **CloudWatch:** Handle new error codes for MetricInsights. [#47033](https://github.com/grafana/grafana/pull/47033), [@Gabrielopesantos](https://github.com/Gabrielopesantos)
+- **Dashboards:** show changes in save dialog. [#46557](https://github.com/grafana/grafana/pull/46557), [@ryantxu](https://github.com/ryantxu)
+- **DataSource:** Default data source is no longer a persisted state but just the default data source for new panels. [#45132](https://github.com/grafana/grafana/pull/45132), [@torkelo](https://github.com/torkelo)
+- **DataSourcePlugin API:** Allow queries import when changing data source type. [#47435](https://github.com/grafana/grafana/pull/47435), [@dprokop](https://github.com/dprokop)
+- **Explore:** Remove return to panel button. [#45018](https://github.com/grafana/grafana/pull/45018), [@gelicia](https://github.com/gelicia)
+- **Explore:** allow users to save Explore state to a new panel in a new dashboard. [#45148](https://github.com/grafana/grafana/pull/45148), [@Elfo404](https://github.com/Elfo404)
+- **Instrumentation:** Proxy status code correction and various improvements. [#47473](https://github.com/grafana/grafana/pull/47473), [@marefr](https://github.com/marefr)
+- **Logging:** Introduce feature toggle to activate gokit/log format. [#47336](https://github.com/grafana/grafana/pull/47336), [@ying-jeanne](https://github.com/ying-jeanne)
+- **NewsPanel:** Add support for Atom feeds. [#45390](https://github.com/grafana/grafana/pull/45390), [@kaydelaney](https://github.com/kaydelaney)
+- **Plugins:** Add deprecation notice for /api/tsdb/query endpoint. [#45238](https://github.com/grafana/grafana/pull/45238), [@wbrowne](https://github.com/wbrowne)
+- **Plugins:** Adding support for traceID field to accept variables. [#45559](https://github.com/grafana/grafana/pull/45559), [@vinisdl](https://github.com/vinisdl)
+- **PostgreSQL:** \_\_unixEpochGroup to support arithmetic expression as argument. [#46764](https://github.com/grafana/grafana/pull/46764), [@s0nik42](https://github.com/s0nik42)
+- **Profile/Help:** Expose option to disable profile section and help menu. [#46308](https://github.com/grafana/grafana/pull/46308), [@cameronwaterman](https://github.com/cameronwaterman)
+- **Prometheus:** Enable new visual query builder by default. [#46634](https://github.com/grafana/grafana/pull/46634), [@torkelo](https://github.com/torkelo)
+- **SAML:** Allow disabling of SAML signups. [#47481](https://github.com/grafana/grafana/pull/47481), [@mmandrus](https://github.com/mmandrus)
+- **SAML:** Allow disabling of SAML signups. (Enterprise)
+- **Table:** New pagination option. [#45732](https://github.com/grafana/grafana/pull/45732), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TablePanel:** Add cell inspect option. [#45620](https://github.com/grafana/grafana/pull/45620), [@dprokop](https://github.com/dprokop)
+- **Tempo / Trace Viewer:** Support Span Links in Trace Viewer. [#45632](https://github.com/grafana/grafana/pull/45632), [@Shachi16](https://github.com/Shachi16)
+- **Tempo:** Download span references in data inspector. [#47074](https://github.com/grafana/grafana/pull/47074), [@connorlindsey](https://github.com/connorlindsey)
+- **Tempo:** Separate trace to logs and loki search datasource config. [#46655](https://github.com/grafana/grafana/pull/46655), [@connorlindsey](https://github.com/connorlindsey)
+- **Trace View:** Show number of child spans. [#44393](https://github.com/grafana/grafana/pull/44393), [@tharun208](https://github.com/tharun208)
+- **Transformations:** Support escaped characters in key-value pair parsing. [#47901](https://github.com/grafana/grafana/pull/47901), [@aangelisc](https://github.com/aangelisc)
+
+### Bug fixes
+
+- **Azure Monitor:** Bug Fix for incorrect variable cascading for template variables. [#47478](https://github.com/grafana/grafana/pull/47478), [@jcolladokuri](https://github.com/jcolladokuri)
+- **CloudWatch:** List all metrics properly in SQL autocomplete. [#45898](https://github.com/grafana/grafana/pull/45898), [@sunker](https://github.com/sunker)
+- **CloudWatch:** Run query on blur in logs query field. [#47454](https://github.com/grafana/grafana/pull/47454), [@fridgepoet](https://github.com/fridgepoet)
+- **Dashboard:** Template variables are now correctly persisted when clicking breadcrumb links. [#46790](https://github.com/grafana/grafana/pull/46790), [@ashharrison90](https://github.com/ashharrison90)
+- **DashboardPage:** Remember scroll position when coming back panel edit / view panel. [#47639](https://github.com/grafana/grafana/pull/47639), [@torkelo](https://github.com/torkelo)
+- **Panel Edit:** Options search now works correctly when a logarithmic scale option is set. [#47927](https://github.com/grafana/grafana/pull/47927), [@ashharrison90](https://github.com/ashharrison90)
+- **Postgres:** Return tables with hyphenated schemes. [#45754](https://github.com/grafana/grafana/pull/45754), [@zuchka](https://github.com/zuchka)
+- **Table panel:** Fix horizontal scrolling when pagination is enabled. [#47776](https://github.com/grafana/grafana/pull/47776), [@dprokop](https://github.com/dprokop)
+- **Variables:** Ensure variables in query params are correctly recognised. [#47049](https://github.com/grafana/grafana/pull/47049), [@ashharrison90](https://github.com/ashharrison90)
+- **Variables:** Fix crash when changing query variable datasource. [#44957](https://github.com/grafana/grafana/pull/44957), [@joshhunt](https://github.com/joshhunt)
+- **Visualizations:** Stack negative-valued series downwards. [#47373](https://github.com/grafana/grafana/pull/47373), [@leeoniya](https://github.com/leeoniya)
+
+### Breaking changes
+
+For a proxied request, e.g. Grafana's datasource or plugin proxy:
+
+- If the request is cancelled, e.g. from the browser/by the client, the HTTP status code is now `499 Client closed request` instead of `502 Bad gateway`
+- If the request times out, e.g. takes longer time than allowed, the HTTP status code is now `504 Gateway timeout` instead of `502 Bad gateway`. Issue [#47473](https://github.com/grafana/grafana/issues/47473)
+
+The change in behavior is that negative-valued series are now stacked downwards from 0 (in their own stacks), rather than downwards from the top of the positive stacks. We now automatically group stacks by Draw style, Line interpolation, and Bar alignment, making it impossible to stack bars on top of lines, or smooth lines on top of stepped lines. Issue [#47373](https://github.com/grafana/grafana/issues/47373)
+
+The meaning of the default data source has now changed from being a persisted property in a panel. Before when you selected the default data source for a panel and later changed the default data source to another data source it would change all panels who were configured to use the default data source. From now on the default data source is just the default for new panels and changing the default will not impact any currently saved dashboards. Issue [#45132](https://github.com/grafana/grafana/issues/45132)
+
+The Tooltip component provided by `@grafana/ui` is no longer automatically interactive (that is you can hover onto it and click a link or select text). It will from now on by default close automatically when you mouse out from the trigger element. To make tooltips behave like before set the new `interactive` property to true.  
+ Issue [#45053](https://github.com/grafana/grafana/issues/45053)
+
+### Deprecations
+
+`/api/tsdb/query` API has been deprecated and will be removed in a future release. Use [/api/ds/query](https://grafana.com/docs/grafana/latest/http_api/data_source/#query-a-data-source) instead. Issue [#45238](https://github.com/grafana/grafana/issues/45238)
+
+### Plugin development fixes & changes
+
+- **Card:** Increase clickable area when meta items are present. [#47935](https://github.com/grafana/grafana/pull/47935), [@ashharrison90](https://github.com/ashharrison90)
+- **Loki:** Fix operator description propup from being shortened. [#46575](https://github.com/grafana/grafana/pull/46575), [@glintik](https://github.com/glintik)
+- **Tooltips:** Make tooltips non interactive by default. [#45053](https://github.com/grafana/grafana/pull/45053), [@torkelo](https://github.com/torkelo)
+
+<!-- 8.5.0 END -->
+<!-- 8.5.0-beta1 START -->
+
+# 8.5.0-beta1 (2022-04-06)
+
+### Features and enhancements
+
+- Add config option to enable/disable reporting. (Enterprise)
+- **Alerting:** Accurately set value for prom-compatible APIs. [#47216](https://github.com/grafana/grafana/pull/47216), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Provisioning API - Notification Policies. [#46755](https://github.com/grafana/grafana/pull/46755), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Notification URL points to alert view page instead of alert edit page. [#47752](https://github.com/grafana/grafana/pull/47752), [@joeblubaugh](https://github.com/joeblubaugh)
+- **Analytics:** Enable grafana and plugin update checks to be operated independently. [#46352](https://github.com/grafana/grafana/pull/46352), [@wbrowne](https://github.com/wbrowne)
+- **Azure Monitor:** Add support for multiple template variables in resource picker. [#46215](https://github.com/grafana/grafana/pull/46215), [@sarahzinger](https://github.com/sarahzinger)
+- **Caching:** Add separate TTL for resources cache. (Enterprise)
+- **Caching:** add support for TLS configuration for Redis Cluster. (Enterprise)
+- **NewsPanel:** Remove Use Proxy option and update documentation with recommendations. [#47189](https://github.com/grafana/grafana/pull/47189), [@joshhunt](https://github.com/joshhunt)
+- **OAuth:** Sync GitHub OAuth user name to Grafana if it's set. [#45438](https://github.com/grafana/grafana/pull/45438), [@pallxk](https://github.com/pallxk)
+
+### Bug fixes
+
+- **Plugins:** Fix Default Nav URL for dashboard includes. [#47143](https://github.com/grafana/grafana/pull/47143), [@wbrowne](https://github.com/wbrowne)
+
+### Breaking changes
+
+When user is using Github OAuth, GitHub login is showed as both Grafana login and name. Now the GitHub name is showed as Grafana name, and GitHub login is showed as Grafana Login. Issue [#45438](https://github.com/grafana/grafana/issues/45438)
+
+The meaning of the default data source has now changed from being a persisted property in a panel. Before when you selected the default data source for a panel and later changed the default data source to another data source it would change all panels who were configured to use the default data source. From now on the default data source is just the default for new panels and changing the default will not impact any currently saved dashboards. Issue [#45132](https://github.com/grafana/grafana/issues/45132)
+
+<!-- 8.4.7 START -->
+
+# 8.4.7 (2022-04-19)
+
+### Features and enhancements
+
+- **CloudWatch:** Added missing MemoryDB Namespace metrics. [#47290](https://github.com/grafana/grafana/pull/47290), [@james-deee](https://github.com/james-deee)
+- **Histogram Panel:** Take decimal into consideration. [#47330](https://github.com/grafana/grafana/pull/47330), [@mdvictor](https://github.com/mdvictor)
+- **TimeSeries:** Sort tooltip values based on raw values. [#46738](https://github.com/grafana/grafana/pull/46738), [@dprokop](https://github.com/dprokop)
+
+### Bug fixes
+
+- **API:** Include userId, orgId, uname in request logging middleware. [#47183](https://github.com/grafana/grafana/pull/47183), [@marefr](https://github.com/marefr)
+- **Elasticsearch:** Respect maxConcurrentShardRequests datasource setting. [#47120](https://github.com/grafana/grafana/pull/47120), [@alexandrst88](https://github.com/alexandrst88)
+
+<!-- 8.4.7 END -->
+<!-- 8.5.0-beta1 END -->
+<!-- 8.4.6 START -->
+
+# 8.4.6 (2022-04-12)
+
+- **Security:** Fixes CVE-2022-24812. For more information, see our [blog](https://grafana.com/blog/2022/04/12/grafana-enterprise-8.4.6-released-with-high-severity-security-fix/)
+
+<!-- 8.4.6 END -->
+<!-- 8.4.5 START -->
+
+# 8.4.5 (2022-03-31)
+
+### Features and enhancements
+
+- **Instrumentation:** Make backend plugin metrics endpoints available with optional authentication. [#46467](https://github.com/grafana/grafana/pull/46467), [@marefr](https://github.com/marefr)
+- **Table panel:** Show datalinks for cell display modes JSON View and Gauge derivates. [#46020](https://github.com/grafana/grafana/pull/46020), [@mdvictor](https://github.com/mdvictor)
+
+### Bug fixes
+
+- **Azure Monitor:** Small bug fixes for Resource Picker. [#46665](https://github.com/grafana/grafana/pull/46665), [@sarahzinger](https://github.com/sarahzinger)
+- **Logger:** Use specified format for file logger. [#46970](https://github.com/grafana/grafana/pull/46970), [@sakjur](https://github.com/sakjur)
+- **Logs:** Handle missing fields in dataframes better. [#46963](https://github.com/grafana/grafana/pull/46963), [@gabor](https://github.com/gabor)
+- **ManageDashboards:** Fix error when deleting all dashboards from folder view. [#46877](https://github.com/grafana/grafana/pull/46877), [@joshhunt](https://github.com/joshhunt)
+
+<!-- 8.4.5 END -->
+<!-- 8.4.4 START -->
+
+# 8.4.4 (2022-03-16)
+
+### Features and enhancements
+
+- **Loki:** Add unpack to autocomplete suggestions (#44623). [#46573](https://github.com/grafana/grafana/pull/46573), [@glintik](https://github.com/glintik)
+- **Plugins:** allow using both Function and Class components for app plugins. [#46148](https://github.com/grafana/grafana/pull/46148), [@leventebalogh](https://github.com/leventebalogh)
+- **TimeSeries:** Add migration for Graph panel's transform series override. [#46577](https://github.com/grafana/grafana/pull/46577), [@dprokop](https://github.com/dprokop)
+- **TimeSeries:** Preserve null/undefined values when performing negative y transform. [#46584](https://github.com/grafana/grafana/pull/46584), [@dprokop](https://github.com/dprokop)
+
+### Bug fixes
+
+- **CloudWatch:** Use default http client from aws-sdk-go. [#46370](https://github.com/grafana/grafana/pull/46370), [@sunker](https://github.com/sunker)
+- **Dashboards:** Fixes repeating by row and no refresh. [#46565](https://github.com/grafana/grafana/pull/46565), [@torkelo](https://github.com/torkelo)
+- **Gauge:** Fixes blank viz when data link exists and orientation was horizontal. [#46335](https://github.com/grafana/grafana/pull/46335), [@torkelo](https://github.com/torkelo)
+- **Search:** sort results correctly when using postgres. [#46466](https://github.com/grafana/grafana/pull/46466), [@xlson](https://github.com/xlson)
+- **TagsInput:** fix tags remove button accessibility issues. [#46254](https://github.com/grafana/grafana/pull/46254), [@Elfo404](https://github.com/Elfo404)
+- **TextPanel:** Sanitize after markdown has been rendered to html. [#46166](https://github.com/grafana/grafana/pull/46166), [@ashharrison90](https://github.com/ashharrison90)
+
+<!-- 8.4.4 END -->
+<!-- 8.4.3 START -->
+
+# 8.4.3 (2022-03-02)
+
+### Features and enhancements
+
+- **Alerting:** Grafana uses > instead of >= when checking the For duration. [#46010](https://github.com/grafana/grafana/issues/46010)
+- **Alerting:** Use expanded labels in dashboard annotations. [#45726](https://github.com/grafana/grafana/pull/45726), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Logs:** Escape windows newline into single newline. [#45771](https://github.com/grafana/grafana/pull/45771), [@perosb](https://github.com/perosb)
+
+### Bug fixes
+
+- **Alerting:** Fix use of > instead of >= when checking the For duration. [#46011](https://github.com/grafana/grafana/pull/46011), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Azure Monitor:** Fixes broken log queries that use workspace. [#45820](https://github.com/grafana/grafana/pull/45820), [@sunker](https://github.com/sunker)
+- **CloudWatch:** Remove error message when using multi-valued template vars in region field. [#45886](https://github.com/grafana/grafana/pull/45886), [@sunker](https://github.com/sunker)
+- **Middleware:** Fix IPv6 host parsing in CSRF check. [#45911](https://github.com/grafana/grafana/pull/45911), [@ying-jeanne](https://github.com/ying-jeanne)
+
+### Plugin development fixes & changes
+
+- **ClipboardButton:** Use a fallback when the Clipboard API is unavailable. [#45831](https://github.com/grafana/grafana/pull/45831), [@ashharrison90](https://github.com/ashharrison90)
+
+<!-- 8.4.3 END -->
+<!-- 8.4.2 START -->
+
+# 8.4.2 (2022-02-23)
+
+### Features and enhancements
+
+- **OAuth:** Add setting to skip org assignment for external users. [#34834](https://github.com/grafana/grafana/pull/34834), [@baez90](https://github.com/baez90)
+- **Tracing:** Add option to map tag names to log label names in trace to logs settings. [#45178](https://github.com/grafana/grafana/pull/45178), [@connorlindsey](https://github.com/connorlindsey)
+
+### Bug fixes
+
+- **Explore:** Fix closing split pane when logs panel is used. [#45602](https://github.com/grafana/grafana/pull/45602), [@ifrost](https://github.com/ifrost)
+
+<!-- 8.4.2 END -->
+<!-- 8.4.1 START -->
+
+# 8.4.1 (2022-02-18)
+
+### Features and enhancements
+
+- **Cloudwatch:** Add support for AWS/PrivateLink\* metrics and dimensions. [#45515](https://github.com/grafana/grafana/pull/45515), [@szymonpk](https://github.com/szymonpk)
+- **Configuration:** Add ability to customize okta login button name and icon. [#44079](https://github.com/grafana/grafana/pull/44079), [@DanCech](https://github.com/DanCech)
+- **Tempo:** Switch out Select with AsyncSelect component to get loading state in Tempo Search. [#45110](https://github.com/grafana/grafana/pull/45110), [@CatPerry](https://github.com/CatPerry)
+
+### Bug fixes
+
+- **Alerting:** Fix migrations by making send_alerts_to field nullable. [#45572](https://github.com/grafana/grafana/pull/45572), [@santihernandezc](https://github.com/santihernandezc)
+
+<!-- 8.4.1 END -->
+<!-- 8.4.0 START -->
+
+# 8.4.0 (2022-02-16)
+
+### Features and enhancements
+
+- **API:** Extract OpenAPI specification from source code using go-swagger. [#40528](https://github.com/grafana/grafana/pull/40528), [@papagian](https://github.com/papagian)
+- **AccessControl:** Disable user remove and user update roles when they do not have the permissions. [#43429](https://github.com/grafana/grafana/pull/43429), [@Jguer](https://github.com/Jguer)
+- **AccessControl:** Provisioning for teams. [#43767](https://github.com/grafana/grafana/pull/43767), [@gamab](https://github.com/gamab)
+- **API:** Add usage stats preview endpoint. [#43899](https://github.com/grafana/grafana/pull/43899), [@Jguer](https://github.com/Jguer)
+- **Alerting:** Move slow queries in the scheduler to another goroutine. [#44423](https://github.com/grafana/grafana/pull/44423), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** Use time.Ticker instead of alerting.Ticker in ngalert. [#44395](https://github.com/grafana/grafana/pull/44395), [@grobinson-grafana](https://github.com/grobinson-grafana)
+- **Alerting:** add custom grouping to Alert Panel. [#44559](https://github.com/grafana/grafana/pull/44559), [@gillesdemey](https://github.com/gillesdemey)
+- **Analytics:** Add user id tracking to google analytics. [#42763](https://github.com/grafana/grafana/pull/42763), [@autoric](https://github.com/autoric)
+- **Angular:** Add AngularJS plugin support deprecation plan to docs site. [#45149](https://github.com/grafana/grafana/pull/45149), [@torkelo](https://github.com/torkelo)
+- **Auth:** implement auto_sign_up for auth.jwt. [#43502](https://github.com/grafana/grafana/pull/43502), [@sakjur](https://github.com/sakjur)
+- **Azure Monitor Logs:** Order subscriptions in resource picker by name. [#45228](https://github.com/grafana/grafana/pull/45228), [@sunker](https://github.com/sunker)
+- **Azure monitor Logs:** Optimize data fetching in resource picker. [#44549](https://github.com/grafana/grafana/pull/44549), [@sunker](https://github.com/sunker)
+- **AzureMonitor:** Filter list of resources by resourceType. [#43522](https://github.com/grafana/grafana/pull/43522), [@andresmgot](https://github.com/andresmgot)
+- **BarChart:** color by field, x time field, bar radius, label skipping. [#43257](https://github.com/grafana/grafana/pull/43257), [@leeoniya](https://github.com/leeoniya)
+- **Chore:** Implement OpenTelemetry in Grafana. [#42674](https://github.com/grafana/grafana/pull/42674), [@idafurjes](https://github.com/idafurjes)
+- **Cloud Monitoring:** Adds metric type to Metric drop down options. [#43268](https://github.com/grafana/grafana/pull/43268), [@tw1nk](https://github.com/tw1nk)
+- **CloudWatch:** Add Data Lifecycle Manager metrics and dimension. [#43310](https://github.com/grafana/grafana/pull/43310), [@ilyastoli](https://github.com/ilyastoli)
+- **CloudWatch:** Add Missing Elasticache Host-level metrics. [#43455](https://github.com/grafana/grafana/pull/43455), [@dhendo](https://github.com/dhendo)
+- **CloudWatch:** Add all ElastiCache Redis Metrics. [#43336](https://github.com/grafana/grafana/pull/43336), [@siavashs](https://github.com/siavashs)
+- **CloudWatch:** Add new AWS/ES metrics. [#43034](https://github.com/grafana/grafana/pull/43034), [@sunker](https://github.com/sunker)
+- **Cloudwatch:** Add syntax highlighting and autocomplete for "Metric Search". [#43985](https://github.com/grafana/grafana/pull/43985), [@sarahzinger](https://github.com/sarahzinger)
+- **Explore:** Support custom display label for exemplar links for Prometheus datasource. [#42732](https://github.com/grafana/grafana/pull/42732), [@JokerQueue](https://github.com/JokerQueue)
+- **Hotkeys:** Make time range absolute/permanent. [#43802](https://github.com/grafana/grafana/pull/43802), [@davkal](https://github.com/davkal)
+- **Playlists:** Enable sharing direct links to playlists. [#44161](https://github.com/grafana/grafana/pull/44161), [@ashharrison90](https://github.com/ashharrison90)
+- **SQLStore:** Prevent concurrent migrations. [#44101](https://github.com/grafana/grafana/pull/44101), [@papagian](https://github.com/papagian)
+- **SSE:** Add Mode to drop NaN/Inf/Null in Reduction operations. [#43583](https://github.com/grafana/grafana/pull/43583), [@kylebrandt](https://github.com/kylebrandt)
+- **Setting:** Support configuring feature toggles with bools instead of just passing an array. [#43326](https://github.com/grafana/grafana/pull/43326), [@bergquist](https://github.com/bergquist)
+- **TimeSeries:** Add support for negative Y and constant transform. [#44774](https://github.com/grafana/grafana/pull/44774), [@dprokop](https://github.com/dprokop)
+- **Transformations:** Add 'JSON' field type to ConvertFieldTypeTransformer. [#42624](https://github.com/grafana/grafana/pull/42624), [@sd2k](https://github.com/sd2k)
+
+### Bug fixes
+
+- **Auth:** Guarantee consistency of signed SigV4 headers. [#45054](https://github.com/grafana/grafana/pull/45054), [@wbrowne](https://github.com/wbrowne)
+- **CloudWatch:** Fix MetricName resetting on Namespace change. [#44165](https://github.com/grafana/grafana/pull/44165), [@yaelleC](https://github.com/yaelleC)
+- **Cloudwatch :** Fixed resetting metric name when changing namespace in Metric Query. [#44612](https://github.com/grafana/grafana/pull/44612), [@yaelleC](https://github.com/yaelleC)
+- **Explore:** Avoid locking timepicker when range is inverted. [#44790](https://github.com/grafana/grafana/pull/44790), [@Elfo404](https://github.com/Elfo404)
+- **Instrumentation:** Fix HTTP request instrumentation of authentication failures. [#44234](https://github.com/grafana/grafana/pull/44234), [@marefr](https://github.com/marefr)
+- **LibraryPanels:** Prevent long descriptions and names from obscuring the delete button. [#45190](https://github.com/grafana/grafana/pull/45190), [@zuchka](https://github.com/zuchka)
+- **OAuth:** Fix parsing of ID token if header contains non-string value. [#44159](https://github.com/grafana/grafana/pull/44159), [@marefr](https://github.com/marefr)
+- **Panel Edit:** Visualization search now works correctly with special characters. [#45137](https://github.com/grafana/grafana/pull/45137), [@ashharrison90](https://github.com/ashharrison90)
+- **Provisioning:** Fix duplicate validation when multiple organizations have been configured. [#44151](https://github.com/grafana/grafana/pull/44151), [@marefr](https://github.com/marefr)
+- **QueryField:** Fix issue with undo history when suggestion is inserted (#28656). [#39114](https://github.com/grafana/grafana/pull/39114), [@glintik](https://github.com/glintik)
+- **TablePanel:** Do not prefix columns with frame name if multiple frames and override active. [#45174](https://github.com/grafana/grafana/pull/45174), [@mdvictor](https://github.com/mdvictor)
+
+### Deprecations
+
+AngularJS plugin support is now in a deprecated state, meaning it will be removed in a future release. Currently, that is planned for version 10 (in 2023). The documentation site has an [article](https://grafana.com/docs/grafana/next/developers/angular_deprecation/) with more details on why, when, and how. Issue [#45149](https://github.com/grafana/grafana/issues/45149)
+
+<!-- 8.4.0 END -->
+<!-- 8.4.0-beta1 START -->
+
+# 8.4.0-beta1 (2022-02-02)
+
+### Features and enhancements
+
+- **Alerting:** Support WeCom as a contact point type. [#40975](https://github.com/grafana/grafana/pull/40975), [@smallpath](https://github.com/smallpath)
+- **Alerting:** UI for mute timings. [#41578](https://github.com/grafana/grafana/pull/41578), [@nathanrodman](https://github.com/nathanrodman)
+- **Alerting:** add settings for peer reconnection in HA mode. [#42300](https://github.com/grafana/grafana/pull/42300), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **Auth:** implement auto_sign_up for auth.jwt. [#37040](https://github.com/grafana/grafana/pull/37040), [@Roguelazer](https://github.com/Roguelazer)
+- **Dashboard:** Add Show unknown variables toggle to dashboard settings. [#41854](https://github.com/grafana/grafana/pull/41854), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Instrumentation:** Logger migration from log15 to gokit/log. [#41636](https://github.com/grafana/grafana/pull/41636), [@ying-jeanne](https://github.com/ying-jeanne)
+- **MSSQL:** Change regex to validate Provider connection string. [#40248](https://github.com/grafana/grafana/pull/40248), [@ianselmi](https://github.com/ianselmi)
+- **MSSQL:** Configuration of certificate verification for TLS connection. [#31865](https://github.com/grafana/grafana/pull/31865), [@mortenaa](https://github.com/mortenaa)
+- **Middleware:** Don't require HTTPS for HSTS headers to be emitted. [#35147](https://github.com/grafana/grafana/pull/35147), [@alexmv](https://github.com/alexmv)
+- **Navigation:** Implement Keyboard Navigation. [#41618](https://github.com/grafana/grafana/pull/41618), [@axelavargas](https://github.com/axelavargas)
+- **News:** Reload feed when changing the time range or refreshing. [#42217](https://github.com/grafana/grafana/pull/42217), [@ashharrison90](https://github.com/ashharrison90)
+- **UI/Plot:** Implement keyboard controls for plot cursor. [#42244](https://github.com/grafana/grafana/pull/42244), [@kaydelaney](https://github.com/kaydelaney)
+
+<!-- 8.3.7 START -->
+
+# 8.3.7 (2022-03-01)
+
+### Bug fixes
+
+- **Provisioning:** Ensure that the default value for orgID is set when provisioning datasources to be deleted. [#44244](https://github.com/grafana/grafana/pull/44244), [@filewalkwithme](https://github.com/filewalkwithme)
+
+<!-- 8.3.7 END -->
+
+<!-- 8.3.6 START -->
+
+# 8.3.6 (2022-02-09)
+
+### Features and enhancements
+
+- **Cloud Monitoring:** Reduce request size when listing labels. [#44365](https://github.com/grafana/grafana/pull/44365), [@mtanda](https://github.com/mtanda)
+- **Explore:** Show scalar data result in a table instead of graph. [#44362](https://github.com/grafana/grafana/pull/44362), [@tharun208](https://github.com/tharun208)
+- **Snapshots:** Updates the default external snapshot server URL. [#44563](https://github.com/grafana/grafana/pull/44563), [@DanCech](https://github.com/DanCech)
+- **Table:** Makes footer not overlap table content. [#44210](https://github.com/grafana/grafana/pull/44210), [@dprokop](https://github.com/dprokop)
+- **Tempo:** Add request histogram to service graph datalink. [#44671](https://github.com/grafana/grafana/pull/44671), [@connorlindsey](https://github.com/connorlindsey)
+- **Tempo:** Add time range to tempo search query behind a feature flag. [#43811](https://github.com/grafana/grafana/pull/43811), [@connorlindsey](https://github.com/connorlindsey)
+- **Tempo:** Auto-clear results when changing query type. [#44390](https://github.com/grafana/grafana/pull/44390), [@connorlindsey](https://github.com/connorlindsey)
+- **Tempo:** Display start time in search results as relative time. [#44568](https://github.com/grafana/grafana/pull/44568), [@tharun208](https://github.com/tharun208)
+
+### Bug fixes
+
+- **CloudMonitoring:** Fix resource labels in query editor. [#44550](https://github.com/grafana/grafana/pull/44550), [@iwysiu](https://github.com/iwysiu)
+- **Cursor sync:** Apply the settings without saving the dashboard. [#44270](https://github.com/grafana/grafana/pull/44270), [@dprokop](https://github.com/dprokop)
+- **LibraryPanels:** Fix for Error while cleaning library panels. [#45033](https://github.com/grafana/grafana/pull/45033), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Logs Panel:** fix timestamp parsing for string dates without timezone. [#44664](https://github.com/grafana/grafana/pull/44664), [@Elfo404](https://github.com/Elfo404)
+- **Prometheus:** Fix some of the alerting queries that use reduce/math operation. [#44380](https://github.com/grafana/grafana/pull/44380), [@ivanahuckova](https://github.com/ivanahuckova)
+- **TablePanel:** Fix ad-hoc variables not working on default datasources. [#44314](https://github.com/grafana/grafana/pull/44314), [@joshhunt](https://github.com/joshhunt)
+- **Text Panel:** Fix alignment of elements. [#44313](https://github.com/grafana/grafana/pull/44313), [@ashharrison90](https://github.com/ashharrison90)
+- **Variables:** Fix for constant variables in self referencing links. [#44631](https://github.com/grafana/grafana/pull/44631), [@hugohaggmark](https://github.com/hugohaggmark)
+
+<!-- 8.3.6 END -->
+<!-- 8.4.0-beta1 END -->
+<!-- 8.3.5 START -->
+
+# 8.3.5 (2022-02-08)
+
+- **Security**: Fixes CVE-2022-21702. For more information, see our [blog](https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes/)
+- **Security**: Fixes CVE-2022-21703. For more information, see our [blog](https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes/)
+- **Security**: Fixes CVE-2022-21713. For more information, see our [blog](https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes/)
+
+<!-- 8.3.5 END -->
+<!-- 8.3.4 START -->
+
+# 8.3.4 (2022-01-17)
+
+### Features and enhancements
+
+- **Alerting:** Allow configuration of non-ready alertmanagers. [#43063](https://github.com/grafana/grafana/pull/43063), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Allow customization of Google chat message. [#43568](https://github.com/grafana/grafana/pull/43568), [@alexweav](https://github.com/alexweav)
+- **Alerting:** Allow customization of Google chat message (#43568). [#43723](https://github.com/grafana/grafana/pull/43723), [@alexweav](https://github.com/alexweav)
+- **AppPlugins:** Support app plugins with only default nav. [#43016](https://github.com/grafana/grafana/pull/43016), [@torkelo](https://github.com/torkelo)
+- **InfluxDB:** InfluxQL: query editor: skip fields in metadata queries. [#42543](https://github.com/grafana/grafana/pull/42543), [@gabor](https://github.com/gabor)
+- **Postgres/MySQL/MSSQL:** Cancel in-flight SQL query if user cancels query in grafana. [#43890](https://github.com/grafana/grafana/pull/43890), [@mdvictor](https://github.com/mdvictor)
+- **Prometheus:** Forward oauth tokens after prometheus datasource migration. [#43686](https://github.com/grafana/grafana/pull/43686), [@MasslessParticle](https://github.com/MasslessParticle)
+
+### Bug fixes
+
+- **Azure Monitor:** Bug fix for variable interpolations in metrics dropdowns. [#43251](https://github.com/grafana/grafana/pull/43251), [@sarahzinger](https://github.com/sarahzinger)
+- **Azure Monitor:** Improved error messages for variable queries. [#43213](https://github.com/grafana/grafana/pull/43213), [@sunker](https://github.com/sunker)
+- **CloudMonitoring:** Fixes broken variable queries that use group bys. [#43914](https://github.com/grafana/grafana/pull/43914), [@sunker](https://github.com/sunker)
+- **Configuration:** You can now see your expired API keys if you have no active ones. [#42452](https://github.com/grafana/grafana/pull/42452), [@ashharrison90](https://github.com/ashharrison90)
+- **Elasticsearch:** Fix handling multiple datalinks for a single field. [#44029](https://github.com/grafana/grafana/pull/44029), [@Elfo404](https://github.com/Elfo404)
+- **Export:** Fix error being thrown when exporting dashboards using query variables that reference the default datasource. [#44034](https://github.com/grafana/grafana/pull/44034), [@ashharrison90](https://github.com/ashharrison90)
+- **ImportDashboard:** Fixes issue with importing dashboard and name ending up in uid. [#43451](https://github.com/grafana/grafana/pull/43451), [@torkelo](https://github.com/torkelo)
+- **Login:** Page no longer overflows on mobile. [#43739](https://github.com/grafana/grafana/pull/43739), [@ashharrison90](https://github.com/ashharrison90)
+- **Plugins:** Set backend metadata property for core plugins. [#43349](https://github.com/grafana/grafana/pull/43349), [@marefr](https://github.com/marefr)
+- **Prometheus:** Fill missing steps with null values. [#43622](https://github.com/grafana/grafana/pull/43622), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Fix interpolation of $\_\_rate_interval variable. [#44035](https://github.com/grafana/grafana/pull/44035), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Interpolate variables with curly brackets syntax. [#42927](https://github.com/grafana/grafana/pull/42927), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Respect the http-method data source setting. [#42753](https://github.com/grafana/grafana/pull/42753), [@gabor](https://github.com/gabor)
+- **Table:** Fixes issue with field config applied to wrong fields when hiding columns. [#43376](https://github.com/grafana/grafana/pull/43376), [@torkelo](https://github.com/torkelo)
+- **Toolkit:** Fix bug with rootUrls not being properly parsed when signing a private plugin. [#43014](https://github.com/grafana/grafana/pull/43014), [@dessen-xu](https://github.com/dessen-xu)
+- **Variables:** Fix so data source variables are added to adhoc configuration. [#43881](https://github.com/grafana/grafana/pull/43881), [@hugohaggmark](https://github.com/hugohaggmark)
+
+### Plugin development fixes & changes
+
+- **Toolkit:** Revert build config so tslib is bundled with plugins to prevent plugins from crashing. [#43556](https://github.com/grafana/grafana/pull/43556), [@mckn](https://github.com/mckn)
+
+<!-- 8.3.4 END -->
+<!-- 8.3.3 START -->
+
+# 8.3.3 (2021-12-10)
+
+### Features and enhancements
+
+- **BarChart:** Use new data error view component to show actions in panel edit. [#42474](https://github.com/grafana/grafana/pull/42474), [@torkelo](https://github.com/torkelo)
+- **CloudMonitor:** Iterate over pageToken for resources. [#42546](https://github.com/grafana/grafana/pull/42546), [@iwysiu](https://github.com/iwysiu)
+- **Macaron:** Prevent WriteHeader invalid HTTP status code panic. [#42973](https://github.com/grafana/grafana/pull/42973), [@bergquist](https://github.com/bergquist)
+
+### Bug fixes
+
+- **AnnoListPanel:** Fix interpolation of variables in tags. [#42318](https://github.com/grafana/grafana/pull/42318), [@francoisdtm](https://github.com/francoisdtm)
+- **CloudWatch:** Allow queries to have no dimensions specified. [#42800](https://github.com/grafana/grafana/pull/42800), [@sunker](https://github.com/sunker)
+- **CloudWatch:** Fix broken queries for users migrating from 8.2.4/8.2.5 to 8.3.0. [#42611](https://github.com/grafana/grafana/pull/42611), [@sunker](https://github.com/sunker)
+- **CloudWatch:** Make sure MatchExact flag gets the right value. [#42621](https://github.com/grafana/grafana/pull/42621), [@sunker](https://github.com/sunker)
+- **Dashboards:** Fix so that empty folders can be deleted from the manage dashboards/folders page. [#42527](https://github.com/grafana/grafana/pull/42527), [@ashharrison90](https://github.com/ashharrison90)
+- **InfluxDB:** Improve handling of metadata query errors in InfluxQL. [#42500](https://github.com/grafana/grafana/pull/42500), [@gabor](https://github.com/gabor)
+- **Loki:** Fix adding of ad hoc filters for queries with parser and line_format expressions. [#42590](https://github.com/grafana/grafana/pull/42590), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Fix running of exemplar queries for non-histogram metrics. [#42749](https://github.com/grafana/grafana/pull/42749), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Interpolate template variables in interval. [#42637](https://github.com/grafana/grafana/pull/42637), [@ivanahuckova](https://github.com/ivanahuckova)
+- **StateTimeline:** Fix toolitp not showing when for frames with multiple fields. [#42741](https://github.com/grafana/grafana/pull/42741), [@dprokop](https://github.com/dprokop)
+- **TraceView:** Fix virtualized scrolling when trace view is opened in right pane in Explore. [#42480](https://github.com/grafana/grafana/pull/42480), [@autoric](https://github.com/autoric)
+- **Variables:** Fix repeating panels for on time range changed variables. [#42828](https://github.com/grafana/grafana/pull/42828), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Variables:** Fix so queryparam option works for scoped variables. [#42742](https://github.com/grafana/grafana/pull/42742), [@hugohaggmark](https://github.com/hugohaggmark)
+
+<!-- 8.3.3 END -->
+<!-- 8.3.2 START -->
+
+# 8.3.2 (2021-12-10)
+
+- **Security**: Fixes CVE-2021-43813 and CVE-2021-43815. For more information, see our [blog](https://grafana.com/blog/2021/12/10/grafana-8.3.2-and-7.5.12-released-with-moderate-severity-security-fix/
+
+<!-- 8.3.2 END -->
+
+<!-- 8.3.1 START -->
+
+# 8.3.1 (2021-12-07)
+
+- **Security**: Fixes CVE-2021-43798. For more information, see our [blog](https://grafana.com/blog/2021/12/07/grafana-8.3.1-8.2.7-8.1.8-and-8.0.7-released-with-high-severity-security-fix/)
+
+<!-- 8.3.1 END -->
+
+<!-- 8.3.0 START -->
+
+# 8.3.0 (2021-11-30)
+
+### Features and enhancements
+
+- **Alerting:** Prevent folders from being deleted when they contain alerts. [#42307](https://github.com/grafana/grafana/pull/42307), [@peterholmberg](https://github.com/peterholmberg)
+- **Alerting:** Show full preview value in tooltip. [#42445](https://github.com/grafana/grafana/pull/42445), [@peterholmberg](https://github.com/peterholmberg)
+- **BarGauge:** Limit title width when name is really long. [#42346](https://github.com/grafana/grafana/pull/42346), [@torkelo](https://github.com/torkelo)
+- **CloudMonitoring:** Avoid to escape regexps in filters. [#41961](https://github.com/grafana/grafana/pull/41961), [@andresmgot](https://github.com/andresmgot)
+- **CloudWatch:** Add support for AWS Metric Insights. [#42487](https://github.com/grafana/grafana/pull/42487), [@sunker](https://github.com/sunker)
+- **TooltipPlugin:** Remove other panels' shared tooltip in edit panel. [#42187](https://github.com/grafana/grafana/pull/42187), [@mdvictor](https://github.com/mdvictor)
+- **Visualizations:** Limit y label width to 40% of visualization width. [#42350](https://github.com/grafana/grafana/pull/42350), [@torkelo](https://github.com/torkelo)
+
+### Bug fixes
+
+- **Alerting:** Clear alerting rule evaluation errors after intermittent failures. [#42386](https://github.com/grafana/grafana/pull/42386), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Fix refresh on legacy Alert List panel. [#42322](https://github.com/grafana/grafana/pull/42322), [@peterholmberg](https://github.com/peterholmberg)
+- **Dashboard:** Fix queries for panels with non-integer widths. [#42420](https://github.com/grafana/grafana/pull/42420), [@gabor](https://github.com/gabor)
+- **Explore:** Fix url update inconsistency. [#42288](https://github.com/grafana/grafana/pull/42288), [@gabor](https://github.com/gabor)
+- **Prometheus:** Fix range variables interpolation for time ranges smaller than 1 second. [#42242](https://github.com/grafana/grafana/pull/42242), [@ivanahuckova](https://github.com/ivanahuckova)
+- **ValueMappings:** Fixes issue with regex value mapping that only sets color. [#42311](https://github.com/grafana/grafana/pull/42311), [@torkelo](https://github.com/torkelo)
+
+<!-- 8.3.0 END -->
+<!-- 8.3.0-beta2 START -->
+
+# 8.3.0-beta2 (2021-11-25)
+
+### Features and enhancements
+
+- **Alerting:** Create DatasourceError alert if evaluation returns error. [#41869](https://github.com/grafana/grafana/pull/41869), [@gerobinson](https://github.com/gerobinson)
+- **Alerting:** Make Unified Alerting enabled by default for those who do not use legacy alerting. [#42200](https://github.com/grafana/grafana/pull/42200), [@armandgrillet](https://github.com/armandgrillet)
+- **Alerting:** Support mute timings configuration through the api for the embedded alert manager. [#41533](https://github.com/grafana/grafana/pull/41533), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **CloudWatch:** Add missing AWS/Events metrics. [#42164](https://github.com/grafana/grafana/pull/42164), [@n2N8Z](https://github.com/n2N8Z)
+- **Docs:** Add easier to find deprecation notices to certain data sources and to the changelog. [#41938](https://github.com/grafana/grafana/pull/41938), [@gabor](https://github.com/gabor)
+- **Plugins Catalog:** Enable install controls based on the pluginAdminEnabled flag. [#41686](https://github.com/grafana/grafana/pull/41686), [@leventebalogh](https://github.com/leventebalogh)
+- **Query caching:** Increase max_value_mb default to 10. (Enterprise)
+- **Table:** Add space between values for the DefaultCell. [#42246](https://github.com/grafana/grafana/pull/42246), [@kirederik](https://github.com/kirederik)
+- **Table:** Add space between values on JSONViewCell. [#42156](https://github.com/grafana/grafana/pull/42156), [@kirederik](https://github.com/kirederik)
+- **Tracing:** Make query editors available in dashboard for Tempo and Zipkin. [#41974](https://github.com/grafana/grafana/pull/41974), [@ivanahuckova](https://github.com/ivanahuckova)
+
+### Bug fixes
+
+- **AccessControl:** Renamed `orgs` roles, removed `fixed:orgs:reader` introduced in beta1. [#42049](https://github.com/grafana/grafana/pull/42049), [@gamab](https://github.com/gamab)
+- **Azure Monitor:** Add trap focus for modals in grafana/ui and other small a11y fixes for Azure Monitor. [#41449](https://github.com/grafana/grafana/pull/41449), [@sarahzinger](https://github.com/sarahzinger)
+- **CodeEditor:** Prevent suggestions from being clipped. [#42120](https://github.com/grafana/grafana/pull/42120), [@kaydelaney](https://github.com/kaydelaney)
+- **Dashboard:** Fix cache timeout persistence. [#42204](https://github.com/grafana/grafana/pull/42204), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Datasource:** Fix stable sort order of query responses. [#41868](https://github.com/grafana/grafana/pull/41868), [@marefr](https://github.com/marefr)
+- **Explore:** Fix error in query history when removing last item. [#42179](https://github.com/grafana/grafana/pull/42179), [@gabor](https://github.com/gabor)
+- **Logs:** Fix requesting of older logs when flipped order. [#41966](https://github.com/grafana/grafana/pull/41966), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Fix running of health check query based on access mode. [#42189](https://github.com/grafana/grafana/pull/42189), [@ivanahuckova](https://github.com/ivanahuckova)
+- **TextPanel:** Fix suggestions for existing panels. [#42195](https://github.com/grafana/grafana/pull/42195), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Tracing:** Fix incorrect indentations due to reoccurring spanIDs. [#41919](https://github.com/grafana/grafana/pull/41919), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Tracing:** Show start time of trace with milliseconds precision. [#42132](https://github.com/grafana/grafana/pull/42132), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Variables:** Make renamed or missing variable section expandable. [#41964](https://github.com/grafana/grafana/pull/41964), [@hugohaggmark](https://github.com/hugohaggmark)
+
+### Breaking changes
+
+### Grafana 8 Alerting enabled by default for installations that do not use legacy alerting
+
+Starting with Grafana v8.3.0, if you have **not** explicitly disabled unified alerting and **do not** have legacy alerts set up you are automatically "migrated" to Grafana 8 Alerting.
+
+A migration **from legacy to Grafana 8 Alerting** will never incur a data loss, as the previous data is kept around for rollback purposes. However, going from **Grafana 8 Alerting to legacy alerting** will delete all the data created for Grafana 8 Alerting. It is recommended that you **backup your database** before attempting a migration between systems.
+
+If unclear, please verify the table below:
+
+| `[alerting][enabled]` | `[unified_alerting][enabled]` | With Existing Legacy Alerts | Result             |
+| --------------------- | ----------------------------- | --------------------------- | ------------------ |
+| `true`                | `true`                        | N/A                         | Error              |
+| `true`                | `false`                       | N/A                         | Legacy Alerting    |
+| `true`                | not set                       | Yes                         | Legacy Alerting    |
+| `true`                | not set                       | No                          | Grafana 8 Alerting |
+| not set               | `true`                        | N/A                         | Grafana 8 Alerting |
+| not set               | `false`                       | N/A                         | Legacy Alerting    |
+| not set               | not set                       | Yes                         | Legacy Alerting    |
+| not set               | not set                       | No                          | Grafana 8 Alerting |
+| `false`               | `true`                        | N/A                         | Grafana 8 Alerting |
+| `false`               | `false`                       | N/A                         | Alerting disabled  |
+| `false`               | not set                       | N/A                         | Grafana 8 Alerting |
+
+N/A in the "With Existing Legacy Alerts" column means that it does not matter if you have legacy alerts or not.
+Issue [#42200](https://github.com/grafana/grafana/issues/42200)
+
+### Keep Last State for "If execution error or timeout" when upgrading to Grafana 8 alerting
+
+In Grafana 8.3.0-beta2 we changed how alert rules that use `Keep Last State` for `If execution error or timeout` are upgraded from Legacy Alerting to Grafana 8 alerting. In 8.3.0-beta1 and earlier, alert rules with `Keep Last State` for `If execution error or timeout` were changed to `Alerting` when upgrading from Legacy Alerting to Grafana 8 alerting. However, in 8.3.0-beta2 these alert rules are now upgraded to a new option called `Error`. With this option, on encountering an error evaluating an alert rule, Grafana creates a special alert called `DatasourceError` with the `rule_uid` and `ref_id` as labels and an annotation called `Error` with the error message. Issue [#41869](https://github.com/grafana/grafana/issues/41869)
+
+### Deprecations
+
+The access mode "browser" is deprecated in the following data sources and will be removed in a later release:
+
+- Prometheus
+- InfluxDB
+- Elasticsearch Issue [#41938](https://github.com/grafana/grafana/issues/41938)
+
+### Plugin development fixes & changes
+
+- **Select:** Select menus now properly scroll during keyboard navigation. [#41917](https://github.com/grafana/grafana/pull/41917), [@ashharrison90](https://github.com/ashharrison90)
+
+<!-- 8.3.0-beta2 END -->
+<!-- 8.3.0-beta1 START -->
+
+# 8.3.0-beta1 (2021-11-18)
+
+### Features and enhancements
+
+- **AccessControl:** Apply fine-grained access control to licensing. (Enterprise)
+- **Alerting:** Add UI for contact point testing with custom annotations and labels. [#40491](https://github.com/grafana/grafana/pull/40491), [@nathanrodman](https://github.com/nathanrodman)
+- **Alerting:** Make alert state indicator in panel header work with Grafana 8 alerts. [#38713](https://github.com/grafana/grafana/pull/38713), [@domasx2](https://github.com/domasx2)
+- **Alerting:** Option for Discord notifier to use webhook name. [#40463](https://github.com/grafana/grafana/pull/40463), [@Skyebold](https://github.com/Skyebold)
+- **Annotations:** Deprecate AnnotationsSrv. [#39631](https://github.com/grafana/grafana/pull/39631), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Auditing:** Add audit logs for unified alerting endpoints. (Enterprise)
+- **Auditing:** Add endpoints (plugins, datasources, library elements). (Enterprise)
+- **Auth:** Omit all base64 paddings in JWT tokens for the JWT auth. [#35602](https://github.com/grafana/grafana/pull/35602), [@gillg](https://github.com/gillg)
+- **Azure Monitor:** Clean up fields when editing Metrics. [#41762](https://github.com/grafana/grafana/pull/41762), [@andresmgot](https://github.com/andresmgot)
+- **AzureMonitor:** Add new starter dashboards. [#39876](https://github.com/grafana/grafana/pull/39876), [@jcolladokuri](https://github.com/jcolladokuri)
+- **AzureMonitor:** Add starter dashboard for app monitoring with Application Insights. [#40725](https://github.com/grafana/grafana/pull/40725), [@jcolladokuri](https://github.com/jcolladokuri)
+- **Barchart/Time series:** Allow x axis label. [#41142](https://github.com/grafana/grafana/pull/41142), [@oscarkilhed](https://github.com/oscarkilhed)
+- **CLI:** Improve error handling for installing plugins. [#41257](https://github.com/grafana/grafana/pull/41257), [@marefr](https://github.com/marefr)
+- **CloudMonitoring:** Migrate to use backend plugin SDK contracts. [#38650](https://github.com/grafana/grafana/pull/38650), [@idafurjes](https://github.com/idafurjes)
+- **CloudWatch Logs:** Add retry strategy for hitting max concurrent queries. [#39290](https://github.com/grafana/grafana/pull/39290), [@aocenas](https://github.com/aocenas)
+- **CloudWatch:** Add AWS RoboMaker metrics and dimension. [#41450](https://github.com/grafana/grafana/pull/41450), [@ilyastoli](https://github.com/ilyastoli)
+- **CloudWatch:** Add AWS Transfer metrics and dimension. [#41168](https://github.com/grafana/grafana/pull/41168), [@ilyastoli](https://github.com/ilyastoli)
+- **Dashboard:** replace datasource name with a reference object. [#33817](https://github.com/grafana/grafana/pull/33817), [@ryantxu](https://github.com/ryantxu)
+- **Dashboards:** Show logs on time series when hovering. [#40110](https://github.com/grafana/grafana/pull/40110), [@ryantxu](https://github.com/ryantxu)
+- **Elasticsearch:** Add support for Elasticsearch 8.0 (Beta). [#41729](https://github.com/grafana/grafana/pull/41729), [@Elfo404](https://github.com/Elfo404)
+- **Elasticsearch:** Add time zone setting to Date Histogram aggregation. [#40882](https://github.com/grafana/grafana/pull/40882), [@Elfo404](https://github.com/Elfo404)
+- **Elasticsearch:** Enable full range log volume histogram. [#41202](https://github.com/grafana/grafana/pull/41202), [@ifrost](https://github.com/ifrost)
+- **Elasticsearch:** Full range logs volume. [#40700](https://github.com/grafana/grafana/pull/40700), [@ifrost](https://github.com/ifrost)
+- **Explore:** Allow changing the graph type. [#40522](https://github.com/grafana/grafana/pull/40522), [@gabor](https://github.com/gabor)
+- **Explore:** Show ANSI colors when highlighting matched words in the logs panel. [#40971](https://github.com/grafana/grafana/pull/40971), [@oliverfrye](https://github.com/oliverfrye)
+- **Graph(old) panel:** Listen to events from Time series panel. [#41033](https://github.com/grafana/grafana/pull/41033), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Import:** Load gcom dashboards from URL. [#41799](https://github.com/grafana/grafana/pull/41799), [@ashharrison90](https://github.com/ashharrison90)
+- **LibraryPanels:** Improves export and import of library panels between orgs. [#39214](https://github.com/grafana/grafana/pull/39214), [@hugohaggmark](https://github.com/hugohaggmark)
+- **OAuth:** Support PKCE. [#39948](https://github.com/grafana/grafana/pull/39948), [@sakjur](https://github.com/sakjur)
+- **Panel edit:** Overrides now highlight correctly when searching. [#41684](https://github.com/grafana/grafana/pull/41684), [@ashharrison90](https://github.com/ashharrison90)
+- **PanelEdit:** Display drag indicators on draggable sections. [#41711](https://github.com/grafana/grafana/pull/41711), [@ashharrison90](https://github.com/ashharrison90)
+- **Plugins:** Refactor Plugin Management. [#40477](https://github.com/grafana/grafana/pull/40477), [@wbrowne](https://github.com/wbrowne)
+- **Prometheus:** Add custom query parameters when creating PromLink url. [#41213](https://github.com/grafana/grafana/pull/41213), [@Ian-Yy](https://github.com/Ian-Yy)
+- **Prometheus:** Remove limits on metrics, labels, and values in Metrics Browser. [#40660](https://github.com/grafana/grafana/pull/40660), [@autoric](https://github.com/autoric)
+- **StateTimeline:** Share cursor with rest of the panels. [#41038](https://github.com/grafana/grafana/pull/41038), [@zoltanbedi](https://github.com/zoltanbedi)
+- **Tempo:** Add error details when json upload fails. [#41803](https://github.com/grafana/grafana/pull/41803), [@aocenas](https://github.com/aocenas)
+- **Tempo:** Add filtering for service graph query. [#41162](https://github.com/grafana/grafana/pull/41162), [@aocenas](https://github.com/aocenas)
+- **Tempo:** Add links to nodes in Service Graph pointing to Prometheus metrics. [#41135](https://github.com/grafana/grafana/pull/41135), [@aocenas](https://github.com/aocenas)
+- **Time series/Bar chart panel:** Add ability to sort series via legend. [#40226](https://github.com/grafana/grafana/pull/40226), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TimeSeries:** Allow multiple axes for the same unit. [#41635](https://github.com/grafana/grafana/pull/41635), [@dprokop](https://github.com/dprokop)
+- **TraceView:** Allow span links defined on dataFrame. [#40563](https://github.com/grafana/grafana/pull/40563), [@aocenas](https://github.com/aocenas)
+- **Transformations:** Support a rows mode in labels to fields. [#41020](https://github.com/grafana/grafana/pull/41020), [@ryantxu](https://github.com/ryantxu)
+- **ValueMappings:** Don't apply field config defaults to time fields. [#41132](https://github.com/grafana/grafana/pull/41132), [@torkelo](https://github.com/torkelo)
+- **Variables:** Only update panels that are impacted by variable change. [#39420](https://github.com/grafana/grafana/pull/39420), [@hugohaggmark](https://github.com/hugohaggmark)
+
+### Bug fixes
+
+- **API:** Fix dashboard quota limit for imports. [#41495](https://github.com/grafana/grafana/pull/41495), [@yangkb09](https://github.com/yangkb09)
+- **Alerting:** Fix rule editor issues with Azure Monitor data source. [#41317](https://github.com/grafana/grafana/pull/41317), [@domasx2](https://github.com/domasx2)
+- **Azure monitor:** Make sure alert rule editor is not enabled when template variables are being used. [#41335](https://github.com/grafana/grafana/pull/41335), [@sunker](https://github.com/sunker)
+- **CloudMonitoring:** Fix annotation queries. [#41529](https://github.com/grafana/grafana/pull/41529), [@sunker](https://github.com/sunker)
+- **CodeEditor:** Trigger the latest getSuggestions() passed to CodeEditor. [#40544](https://github.com/grafana/grafana/pull/40544), [@DukeManh](https://github.com/DukeManh)
+- **Dashboard:** Remove the current panel from the list of options in the Dashboard datasource. [#41826](https://github.com/grafana/grafana/pull/41826), [@ashharrison90](https://github.com/ashharrison90)
+- **Encryption:** Fix decrypting secrets in alerting migration. [#41061](https://github.com/grafana/grafana/pull/41061), [@undef1nd](https://github.com/undef1nd)
+- **InfluxDB:** Fix corner case where index is too large in ALIAS field. [#41562](https://github.com/grafana/grafana/pull/41562), [@gabor](https://github.com/gabor)
+- **NavBar:** Order App plugins alphabetically. [#40078](https://github.com/grafana/grafana/pull/40078), [@ashharrison90](https://github.com/ashharrison90)
+- **NodeGraph:** Fix zooming sensitivity on touchpads. [#40718](https://github.com/grafana/grafana/pull/40718), [@aocenas](https://github.com/aocenas)
+- **Plugins:** Add OAuth pass-through logic to api/ds/query endpoint. [#41352](https://github.com/grafana/grafana/pull/41352), [@wbrowne](https://github.com/wbrowne)
+- **Snapshots:** Fix panel inspector for snapshot data. [#41530](https://github.com/grafana/grafana/pull/41530), [@joshhunt](https://github.com/joshhunt)
+- **Tempo:** Fix basic auth password reset on adding tag. [#41808](https://github.com/grafana/grafana/pull/41808), [@aocenas](https://github.com/aocenas)
+- **ValueMapping:** Fixes issue with regex mappings. [#41515](https://github.com/grafana/grafana/pull/41515), [@mcdee](https://github.com/mcdee)
+
+### Plugin development fixes & changes
+
+- **grafana/ui:** Enable slider marks display. [#41275](https://github.com/grafana/grafana/pull/41275), [@dprokop](https://github.com/dprokop)
+
+<!-- 8.2.7 START -->
+
+# 8.2.7 (2021-12-07)
+
+- **Security**: Fixes CVE-2021-43798. For more information, see our [blog](https://grafana.com/blog/2021/12/07/grafana-8.3.1-8.2.7-8.1.8-and-8.0.7-released-with-high-severity-security-fix/)
+
+<!-- 8.2.7 END -->
+
+<!-- 8.2.6 START -->
+
+# 8.2.6 (2021-12-02)
+
+### Features and enhancements
+
+- **Security:** Upgrade Docker base image to Alpine 3.14.3. [#42061](https://github.com/grafana/grafana/pull/42061), [@dsotirakis](https://github.com/dsotirakis)
+- **Security:** Upgrade Go to 1.17.2. [#42427](https://github.com/grafana/grafana/pull/42427), [@idafurjes](https://github.com/idafurjes)
+
+### Bug fixes
+
+- **TimeSeries:** Fix fillBelowTo wrongly affecting fills of unrelated series. [#41998](https://github.com/grafana/grafana/pull/41998), [@leeoniya](https://github.com/leeoniya)
+
+<!-- 8.2.6 END -->
+<!-- 8.3.0-beta1 END -->
 <!-- 8.2.5 START -->

 # 8.2.5 (2021-11-18)
@@ -5,6 +664,7 @@
 ### Bug fixes

 - **Alerting:** Fix a bug where the metric in the evaluation string was not correctly populated. [#41731](https://github.com/grafana/grafana/pull/41731), [@JohnnyQQQQ](https://github.com/JohnnyQQQQ)
+- **Alerting:** Fix no data behaviour in Legacy Alerting for alert rules using the AND operator. [#41305](https://github.com/grafana/grafana/pull/41305), [@gerobinson](https://github.com/gerobinson)
 - **CloudMonitoring:** Ignore min and max aggregation in MQL queries. [#41302](https://github.com/grafana/grafana/pull/41302), [@sunker](https://github.com/sunker)
 - **Dashboards:** 'Copy' is no longer added to new dashboard titles. [#41344](https://github.com/grafana/grafana/pull/41344), [@joshhunt](https://github.com/joshhunt)
 - **DataProxy:** Fix overriding response body when response is a WebSocket upgrade. [#41364](https://github.com/grafana/grafana/pull/41364), [@marefr](https://github.com/marefr)
@@ -15,6 +675,14 @@
 - **Tempo:** Fix validation of float durations. [#41400](https://github.com/grafana/grafana/pull/41400), [@ivanahuckova](https://github.com/ivanahuckova)
 - **Tracing:** Correct tags for each span are shown. [#41473](https://github.com/grafana/grafana/pull/41473), [@ivanahuckova](https://github.com/ivanahuckova)

+### Breaking changes
+
+### Fix No Data behaviour in Legacy Alerting
+
+In Grafana 8.2.5 and later, this change fixes a bug in the evaluation of alert rules when using the AND operator to compare two or more conditions. In Grafana 8.2.4 and earlier such alert rules would evaluate to `OK` if at least one, but not all, conditions returned no data. This change fixes that bug such that in Grafana 8.2.5 these alert rules now evaluate to `No Data`.
+
+If an alert should evaluate to `OK` when one or all conditions return `No Data` then this can be done via changing `If no data or all values are null` to `OK`. However, this will not preserve the old behaviour in 8.2.4 where an alert will be `OK` if at least one, but not all, conditions return no data and then `No Data` if all conditions return `No Data`. Issue [#41305](https://github.com/grafana/grafana/issues/41305)
+
 <!-- 8.2.5 END -->
 <!-- 8.2.4 START -->

@@ -253,6 +921,14 @@ Panel queries and/or annotation queries that used more than one statistic will b

 <!-- 8.2.0-beta1 END -->

+<!-- 8.1.8 START -->
+
+# 8.1.8 (2021-12-07)
+
+- **Security**: Fixes CVE-2021-43798. For more information, see our [blog](https://grafana.com/blog/2021/12/07/grafana-8.3.1-8.2.7-8.1.8-and-8.0.7-released-with-high-severity-security-fix/)
+
+<!-- 8.1.8 END -->
+
 <!-- 8.1.7 START -->

 # 8.1.7 (2021-10-06)
@@ -527,6 +1203,14 @@ Issue [#33879](https://github.com/grafana/grafana/issues/33879)

 <!-- 8.1.0-beta1 END -->

+<!-- 8.0.7 START -->
+
+# 8.0.7 (2021-12-07)
+
+- **Security**: Fixes CVE-2021-43798. For more information, see our [blog](https://grafana.com/blog/2021/12/07/grafana-8.3.1-8.2.7-8.1.8-and-8.0.7-released-with-high-severity-security-fix/)
+
+<!-- 8.0.7 END -->
+
 <!-- 8.0.6 START -->

 # 8.0.6 (2021-07-14)
@@ -958,6 +1642,24 @@ Issue [#33352](https://github.com/grafana/grafana/issues/33352)
 - **AGPL License:** Update license from Apache 2.0 to the GNU Affero General Public License (AGPL). [#33184](https://github.com/grafana/grafana/pull/33184)

 <!-- 8.0.0-beta1 END -->
+<!-- 7.5.15 START -->
+
+# 7.5.15 (2022-02-08)
+
+- **Security**: Fixes CVE-2022-21702. For more information, see our [blog](https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes/)
+- **Security**: Fixes CVE-2022-21703. For more information, see our [blog](https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes/)
+- **Security**: Fixes CVE-2022-21713. For more information, see our [blog](https://grafana.com/blog/2022/02/08/grafana-7.5.15-and-8.3.5-released-with-moderate-severity-security-fixes/)
+
+<!-- 7.5.15 END -->
+<!-- 7.5.13 START -->
+
+# 7.5.13 (2022-01-18)
+
+### Bug fixes
+
+- **[v7.5.x] Alerting:** Fix NoDataFound for alert rules using AND operator (#41305). [#44066](https://github.com/grafana/grafana/pull/44066), [@armandgrillet](https://github.com/armandgrillet)
+
+<!-- 7.5.13 END -->

 <!-- 7.5.11 START -->

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -46,6 +46,10 @@ If you have an idea of how to improve Grafana, submit an [enhancement request](h

 We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve.

+### Write documentation
+
+To edit or write technical content, refer to [Contribute to our documentation](/contribute/documentation/README.md). We welcome your expertise and input as our body of technical content grows.
+
 ### Triage issues

 If you don't have the knowledge or time to code, consider helping with _issue triage_. The community will thank you for saving them time by spending some of yours.
@@ -76,6 +80,6 @@ Before we can accept your pull request, you need to [sign our CLA](https://grafa
 ## Where do I go from here?

 - Set up your [development environment](contribute/developer-guide.md).
- Learn how to [contribute documentation](contribute/documentation.md).
+- Learn how to [contribute documentation](contribute/README.md).
 - Get started [developing plugins](https://grafana.com/docs/grafana/latest/developers/plugins/) for Grafana.
- Look through the resources in the [contribute](https://github.com/grafana/grafana/tree/main/contribute) folder.
+- Look through the resources in the [contribute](contribute) folder.
--- a/10
+++ b/10
@@ -1,4 +1,4 @@
-FROM node:16-alpine3.14 as js-builder
+FROM node:16-alpine3.15 as js-builder

 ENV NODE_OPTIONS=--max_old_space_size=8000

@@ -11,7 +11,7 @@ COPY plugins-bundled plugins-bundled

 RUN yarn install

-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
 COPY tools tools
 COPY scripts scripts
@@ -20,17 +20,17 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.17.0-alpine3.14 as go-builder
+FROM golang:1.17.9-alpine3.15 as go-builder

 RUN apk add --no-cache gcc g++ make

 WORKDIR /grafana

 COPY go.mod go.sum embed.go Makefile build.go package.json ./
-COPY ./local/* ./local/
 COPY cue cue
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
+COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
 COPY cue.mod cue.mod
@@ -40,7 +40,7 @@ RUN go mod verify
 RUN make build-go

 # Final stage
-FROM alpine:3.14.2
+FROM alpine:3.15

 LABEL maintainer="Grafana team <hello@grafana.com>"

--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,4 +1,4 @@
-FROM node:16-alpine3.14 as js-builder
+FROM node:16-alpine3.15 as js-builder

 ENV NODE_OPTIONS=--max_old_space_size=8000

@@ -12,7 +12,7 @@ COPY plugins-bundled plugins-bundled

 RUN yarn install

-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
 COPY tools tools
 COPY scripts scripts
@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build

-FROM golang:1.17.0 AS go-builder
+FROM golang:1.17.9 AS go-builder

 WORKDIR /src/grafana

@@ -33,6 +33,7 @@ COPY cue cue/
 COPY cue.mod cue.mod/
 COPY packages/grafana-schema packages/grafana-schema/
 COPY public/app/plugins public/app/plugins/
+COPY public/api-spec.json public/api-spec.json

 RUN go mod verify
 RUN make build-go
--- a/GOVERNANCE.md
+++ b/GOVERNANCE.md
@@ -79,7 +79,7 @@ The current team members are:
 - Dominik Prokop ([Grafana Labs](https://grafana.com/))
 - Emil Tullstedt ([Grafana Labs](https://grafana.com/))
 - Erik Sundell ([Grafana Labs](https://grafana.com/))
- Fredrik Enestad ([Soundtrack Your Brand](https://www.soundtrackyourbrand.com/))
+- Fredrik Enestad ([Embark Studios](https://www.embark-studios.com/))
 - Hugo Häggmark ([Grafana Labs](https://grafana.com/))
 - Ivana Huckova ([Grafana Labs](https://grafana.com/))
 - Jeroen Op 't Eynde ([Grafana Labs](https://grafana.com/))
@@ -100,7 +100,7 @@ The current team members are:
 - Ryan McKinley ([Grafana Labs](https://grafana.com/))
 - Sofia Papagiannaki ([Grafana Labs](https://grafana.com/))
 - Stephanie Closson ([Grafana Labs](https://grafana.com/))
- Tobias Skarhed ([Grafana Labs](https://grafana.com/))
+- Tobias Skarhed ([CERN](https://home.web.cern.ch/))
 - Torkel Ödegaard ([Grafana Labs](https://grafana.com/))
 - Utkarsh Bhatnagar ([Tinder](https://www.tinder.com/))
 - Will Browne ([Grafana Labs](https://grafana.com/))
--- a/ISSUE_TRIAGE.md
+++ b/ISSUE_TRIAGE.md
@@ -77,11 +77,11 @@ Instructions for setting up filters in Gmail can be found [here](#setting-up-gma

 ## 2. Ensure the issue contains basic information

-Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://help.github.com/en/articles/creating-issue-templates-for-your-repository) to guide contributors to provide standard information that must be included for each type of template or type of issue.
+Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how to categorize the issue. The Grafana project utilizes [GitHub issue templates](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository) to guide contributors to provide standard information that must be included for each type of template or type of issue.

 ### Standard issue information that must be included

-Given a certain [issue template](<[template](https://github.com/grafana/grafana/issues/new/choose)>) have been used by the issue author or depending how the issue is perceived by the issue triage responsible, the following should help you understand what standard issue information that must be included.
+Given a certain [issue template](https://github.com/grafana/grafana/issues/new/choose) have been used by the issue author or depending how the issue is perceived by the issue triage responsible, the following should help you understand what standard issue information that must be included.

 #### Bug reports

@@ -192,7 +192,7 @@ First, evaluate if the documentation makes sense to be included in the Grafana p

 - Is this something we want/can maintain as a project?
 - Is this referring to usage of some specific integration/tool and in that case is that a popular use case in combination with Grafana?
- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users want/need this.
+- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments) to identify that lots of other users want/need this.

 Second, label the issue `type/docs` and at least one `area/*` or `datasource/*` label.

@@ -296,13 +296,13 @@ In many cases the issue author or community as a whole is more suitable to contr

 ## Investigation of issues

-When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending on the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it.
+When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending on the perceived severity and/or number of [upvotes](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments), the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it.

 Investigating issues can be a very time consuming task, especially for the maintainers, given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services, etc that are being used with Grafana. There is a certain number of combinations that are more common than others, and these are in general easier for maintainers to investigate.

 For some other combinations it may not be possible at all for a maintainer to setup a proper test environment to investigate the issue. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.

-Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
+Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.

 ## Automation

--- a/LICENSING.md
+++ b/LICENSING.md
@@ -21,7 +21,7 @@ grafana-mixin/
 cue/
 ```

-The following directories and their subdirectories are the original upstream licenses:
+The following directories and their subdirectories are licensed under their original upstream licenses:

 ```
 public/vendor/
--- a/77
+++ b/77
@@ -7,11 +7,15 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk

-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help

 GO = go
 GO_FILES ?= ./pkg/...
 SH_FILES ?= $(shell find ./scripts -name *.sh)
+API_DEFINITION_FILES = $(shell find ./pkg/api/docs/definitions -name '*.go' -print)
+SWAGGER_TAG ?= latest
+GO_BUILD_FLAGS += $(if $(GO_BUILD_DEV),-dev)
+GO_BUILD_FLAGS += $(if $(GO_BUILD_TAGS),-build-tags=$(GO_BUILD_TAGS))

 all: deps build

@@ -28,23 +32,72 @@ node_modules: package.json yarn.lock ## Install node modules.
 	@echo "install frontend dependencies"
 	YARN_ENABLE_PROGRESS_BARS=false yarn install --immutable

+##@ Swagger
+SPEC_TARGET = public/api-spec.json
+MERGED_SPEC_TARGET := public/api-merged.json
+NGALERT_SPEC_TARGET = pkg/services/ngalert/api/tooling/post.json
+
+$(SPEC_TARGET): $(API_DEFINITION_FILES) ## Generate API spec
+	docker run --rm -it \
+	-e GOPATH=${HOME}/go:/go \
+	-e SWAGGER_GENERATE_EXTENSION=false \
+	-v ${HOME}/go:/go \
+	-v $$(pwd):/grafana \
+	-w $$(pwd)/pkg/api/docs quay.io/goswagger/swagger:$(SWAGGER_TAG) \
+	generate spec -m -o /grafana/public/api-spec.json \
+	-w /grafana/pkg/server \
+	-x "grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
+	-x "github.com/prometheus/alertmanager" \
+	-i /grafana/pkg/api/docs/tags.json
+
+swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET)
+
+$(NGALERT_SPEC_TARGET):
+	+$(MAKE) -C pkg/services/ngalert/api/tooling post.json
+
+$(MERGED_SPEC_TARGET): $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) ## Merge generated and ngalert API specs
+	go run pkg/api/docs/merge/merge_specs.go -o=public/api-merged.json $(<) pkg/services/ngalert/api/tooling/post.json
+
+ensure_go-swagger_mac:
+	@hash swagger &>/dev/null || (brew tap go-swagger/go-swagger && brew install go-swagger)
+
+--swagger-api-spec-mac: ensure_go-swagger_mac $(API_DEFINITION_FILES)  ## Generate API spec (for M1 Mac)
+	swagger generate spec -m -w pkg/server -o public/api-spec.json \
+	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
+	-x "github.com/prometheus/alertmanager" \
+	-i pkg/api/docs/tags.json
+
+swagger-api-spec-mac: gen-go --swagger-api-spec-mac $(MERGED_SPEC_TARGET)
+
+validate-api-spec: $(MERGED_SPEC_TARGET) ## Validate API spec
+	docker run --rm -it \
+	-e GOPATH=${HOME}/go:/go \
+	-e SWAGGER_GENERATE_EXTENSION=false \
+	-v ${HOME}/go:/go \
+	-v $$(pwd):/grafana \
+	-w $$(pwd)/pkg/api/docs quay.io/goswagger/swagger:$(SWAGGER_TAG) \
+	validate /grafana/$(<)
+
+clean-api-spec:
+	rm $(SPEC_TARGET) $(MERGED_SPEC_TARGET)
+
 ##@ Building

 gen-go: $(WIRE)
 	@echo "generate go files"
 	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server ./pkg/cmd/grafana-cli/runner

-build-go: gen-go ## Build all Go binaries.
+build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries.
 	@echo "build go files"
-	$(GO) run build.go build
+	$(GO) run build.go $(GO_BUILD_FLAGS) build

 build-server: ## Build Grafana server.
 	@echo "build server"
-	$(GO) run build.go build-server
+	$(GO) run build.go $(GO_BUILD_FLAGS) build-server

 build-cli: ## Build Grafana CLI application.
 	@echo "build grafana-cli"
-	$(GO) run build.go build-cli
+	$(GO) run build.go $(GO_BUILD_FLAGS) build-cli

 build-js: ## Build frontend assets.
 	@echo "build frontend"
@@ -95,17 +148,15 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.

 ##@ Docker

-build-docker-dev: ## Build Docker image for development (fast).
-	@echo "build development container"
-	@echo "\033[92mInfo:\033[0m the frontend code is expected to be built already."
-	$(GO) run build.go -goos linux -pkg-arch amd64 ${OPT} build latest
-	cp dist/grafana-latest.linux-x64.tar.gz packaging/docker
-	cd packaging/docker && docker build --tag grafana/grafana:dev .
-
 build-docker-full: ## Build Docker image for development.
 	@echo "build docker container"
 	docker build --tag grafana/grafana:dev .

+build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
+	@echo "build docker container"
+	docker build --tag grafana/grafana:dev-ubuntu -f ./Dockerfile.ubuntu .
+
+
 ##@ Services

 # create docker-compose file with provided sources and start them
@@ -158,7 +209,7 @@ gen-ts:
 # you modify starlark files.
 drone: $(DRONE)
 	$(DRONE) starlark --format
-	$(DRONE) lint .drone.yml
+	$(DRONE) lint .drone.yml --trusted
 	$(DRONE) --server https://drone.grafana.net sign --save grafana/grafana

 help: ## Display this help.
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 ![Grafana](docs/logo-horizontal.png)

-The open-source platform for monitoring and observability.
+The open-source platform for monitoring and observability

 [![License](https://img.shields.io/github/license/grafana/grafana)](LICENSE)
 [![Drone](https://drone.grafana.net/api/badges/grafana/grafana/status.svg)](https://drone.grafana.net/grafana/grafana)
 [![Go Report Card](https://goreportcard.com/badge/github.com/grafana/grafana)](https://goreportcard.com/report/github.com/grafana/grafana)

-Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data driven culture:
+Grafana allows you to query, visualize, alert on and understand your metrics no matter where they are stored. Create, explore, and share dashboards with your team and foster a data-driven culture:

- **Visualize:** Fast and flexible client side graphs with a multitude of options. Panel plugins offer many different ways to visualize metrics and logs.
+- **Visualizations:** Fast and flexible client side graphs with a multitude of options. Panel plugins offer many different ways to visualize metrics and logs.
 - **Dynamic Dashboards:** Create dynamic & reusable dashboards with template variables that appear as dropdowns at the top of the dashboard.
 - **Explore Metrics:** Explore your data through ad-hoc queries and dynamic drilldown. Split view and compare different time ranges, queries and data sources side by side.
 - **Explore Logs:** Experience the magic of switching from metrics to logs with preserved label filters. Quickly search through all your logs or streaming them live.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -14,7 +14,7 @@ Grafana Labs will send you a response indicating the next steps in handling your

 ## Security announcements

-We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/security-announcements),
+We maintain a category on the community site called [Security Announcements](https://community.grafana.com/c/support/security-announcements),
 where we will post a summary, remediation, and mitigation details for any patch containing security fixes.

-You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/security-announcements.rss).
+You can also subscribe to email updates to this category if you have a grafana.com account and sign on to the community site or track updates via an [RSS feed](https://community.grafana.com/c/support/security-announcements.rss).
--- a/UPGRADING_DEPENDENCIES.md
+++ b/UPGRADING_DEPENDENCIES.md
@@ -15,6 +15,7 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
 - `grafana/build-container`
 - Appveyor
 - Dockerfile
+- `.github/workflows/publish.yml`

 ## Go dependencies

--- a/babel.config.json
+++ b/babel.config.json
@@ -0,0 +1,62 @@
+{
+  "babelrc": false,
+  // Note: order is bottom-to-top and/or right-to-left
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "bugfixes": true,
+        "browserslistEnv": "dev",
+        "useBuiltIns": "entry",
+        "corejs": "3.10"
+      }
+    ],
+    [
+      "@babel/preset-typescript",
+      {
+        "allowNamespaces": true,
+        "allowDeclareFields": true
+      }
+    ],
+    [
+      "@babel/preset-react",
+      {
+        "runtime": "automatic"
+      }
+    ]
+  ],
+  "plugins": [
+    [
+      "@babel/plugin-transform-typescript",
+      {
+        "allowNamespaces": true,
+        "allowDeclareFields": true
+      }
+    ],
+    // added to mitigate https://github.com/babel/babel/issues/14289
+    // package (and following line) can be removed once the issue is fixed and released
+    "@babel/plugin-proposal-class-properties",
+    ["@babel/plugin-proposal-object-rest-spread", { "loose": true }],
+    "@babel/plugin-transform-react-constant-elements",
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-syntax-dynamic-import", // needed for `() => import()` in routes.ts
+    "angularjs-annotate",
+    "macros"
+  ],
+  "env": {
+    "production": {
+      "presets": [
+        [
+          "@babel/preset-env",
+          {
+            "browserslistEnv": "production"
+          }
+        ]
+      ]
+    },
+    "hot": {
+      "plugins": ["react-refresh/babel"]
+    }
+  }
+}
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -9,6 +9,9 @@ app_mode = production
 # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
 instance_name = ${HOSTNAME}

+# force migration will run migrations that might cause dataloss
+force_migration = false
+
 #################################### Paths ###############################
 [paths]
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
@@ -122,6 +125,9 @@ path = grafana.db
 # For "sqlite3" only. cache mode setting used for connecting to the database
 cache_mode = private

+# For "mysql" only if lockingMigration feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+locking_attempt_timeout_sec = 0
+
 #################################### Cache server #############################
 [remote_cache]
 # Either "redis", "memcached" or "database" default is "database"
@@ -190,12 +196,19 @@ reporting_enabled = true
 reporting_distributor = grafana-labs

 # Set to false to disable all checks to https://grafana.com
-# for new versions (grafana itself and plugins), check is used
-# in some UI views to notify that grafana or plugin update exists
+# for new versions of grafana. The check is used
+# in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to https://grafana.com to get latest versions
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 check_for_updates = true

+# Set to false to disable all checks to https://grafana.com
+# for new versions of plugins. The check is used
+# in some UI views to notify that a plugin update exists.
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://grafana.com to get the latest versions.
+check_for_plugin_updates = true
+
 # Google Analytics universal tracking code, only enabled if you specify an id here
 google_analytics_ua_id =

@@ -208,12 +221,21 @@ rudderstack_write_key =
 # Rudderstack data plane url, enabled only if rudderstack_write_key is also set
 rudderstack_data_plane_url =

+# Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
+rudderstack_sdk_url =
+
+# Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
+rudderstack_config_url =
+
 # Application Insights connection string. Specify an URL string to enable this feature.
 application_insights_connection_string =

 # Optional. Specifies an Application Insights endpoint URL where the endpoint string is wrapped in backticks ``.
 application_insights_endpoint_url =

+# Controls if the UI contains any links to user feedback forms
+feedback_links_enabled = true
+
 #################################### Security ############################
 [security]
 # disable creation of admin user on first start of grafana
@@ -228,8 +250,11 @@ admin_password = admin
 # used for signing
 secret_key = SW2YcwTIb9zpOOhoPsMm

-# key provider used for envelope encryption, default to static value specified by secret_key
-encryption_provider = secretKey
+# current key provider used for envelope encryption, default to static value specified by secret_key
+encryption_provider = secretKey.v1
+
+# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1
+available_encryption_providers =

 # disable gravatar profile images
 disable_gravatar = false
@@ -250,7 +275,6 @@ cookie_samesite = lax
 allow_embedding = false

 # Set to true if you want to enable http strict transport security (HSTS) response header.
-# This is only sent when HTTPS is enabled in this configuration.
 # HSTS tells browsers that the site should only be accessed using HTTPS.
 strict_transport_security = false

@@ -281,12 +305,24 @@ content_security_policy = false
 # $ROOT_PATH is server.root_url without the protocol.
 content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""

+# Controls if old angular plugins are supported or not. This will be disabled by default in Grafana v9.
+angular_support_enabled = true
+
+[security.encryption]
+# Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
+# Please note that small values may cause performance issues due to a high frequency decryption operations.
+data_keys_cache_ttl = 15m
+
+# Defines the frequency of data encryption keys cache cleanup interval.
+# On every interval, decrypted data encryption keys that reached the TTL are removed from the cache.
+data_keys_cache_cleanup_interval = 1m
+
 #################################### Snapshots ###########################
 [snapshots]
 # snapshot sharing options
 external_enabled = true
-external_snapshot_url = https://snapshots-origin.raintank.io
-external_snapshot_name = Publish to snapshot.raintank.io
+external_snapshot_url = https://snapshots.raintank.io
+external_snapshot_name = Publish to snapshots.raintank.io

 # Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
 # creating and deleting snapshots.
@@ -389,12 +425,18 @@ oauth_auto_login = false
 # OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
 oauth_state_cookie_max_age = 600

+# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
+oauth_skip_org_role_update_sync = false
+
 # limit of api_key seconds to live before expiration
 api_key_max_seconds_to_live = -1

 # Set to true to enable SigV4 authentication option for HTTP-based datasources
 sigv4_auth_enabled = false

+# Set to true to enable verbose logging of SigV4 request signing
+sigv4_verbose_logging = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -479,10 +521,12 @@ auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
 token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
 allowed_domains =
 allowed_groups =
+role_attribute_strict = false

 #################################### Okta OAuth #######################
 [auth.okta]
 name = Okta
+icon = okta
 enabled = false
 allow_sign_up = true
 client_id = some_id
@@ -499,6 +543,7 @@ role_attribute_strict = false
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
 name = OAuth
+icon = signin
 enabled = false
 allow_sign_up = true
 client_id = some_id
@@ -542,6 +587,7 @@ ldap_sync_ttl = 60
 sync_ttl = 60
 whitelist =
 headers =
+headers_encoded = false
 enable_login_token = false

 #################################### Auth JWT ##########################
@@ -555,6 +601,7 @@ jwk_set_file =
 cache_ttl = 60m
 expected_claims = {}
 key_file =
+auto_sign_up = false

 #################################### Auth LDAP ###########################
 [auth.ldap]
@@ -735,8 +782,8 @@ global_alert_rule = -1

 #################################### Unified Alerting ####################
 [unified_alerting]
-# Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.
-enabled = false
+# Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed when switching. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
+enabled =

 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
 disabled_orgs =
@@ -790,8 +837,8 @@ min_interval = 10s

 #################################### Alerting ############################
 [alerting]
-# Disable legacy alerting engine & UI features
-enabled = true
+# Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
+enabled =

 # Makes it possible to turn off alert execution but alerting UI is visible
 execute_alerts = true
@@ -856,15 +903,30 @@ max_annotations_to_keep =
 # Enable the Explore section
 enabled = true

+#################################### Help #############################
+[help]
+# Enable the Help section
+enabled = true
+
+#################################### Profile #############################
+[profile]
+# Enable the Profile section
+enabled = true
+
+#################################### Query History #############################
+[query_history]
+# Enable the Query history
+enabled = false
+
 #################################### Internal Grafana Metrics ############
-# Metrics available at HTTP API Url /metrics
+# Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
 [metrics]
 enabled              = true
 interval_seconds     = 10
 # Disable total stats (stat_totals_*) metrics to be generated
 disable_total_stats = false

-#If both are set, basic auth will be required for the metrics endpoint.
+#If both are set, basic auth will be required for the metrics endpoints.
 basic_auth_username =
 basic_auth_password =

@@ -911,6 +973,10 @@ zipkin_propagation = false
 # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
 disable_shared_zipkin_spans = false

+[tracing.opentelemetry.jaeger]
+# jaeger destination (ex http://localhost:14268/api/traces)
+address =
+
 #################################### External Image Storage ##############
 [external_image_storage]
 # Used for uploading images to public servers so they can be included in slack/email messages.
@@ -968,7 +1034,7 @@ enable_alpha = false
 app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
 allow_loading_unsigned_plugins =
-# Enable or disable installing plugins directly from within Grafana.
+# Enable or disable installing / uninstalling / updating plugins directly from within Grafana.
 plugin_admin_enabled = true
 plugin_admin_external_manage_enabled = false
 plugin_catalog_url = https://grafana.com/grafana/plugins/
@@ -1040,12 +1106,14 @@ rendering_chrome_bin =
 # Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
 rendering_mode =

-# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# When rendering_mode = clustered, you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
 # and will cluster using browser instances.
 # Mode 'context' will cluster using incognito pages.
 rendering_clustering_mode =
-# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
+# When rendering_mode = clustered, you can define the maximum number of browser instances/incognito pages that can execute concurrently. Default is '5'.
 rendering_clustering_max_concurrency =
+# When rendering_mode = clustered, you can specify the duration a rendering request can take before it will time out. Default is `30` seconds.
+rendering_clustering_timeout =

 # Limit the maximum viewport width, height and device scale factor that can be requested.
 rendering_viewport_max_width =
@@ -1061,9 +1129,23 @@ grpc_port =
 license_path =

 [feature_toggles]
-# enable features, separated by spaces
+# there are currently two ways to enable feature toggles in the `grafana.ini`.
+# you can either pass an array of feature you want to enable to the `enable` field or
+# configure each toggle by setting the name of the toggle to true/false. Toggles set to true/false
+# will take precedence over toggles in the `enable` list.
+
+# enable = feature1,feature2
 enable =

+# The new prometheus visual query builder
+promQueryBuilder = true
+
+# Experimental Explore to Dashboard workflow
+explore2Dashboard = true
+
+# feature1 = true
+# feature2 = false
+
 [date_formats]
 # For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/

--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -9,6 +9,9 @@
 # instance name, defaults to HOSTNAME environment variable value or hostname if HOSTNAME var is empty
 ;instance_name = ${HOSTNAME}

+# force migration will run migrations that might cause dataloss
+;force_migration = false
+
 #################################### Paths ####################################
 [paths]
 # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used)
@@ -123,6 +126,9 @@
 # For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
 ;cache_mode = private

+# For "mysql" only if lockingMigration feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+;locking_attempt_timeout_sec = 0
+
 ################################### Data sources #########################
 [datasources]
 # Upper limit of data sources that Grafana will return. This limit is a temporary configuration and it will be deprecated when pagination will be introduced on the list data sources API.
@@ -195,19 +201,41 @@
 # The name of the distributor of the Grafana instance. Ex hosted-grafana, grafana-labs
 ;reporting_distributor = grafana-labs

-# Set to false to disable all checks to https://grafana.net
-# for new versions (grafana itself and plugins), check is used
-# in some UI views to notify that grafana or plugin update exists
+# Set to false to disable all checks to https://grafana.com
+# for new versions of grafana. The check is used
+# in some UI views to notify that a grafana update exists.
 # This option does not cause any auto updates, nor send any information
-# only a GET request to http://grafana.com to get latest versions
+# only a GET request to https://raw.githubusercontent.com/grafana/grafana/main/latest.json to get the latest version.
 ;check_for_updates = true

+# Set to false to disable all checks to https://grafana.com
+# for new versions of plugins. The check is used
+# in some UI views to notify that a plugin update exists.
+# This option does not cause any auto updates, nor send any information
+# only a GET request to https://grafana.com to get the latest versions.
+;check_for_plugin_updates = true
+
 # Google Analytics universal tracking code, only enabled if you specify an id here
 ;google_analytics_ua_id =

 # Google Tag Manager ID, only enabled if you specify an id here
 ;google_tag_manager_id =

+# Rudderstack write key, enabled only if rudderstack_data_plane_url is also set
+;rudderstack_write_key =
+
+# Rudderstack data plane url, enabled only if rudderstack_write_key is also set
+;rudderstack_data_plane_url =
+
+# Rudderstack SDK url, optional, only valid if rudderstack_write_key and rudderstack_data_plane_url is also set
+;rudderstack_sdk_url =
+
+# Rudderstack Config url, optional, used by Rudderstack SDK to fetch source config
+;rudderstack_config_url =
+
+# Controls if the UI contains any links to user feedback forms
+;feedback_links_enabled = true
+
 #################################### Security ####################################
 [security]
 # disable creation of admin user on first start of grafana
@@ -222,8 +250,11 @@
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm

-# key provider used for envelope encryption, default to static value specified by secret_key
-;encryption_provider = secretKey
+# current key provider used for envelope encryption, default to static value specified by secret_key
+;encryption_provider = secretKey.v1
+
+# list of configured key providers, space separated (Enterprise only): e.g., awskms.v1 azurekv.v1
+;available_encryption_providers =

 # disable gravatar profile images
 ;disable_gravatar = false
@@ -244,7 +275,6 @@
 ;allow_embedding = false

 # Set to true if you want to enable http strict transport security (HSTS) response header.
-# This is only sent when HTTPS is enabled in this configuration.
 # HSTS tells browsers that the site should only be accessed using HTTPS.
 ;strict_transport_security = false

@@ -275,12 +305,24 @@
 # $ROOT_PATH is server.root_url without the protocol.
 ;content_security_policy_template = """script-src 'self' 'unsafe-eval' 'unsafe-inline' 'strict-dynamic' $NONCE;object-src 'none';font-src 'self';style-src 'self' 'unsafe-inline' blob:;img-src * data:;base-uri 'self';connect-src 'self' grafana.com ws://$ROOT_PATH wss://$ROOT_PATH;manifest-src 'self';media-src 'none';form-action 'self';"""

+# Controls if old angular plugins are supported or not. This will be disabled by default in Grafana v9.
+;angular_support_enabled = true
+
+[security.encryption]
+# Defines the time-to-live (TTL) for decrypted data encryption keys stored in memory (cache).
+# Please note that small values may cause performance issues due to a high frequency decryption operations.
+;data_keys_cache_ttl = 15m
+
+# Defines the frequency of data encryption keys cache cleanup interval.
+# On every interval, decrypted data encryption keys that reached the TTL are removed from the cache.
+;data_keys_cache_cleanup_interval = 1m
+
 #################################### Snapshots ###########################
 [snapshots]
 # snapshot sharing options
 ;external_enabled = true
-;external_snapshot_url = https://snapshots-origin.raintank.io
-;external_snapshot_name = Publish to snapshot.raintank.io
+;external_snapshot_url = https://snapshots.raintank.io
+;external_snapshot_name = Publish to snapshots.raintank.io

 # Set to true to enable this Grafana instance act as an external snapshot server and allow unauthenticated requests for
 # creating and deleting snapshots.
@@ -377,12 +419,18 @@
 # OAuth state max age cookie duration in seconds. Defaults to 600 seconds.
 ;oauth_state_cookie_max_age = 600

+# Skip forced assignment of OrgID 1 or 'auto_assign_org_id' for social logins
+;oauth_skip_org_role_update_sync = false
+
 # limit of api_key seconds to live before expiration
 ;api_key_max_seconds_to_live = -1

 # Set to true to enable SigV4 authentication option for HTTP-based datasources.
 ;sigv4_auth_enabled = false

+# Set to true to enable verbose logging of SigV4 request signing
+;sigv4_verbose_logging = false
+
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -458,6 +506,7 @@
 ;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
 ;allowed_domains =
 ;allowed_groups =
+;role_attribute_strict = false

 #################################### Okta OAuth #######################
 [auth.okta]
@@ -519,6 +568,8 @@
 ;sync_ttl = 60
 ;whitelist = 192.168.1.1, 192.168.2.1
 ;headers = Email:X-User-Email, Name:X-User-Name
+# Non-ASCII strings in header values are encoded using quoted-printable encoding
+;headers_encoded = false
 # Read the auth proxy docs for details on what the setting below enables
 ;enable_login_token = false

@@ -533,6 +584,7 @@
 ;cache_ttl = 60m
 ;expected_claims = {"aud": ["foo", "bar"]}
 ;key_file = /path/to/key/file
+;auto_sign_up = false

 #################################### Auth LDAP ##########################
 [auth.ldap]
@@ -713,7 +765,7 @@
 #################################### Unified Alerting ####################
 [unified_alerting]
 #Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
-;enabled = false
+;enabled = true

 # Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
 ;disabled_orgs =
@@ -768,7 +820,7 @@
 #################################### Alerting ############################
 [alerting]
 # Disable legacy alerting engine & UI features
-;enabled = true
+;enabled = false

 # Makes it possible to turn off alert execution but alerting UI is visible
 ;execute_alerts = true
@@ -833,8 +885,23 @@
 # Enable the Explore section
 ;enabled = true

+#################################### Help #############################
+[help]
+# Enable the Help section
+;enabled = true
+
+#################################### Profile #############################
+[profile]
+# Enable the Profile section
+;enabled = true
+
+#################################### Query History #############################
+[query_history]
+# Enable the Query history
+;enabled = false
+
 #################################### Internal Grafana Metrics ##########################
-# Metrics available at HTTP API Url /metrics
+# Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
 [metrics]
 # Disable / Enable internal metrics
 ;enabled           = true
@@ -843,7 +910,7 @@
 # Disable total stats (stat_totals_*) metrics to be generated
 ;disable_total_stats = false

-#If both are set, basic auth will be required for the metrics endpoint.
+#If both are set, basic auth will be required for the metrics endpoints.
 ; basic_auth_username =
 ; basic_auth_password =

@@ -888,6 +955,10 @@
 # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
 ;disable_shared_zipkin_spans = false

+[tracing.opentelemetry.jaeger]
+# jaeger destination (ex http://localhost:14268/api/traces)
+; address = http://localhost:14268/api/traces
+
 #################################### External image storage ##########################
 [external_image_storage]
 # Used for uploading images to public servers so they can be included in slack/email messages.
@@ -941,7 +1012,7 @@
 ;app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
 ;allow_loading_unsigned_plugins =
-# Enable or disable installing plugins directly from within Grafana.
+# Enable or disable installing / uninstalling / updating plugins directly from within Grafana.
 ;plugin_admin_enabled = false
 ;plugin_admin_external_manage_enabled = false
 ;plugin_catalog_url = https://grafana.com/grafana/plugins/
@@ -1012,12 +1083,14 @@
 # Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
 ;rendering_mode =

-# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
+# When rendering_mode = clustered, you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
 # and will cluster using browser instances.
 # Mode 'context' will cluster using incognito pages.
 ;rendering_clustering_mode =
-# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
+# When rendering_mode = clustered, you can define the maximum number of browser instances/incognito pages that can execute concurrently. Default is '5'.
 ;rendering_clustering_max_concurrency =
+# When rendering_mode = clustered, you can specify the duration a rendering request can take before it will time out. Default is `30` seconds.
+;rendering_clustering_timeout =

 # Limit the maximum viewport width, height and device scale factor that can be requested.
 ;rendering_viewport_max_width =
@@ -1034,8 +1107,15 @@
 ;license_path =

 [feature_toggles]
-# enable features, separated by spaces
-;enable =
+# there are currently two ways to enable feature toggles in the `grafana.ini`.
+# you can either pass an array of feature you want to enable to the `enable` field or
+# configure each toggle by setting the name of the toggle to true/false. Toggles set to true/false
+# will take presidence over toggles in the `enable` list.
+
+;enable = feature1,feature2
+
+;feature1 = true
+;feature2 = false

 [date_formats]
 # For information on what formatting patterns that are supported https://momentjs.com/docs/#/displaying/
--- a/contribute/README.md
+++ b/contribute/README.md
@@ -3,7 +3,7 @@
 This directory contains guides for contributors to the Grafana project.

 - [Create a pull request](create-pull-request.md)
- [Contributing documentation](documentation.md)
+- [Contribute documentation](../contribute/documentation/README.md)
 - [Developer guide](developer-guide.md)
 - [Triage issues](triage-issues.md)
 - [Merge a pull request](merge-pull-request.md)
--- a/contribute/architecture/backend/communication.md
+++ b/contribute/architecture/backend/communication.md
@@ -2,6 +2,8 @@

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

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

 ## Events
@@ -109,7 +111,7 @@ ctx := req.Request.Context()
 query := &models.FindDashboardQuery{
    ID: "foo",
 }
-if err := bus.DispatchCtx(ctx, query); err != nil {
+if err := bus.Dispatch(ctx, query); err != nil {
    return err
 }
 // The query now contains a result.
--- a/contribute/architecture/backend/database.md
+++ b/contribute/architecture/backend/database.md
@@ -99,6 +99,8 @@ To add a migration:
 - In the `AddMigrations` function, find the `addXxxMigration` function for the service you want to create a migration for.
 - At the end of the `addXxxMigration` function, register your migration:

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

 ### Implement `DatabaseMigrator`
--- a/contribute/breaking-changes-comment-screenshot.png
+++ b/contribute/breaking-changes-comment-screenshot.png
--- a/contribute/breaking-changes-console-screenshot-1.png
+++ b/contribute/breaking-changes-console-screenshot-1.png
--- a/contribute/breaking-changes-console-screenshot-2.png
+++ b/contribute/breaking-changes-console-screenshot-2.png
--- a/contribute/breaking-changes-console-screenshot-3.png
+++ b/contribute/breaking-changes-console-screenshot-3.png
--- a/contribute/breaking-changes-guide.md
+++ b/contribute/breaking-changes-guide.md
@@ -0,0 +1,119 @@
+# Handling breaking changes in Grafana frontend APIs
+
+This guide tries to help you identify and communicate breaking changes introduced to our frontend API.
+
+- [What are our public APIs?](#what-are-our-public-apis)
+- [What is Levitate?](#what-is-levitate)
+- [How does the CI workflow look like?](#how-does-the-ci-workflow-look-like)
+- [I received a comment on my PR, what does it mean?](#i-received-a-comment-on-my-pr-what-does-it-mean)
+- [**I know it's a breaking change, what's next?**](#i-know-its-a-breaking-change-whats-next)
+  - [Introduce breaking changes only in major versions](#introduce-breaking-changes-only-in-major-versions)
+  - [Deprecate first](#deprecate-first)
+  - [Communicate](#communicate)
+- [I still have questions, who can help me out?](#i-still-have-questions-who-can-help-me-out)
+
+---
+
+## What are our public APIs?
+
+The Grafana frontend codebase is exposing functionality through NPM packages to make plugin development easier and faster.
+These packages live in the `/packages` folder and contain packages like:
+
+- `@grafana/data`
+- `@grafana/runtime`
+- `@grafana/toolkit`
+- `@grafana/ui`
+- etc. ([They can be viewed here](https://github.com/grafana/grafana/tree/main/packages)
+
+Any change that causes dependent software to behave differently is considered to be breaking.
+
+## What is Levitate?
+
+[`@grafana/levitate`](https://github.com/grafana/levitate) is a tool created by Grafana that can show breaking changes between two versions of a **TypeScript** package or a source file.
+
+It can list exported members of an NPM package or imports used by an NPM package,
+**but we are mainly using it for comparing different versions of the same package to see changes in the exported members.**
+
+A Github workflow runs against every pull request and comments a hint in case there are
+possible breaking changes. It also adds the `"breaking change"` label to the pull request.
+
+## How does the CI workflow look like?
+
+<img src="./breaking-changes-workflow.png" alt="CI workflow" width="700" />
+
+## I received a comment on my PR, what does it mean?
+
+![Levitate comment](./breaking-changes-comment-screenshot.png)
+
+Receiving a comment like the one above does not necessarily mean that you actually introduced breaking
+changes (as certain edge cases are still not covered by the tool), but as there is a good chance we rather raise attention.
+
+By clicking the links in the comment ("more info" or "Check console output") you can view more detailed information about what triggered the notification.
+
+**Removed exported members** (console view):<br />
+This means that some previously exported members won't be available in the newer version of the package which can break dependent plugins.
+
+![](./breaking-changes-console-screenshot-1.png)
+
+**Changed an existing member** (console view):<br />
+This means that a member was changed in a way that can break dependent plugins.
+
+![](./breaking-changes-console-screenshot-2.png)
+
+**No breaking changes** (console view):<br />
+Seeing this suggests that whilst changes were made, most probably none of them were breaking. You are good to go! 👏
+
+![](./breaking-changes-console-screenshot-3.png)
+
+## How can I decide if it is really a breaking change?
+
+First go to the console output of the workflow and make sure that the diffs make sense.
+
+It can happen that Levitate highlights a change which is marked with TSDoc tags `// @alpha` or `// @internal` in
+which case you can choose to ignore it - keep in mind though that these flags won't really hold developers back
+from using your code and most likely it is going to cause them problems if we are breaking them.
+
+It can also happen that Levitate marks changing an interface as a possible breaking change.
+For anyone that implements that interface introducing a new property will break their code. Whilst this is correctly marked as a breaking change maybe it is an interface that is never implemented by other developers. In which case you can choose to ignore Levitate's message.
+
+These notifications are only warnings though, and **in the end it's up to the author of the PR to make a decision that makes the most sense.**
+
+## I know it's a breaking change, what's next?
+
+### Introduce breaking changes only in major versions
+
+We can make breaking changes less painful if they are only happening between major releases of Grafana.
+
+### Deprecate first
+
+Whenever possible try to deprecate first what you are about to remove or change. For example:
+
+```javascript
+import { deprecationWarning } from '@grafana/data';
+
+/**
+ * @deprecated -- this is no longer necessary and will be removed in Grafana 9.0.0
+ */
+myOldFunction(name: string) {
+    deprecationWarning('MyFile', 'myOldFunction', 'myNewFunction');
+    // ...
+}
+```
+
+1. Add a deprecation comment `// @deprecated`
+2. Add info in the comment about **when it is going to be removed**
+3. Add info in the comment about **what should be used instead**
+4. In case it's a function or a method, use `deprecationWarning(<file name>, <old name>, <new name>)` to raise attention during runtime as well
+5. Update the [migration guide](../docs/sources/developers/plugins/migration-guide.md) with your instructions
+
+### Communicate
+
+Reach out to **@grafana/plugins-platform-frontend** to help finding which plugins are using the code that is just about to change, so we try making it smoother by communicating it to them.
+
+---
+
+## I still have questions, who can help me out?
+
+We are here to help.
+
+Please either ping us in the pull request by using the **@grafana/plugins-platform-frontend** handle or reach out to us on the internal Slack in `#grafana-plugins-platform`.
--- a/contribute/breaking-changes-workflow.png
+++ b/contribute/breaking-changes-workflow.png
--- a/contribute/developer-guide.md
+++ b/contribute/developer-guide.md
@@ -39,6 +39,14 @@ For alternative ways of cloning the Grafana repository, please refer to [GitHub'

 **Warning:** Do not use `go get` to download Grafana. Recent versions of Go have added behavior which isn't compatible with the way the Grafana repository is structured.

+### Configure Editors
+
+For some IDEs, additional configuration may be needed for Typescript to work with [Yarn plug'n'play](https://yarnpkg.com/features/pnp).
+For [VSCode](https://yarnpkg.com/getting-started/editor-sdks#vscode) and [Vim](https://yarnpkg.com/getting-started/editor-sdks#vim),
+it's as easy as running `yarn dlx @yarnpkg/sdks vscode` or `yarn dlx @yarnpkg/sdks vim`, respectively.
+
+More information can be found [here](https://yarnpkg.com/getting-started/editor-sdks).
+
 ## Build Grafana

 Grafana consists of two components; the _frontend_, and the _backend_.
@@ -81,7 +89,23 @@ When you log in for the first time, Grafana asks you to change your password.

 The Grafana backend includes SQLite which requires GCC to compile. So in order to compile Grafana on Windows you need to install GCC. We recommend [TDM-GCC](http://tdm-gcc.tdragon.net/download). Eventually, if you use [Scoop](https://scoop.sh), you can install GCC through that.

-You can simply build the back-end as follows: `go run build.go build`. The Grafana binaries will be in bin\\windows-amd64.
+You can build the back-end as follows:
+
+1. Follow the [instructions](https://github.com/google/wire#installing) to install the Wire tool.
+2. Generate code using Wire:
+
+```
+# Normally Wire tool installed at $GOPATH/bin/wire.exe
+<Wire tool install path> gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner
+```
+
+3. Build the Grafana binaries:
+
+```
+go run build.go build
+```
+
+The Grafana binaries will be in bin\\windows-amd64.
 Alternately, if you wish to use the `make` command, install [Make for Windows](http://gnuwin32.sourceforge.net/packages/make.htm) and use it in a Unix shell (f.ex. Git Bash).

 ## Test Grafana
@@ -112,6 +136,20 @@ Running the backend tests on Windows currently needs some tweaking, so use the b
 go run build.go test
 ```

+### Run PostgreSQL and MySQL integration tests
+
+To run PostgreSQL and MySQL integration tests locally, you need to start the docker blocks for MySQL and/or PostgreSQL test data sources by running `make devenv sources=mysql_tests,postgres_tests`. When your test data sources are running, you can execute integration tests by running:
+
+```
+GRAFANA_TEST_DB=mysql go test -covermode=atomic -tags=integration ./pkg/...
+```
+
+and/or
+
+```
+GRAFANA_TEST_DB=postgres go test -covermode=atomic -tags=integration ./pkg/...
+```
+
 ### Run end-to-end tests

 The end to end tests in Grafana use [Cypress](https://www.cypress.io/) to run automated scripts in a headless Chromium browser. Read more about our [e2e framework](/contribute/style-guides/e2e.md).
@@ -188,11 +226,6 @@ make build-docker-full

 The resulting image will be tagged as grafana/grafana:dev.

-> **Note:** If you've already set up a local development environment, and you're running a `linux/amd64` machine, you can speed up building the Docker image:
-
-1. Build the frontend: `go run build.go build-frontend`.
-1. Build the Docker image: `make build-docker-dev`.
-
 **Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise, `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.

 ## Troubleshooting
--- a/contribute/documentation.md
+++ b/contribute/documentation.md
@@ -1,42 +0,0 @@
-# Contributing to documentation
-
-This documents guides you through the process of contributing to the Grafana documentation. Make sure you've read the guide for [Contributing to Grafana](/CONTRIBUTING.md).
-
-## Your first contribution
-
-If you’re unsure about where to start, check out some of our [open docs issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs).
-
-Sometimes it can be difficult to understand an issue when you're just getting started. Refer to this list of [beginner-friendly issues](https://github.com/grafana/grafana/issues?q=is%3Aopen+is%3Aissue+label%3Atype%2Fdocs+label%3A"beginner+friendly") for tasks suitable for first-time contributors.
-
-When you’ve found an issue you want to work on, please comment on the issue to let other people know you intend to work on it.
-
-If you encounter any misspellings or violations to the style guide, please let us know by submitting an issue (or just fix them if they are minor changes).
-
-On every page in the [documentation](https://grafana.com/docs/) are two links in the upper right corner:
-
- **Edit this page** takes you directly to the file on GitHub where you can contribute a fix.
- **Request doc changes** prepares an issue on GitHub with relevant information already filled in.
-
-## Join our community
-
-For general discussions on documentation, you’re welcome to join the `#docs` channel on our [public Grafana Slack](http://slack.raintank.io) team.
-
-## Style and formatting
-
-All Grafana documentation is written using [Markdown](https://en.wikipedia.org/wiki/Markdown), and can be found in the [docs](/docs) directory in the [Grafana GitHub repository](https://github.com/grafana/grafana). The [documentation website](https://grafana.com/docs) is generated with [Hugo](https://gohugo.io) which uses [Blackfriday](https://github.com/russross/blackfriday) as its Markdown rendering engine.
-
-### Documentation structure
-
-The Grafana documentation is organized into topics, called _sections_. You can take a look at the current build at [grafana.com/docs/](https://grafana.com/docs/).
-
-Each top-level section is located under the [docs/sources](/docs/sources) directory. Subsections are added by creating a subdirectory in the directory of the parent section.
-
-For each section, an `_index.md` file provides an overview of the topic.
-
-### Style guide
-
-Refer to the [Documentation style guide](style-guides/documentation-style-guide.md) for information about Grafana style, word choice, and grammar conventions.
-
-### Spelling
-
-The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.
--- a/contribute/documentation/README.md
+++ b/contribute/documentation/README.md
@@ -0,0 +1,235 @@
+# Contribute to our documentation
+
+We provide these guidelines to help our contributors make additions or corrections to our documentation.
+
+## Welcome
+
+Welcome. We're glad you're here to help make our technical documentation even better. We develop content that leads our users to success using Grafana products. Technical accuracy is our primary consideration, and we value the use of inclusive language. We regard your feedback as a gift - thanks for reading through these guidelines.
+
+### Intended audience
+
+We write these guidelines for contributors who are interested in improving our technical content.
+
+## Understanding the structure of Grafana documentation
+
+All Grafana Enterprise and OSS documentation is located in the [Grafana open source project](https://github.com/grafana/grafana) GitHub repository: https://github.com/grafana/grafana/tree/main/docs/sources.
+
+- The **sources** directory organizes content by topic areas, for example **administration** and **alerting**.
+- Topic directories include an `_index.md` file, which provides an overview of the topic, and optionally includes subtopics that provide more detail.
+
+> The `_index.md` file is required.
+
+### Writing in markdown
+
+We write technical documentation using [Markdown](https://en.wikipedia.org/wiki/Markdown). We've put together a short guide to help you how to structure and format your content.
+
+To access the markdown guide, refer to [Markdown style guide](documentation-markdown-guide.md).
+
+## Ways to contribute
+
+We're thrilled that you are considering contributing to the documentation. You can contribute content in the following ways:
+
+- [Request a change](#request-a-change)
+- [Edit a topic](#edit-a-topic)
+- [Write a topic](#write-a-topic)
+
+### Request a change
+
+Request a change when you want to make a suggestion about a topic, but don't want to provide an edit that generates a pull request. Requesting a change gives you the freedom to express your ideas without committing language. Your suggestion can reflect a small change to wording or can reflect larger, more substantive changes.
+
+GitHub captures your request as an **Issue** logged against the repository.
+
+Before you begin:
+
+- Create a GitHub account.
+
+To request a change, complete the following steps:
+
+1.  While viewing the topic, click **Request a change**.
+
+The Issue title auto-populates with the location of the file about which you are requesting a change.
+
+![Request a change](request-change.png)
+
+2. Enter a change request description.
+
+3. Add the **type/docs** label.
+
+4. Click **Submit new issue**.
+
+### Edit a topic
+
+If you want to recommend a small change, such as suggesting a correction to a topic, you can edit the topic directly in GitHub. You are not required to fork and clone the repo to use this approach.
+
+Other small changes might include:
+
+- Adding steps to a task
+- Adding clarifying language to a concept
+- Providing an example
+
+Before you begin:
+
+- Create a GitHub account.
+
+To edit a topic, complete the following steps:
+
+1. While viewing the topic you want to edit, click **Edit this page**.
+
+![Edit a topic](edit-file.png)
+
+2. Add your changes to the topic.
+
+3. Scroll to the bottom of the page and enter a branch name.
+
+   For example, enter `clarified dashboard panel definition`.
+
+4. Click **Commit**.
+
+   GitHub prompts you to create a PR.
+
+5. Complete the prompts provided in the body of the PR.
+
+6. Click **Create pull request**.
+
+### Write a topic
+
+At Grafana Labs, we use the principles of topic-based authoring when we write technical documentation. Topic-based authoring provides guidelines for writing three _types_ of technical documentation: concept, task, and reference. Before you begin writing, establish the topic type you want to write.
+
+#### Understanding topic types
+
+Technical content is divided into three topic types: concept, task, and reference.
+
+- **Concept**: A concept topic explains _what_ a feature (or idea) is, and why it is important.
+- **Task**: A task topic explains _how_ to complete an end user procedure in the system. Task topics contain steps.
+- **Reference** A reference topic contains lookup information that a user might consult when they complete a task. Documenting a list of values with descriptions is a common form of reference topic.
+
+**Example**
+
+Suppose you are writing content for a site called _Doggie handbook_. You might organize your topics like this:
+
+**Concepts**
+
+- What a dog is
+- Brief history of dogs
+- Why you might want a dog
+- Tasks dogs can be trained to do
+
+**Tasks**
+
+- Feed the dog
+- Groom the dog
+- Train the dog
+
+**References**
+
+- List of dog equipment you will need
+- Table of breeds that includes breed name, size range, short or long hair, and type of dog
+
+#### Prepare your environment
+
+Before you begin writing, we recommend that you fork and clone the Grafana repository so that you can use a text editor locally to create branches, commit your changes, and create a PR.
+
+While this document doesn't include git commands or descriptions of Github operations, you might find these links useful.
+
+- [Install git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git): We store all source code, including documentation, in Git repositories.
+- [Fork a repo](https://docs.github.com/en/get-started/quickstart/fork-a-repo): Locate the repo you want to clone, and fork it.
+- [Clone a repo](https://docs.github.com/en/repositories/creating-and-managing-repositories/cloning-a-repository): Clone the repository to your local machine.
+- [Create a branch](https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging): Before you make change, create a branch. Do not push changes against the `main` branch.
+- [Create a PR](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request): After you add, commit, and push your changes, create a PR in Github.
+
+#### Use a documentation template to contribute a topic
+
+We have provided documentation templates that align with each topic type:
+
+- [Concept](templates/doc-concept-template.md)
+- [Task](templates/doc-task-template.md)
+- [Reference](templates/doc-reference-template.md)
+
+Each template provides additional usage and formatting guidelines. We recommend that you make a copy of whichever template you are using, then add content.
+
+> Remove any unused content before you commit your changes.
+
+#### View a local build
+
+Prior to pushing your changes, you can view a local build of the documentation so that you can review your work.
+
+To view a local build:
+
+1. Install [Docker](https://www.docker.com/products/docker-desktop).
+
+1. Run Docker.
+
+1. Navigate to the **docs** root directory.
+
+1. Run `make build`.
+
+1. Open `localhost:3002` to review your changes.
+
+## Push changes and create a PR
+
+When you are ready for other people to review your work, perform the following tasks.
+
+1. [Add](https://git-scm.com/docs/git-add) your changes, which prepares your content for the next commit.
+
+1. [Commit](https://git-scm.com/docs/git-commit) your changes.
+
+1. [Push](https://git-scm.com/docs/git-push) your changes to Github.
+
+1. [Create a PR](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) in Github.
+
+The docs build system automatically conducts a series of tests to ensure that the content doesn't conflict with other content in the docs repository.
+
+### Understanding the PR review and approval workflow
+
+When a PR is added to the repo with a label associated with `docs`, it will be reviewed by a member of the technical writing team. Depending on the size of the PR and the priority of other work, the PR will either be immediately reviewed and merged (minor fixes typically follow this pattern) or the PR will be triaged and placed in the backlog of work or moved into further development.
+
+## Join our community
+
+For general discussions on documentation, you’re welcome to join the `#docs` channel on our [public Grafana Slack](http://slack.raintank.io) team.
+
+## Reference: Top five writing tips
+
+While we don't provide a comprehensive style guide in this document, here's a few writing tips to help the writing process.
+
+### Consider the audience
+
+Write for an audience that is computer literate and has general technical knowledge, but is not necessarily familiar with Grafana or the finer points of observability.
+
+Pretend you are explaining your topic to a brand new Grafana user or developer.
+
+### Write clear and concise sentences and paragraphs
+
+Use the following sentence structure when you write: _subject_—_verb_—_object_. If you are telling a user to do something, write an imperative sentence. For example “Enter the refresh rate time interval and click Save.”
+
+- You can also start a sentence with an _if_ clause, which positions the condition before the action.
+- Limit the number of words in a sentence to 20..
+
+### Use active voice
+
+Active voice makes the performer of the action the subject
+of the sentence. When you write in passive voice, the recipient of the action (and not the performer) becomes the subject of the sentence.
+
+Active-voice sentences are more direct and clearly identify _who_ is doing _what_. Not all tasks are completed by a user; sometimes the system can also be a performer (and by extension, the subject of the sentence). When you write in active voice you clearly make that distinction, which results in more engaging and less wordy content.
+
+| Use (active)                                          | Avoid (passive)                                                      |
+| ----------------------------------------------------- | -------------------------------------------------------------------- |
+| After you upgrade the software, restart the computer. | After the software has been upgraded, the computer can be restarted. |
+| Click **OK** to save the dashboard.                   | The dashboard is saved when the **OK** button is clicked.            |
+| Create a dashboard.                                   | A dashboard is created by you.                                       |
+
+### Avoid obscure non-English words and abbreviations
+
+Users might be unfamiliar with some non-English words and abbreviations such as _per_, _vs_, and _via_. Latin abbreviations in particular, like _i.e._, _e.g._, and _etc._, are vague.
+
+| Use          | Don’t use   |
+| ------------ | ----------- |
+| through      | via         |
+| that is      | i.e.        |
+| according to | per, as per |
+| and so on    | etc.        |
+
+### Write self-contained topics
+
+Thanks to search engines, every page in the documentation might be a reader's entry point. This means that each page needs to be self-contained and make sense on its own. The reader should not need to read other topics in order to perform the task or understand the concept.
+
+However, try to be helpful and link to related information. Using the _Doggie handbook_ example, the concept topic that explains what dogs can be trained to do might link to the Train the dog task.
--- a/contribute/documentation/documentation-markdown-guide.md
+++ b/contribute/documentation/documentation-markdown-guide.md
--- a/contribute/documentation/edit-file.png
+++ b/contribute/documentation/edit-file.png
--- a/contribute/documentation/request-change.png
+++ b/contribute/documentation/request-change.png
--- a/contribute/documentation/templates/doc-concept-template.md
+++ b/contribute/documentation/templates/doc-concept-template.md
--- a/contribute/documentation/templates/doc-reference-template.md
+++ b/contribute/documentation/templates/doc-reference-template.md
--- a/contribute/documentation/templates/doc-task-template.md
+++ b/contribute/documentation/templates/doc-task-template.md
--- a/contribute/merge-pull-request.md
+++ b/contribute/merge-pull-request.md
@@ -21,9 +21,13 @@ The following checklist/summary should give you a quick overview of what to ask/

 Before actually merging a pull request there's a couple of things to take into consideration.

+### Status checks
+
+Before you can merge a pull request, it must have a review approval, and all the required status checks must pass.
+
 ### Format the pull request title

-Make sure that the pull request title is properly formatted according to `<Area>: <Summary>` and try to make the summary short and understandable for the community as a whole.
+The pull request title should be formatted according to `<Area>: <Summary>`. Keep the summary short and understandable for the community as a whole.

 All commits in a pull request are squashed when merged and the pull request title will be the default subject line of the squashed commit message. It's also used for [changelog/release notes](#include-in-changelog-and-release-notes).

@@ -31,9 +35,9 @@ See [formatting guidelines](create-pull-request.md#formatting-guidelines) for mo

 ### Assign a milestone

-It's recommended to add a milestone to every pull request. This makes it easier to track what changes did go into a certain release. Without this you're basically left with going through git commits which could be a lot harder.
+A milestone **should** be added to every pull request. Several things in the Grafana release process requires at least pull requests to be in a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).

-There's also various tooling built that in some cases requires a pull request to be assigned a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).
+This makes it easier to track what changes go into a certain release. Without this information, release managers have to go through git commits which is not an efficient process.

 ### Include in changelog and release notes?

@@ -81,7 +85,20 @@ In case the pull request introduces a breaking change you should document this.

 ### Should the pull request be backported?

-If your pull request has changes that need to go into one or several existing release branches you need to backport the changes. Please refer to [Backport PR](.github/bot.md#backport-pr) for detailed instructions.
+An active decision of backporting needs to be taken for every pull request. There's a pull request check named **Backport Check** that will enforce this. By adding/removing labels on the pull request the check will be re-evaluated.
+
+#### No backport
+
+If you don't want to backport you need to add a label named **no-backport** to the pull request.
+
+#### Backport
+
+If your pull request has changes that need to go into one or several existing release branches you need to backport the changes. Please refer to [Backport PR](/.github/bot.md#backport-pr) for detailed instructions.
+
+The general rule of thumb regarding what changes goes into what release is:
+
+- bug fixes should be released in patch releases, e.g. v8.1.3, if the bug was introduced in the same major/minor or lower patch version.
+- new features should go into the next major/minor version, e.g. v8.0.0, v8.2.0.

 Some examples when backport is required:

--- a/contribute/style-guides/backend.md
+++ b/contribute/style-guides/backend.md
@@ -58,6 +58,100 @@ code, plus lets you run each test case in isolation when debugging. Don't use `t
 Use [`t.Cleanup`](https://golang.org/pkg/testing/#T.Cleanup) to clean up resources in tests. It's a less fragile choice than `defer`, since it's independent of which
 function you call it in. It will always execute after the test is over in reverse call order (last `t.Cleanup` first, same as `defer`).

+### Mock
+
+Optionally, we use [`mock.Mock`](https://github.com/stretchr/testify#mock-package) package to generate mocks. This is
+useful when you expect different behaviours of the same function.
+
+#### Tips
+
+- Use `Once()` or `Times(n)` to make this mock only works `n` times.
+- Use `mockedClass.AssertExpectations(t)` to guarantee that the mock is called the times asked.
+  - If any mock set is not called or its expects more calls, the test fails.
+- You can pass `mock.Anything` as argument if you don't care about the argument passed.
+- Use `mockedClass.AssertNotCalled(t, "FunctionName")` to assert that this test is not called.
+
+#### Example
+
+This is an example to easily create a mock of an interface.
+
+Given this interface:
+
+```go
+func MyInterface interface {
+    Get(ctx context.Context, id string) (Object, error)
+}
+```
+
+Mock implementation should be like this:
+
+```go
+import
+
+func MockImplementation struct {
+    mock.Mock
+}
+
+func (m *MockImplementation) Get(ctx context.Context, id string) error {
+    args := m.Called(ctx, id) // Pass all arguments in order here
+    return args.Get(0).(Object), args.Error(1)
+}
+```
+
+And use it as the following way:
+
+```go
+
+objectToReturn := Object{Message: "abc"}
+errToReturn := errors.New("my error")
+
+myMock := &MockImplementation{}
+defer myMock.AssertExpectations(t)
+
+myMock.On("Get", mock.Anything, "id1").Return(objectToReturn, errToReturn).Once()
+myMock.On("Get", mock.Anything, "id2").Return(Object{}, nil).Once()
+
+anyService := NewService(myMock)
+resp, err := anyService.Call("id1")
+
+assert.Equal(t, resp.Message, objectToReturn.Message)
+assert.Error(t, err, errToReturn)
+
+resp, err = anyService.Call("id2")
+assert.Nil(t, err)
+```
+
+#### Mockery
+
+When an interface to test is too big, it's annoying to mock each function manually. To avoid this, you can
+use [`mockery`](https://github.com/vektra/mockery) library to generate the mocks.
+
+The command is like the following (there are more options documented if you need to use another one):
+
+```
+mockery --name InterfaceName --structname MockImplementationName --inpackage --filename my_implementation_mock.go
+```
+
+- `--name`: Interface to mock
+- `--structname`: Mock implementation name
+- `--inpackage`: To use the same package name as the interface
+- `--filename`: Your mock generated file name
+
+If any interface signature changes, executing the command again updates the mock.
+
+Additionally, you can put `go:generate` command on the top of the file as a comment. It's useful because some IDEs
+like Goland and Visual Studio Code allows executing scripts from the IDE.
+
+```
+package <package>
+
+import (
+	...
+)
+
+//go:generate mockery --name InterfaceName --structname MockImplementationName --inpackage --filename my_implementation_mock.go
+```
+
 ## Globals

 As a general rule of thumb, avoid using global variables, since they make the code difficult to maintain and reason
--- a/contribute/style-guides/documentation-style-guide.md
+++ b/contribute/style-guides/documentation-style-guide.md
@@ -119,7 +119,7 @@ If that is the case, then use the following format for headings:
 - Assume all graphics will be exclusively viewed on the web.
 - Maximum image size is 3840px X 2160px.
 - Screenshots should be readable, but not too large.
- _Do not_ use image shortcodes. Follow the guidance in the [Grafana markdown guide](https://github.com/grafana/grafana/blob/main/contribute/style-guides/documentation-markdown-guide.md#images).
+- _Do not_ use image shortcodes. Follow the guidance in [Markdown style guide](../documentation/documentation-markdown-guide.md#Images).
 - Markdown image links are preferred. Only use the HTML image links if you need to style the image in ways unsupported in Markdown.
 - When you name a file, follow the [file naming conventions](#file-naming-conventions). Example: image-name-7-3.png

--- a/contribute/style-guides/e2e-core.md
+++ b/contribute/style-guides/e2e-core.md
@@ -16,8 +16,8 @@ BASE_URL=http://172.0.10.2:3333 yarn e2e

 The above commands use some utils scripts under [_\<repo-root>/e2e_](../../e2e) that can also be used for more control.

- `./e2e/start-server` This creates a fresh new grafana server working dir, setup's config and starts the server. It will also kill any previously started server that is still running using pid file at _\<repo-root>/e2e/tmp/pid_.
- `./e2e/wait-for-grafana` waits for `$HOST` and `$PORT` to be available. Per default localhost and 3001.
+- `./scripts/grafana-server/start-server` This creates a fresh new grafana server working dir, setup's config and starts the server. It will also kill any previously started server that is still running using pid file at _\<repo-root>/scripts/grafana-server/tmp/pid_.
+- `./scripts/grafana-server/wait-for-grafana` waits for `$HOST` and `$PORT` to be available. Per default localhost and 3001.
 - `./e2e/run-suite <debug|dev|noarg>` Starts cypress in different modes.

 ## Test suites
--- a/contribute/style-guides/frontend.md
+++ b/contribute/style-guides/frontend.md
@@ -255,6 +255,7 @@ Organize your code in a directory that encloses feature code:
 - Put React components in `components` directory (i.e. `features/my-feature/components/ButtonPeopleDreamOf.tsx`).
 - Put test files next to the test subject.
 - Put containers (pages) in feature root (i.e. `features/my-feature/DashboardPage.tsx`).
+- Put API function calls that isn't a redux thunk in an `api.ts` file within the same directory.
 - Subcomponents can live in the component folders. Small component do not need their own folder.
 - Component SASS styles should live in the same folder as component code.

--- a/contribute/templates/README.md
+++ b/contribute/templates/README.md
@@ -1,60 +0,0 @@
-# Templates
-
-Templates are both a starting point and an instruction manual for writing something new. They are intended to make life easier by providing a jumping-off point, something besides a blank page to start from. They are not intended to be a limitation. If the template does not work perfectly for your use case, you can adjust or change it. We will work it out in code review.
-
-## Create a template
-
-Feel free to add templates to the `templates` folder. Try to make them as generic as possible and include clear instructions for when and how to use the template. Assume that the template user is a brand new contributor and write accordingly.
-
-## Use a template
-
-1. Read the template. Make sure you understand what it is for and how it is intended to be used.
-1. Copy and rename the template. Move it to where you actually need it.
-   You might also want to copy the content of the template and paste it into a different file. This is acceptable use.
-1. Replace the template content with your own. Delete whatever is unnecessary.
-
-## Documentation templates
-
-In an ideal world, each topic will correspond to an information _type_ ([task](doc-task-template.md), [reference](doc-reference-template.md), [concept](doc-concept-template.md)) and contain only that type of information.
-
-However, this is not always practical. For example, you have a series of short topics, you can group them into one topic.
-
-Try to _chunk_ your content. This means you should organize the document so that the same kinds of content are grouped together.
-
-### Chunking example
-
-If I was writing content for a site called _Doggie handbook_, I might organize it like this.
-
-**Concept**
-
- What a dog is
- Brief history of dogs
- Why you might want a dog
- Tasks dogs can be trained to do
-
-**Tasks**
-
- Feed the dog
- Groom the dog
- Train the dog
-
-**Reference**
-
- List of dog equipment you will need
- Table of breeds that includes breed name, size range, short or long hair, and type of dog
-
-### Audience
-
-Write for an audience that is computer literate and has general technical knowledge, but is not necessarily familiar with Grafana or the finer points of observability.
-
-Pretend you are explaining your topic to a brand new Grafana user or developer.
-
-### Self-contained
-
-Thanks to search engines, every page in the documentation might be a reader's entry point. This means that each page needs to be self-contained and make sense on its own. The reader should not need to read other topics in order to perform the task or understand the concept.
-
-However, try to be helpful and link to related information. Using the _Doggie handbook_ example, the concept topic that explains what dogs can be trained to do might link to the Train the dog task.
-
-## Code templates
-
-This is a placeholder for future templates.
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -34,11 +34,15 @@ datasources:
    type: prometheus
    access: proxy
    url: http://localhost:9090
+    jsonData:
+      manageAlerts: false

  - name: gdev-slow-prometheus
    type: prometheus
    access: proxy
    url: http://localhost:3011
+    jsonData:
+      manageAlerts: false

  - name: gdev-testdata
    isDefault: true
@@ -191,7 +195,7 @@ datasources:
      timeInterval: 10s
      interval: Daily
      timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0

  - name: gdev-elasticsearch-v7-logs
    type: elasticsearch
@@ -201,7 +205,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0

  - name: gdev-elasticsearch-v7-filebeat
    type: elasticsearch
@@ -211,7 +215,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0
      timeInterval: "10s"
      logMessageField: message
      logLevelField: fields.level
@@ -224,7 +228,7 @@ datasources:
    jsonData:
      interval: Daily
      timeField: "@timestamp"
-      esVersion: 70
+      esVersion: 7.10.0
      timeInterval: "10s"

  - name: gdev-mysql
@@ -251,6 +255,17 @@ datasources:
    secureJsonData:
      password: Password!

+  - name: gdev-mssql-tls
+    type: mssql
+    url: localhost:1434
+    database: grafana
+    user: grafana
+    jsonData:
+      encrypt: "true"
+      tlsSkipVerify: true
+    secureJsonData:
+      password: Password!
+
  - name: gdev-mssql-ds-tests
    type: mssql
    url: localhost:1433
@@ -293,6 +308,7 @@ datasources:
    url: http://localhost:3100
    editable: false
    jsonData:
+      manageAlerts: false
      derivedFields:
        - name: "traceID"
          matcherRegex: "traceID=(\\w+)"
--- a/devenv/datasources_docker.yaml
+++ b/devenv/datasources_docker.yaml
@@ -42,7 +42,7 @@ datasources:
      version: Flux
      organization: myorg
      defaultBucket: mybucket
-      
+
  - name: gdev-influxdb-influxql
    type: influxdb
    access: proxy
@@ -220,6 +220,17 @@ datasources:
    secureJsonData:
      password: Password!

+  - name: gdev-mssql-tls
+    type: mssql
+    url: localhost:1434
+    database: grafana
+    user: grafana
+    jsonData:
+      encrypt: "true"
+      tlsSkipVerify: true
+    secureJsonData:
+      password: Password!
+
  - name: gdev-mssql-ds-tests
    type: mssql
    url: mssqltests:1433
@@ -259,4 +270,4 @@ datasources:
    type: loki
    access: proxy
    url: http://loki:3100
-    editable: false
+    editable: false
--- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
+++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json
@@ -815,19 +815,19 @@
              "value": "Wm2"
            },
            {
-              "text": "Volt-ampere (VA)",
+              "text": "Volt-Ampere (VA)",
              "value": "voltamp"
            },
            {
-              "text": "Kilovolt-ampere (kVA)",
+              "text": "Kilovolt-Ampere (kVA)",
              "value": "kvoltamp"
            },
            {
-              "text": "Volt-ampere reactive (var)",
+              "text": "Volt-Ampere reactive (VAr)",
              "value": "voltampreact"
            },
            {
-              "text": "Kilovolt-ampere reactive (kvar)",
+              "text": "Kilovolt-Ampere reactive (kVAr)",
              "value": "kvoltampreact"
            },
            {
--- a/devenv/dev-dashboards/all-panels.json
+++ b/devenv/dev-dashboards/all-panels.json
@@ -161,7 +161,8 @@
          "rowHeight": 0.99,
          "showValue": "auto",
          "tooltip": {
-            "mode": "single"
+            "mode": "single",
+            "sort": "none"
          }
        },
        "targets": [
@@ -545,7 +546,8 @@
            "values": false
          },
          "tooltip": {
-            "mode": "single"
+            "mode": "single",
+            "sort": "none"
          }
        },
        "targets": [
@@ -792,7 +794,8 @@
            "placement": "bottom"
          },
          "tooltip": {
-            "mode": "single"
+            "mode": "single",
+            "sort": "none"
          }
        },
        "targets": [
@@ -861,7 +864,8 @@
          "stacking": "none",
          "text": {},
          "tooltip": {
-            "mode": "single"
+            "mode": "single",
+            "sort": "none"
          }
        },
        "targets": [
@@ -890,7 +894,7 @@
      }
    ],
    "refresh": "",
-    "schemaVersion": 30,
+    "schemaVersion": 33,
    "style": "dark",
    "tags": [
      "gdev",
--- a/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json
+++ b/devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_compare.json
--- a/Show More
+++ b/Show More