Merge pull request #303 from grafana/bump-version-8.5.0-beta.1

Release: Bump version to 8.5.0-beta.1

.betterer.results

@@ -0,0 +1,345 @@
+// 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:2315765050": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/ColorPicker/NamedColorsPalette.test.tsx:1355456933": [
+      [1, 31, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/FileUpload/FileUpload.test.tsx:3475964456": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/FormField/FormField.test.tsx:2387359174": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Forms/Legacy/Input/Input.test.tsx:4019574269": [
+      [2, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Gauge/Gauge.test.tsx:1435004725": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Graph/Graph.test.tsx:2882401917": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Graph/GraphTooltip/MultiModeGraphTooltip.test.tsx:3734531523": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/List/AbstractList.test.tsx:2210654375": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogLabels.test.tsx:1113070745": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogMessageAnsi.test.tsx:1478948568": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogRowContextProvider.test.tsx:636540759": [
+      [3, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Logs/LogRows.test.tsx:2288254498": [
+      [3, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/QueryField/QueryField.test.tsx:1297745712": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Slider/Slider.test.tsx:2110443485": [
+      [3, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Typeahead/PartialHighlighter.test.tsx:3831493850": [
+      [1, 31, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Typeahead/Typeahead.test.tsx:1026793168": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/components/Typeahead/TypeaheadInfo.test.tsx:3968135869": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/braces.test.tsx:2551821825": [
+      [3, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/clear.test.tsx:4145618392": [
+      [3, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/runner.test.tsx:2165687770": [
+      [3, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/grafana-ui/src/slate-plugins/suggestions.test.tsx:4138775391": [
+      [1, 18, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/CanvasSpanGraph.test.js:3515574241": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/GraphTicks.test.js:1837731860": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/Scrubber.test.js:1200884350": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/TickLabels.test.js:3094256278": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/ViewingLayer.test.js:2643658696": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/SpanGraph/index.test.js:4118842298": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.test.js:3669774385": [
+      [15, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TracePageHeader/TracePageSearchBar.test.js:2095199604": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/ListView/index.test.js:793239444": [
+      [15, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/ReferencesButton.test.js:2288177454": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBar.test.js:2127169675": [
+      [15, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanBarRow.test.js:814916029": [
+      [15, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.test.js:2200354834": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianLogs.test.js:3242453659": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianReferences.test.js:1301875390": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianText.test.js:2881451220": [
+      [15, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/KeyValuesTable.test.js:2159985979": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/TextList.test.js:3713828679": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/index.test.js:3788127934": [
+      [17, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetailRow.test.js:1119974018": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/SpanTreeOffset.test.js:232429058": [
+      [14, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/Ticks.test.js:2626977087": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineCollapser.test.js:954294244": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineColumnResizer.test.js:208811948": [
+      [15, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineHeaderRow.test.js:1197952226": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/TimelineHeaderRow/TimelineViewingLayer.test.js:3714128222": [
+      [15, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/VirtualizedTraceView.test.js:2249890922": [
+      [14, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/TraceTimelineViewer/index.test.js:4107025050": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/common/CopyIcon.test.js:3119664776": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/common/NewWindowIcon.test.js:3878561197": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/common/UiFindInput.test.js:2258975438": [
+      [15, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "packages/jaeger-ui-components/src/url/ReferenceLink.test.js:830986413": [
+      [15, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/PageActionBar/PageActionBar.test.tsx:2111991019": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/QueryOperationRow/QueryOperationAction.test.tsx:1284778262": [
+      [2, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/QueryOperationRow/QueryOperationRow.test.tsx:4115956163": [
+      [2, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/Select/FolderPicker.test.tsx:3389713532": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/core/components/Select/MetricSelect.test.tsx:3409251428": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/alerting/AlertRuleList.test.tsx:1800339390": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/alerting/TestRuleResult.test.tsx:4118445705": [
+      [3, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/api-keys/ApiKeysAddedModal.test.tsx:3516294961": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/DashboardRow/DashboardRow.test.tsx:2934056165": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardAsForm.test.tsx:2536713486": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/SaveDashboard/forms/SaveDashboardForm.test.tsx:1262111696": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/components/ShareModal/ShareLink.test.tsx:809006195": [
+      [1, 35, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/dashgrid/DashboardGrid.test.tsx:1798654441": [
+      [1, 35, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dashboard/dashgrid/PanelHeader/PanelHeaderCorner.test.tsx:3293585799": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/DashboardsTable.test.tsx:1799076152": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/DataSourceDashboards.test.tsx:3705773301": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/DataSourcesListPage.test.tsx:1470540840": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/settings/BasicSettings.test.tsx:3867031406": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/datasources/settings/ButtonRow.test.tsx:1546608090": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/dimensions/editors/ThresholdsEditor/ThresholdsEditor.test.tsx:2556927610": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/LiveLogs.test.tsx:1667605379": [
+      [2, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistory.test.tsx:409631018": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistoryCard.test.tsx:689438177": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistoryQueriesTab.test.tsx:3436519226": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistorySettings.test.tsx:538589654": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RichHistory/RichHistoryStarredTab.test.tsx:3948011811": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/RunButton.test.tsx:138299098": [
+      [3, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/SecondaryActions.test.tsx:2096700362": [
+      [2, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/explore/TimeSyncButton.test.tsx:4230066214": [
+      [2, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/folders/FolderSettingsPage.test.tsx:3884290298": [
+      [2, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/invites/InviteesTable.test.tsx:3077684439": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/org/OrgDetailsPage.test.tsx:2540662821": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/org/OrgProfile.test.tsx:4200739179": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/CreateTeam.test.tsx:262744099": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamGroupSync.test.tsx:1549471437": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamList.test.tsx:3009556824": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamMemberRow.test.tsx:7032440": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamMembers.test.tsx:3993436101": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamPages.test.tsx:1265047708": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/teams/TeamSettings.test.tsx:2628968507": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/users/UsersActionBar.test.tsx:4031641375": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/users/UsersListPage.test.tsx:2626906707": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/features/users/UsersTable.test.tsx:3051231816": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/cloud-monitoring/components/Aggregation.test.tsx:2813729913": [
+      [2, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/ConfigEditor.test.tsx:2974837543": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/cloudwatch/components/LogsQueryField.test.tsx:132770839": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/elasticsearch/configuration/ConfigEditor.test.tsx:1089831034": [
+      [1, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx:2916632804": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/grafana-azure-monitor-datasource/components/deprecated/components/InsightsConfig.test.tsx:1635510338": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/influxdb/components/ConfigEditor.test.tsx:767000341": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/components/LokiExploreQueryEditor.test.tsx:2608233977": [
+      [1, 26, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/components/LokiQueryEditor.test.tsx:2337402520": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/ConfigEditor.test.tsx:1661240493": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DebugSection.test.tsx:2909181412": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DerivedField.test.tsx:1527527456": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/loki/configuration/DerivedFields.test.tsx:2923116422": [
+      [1, 17, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/datasource/prometheus/configuration/AzureCredentialsForm.test.tsx:1231427": [
+      [1, 19, 13, "RegExp match", "2409514259"]
+    ],
+    "public/app/plugins/panel/bargauge/BarGaugePanel.test.tsx:1527575498": [
+      [1, 31, 13, "RegExp match", "2409514259"]
+    ]
+  }`
+};

.betterer.ts

@@ -0,0 +1,5 @@
+import { regexp } from '@betterer/regexp';
+
+export default {
+  'no enzyme tests': () => regexp(/from 'enzyme'/g).include('**/*.test.*'),
+};

.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,10 +13,10 @@ watch_dirs = [
   "$WORKDIR/conf",
 ]
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
-ignore_files = ["wire_gen.go"] 
+ignore_files = ["wire_gen.go"]
 build_delay = 1500
 cmds = [
   ["make", "gen-go"],
-  ["go", "run", "build.go", "-dev", "build-server"],
+  ["GO_BUILD_DEV=1", "make", "build-server"],
   ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.drone.star

@@ -6,6 +6,7 @@
 
 load('scripts/drone/pipelines/pr.star', 'pr_pipelines')
 load('scripts/drone/pipelines/main.star', 'main_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')

.eslintignore

@@ -1,14 +1,21 @@
-node_modules
-compiled
+.git
+.github
+.yarn
 build
-vendor
-devenv
+compiled
 data
+deployment_tools_config.json
+devenv
 dist
 e2e/tmp
-scripts/grafana-server/tmp
+node_modules
+pkg
 public/lib/monaco
-deployment_tools_config.json
+scripts/grafana-server/tmp
+vendor
+
+# TS generate from cue by cuetsy
+**/*.gen.ts
 
 # Auto-generated localisation files
 public/locales/_build/

.eslintrc

@@ -1,12 +1,12 @@
 {
   "extends": ["@grafana/eslint-config"],
   "root": true,
-  "plugins": ["no-only-tests", "@emotion", "lodash"],
+  "plugins": ["@emotion", "lodash", "jest"],
   "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"
   },
   "overrides": [
     {

.github/CODEOWNERS

@@ -53,12 +53,18 @@ go.sum @grafana/backend-platform
 /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
@@ -96,12 +102,13 @@ go.sum @grafana/backend-platform
 /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-experience-squad
 /public/app/features/plugins @grafana/plugins-platform-frontend
-/public/app/core/components/TransformersUI/spatial @grafana/grafana-edge-squad
+/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

.github/commands.json

@@ -90,6 +90,14 @@
       "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",
@@ -98,20 +106,12 @@
       "url":"https://github.com/orgs/grafana/projects/97"
     }
   },
-  {
-    "type":"label",
-    "name":"oss-observability",
-    "action":"addToProject",
-    "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
-    }
-  },
   {
     "type":"label",
     "name":"datasource/Prometheus",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "url":"https://github.com/orgs/grafana/projects/112"
     }
   },
   {
@@ -119,7 +119,23 @@
     "name":"datasource/InfluxDB",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "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"
     }
   },
   {
@@ -127,7 +143,7 @@
     "name":"datasource/OpenSearch",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -135,7 +151,7 @@
     "name":"datasource/Loki",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -143,7 +159,7 @@
     "name":"datasource/Tempo",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -151,7 +167,23 @@
     "name":"datasource/Elasticsearch",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "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"
     }
   },
   {
@@ -159,7 +191,7 @@
     "name":"area/explore",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/54"
+      "url":"https://github.com/orgs/grafana/projects/111"
     }
   },
   {
@@ -177,5 +209,13 @@
     "removeFromProject":{
       "url":"https://github.com/grafana/grafana/projects/33"
     }
+  },
+  {
+    "type": "label",
+    "name": "team/grafana-partners",
+    "action": "addToProject",
+    "addToProject": {
+      "url": "https://github.com/orgs/grafana/projects/87"
+    }
   }
 ]

.github/pr-commands.json

@@ -179,11 +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]"],
+    "ignoreList": ["renovate[bot]","dependabot[bot]"],
     "action": "updateLabel",
     "addLabel": "pr/external"
   }

.github/renovate.json5

@@ -11,13 +11,16 @@
     "@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
     "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",

.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.

.github/workflows/bump-version.yml

@@ -16,6 +16,8 @@ on:
           required: true
         metricsWriteAPIKey:
           required: true
+env:
+    YARN_ENABLE_IMMUTABLE_INSTALLS: false
 jobs:
   main:
     runs-on: ubuntu-latest
@@ -58,12 +60,6 @@ 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: ${{ github.event.inputs.version != '' && 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: ${{ github.event.inputs.version != '' && steps.intermedia.outputs.branch_exist == '0' && !contains(steps.intermedia.outputs.short_ref, 'main') }}
         run: |
@@ -80,7 +76,7 @@ jobs:
           ref: main
       - 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 (manually invoked)

.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

.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

.github/workflows/commands.yml

@@ -4,7 +4,8 @@ on:
     types: [labeled, unlabeled]
   issue_comment:
     types: [created]
-
+concurrency:
+  group: issue-commands-${{ github.event.issue.number }}
 jobs:
   main:
     runs-on: ubuntu-latest

.github/workflows/detect-breaking-changes-build.yml

@@ -43,18 +43,18 @@ jobs:
         name: buildPr
         path: './pr/pr_built_packages.zip'
 
-  buildMain:
-    name: Build Main
+  buildBase:
+    name: Build Base
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: './main'
+        working-directory: './base'
 
     steps:
     - uses: actions/checkout@v2
       with: 
-        path: './main'
-        ref: 'main'
+        path: './base'
+        ref: ${{ github.event.pull_request.base.ref }}
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
@@ -76,18 +76,18 @@ jobs:
       run: yarn packages:build
 
     - name: Zip built packages
-      run: zip -r ./main_built_packages.zip ./packages/**/dist
+      run: zip -r ./base_built_packages.zip ./packages/**/dist
 
     - name: Upload build output as artifact
       uses: actions/upload-artifact@v2
       with:
-        name: buildMain
-        path: './main/main_built_packages.zip'
+        name: buildBase
+        path: './base/base_built_packages.zip'
 
   Detect:
     name: Detect breaking changes
     runs-on: ubuntu-latest
-    needs: ['buildPR', 'buildMain']
+    needs: ['buildPR', 'buildBase']
     env:
       GITHUB_STEP_NUMBER: 7
 
@@ -99,20 +99,20 @@ jobs:
         with:
           name: buildPr
 
-      - name: Get built packages from main
+      - name: Get built packages from base
         uses: actions/download-artifact@v2
         with:
-          name: buildMain
+          name: buildBase
       
       - name: Unzip artifact from pr
         run: unzip pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
 
-      - name: Unzip artifact from main
-        run: unzip main_built_packages.zip -d ./main && rm main_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@v5
+        uses: actions/github-script@v6
         with:
           script: |
               const script = require('./.github/workflows/scripts/pr-get-job-link.js')
@@ -128,7 +128,7 @@ jobs:
       - 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\" }" > ./levitate/result.json
+            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

.github/workflows/detect-breaking-changes-report.yml

@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v2
     
     - name: 'Download artifact'
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       env:
         RUN_ID: ${{ github.event.workflow_run.id }}
       with:
@@ -53,7 +53,7 @@ jobs:
       run: unzip "${ARTIFACT_FOLDER}/${ARTIFACT_NAME}.zip" -d "${ARTIFACT_FOLDER}"
     
     - name: Parsing levitate result
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       id: levitate-run
       with:
         script: |
@@ -63,7 +63,7 @@ jobs:
 
     - name: Check if "breaking change" label exists
       id: does-label-exist
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       env:
         PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
       with:
@@ -82,7 +82,7 @@ jobs:
       if: ${{ steps.levitate-run.outputs.exit_code == 1 }}
       uses: marocchino/sticky-pull-request-comment@v2
       with:
-        number: ${{ github.event.workflow_run.pull_requests[0].number }}
+        number: ${{ steps.levitate-run.outputs.pr_number }}
         message: |
           ⚠️   **Possible breaking changes**
 
@@ -90,22 +90,40 @@ jobs:
 
           ${{ steps.levitate-run.outputs.message }}
 
-          [Check console output](${{ steps.levitate-run.outputs.job_link }})
+          [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: ${{ github.event.workflow_run.pull_requests[0].number }}
+        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@v5
+      uses: actions/github-script@v6
       env:
-        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+        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,
@@ -116,10 +134,11 @@ jobs:
 
     - name: Remove "breaking change" label
       if: ${{ steps.levitate-run.outputs.exit_code == 0 && steps.does-label-exist.outputs.result == 1 }}
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       env:
-        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+        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,
@@ -132,10 +151,11 @@ jobs:
     # 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@v5
+      uses: actions/github-script@v6
       env:
-        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+        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,
@@ -147,10 +167,11 @@ jobs:
 
     - name: Remove "grafana/plugins-platform-frontend" from the list of reviewers
       if: ${{ steps.levitate-run.outputs.exit_code == 0 }}
-      uses: actions/github-script@v5
+      uses: actions/github-script@v6
       env:
-        PR_NUMBER: ${{ github.event.workflow_run.pull_requests[0].number }}
+        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,

.github/workflows/pr-checks.yml

@@ -12,7 +12,8 @@ on:
     types:
       - milestoned
       - demilestoned
-
+concurrency:
+  group: pr-checks-${{ github.event.number }}
 jobs:
   main:
     runs-on: ubuntu-latest

.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

.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

.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

.github/workflows/pr-commands-closed.yml

@@ -3,7 +3,8 @@ 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

.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

.github/workflows/publish.yml

@@ -20,7 +20,7 @@ jobs:
       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)"

.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!

.gitignore

@@ -7,7 +7,6 @@ awsconfig
 /.awcache
 /dist
 /public/build
-public/dist/tsconfig.tsbuildinfo
 /public/views/index.html
 /public/views/error.html
 /emails/dist
@@ -17,6 +16,7 @@ public/dist/tsconfig.tsbuildinfo
 vendor/
 /docs/menu.yaml
 /requests
+tsconfig.tsbuildinfo
 
 # Yarn
 .yarn/*
@@ -39,6 +39,7 @@ vendor/
 
 # Enterprise devenv
 /devenv/docker/blocks/grafana-enterprise
+/devenv/docker/blocks/saml-enterprise
 
 /tmp
 tools/phantomjs/phantomjs

.nvmrc

@@ -1 +1 @@
-v16.13.2
+v16.14.0

.prettierignore

@@ -1,14 +1,23 @@
 .git
 .github
-dist/
-pkg/
-node_modules
-public/vendor/
-vendor/
-/data/
+.yarn
+build
+compiled
+data
+deployment_tools_config.json
+devenv
+dist
 e2e/tmp
-scripts/grafana-server/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

.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

.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "7.28.0-sdk",
+  "version": "8.11.0-sdk",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

.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"
 }

.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`);

.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`);

.yarn/sdks/stylelint/package.json

@@ -1,6 +0,0 @@
-{
-  "name": "stylelint",
-  "version": "14.0.1-sdk",
-  "main": "lib/index.js",
-  "type": "commonjs"
-}

.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) {

.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) {

.yarnrc.yml

@@ -9,32 +9,32 @@ packageExtensions:
   "@mdx-js/loader@1.6.22":
     peerDependencies:
       react: 17.0.1
-  "@storybook/addon-docs@6.4.13":
+  "@storybook/addon-docs@6.4.15":
     peerDependencies:
-      "@storybook/manager-webpack5": 6.4.13
-  "@storybook/addon-essentials@6.4.13":
+      "@storybook/manager-webpack5": 6.4.15
+  "@storybook/addon-essentials@6.4.15":
     peerDependencies:
-      "@storybook/components": 6.4.13
-      "@storybook/core-events": 6.4.13
-      "@storybook/manager-webpack5": 6.4.13
-      "@storybook/theming": 6.4.13
-  "@storybook/core-server@6.4.13":
+      "@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.4.13":
+  "@storybook/core@6.4.15":
     peerDependencies:
       "@babel/core": ^7.0.0
-      "@storybook/manager-webpack5": 6.4.13
-  "@storybook/csf-tools@6.4.13":
+      "@storybook/manager-webpack5": 6.4.15
+  "@storybook/csf-tools@6.4.15":
     peerDependencies:
       "@babel/core": ^7.0.0
-  "@storybook/react@6.4.13":
+  "@storybook/react@6.4.15":
     peerDependencies:
-      "@storybook/manager-webpack5": 6.4.13
+      "@storybook/manager-webpack5": 6.4.15
   doctrine@3.0.0:
     dependencies:
       assert: 2.0.0
-  moveable@0.27.3:
+  moveable@0.28.0:
     dependencies:
       "@daybrush/utils": 1.6.0
       framework-utils: ^1.1.0
@@ -49,21 +49,17 @@ packageExtensions:
   react-compat-css-styled@1.0.8:
     dependencies:
       react-simple-compat: 1.2.1
-  react-compat-moveable@0.15.2:
+  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
@@ -82,4 +78,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v2"
 
-yarnPath: .yarn/releases/yarn-3.1.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

CHANGELOG.md

@@ -1,3 +1,213 @@
+<!-- 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)
@@ -1259,7 +1469,15 @@ 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)

Dockerfile

@@ -11,7 +11,7 @@ COPY plugins-bundled plugins-bundled
 
 RUN yarn install
 
-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json ./
+COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
 COPY tools tools
 COPY scripts scripts
@@ -20,7 +20,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.17.6-alpine3.15 as go-builder
+FROM golang:1.17.8-alpine3.15 as go-builder
 
 RUN apk add --no-cache gcc g++ make
 
@@ -30,6 +30,7 @@ COPY go.mod go.sum embed.go Makefile build.go package.json ./
 COPY cue cue
 COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
+COPY public/api-spec.json public/api-spec.json
 COPY pkg pkg
 COPY scripts scripts
 COPY cue.mod cue.mod

Dockerfile.ubuntu

@@ -12,7 +12,7 @@ COPY plugins-bundled plugins-bundled
 
 RUN yarn install
 
-COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json ./
+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.6 AS go-builder
+FROM golang:1.17.8 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

GOVERNANCE.md

@@ -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/))

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
 

Makefile

@@ -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-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"
@@ -99,6 +152,11 @@ 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

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.

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
 

babel.config.json

@@ -33,6 +33,9 @@
         "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",

conf/defaults.ini

@@ -122,6 +122,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 +193,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 =
 
@@ -289,6 +299,18 @@ 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
@@ -397,12 +419,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
@@ -487,10 +515,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
@@ -507,6 +537,7 @@ role_attribute_strict = false
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
 name = OAuth
+icon = signin
 enabled = false
 allow_sign_up = true
 client_id = some_id
@@ -550,6 +581,7 @@ ldap_sync_ttl = 60
 sync_ttl = 60
 whitelist =
 headers =
+headers_encoded = false
 enable_login_token = false
 
 #################################### Auth JWT ##########################
@@ -865,20 +897,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 =
 
@@ -1089,6 +1131,9 @@ license_path =
 # enable = feature1,feature2
 enable =
 
+# The new prometheus visual query builder 
+promQueryBuilder = true
+
 # feature1 = true
 # feature2 = false
 

conf/sample.ini

@@ -123,6 +123,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,13 +198,20 @@
 # 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 =
 
@@ -289,6 +299,18 @@
 # $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
@@ -391,12 +413,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
@@ -472,6 +500,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]
@@ -533,6 +562,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
 
@@ -848,13 +879,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
@@ -863,7 +904,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 =
 

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`.

contribute/developer-guide.md

@@ -136,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).

contribute/documentation/README.md

@@ -212,10 +212,10 @@ of the sentence. When you write in passive voice, the recipient of the action (a
 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.                                       | .   |
+| Create a dashboard.                                   | A dashboard is created by you.                                       |
 
 ### Avoid obscure non-English words and abbreviations
 

contribute/merge-pull-request.md

@@ -93,7 +93,7 @@ If you don't want to backport you need to add a label named **no-backport** to t
 
 #### 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.
+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:
 

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

devenv/datasources.yaml

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

devenv/dev-dashboards/feature-templating/templating-dashboard-links-and-variables.json

@@ -16,7 +16,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1601526910610,
+  "iteration": 1646409057541,
   "links": [
     {
       "icon": "external link",
@@ -73,6 +73,61 @@
       "timeShift": null,
       "title": "${custom.text}",
       "type": "text"
+    },
+    {
+      "id": 4,
+      "gridPos": {
+        "h": 9,
+        "w": 9,
+        "x": 12,
+        "y": 0
+      },
+      "type": "stat",
+      "title": "Panel Title",
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "color": {
+            "mode": "thresholds"
+          },
+          "links": [
+            {
+              "title": "Var Link",
+              "url": "/d/vmie2cmWz/bar-gauge-demo?var-custom=$custom"
+            }
+          ]
+        },
+        "overrides": []
+      },
+      "options": {
+        "reduceOptions": {
+          "values": false,
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": ""
+        },
+        "orientation": "auto",
+        "textMode": "auto",
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto"
+      },
+      "pluginVersion": "8.5.0-pre",
+      "datasource": null
     }
   ],
   "schemaVersion": 26,
@@ -112,6 +167,11 @@
             "selected": false,
             "text": "p3",
             "value": "p3"
+          },
+          {
+            "selected": false,
+            "text": "p4",
+            "value": "test%25value"
           }
         ],
         "query": "p1,p2,p3",

devenv/dev-dashboards/feature-templating/testdata-test-variable-output.json

@@ -0,0 +1,76 @@
+{
+  "__inputs": [],
+  "__elements": [],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "8.4.0-pre"
+    },
+    {
+      "type": "panel",
+      "id": "text",
+      "name": "Text",
+      "version": ""
+    }
+  ],
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "mode": "markdown",
+        "content": "VariableUnderTest: $VariableUnderTest"
+      },
+      "pluginVersion": "8.4.0-pre",
+      "title": "Panel Title",
+      "type": "text"
+    }
+  ],
+  "schemaVersion": 35,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Test variable output",
+  "uid": "kVi2Gex7z",
+  "version": 2,
+  "weekStart": ""
+}

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

@@ -1,7 +1,7 @@
 # You need to run 'sysctl -w vm.max_map_count=262144' on the host machine
 
   elasticsearch7:
-    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0
+    image: docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
     command: elasticsearch -E "discovery.type=single-node"
     ports:
       - "12200:9200"
@@ -17,7 +17,7 @@
       FD_PORT: 9200
 
   filebeat7:
-    image: docker.elastic.co/beats/filebeat-oss:7.0.0
+    image: docker.elastic.co/beats/filebeat-oss:7.17.0
     command: filebeat -e -strict.perms=false
     volumes:
       - ./docker/blocks/elastic7/filebeat.yml:/usr/share/filebeat/filebeat.yml:ro
@@ -25,7 +25,7 @@
       - ../data/log:/var/log/grafana:ro
 
   metricbeat7:
-    image: docker.elastic.co/beats/metricbeat-oss:7.0.0
+    image: docker.elastic.co/beats/metricbeat-oss:7.17.0
     command: metricbeat -e -strict.perms=false
     user: root
     volumes:

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

@@ -7,7 +7,7 @@
   promtail:
     image: grafana/promtail:latest
     volumes:
-      - ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
+      - ./docker/blocks/loki/promtail-config.yaml:/etc/promtail/docker-config.yaml
       - /var/log:/var/log
       - ../data/log:/var/log/grafana
     command:

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

@@ -4,6 +4,12 @@
       - "9090:9090"
     extra_hosts:
       - "host.docker.internal:host-gateway"
+    command: >
+      --enable-feature=remote-write-receiver
+      --config.file=/etc/prometheus/prometheus.yml
+      --storage.tsdb.path=/prometheus
+      --web.console.libraries=/usr/share/prometheus/console_libraries
+      --web.console.templates=/usr/share/prometheus/consoles
 
   node_exporter:
     image: prom/node-exporter

devenv/docker/blocks/prometheus/prometheus.yml

@@ -37,3 +37,8 @@ scrape_configs:
   - job_name: 'prometheus-random-data'
     static_configs:
       - targets: ['prometheus-random-data:8080']
+
+  # - job_name: 'grafana-test-datasource'
+  #   metrics_path: /metrics/plugins/grafana-test-datasource
+  #   static_configs:
+  #     - targets: ['host.docker.internal:3000']

devenv/docker/ha_test/docker-compose.yaml

@@ -24,7 +24,7 @@ services:
       MYSQL_PASSWORD: password
     command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all, --max-connections=1001]
     ports:
-      - 3306
+      - "3306:3306"
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
       timeout: 10s
@@ -47,7 +47,7 @@ services:
   #     POSTGRES_USER: grafana
   #     POSTGRES_PASSWORD: password
   #   ports:
-  #     - 5432
+  #     - "5432:5432"
   #   healthcheck:
   #     test: ["CMD-SHELL", "pg_isready -d grafana -U grafana"]
   #     timeout: 10s
@@ -66,13 +66,9 @@ services:
       - GF_DATABASE_TYPE=mysql
       - GF_DATABASE_HOST=db:3306
       - GF_DATABASE_MAX_OPEN_CONN=300
-      - GF_SESSION_PROVIDER=mysql
-      - GF_SESSION_PROVIDER_CONFIG=grafana:password@tcp(db:3306)/grafana?allowNativePasswords=true
       # - GF_DATABASE_TYPE=postgres
       # - GF_DATABASE_HOST=db:5432
       # - GF_DATABASE_SSL_MODE=disable
-      # - GF_SESSION_PROVIDER=postgres
-      # - GF_SESSION_PROVIDER_CONFIG=user=grafana password=password host=db port=5432 dbname=grafana sslmode=disable
       - GF_SERVER_ROUTER_LOGGING=true
       - GF_LOG_CONSOLE_FORMAT=json
       - GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug,auth:debug

docs/README.md

@@ -10,7 +10,7 @@ Yarn >= 1.22.4
 ## Build the doc site
 
 1. On the command line, first change to the docs folder: `cd docs`.
-1. Run `make docs-quick`. This launches a preview of the website with the current grafana docs at `http://localhost:3002/docs/grafana/next/` which will refresh automatically when changes are made to content in the `sources` directory.
+1. Run `make docs`. This launches a preview of the website with the current grafana docs at `http://localhost:3002/docs/grafana/next/` which will refresh automatically when changes are made to content in the `sources` directory.
 
 If you have the grafana/website repo checked out in the same directory as the grafana repo, then you can run `make docs-local-static` to use local assets (such as images).
 

docs/sources/administration/configuration.md

@@ -14,7 +14,7 @@ Grafana has default and custom configuration files. You can customize your Grafa
 
 ## Configuration file location
 
-The default settings for a Grafana instance are stored in the `$WORKING_DIR/conf/defaults.ini` file. _Do not_ change the location in this file.
+The default settings for a Grafana instance are stored in the `$WORKING_DIR/conf/defaults.ini` file. _Do not_ change this file.
 
 Depending on your OS, your custom configuration file is either the `$WORKING_DIR/conf/defaults.ini` file or the `/usr/local/etc/grafana/grafana.ini` file. The custom configuration file path can be overridden using the `--config` parameter.
 
@@ -202,6 +202,8 @@ Another way is to put a web server like Nginx or Apache in front of Grafana and
 
 ### domain
 
+This setting is only used in as a part of the `root_url` setting (see below). Important if you use GitHub or Google OAuth.
+
 ### enforce_domain
 
 Redirect to correct domain if the host header does not match the domain. Prevents DNS rebinding attacks. Default is `false`.
@@ -314,6 +316,10 @@ The maximum number of open connections to the database.
 
 Sets the maximum amount of time a connection may be reused. The default is 14400 (which means 14400 seconds or 4 hours). For MySQL, this setting should be shorter than the [`wait_timeout`](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout) variable.
 
+### locking_attempt_timeout_sec
+
+For "mysql", if `lockingMigration` feature toggle is set, specify the time (in seconds) to wait before failing to lock the database for the migrations. Default is 0.
+
 ### log_queries
 
 Set to `true` to log the sql calls and execution times.
@@ -357,6 +363,8 @@ Defaults to `private`.
 
 ## [remote_cache]
 
+Caches authentication details and session information in the configured database, Redis or Memcached. This setting does not configure [Query Caching in Grafana Enterprise]({{< relref "../enterprise/query-caching.md" >}}).
+
 ### type
 
 Either `redis`, `memcached`, or `database`. Defaults to `database`
@@ -453,7 +461,13 @@ value is `true`.
 
 ### check_for_updates
 
-Set to false to disable all checks to https://grafana.com for new versions of installed plugins and to the Grafana GitHub repository to check for a newer version of Grafana. The version information is used in some UI views to notify that a new Grafana update or a plugin update exists. This option does not cause any auto updates, nor send any sensitive information. The check is run every 10 minutes.
+Set to false, disables checking for new versions of Grafana from Grafana's GitHub repository. When enabled, the check for a new version runs every 10 minutes. It will notify, via the UI, when a new version is available. The check itself will not prompt any auto-updates of the Grafana software, nor will it send any sensitive information.
+
+### check_for_plugin_updates
+
+> **Note**: Available in Grafana v8.5.0 and later versions.
+
+Set to false disables checking for new versions of installed plugins from https://grafana.com. When enabled, the check for a new plugin runs every 10 minutes. It will notify, via the UI, when a new plugin update exists. The check itself will not prompt any auto-updates of the plugin, nor will it send any sensitive information.
 
 ### google_analytics_ua_id
 
@@ -578,6 +592,21 @@ Set Content Security Policy template used when adding the Content-Security-Polic
 
 <hr />
 
+### angular_support_enabled
+
+This currently defaults to `true` but will in Grafana v9 default to `false`. When set to false the angular framework and support components will not be loaded. This means that
+all plugins and core features that depend on angular support will stop working.
+
+Current core features that will stop working:
+
+- Heatmap panel
+- Old graph panel
+- Old table panel
+- Postgres, MySQL and MSSQL data source query editors
+- Legacy alerting edit rule UI
+
+Before we disable angular support by default we plan to migrate these remaining areas to React.
+
 ## [snapshots]
 
 ### external_enabled
@@ -631,7 +660,7 @@ Path to the default home dashboard. If this value is empty, then Grafana uses St
 
 Set to `false` to prohibit users from being able to sign up / create
 user accounts. Default is `false`. The admin user can still create
-users from the [Grafana Admin Pages]({{< relref "../manage-users/server-admin/server-admin-manage-users.md" >}}).
+users. For more information about creating a user, refer to [Add a user]({{< relref "../administration/manage-users-and-permissions/manage-server-users/add-user.md" >}}).
 
 ### allow_org_create
 
@@ -747,6 +776,12 @@ This setting is ignored if multiple OAuth providers are configured. Default is `
 How many seconds the OAuth state cookie lives before being deleted. Default is `600` (seconds)
 Administrators can increase this if they experience OAuth login state mismatch errors.
 
+### oauth_skip_org_role_update_sync
+
+Skip forced assignment of OrgID `1` or `auto_assign_org_id` for external logins. Default is `false`.
+Use this setting to distribute users with external login to multiple organizations.
+Otherwise, the users' organization would get reset on every new login, for example, via AzureAD.
+
 ### api_key_max_seconds_to_live
 
 Limit of API key seconds to live before expiration. Default is -1 (unlimited).
@@ -757,6 +792,12 @@ Limit of API key seconds to live before expiration. Default is -1 (unlimited).
 
 Set to `true` to enable the AWS Signature Version 4 Authentication option for HTTP-based datasources. Default is `false`.
 
+### sigv4_verbose_logging
+
+> Only available in Grafana 8.4+.
+
+Set to `true` to enable verbose request signature logging when AWS Signature Version 4 Authentication is enabled. Default is `false`.
+
 <hr />
 
 ## [auth.anonymous]
@@ -1310,6 +1351,22 @@ For more information about this feature, refer to [Explore]({{< relref "../explo
 
 Enable or disable the Explore section. Default is `enabled`.
 
+## [help]
+
+Configures the help section.
+
+### enabled
+
+Enable or disable the Help section. Default is `enabled`.
+
+## [profile]
+
+Configures the Profile section.
+
+### enabled
+
+Enable or disable the Profile section. Default is `enabled`.
+
 ## [metrics]
 
 For detailed instructions, refer to [Internal Grafana metrics]({{< relref "view-server/internal-metrics.md" >}}).

docs/sources/administration/manage-organizations/_index.md

@@ -0,0 +1,120 @@
+---
+title: 'Manage organizations'
+menuTitle: 'Manage organizations'
+description: 'Describes how to use organizations to isolate dashboard to users and teams.'
+weight: 300
+aliases:
+  [
+    docs/grafana/latest/manage-users/server-admin/_index.md,
+    docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs.md,
+  ]
+keywords:
+  - organizations
+  - dashboards
+---
+
+# Manage organizations
+
+This topic describes what organizations are, and how to create, edit, and delete them.
+
+## About organizations
+
+An organization is an entity that helps you isolate users and resources such as dashboards, annotations, and data sources from each other. Their purpose is to provide completely separate experiences, which look like multiple instances of Grafana, within a single instance. Multiple organizations are easier and cheaper to manage than multiple instances of Grafana.
+
+Users, configuration settings, and Grafana Enterprise licenses are shared between organizations. Other resources, like dashboards, data sources, annotations, folders, Teams, and Alerts, are isolated within each organization and cannot be easily shared with another organization.
+
+The following table summarizes the resources you can share and/or isolate using organizations.
+
+| Resource                 | Mode             |
+| ------------------------ | ---------------- |
+| Users                    | Share or isolate |
+| Folders                  | Isolate only     |
+| Dashboards               | Isolate only     |
+| Data sources             | Isolate only     |
+| Alerts                   | Isolate only     |
+| Notification channels    | Isolate only     |
+| Annotations              | Isolate only     |
+| Reports                  | Isolate only     |
+| API keys                 | Isolate only     |
+| Authentication providers | Share only       |
+| Configuration settings   | Share only       |
+| Licenses                 | Share            |
+
+The member of one organization cannot view dashboards assigned to another organization. However, a user can belong to multiple organizations.
+
+Grafana Server Administrators are responsible for creating organizations. For more information about the Grafana Server Administrator role, refer to [Grafana server administrators]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#Grafana server administrators" >}}).
+
+## View a list of organizations
+
+Complete this task when you want to view a list of existing organizations.
+
+### Before you begin
+
+- Ensure that you have Grafana Server Administrator permissions
+
+**To view a list of organizations:**
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**.
+
+A list of organizations appears.
+
+![Server Admin organization list](/static/img/docs/manage-users/server-org-list-7-3.png)
+
+## Create an organization
+
+Create an organization when you want to isolate dashboards and other resources from each other.
+
+### Before you begin
+
+- Ensure that you have Grafana Server Administrator permissions
+
+**To create an organization:**
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**.
+1. Click **+ New org**.
+1. Enter the name of the new organization and click **Create**.
+
+   Grafana creates the organization and adds you as the organization administrator.
+
+1. On the **Preferences** tab, select a home dashboard, time zone, and week start.
+
+   For more information about preferences, refer to [Preferences]({{< relref "../preferences/_index.md" >}}).
+
+For more information about adding users to an organization, refer to [Add a user to an organization]({{< relref "../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md" >}}).
+
+## Delete an organization
+
+This action permanently removes an organization from your Grafana server.
+
+> **Warning:** Deleting the organization also deletes all teams and dashboards associated the organization.
+
+### Before you begin
+
+- Ensure that you have Grafana Server Administrator permissions
+- Because the delete action removes all teams and dashboards associated with the organization, ensure that the users who rely on the organization dashboards are aware of the change
+
+**To delete an organization:**
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**.
+1. Click the red **X** next to the organization that you want to delete.
+1. Click **Delete**.
+
+## Edit an organization
+
+Edit an organization when you want to change its name.
+
+### Before you begin
+
+- Ensure that you have Grafana Server Administrator permissions
+
+**To edit an organization:**
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**.
+1. Click the organization you want to edit.
+1. Update the organization name and click **Update**.
+
+![Server admin Edit Organization](/static/img/docs/manage-users/server-admin-edit-org-7-3.png)

docs/sources/administration/manage-user-preferences/_index.md

@@ -0,0 +1,100 @@
++++
+title = "Manage user preferences"
+weight = 400
+description = "Learn how to update your user preferences and switch organizations"
+keywords = ["password", "change", "organization", "change"]
+aliases = ["/docs/grafana/latest/administration/change-your-password/", "docs/sources/administration/manage-user-preferences/_index.md"]
++++
+
+# Manage user preferences
+
+Grafana allows you to manage certain aspects of your user account, including your user name, email, and password.
+
+You can also view important information about your account, such as the organizations and roles to which you are assigned and the Grafana sessions associated with your account.
+
+## Change your Grafana password
+
+You can change your Grafana password at any time.
+
+> **Note**: If your Grafana instance uses an <!--[external authentication provider]({{< relref "../../auth/_index.md">}})--> external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.
+
+**To change your password**:
+
+1. Sign in to Grafana.
+1. Hover your mouse over the user icon in the lower-left corner of the page.
+1. Click **Change Password**.
+   Grafana opens the **Change Password** tab.
+
+1. Enter your old password and a new password.
+1. Confirm your new password.
+1. Click **Change Password**.
+
+## Edit your profile
+
+Your profile includes your name, user name, and email address, which you can update.
+
+**To edit your profile**:
+
+1. Sign in to Grafana.
+1. Hover your cursor over the user icon in the lower-left corner of the page and click **Preferences**.
+1. In the **Edit Profile** section, update your profile and click **Save**.
+
+## Edit your preferences
+
+You can choose the way you would like data to appear in Grafana, including the UI theme, home dashboard, timezone, and first day of the week. You can set these preferences for your own account, for a team, for an organization, or Grafana-wide using configuration settings. Your user preferences take precedence over team, organization, and Grafana default preferences. For more information, see [Grafana preferences]({{< relref "../../administration/preferences/_index.md">}}).
+
+- **UI theme** determines whether Grafana appears in light mode or dark mode. By default, UI theme is set to dark mode.
+- **Home dashboard** refers to the dashboard you see when you sign in to Grafana. By default, this is set to the Home dashboard.
+- **Timezone** is used by dashboards when you set time ranges, so that you view data in your timezone instead of UTC.
+- **Week start** is the first day of the week you want to use in dashboard time ranges, for example, `This week`.
+
+**To edit your preferences**:
+
+1. Sign in to Grafana.
+1. Hover your cursor over the user icon in the lower-left corner of the page, and click **Preferences**.
+1. Update any of the values in the **Preferences** section.
+1. Click **Save** at the bottom of the Preferences section.
+
+## Switch organizations
+
+When you sign in to Grafana, the system signs you in to a default organization. If you are assigned to multiple organizations, then you might need to switch organizations. For example, if you need to view a dashboard not associated with your current organization, then you should switch organizations to view associated dashboards.
+
+**To switch organizations**:
+
+1. Sign in to Grafana.
+1. Hover your cursor over the user icon in the lower-left corner of the page and click **Switch organization**.
+1. Next to the organization that you want to sign in to, click **Switch to**.
+
+## View your assigned organizations
+
+Every user is a member of at least one organization. You can have different roles in each organization of which you are a member.
+
+**To view your assigned organizations**:
+
+1. Sign in to Grafana.
+1. Hover your cursor over the user icon in the lower-left corner of the page and click **Preferences**.
+1. Scroll down to the **Organizations** section and review the following information:
+   - **Name**: The name of the organizations of which you are a member.
+   - **Role**: The role to which you are assigned in the organization. For more information about roles and permissions, refer to [Organization users and permissions]({{< relref "../../administration/manage-users-and-permissions/about-users-and-permissions.md#organization-users-and-permissions" >}}).
+   - **Current**: Grafana indicates the organization that you are currently signed into as _Current_. If you are a member of multiple organizations, you can click **Select** to switch to that organization.
+
+## View your Grafana sessions
+
+Grafana logs your sessions in each Grafana instance. You can review this section if you suspect someone has misused your Grafana credentials.
+
+**To view your Grafana sessions**:
+
+1. Sign in to Grafana.
+1. Hover your cursor over the user icon in the lower-left corner of the page, and click **Preferences**.
+1. Scroll down to the **Sessions** section.
+
+## Sign out a user session
+
+You can sign out other sessions using your account in order to prevent other people from accessing Grafana using your credentials.
+
+**To sign out one of your Grafana sessions**:
+
+1. Sign in to Grafana.
+1. Hover your cursor over the user icon in the lower-left corner of the page, and click **Preferences**.
+1. Scroll down to the **Sessions** section.
+1. Click the red "sign out" icon next to the session you would like to sign out.

docs/sources/administration/manage-users-and-permissions/_index.md

@@ -0,0 +1,13 @@
++++
+title = "Manage users and permissions"
+aliases = ["docs/sources/administration/manage-users-and-permissions/_index.md"]
+weight = 200
++++
+
+# Manage users and permissions
+
+A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system. For example, the **Admin** role includes permissions for an administrator to create and delete users.
+
+The following topics describe how to use permissions to control user access to data sources, dashboards, users, and teams.
+
+{{< section >}}

docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md

@@ -0,0 +1,152 @@
++++
+title = "About users and permissions"
+aliases = ["docs/sources/manage-users/_index.md", "docs/sources/administration/manage-users-and-permissions/about-users-and-permissions.md", "/docs/grafana/latest/permissions/overview/", "docs/sources/permissions/_index.md", "docs/sources/permissions/organization_roles.md"]
+weight = 100
++++
+
+# About users and permissions
+
+A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system. For example, the **Admin** role includes permissions for an administrator to create and delete users.
+
+You can assign a user one of three types of permissions:
+
+- Grafana server administrator permissions: Manage Grafana server-wide settings and resources
+- Organization permissions: Manage access to dashboards, alerts, plugins, teams, playlists, and other resources for an entire organization. The available roles are Viewer, Editor, and Admin.
+- Dashboard and folder permission: Manage access to dashboards and folders
+
+> **Note**: If you are running Grafana Enterprise, you can also control access to data sources and use fine-grained access control to grant read and write permissions for specific resources. For more information about access control options available with Grafana Enterprise, refer to [Grafana Enterprise user permissions features](#grafana-enterprise-user-permissions-features).
+
+## Grafana server administrators
+
+A Grafana server administrator manages server-wide settings and access to resources such as organizations, users, and licenses. Grafana includes a default server administrator that you can use to manage all of Grafana, or you can divide that responsibility among other server administrators that you create.
+
+A server administrator can perform the following tasks:
+
+- Manage users and permissions
+- Create, edit, and delete organizations
+- View server-wide settings defined in the [Configuration]({{< relref "../../administration/configuration.md" >}}) file
+- View Grafana server statistics, including total users and active sessions
+- Upgrade the server to Grafana Enterprise.
+
+> **Note:** The server administrator role does not exist in Grafana Cloud.
+
+## Organization users and permissions
+
+All Grafana users belong to at least one organization. An organization is an entity that exists within your instance of Grafana.
+
+Permissions assigned to a user within an organization control the extent to which the user has access to and can update the following organization resources:
+
+- dashboards and folders
+- alerts
+- playlists
+- users within that organization
+- data sources
+- teams
+- organization and team settings
+- plugins
+- annotations
+- library panels
+- API keys
+
+### Organization roles
+
+Organization role-based permissions are global, which means that each permission level applies to all Grafana resources within an given organization. For example, an editor can see and update _all_ dashboards in an organization, unless those dashboards have been specifically restricted using [dashboard permissions]({{< relref "manage-dashboard-permissions/_index.md">}}).
+
+Grafana uses the following roles to control user access:
+
+- **Organization administrator**: Has access to all organization resources, including dashboards, users, and teams.
+- **Editor**: Can view and edit dashboards, folders, and playlists.
+- **Viewer**: Can view dashboards and playlists.
+
+The following table lists permissions for each role.
+
+| Permission                     | Organization administrator | Editor | Viewer |
+| :----------------------------- | :------------------------: | :----: | :----: |
+| View dashboards                |             x              |   x    |   x    |
+| Add, edit, delete dashboards   |             x              |   x    |        |
+| Add, edit, delete folders      |             x              |   x    |        |
+| View playlists                 |             x              |   x    |   x    |
+| Add, edit, delete playlists    |             x              |   x    |        |
+| Create library panels          |             x              |   x    |        |
+| View annotations               |             x              |   x    |   x    |
+| Add, edit, delete annotations  |             x              |   x    |        |
+| Access Explore                 |             x              |   x    |        |
+| Add, edit, delete data sources |             x              |        |        |
+| Add and edit users             |             x              |        |        |
+| Add and edit teams             |             x              |        |        |
+| Change organizations settings  |             x              |        |        |
+| Change team settings           |             x              |        |        |
+| Configure application plugins  |             x              |        |        |
+
+## Dashboard permissions
+
+When you want to extend a viewer's ability to edit and save dashboard changes or limit an editor's permission to modify a dashboard, you can assign permissions to dashboards and dashboard folders. For example, you might want a certain viewer to be able to to edit a dashboard. While that user can _see_ all dashboards, you can grant them access to _update_ only one of them.
+
+> Important: The dashboard permissions you specify override the organization permissions you assign to the user for the selected entity.
+
+You can specify the following permissions to dashboards and folders.
+
+- **Admin**: Can create, edit, or delete a dashboard or folder. Administrators can also change dashboard and folder permissions.
+- **Edit**: Can create and edit dashboards. Editors _cannot_ change folder or dashboard permissions, or add, edit, or delete folders.
+- **View**: Can only view dashboards and folders.
+
+For more information about assigning dashboard folder permissions, refer to [Grant dashboard folder permissions]({{< relref "./manage-dashboard-permissions/_index.md#grant-dashboard-folder-permissions" >}}).
+
+For more information about assigning dashboard permissions, refer to [Grant dashboard permissions]({{< relref "./manage-dashboard-permissions/_index.md#grant-dashboard-permissions" >}}).
+
+## Editors with administrator permissions
+
+If you have access to the Grafana server, you can modify the default editor role so that editors can use administrator permissions to manage dashboard folders, dashboards, and teams that they create.
+
+> **Note**: This permission does not allow editors to manage folders, dashboards, and teams that they do not create.
+
+This setting can be used to enable self-organizing teams to administer their own dashboards.
+
+For more information about assigning administrator permissions to editors, refer to [Grant editors administrator permissions]({{< relref "./manage-server-users/grant-editor-admin-permissions.md" >}}).
+
+## Viewers with dashboard preview and Explore permissions
+
+If you have access to the Grafana server, you can modify the default viewer role so that viewers can:
+
+- Edit and preview dashboards, but cannot save their changes or create new dashboards.
+- Access and use [Explore]({{< relref "../../explore/_index.md" >}}).
+
+Extending the viewer role is useful for public Grafana installations where you want anonymous users to be able to edit panels and queries, but not be able to save or create new dashboards.
+
+For more information about assigning dashboard preview permissions to viewers, refer to [Enable viewers to preview dashboards and use Explore]({{< relref "./manage-dashboard-permissions/_index.md#enable-viewers-to-preview-dashboards-and-use-explore" >}}).
+
+## Teams and permissions
+
+A team is a group of users within an organization that have common dashboard and data source permission needs. For example, instead of assigning five users access to the same dashboard, you can create a team that consists of those users and assign dashboard permissions to the team. A user can belong to multiple teams.
+
+You can assign a team member one of the following permissions:
+
+- **Member**: Includes the user as a member of the team. Members do not have team administrator privileges.
+- **Admin**: Administrators have permission to manage various aspects of the team, including team membership, permissions, and settings.
+
+Because teams exist inside an organization, the organization administrator can manage all teams. When the `editors_can_admin` setting is enabled, editors can create teams and manage teams that they create. For more information about the `editors_can_admin` setting, refer to [Grant editors administrator permissions]({{< relref "./manage-server-users/grant-editor-admin-permissions.md" >}}).
+
+## Grafana Enterprise user permissions features
+
+While Grafana OSS includes a robust set of permissions and settings that you can use to manage user access to server and organization resources, you might find that you require additional capabilities.
+
+Grafana Enterprise provides the following permissions-related features:
+
+- Data source permissions
+- Fine-grained access control
+
+### Data source permissions
+
+By default, a user can query any data source in an organization, even if the data source is not linked to the user's dashboards.
+
+Data source permissions enable you to restrict data source query permissions to specific **Users** and **Teams**. For more information about assigning data source permissions, refer to [Data source permissions]({{< relref "../../enterprise/datasource_permissions.md" >}}).
+
+### Fine-grained access control
+
+Fine-grained access control provides you a way of granting, changing, and revoking user read and write access to Grafana resources, such as users, reports, and authentication.
+
+For more information about fine-grained access control, refer to [Fine-grained access control]({{< relref "../../enterprise/access-control" >}}).
+
+### Learn more
+
+Want to know more? Complete the [Create users and teams](https://grafana.com/tutorials/create-users-and-teams) tutorial to learn how to set up users and teams.

docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md

@@ -0,0 +1,143 @@
++++
+title = "Manage dashboard permissions"
+aliases = ["/docs/grafana/latest/permissions/dashboard_folder_permissions/", "docs/sources/administration/manage-users-and-permissions/manage-dashboard-permissions/_index.md"]
+weight = 500
++++
+
+# Manage dashboard permissions
+
+Dashboard and dasboard folder permissions enable you to grant a viewer the ability to edit and save dashboard changes, or limit an editor's permission to modify a dashboard.
+
+For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions">}}).
+
+## Grant dashboard folder permissions
+
+When you grant user permissions for folders, that setting applies to all dashboards contained in the folder. Consider using this approach to assigning dashboard permissions when you have users or teams who require access to groups of related dashboards.
+
+### Before you begin
+
+- Ensure you have organization administrator privileges
+- Identify the dashboard folder permissions you want to modify and the users or teams to which you want to grant access. For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions">}}).
+
+**To grant dashboard folder permissions**:
+
+1. Sign in to Grafana as an organization administrator.
+2. In the sidebar, hover your mouse over the **Dashboards** (squares) icon and click **Browse**.
+3. Hover your mouse cursor over a folder and click **Go to folder**.
+4. Click the **Permissions** tab, and then click **Add Permission**.
+5. In the **Add Permission For** dropdown menu, select **User**, **Team**, or one of the role options.
+6. Select the user or team.
+
+   If you select a role option, you do not select a user or team.
+
+7. Select the permission and click **Save**.
+
+## Grant dashboard permissions
+
+When you grant dashboard folder permissions, that setting applies to all dashboards in the folder. For a more granular approach to assigning permissions, you can also assign user permissions to individual dashboards.
+
+For example, if a user with the viewer organization role requires editor (or admin) access to a dashboard, you can assign those elevated permissions on an individual basis.
+
+> **Note**: If you have assigned a user dashboard folder permissions, you cannot also assign the user permission to dashboards contained in the folder.
+
+Grant dashboard permissions when you want to restrict or enhance dashboard access for users who do not have permissions defined in the associated dashboard folder.
+
+### Before you begin
+
+- Ensure you have organization administrator privileges
+- Identify the dashboard permissions you want to modify and the users or teams to which you want to grant access
+
+**To grant dashboard permissions**:
+
+1. Sign in to Grafana as an organization administrator.
+1. In the sidebar, hover your mouse over the **Dashboards** (squares) icon and click **Browse**.
+1. Open a dashboard.
+1. In the top right corner of the dashboard, click **Dashboard settings** (the cog icon).
+1. Click **Permissions** and then click **Add Permission**.
+1. In the **Add Permission For** dropdown menu, select **User** or **Team**.
+1. Select the user or team.
+1. Select the permission and click **Save**.
+
+## Enable viewers to preview dashboards and use Explore
+
+By default, the viewer organization role does not allow viewers to create dashboards or use the Explore feature. However, by modifying a configuration setting you can allow viewers to create and preview (but not save) dashboards, and use the Explore feature.
+
+This modification is useful for public Grafana installations where you want anonymous users to be able to edit panels and queries but not save or create new dashboards.
+
+### Before you begin
+
+- Ensure that you have access to the Grafana server
+
+**To enable viewers to preview dashboards and use Explore**:
+
+1. Open the Grafana configuration file.
+
+   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration">}}).
+
+1. Locate the `viewers_can_edit` parameter.
+1. Set the `viewers_can_edit` value to `true`.
+1. Save your changes and restart Grafana.
+
+## Edit dashboard permissions
+
+Edit dashboard permissions when you are want to enhance or restrict a user's access to a dashboard. For more information about dashboard permissions, refer to [Dashboard permissions]({{< relref "../about-users-and-permissions/#dashboard-permissions">}}).
+
+### Before you begin
+
+- Identify the dashboard and user permission you want to change
+- Ensure you have organization administrator privileges
+
+**To edit dashboard permissions**:
+
+1. Sign in to Grafana as an organization administrator.
+1. In the sidebar, hover your mouse over the **Dashboards** (squares) icon and click **Browse**.
+1. Open a dashboard.
+1. In the top-right corner of the dashboard, click **Dashboard settings** (the cog icon).
+1. Click **Permissions**.
+1. In the dropdown, update the permissions, and click **Save**.
+
+## Restrict access to dashboards
+
+Grafana applies the highest permission a given user has to access a resource like a dashboard, so if you want to prevent a user from accessing a folder or dashboard you need to consider the user's organization role, folder permissions, and dashboard permissions.
+
+- You cannot override organization administrator permissions. Organization administrators have access to all organization resources.
+- User permissions set for a dashboard folder propagate to dashboards contained in the folder.
+- A lower permission level does not affect access if a more general rule exists with a higher permission.
+
+Refer to the following examples to understand how organization and dashboard permissions impact a user's access to dashboards.
+
+### Example 1
+
+In this example, user1 has the editor organization role.
+
+Dashboard permissions settings:
+
+- Everyone with Editor role can edit
+- user1 is set to `view`
+
+Result: User1 has edit permissions because the user's organization role is Editor.
+
+### Example 2
+
+In this example, user1 has the viewer organization role and is a member of team1.
+
+Dashboard permissions settings:
+
+- Everyone with Viewer role can view
+- user1 is set to `edit`
+- team1 is set to `admin`
+
+Result: User1 has administrator permissions for the dashboard because user1 is a member of team1.
+
+### Example 3
+
+In this example, user1 has the viewer organization role.
+
+Dashboard permissions settings:
+
+- user1 is set to `admin`, which is inherited from the permissions set in parent folder
+- user1 is set to `edit`
+
+Result: You receive an error message that cannot override a higher permission with a lower permission in the same dashboard. User1 has administrator permissions.
+
+> Refer to [Fine-grained access Control]({{< relref "../../../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to understand how to use fine-grained permissions to restrict access to dashboards, folders, administrative functions, and other resources.

docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md

@@ -0,0 +1,13 @@
++++
+title = "Manage users in an organization"
+aliases = ["docs/sources/manage-users/org-admin/index.md", "docs/sources/administration/manage-users-and-permissions/manage-org-users/_index.md"]
+weight = 400
++++
+
+# Manage users in an organization
+
+Organization administrators can invite users to join their organization. Organization users have access to organization resources based on their role, which is **Admin**, **Editor**, or **Viewer**. Permissions associated with each role determine the tasks a user can perform in the system.
+
+For more information about organization user permissions, refer to [Organization users and permissions]({{< relref "../about-users-and-permissions/#organization-users-and-permissions">}}).
+
+{{< section >}}

docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md

@@ -0,0 +1,27 @@
++++
+title = "Change a user's organization permissions"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions.md"]
+weight = 30
++++
+
+# Change a user's organization permissions
+
+Update user permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+
+## Before you begin
+
+- Ensure you have organization administrator privileges
+
+**To change the organization role of a user**:
+
+1. Sign in to Grafana as an organization administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
+1. Find the user account for which you want to change the role.
+
+   If necessary, use the search field to filter the list.
+
+1. Locate the user on the list and in the **Role** column, click the user role.
+1. Select the role that you want to assign.
+1. Click **Update**.
+
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also [change a user's organization permissions]({{< relref "../../manage-users-and-permissions/manage-server-users/change-user-org-permissions.md" >}}) in the Server Admin section.

docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md

@@ -0,0 +1,44 @@
++++
+title = "Invite a user to join an organization"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org.md"]
+weight = 10
++++
+
+# Invite a user to join an organization
+
+When you invite users to join an organization, you assign the **Admin**, **Editor**, or **Viewer** role which controls user access to the dashboards and data sources owned by the organization. Users receive an email that prompts them to accept the invitation.
+
+- If you know that the user already has access Grafana and you know their user name, then you issue an invitation by entering their user name.
+- If the user is new to Grafana, then use their email address to issue an invitation. The system automatically creates the user account on first sign in.
+
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also manually [add a user to an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md" >}}).
+
+## Before you begin
+
+- Ensure you have organization administrator privileges.
+- If the user already has access to Grafana, obtain their user name.
+- Determine the permissions you want to assign to the user. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+
+**To invite or add an existing user account to your organization**:
+
+1. Sign in to Grafana as an organization administrator.
+1. To switch to the organization to which you want to invite a user, hover your mouse over your profile and click **Switch organization** and select an organization.
+
+   > **Note**: It might be that you are currently in the proper organization and don't need to switch organizations.
+
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
+1. Click **Invite**.
+1. Enter the following information:
+
+   | Field             | Description                                                                                                                                                                                                                                                              |
+   | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+   | Email or username | Either the email or username that the user will use to sign in to Grafana.                                                                                                                                                                                               |
+   | Name              | The user's name.                                                                                                                                                                                                                                                         |
+   | Role              | Click the organization role to assign this user. For more information about organization roles, refer to [Organization roles]({{< relref "../about-users-and-permissions#organization-roles" >}})..                                                                      |
+   | Send invite email | Switch to on if your organization has configured. The system sends an email to the user inviting them to sign in to Grafana and join the organization. Switch to off if you are not using email. The user can sign in to Grafana with the email or username you entered. |
+
+1. Click **Submit**.
+
+If the invitee is not already a user, the system adds them.
+
+![Invite User](/static/img/docs/manage-users/org-invite-user-7-3.png).

docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md

@@ -0,0 +1,31 @@
++++
+title = "Manage a pending invitation"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites.md"]
+weight = 20
++++
+
+# Manage a pending invitation
+
+Periodically review invitations you have sent so that you can see a list of users that have not yet accepted the invitation or cancel a pending invitation.
+
+> **Note:** The **Pending Invites** button is only visible if there are unanswered invitations.
+
+## Before you begin
+
+- Ensure you have organization administrator privileges
+
+**To manage a pending invitation**:
+
+1. Sign in to Grafana as an organization administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
+1. Click **Pending Invites**.
+
+   The **Pending Invites** button appears only when there are unaccepted invitations.
+
+   ![Pending Invites button](/static/img/docs/manage-users/pending-invites-button-7-3.png)
+
+To cancel an invitation, click the red **X** next to the invitation.
+
+To copy an invitation link and send it directly to a user, click Copy Invite. You can then paste the invite link into a message.
+
+![Pending Invites list](/static/img/docs/manage-users/pending-invites-list-7-3.png)

docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md

@@ -0,0 +1,27 @@
++++
+title = "Remove a user from an organization"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org.md"]
+weight = 40
++++
+
+# Remove a user from an organization
+
+You can remove a user from an organization when they no longer require access to the dashboard or data sources owned by the organization. No longer requiring access to an organization might occur when the user has left your company or has internally moved to another organization.
+
+This action does not remove the user account from the Grafana server.
+
+## Before you begin
+
+- Ensure you have organization administrator privileges
+
+**To remove a user from an organization**:
+
+1. Sign in to Grafana as an organization administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
+1. Find the user account that you want to remove from the organization.
+
+   Use the search field to filter the list, if necessary.
+
+1. Click the red **X** to remove the user from the organization.
+
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md#remove-a-user-from-an-organization" >}}) on the Users page of the Server Admin section.

docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md

@@ -0,0 +1,22 @@
++++
+title = "View a list of organization users"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-org-users/view-list-org-users.md"]
+weight = 50
++++
+
+# View a list of organization users
+
+You can see a list of users with accounts in your Grafana organization. If necessary, you can use the search field to filter the list.
+
+## Before you begin
+
+- Ensure you have organization administrator privileges
+
+**To view a list of organization users**:
+
+1. Sign in to Grafana as an organization administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**.
+
+![Org Admin user list](/static/img/docs/manage-users/org-user-list-7-3.png)
+
+> **Note:** If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can also [view a global list of users]({{< relref "../../manage-users-and-permissions/manage-server-users/view-list-users.md" >}}) in the Server Admin section of Grafana.

docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md

@@ -0,0 +1,17 @@
++++
+title = "Manage users globally"
+aliases = ["docs/sources/manage-users/server-admin/_index.md", "docs/sources/manage-users/server-admin/server-admin-manage-users.md", "docs/sources/administration/manage-users-and-permissions/manage-server-users/_index.md"]
+weight = 300
++++
+
+# Manage users globally
+
+A _user_ is defined as any individual who can log in to Grafana. Each user is associated with a _role_ that includes _permissions_. Permissions determine the tasks a user can perform in the system.
+
+If you have [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions in Grafana, you can manage all users for a Grafana instance in the Server Admin section:
+
+{{< section >}}
+
+If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, refer to [Manage users in a organization]({{< relref "../../manage-users-and-permissions/manage-org-users/_index.md" >}}).
+
+For more information about users and permissions, refer to [About users and permissions]({{< relref "../about-users-and-permissions">}}).

docs/sources/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org.md

@@ -0,0 +1,51 @@
++++
+title = "Add or remove a user from an organization"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user-to-org.md"]
+weight = 30
++++
+
+# Add a user to an organization
+
+Add a user to an organization when you want the user to have access to organization resources such as dashboards, data sources, and playlists. A user must belong to at least one organization.
+
+You are required to specify an Admin role for each organization. The first user you add to an organization becomes the Admin by default. After you assign the Admin role to a user, you can add other users to an organization as either Admins, Editors, or Viewers.
+
+## Before you begin
+
+- [Create an organization]({{< relref "../../manage-organizations/_index.md">}})
+- [Add a user]({{< relref "./add-user.md">}}) to Grafana
+- Ensure you have Grafana server administrator privileges
+
+**To add a user to an organization**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+1. In the **Organizations** section, click **Add user to organization**.
+1. Select an organization and a role.
+
+   For more information about user permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+
+1. Click **Add to organization**.
+
+The next time the user signs in, they will be able to navigate to their new organization using the Switch Organizations option in the user profile menu.
+
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still [invite a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).
+
+# Remove a user from an organization
+
+Remove a user from an organization when they no longer require access to the dashboards, data sources, or alerts in that organization.
+
+## Before you begin
+
+- Ensure you have Grafana server administrator privileges
+
+**To remove a user from an organization**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+1. In the **Organization** section, click **Remove from organization** next to the organization from which you want to remove the user.
+1. Click **Confirm removal**.
+
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still [remove a user from an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/remove-user-from-org.md" >}}) in the Users section of organization configuration.

docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md

@@ -0,0 +1,28 @@
++++
+title = "Add a user"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/add-user.md"]
+weight = 10
++++
+
+# Add a user
+
+Add users when you want to manually provide individuals with access to Grafana.
+
+When you create a user using this method, you must create their password. The user does not receive a notification by email. To invite a user to Grafana and allow them to create their own password, [invite a user to join an organization]({{< relref "../manage-org-users/invite-user-join-org.md">}}).
+
+When you configure advanced authentication using Oauth, SAML, LDAP, or the Auth proxy, users are created automatically.
+
+## Before you begin
+
+- Ensure that you have Grafana server administrator privileges
+
+**To add a user**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click **New user**.
+1. Complete the fields and click **Create user**.
+
+When you create a user, the system assigns the user viewer permissions in a default organization, which you can change. You can now [add a user to a second organization]({{< relref "./add-remove-user-to-org.md">}}).
+
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still add users by [inviting a user to join an organization]({{< relref "../../manage-users-and-permissions/manage-org-users/invite-user-join-org.md" >}}).

docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md

@@ -0,0 +1,27 @@
++++
+title = "Assign or remove Grafana server administrator privileges"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges.md"]
+weight = 20
++++
+
+# Assign or remove Grafana server administrator privileges
+
+Grafana server administrators are responsible for creating users, organizations, and managing permissions. For more information about the server administration role, refer to [Grafana server administrators]({{< relref "../about-users-and-permissions/#grafana-server-administrators">}}).
+
+> **Note:** Server administrators are "super-admins" with full permissions to create, read, update, and delete all resources and users in all organizations, as well as update global settings such as licenses. Only grant this permission to trusted users.
+
+## Before you begin
+
+- [Add a user]({{< relref "./add-user.md">}})
+- Ensure you have Grafana server administrator privileges
+
+**To assign or remove Grafana administrator privileges**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+1. In the **Grafana Admin** section, click **Change**.
+1. Click **Yes** or **No**, depending on whether or not you want this user to have the Grafana server administrator role.
+1. Click **Change**.
+
+The system updates the user's permission the next time they load a page in Grafana.

docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md

@@ -0,0 +1,22 @@
++++
+title = "Change a user's organization permissions"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions.md"]
+weight = 50
++++
+
+# Change a user's organization permissions
+
+Update organization permissions when you want to enhance or restrict a user's access to organization resources. For more information about organization permissions, refer to [Organization roles]({{< relref "../about-users-and-permissions/#organization-roles">}}).
+
+## Before you begin
+
+- [Add a user to an organization]({{< relref "./add-remove-user-to-org.md">}})
+- Ensure you have Grafana server administrator privileges
+
+**To change a user's organization permissions**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+1. In the **Organizations** section, click the role you want to change, and then select another role.
+1. Click **Update**.

docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md

@@ -0,0 +1,24 @@
++++
+title = "Force a user to logout from Grafana"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/force-user-logout.md"]
+weight = 90
++++
+
+# Force a user to log out of Grafana
+
+If you suspect a user account is compromised or is no longer authorized to access the Grafana server, then you can force the user to log out of Grafana.
+
+The force logout action can apply to one device that is logged in to Grafana, or all devices logged in to Grafana.
+
+## Before you begin
+
+- Ensure you have Grafana server administrator privileges
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+1. Scroll down to the **Sessions** section.
+1. Perform one of the following actions:
+   - Click **Force logout** next to the session entry that you want logged out of Grafana.
+   - Click **Force logout from all devices**.
+1. Confirm the logout.

docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md

@@ -0,0 +1,30 @@
++++
+title = "Grant editors administrator permissions"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions.md"]
+weight = 60
++++
+
+# Grant editors administrator permissions
+
+By default, the editor organization role does not allow editors to manage dashboard folders, dashboards, and teams, which you can change by modifying a configuration parameter. You can allow them to do so using the `editors_can_admin` configuration option.
+
+This setting can be used to enable self-organizing teams to administer their own dashboards.
+
+When `editors_can_admin` is enabled:
+
+- Users with the Editor role in an organization are Administrators for new dashboards and folders they create, meaning they can edit dashboard permissions. To learn more about dashboard permissions, refer to [Manage dashboard permissions]({{< relref "../manage-dashboard-permissions/_index.md" >}}).
+- Users with the Editor role in an organization can create teams, and they are Administrators of the teams they create. To learn more about team permissions, refer to [Manage teams]({{< relref "../manage-teams/_index.md" >}})
+
+## Before you begin
+
+- Ensure that you have access to the Grafana server
+
+**To enable editors with administrator permissions**:
+
+1. Log in to the Grafana server and open the Grafana configuration file.
+
+   For more information about the Grafana configuration file and its location, refer to [Configuration]({{< relref "../../../administration/configuration">}}).
+
+1. Locate the `editors_can_admin` parameter.
+1. Set the `editors_can_admin` value to `true`.
+1. Save your changes and restart the Grafana server.

docs/sources/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account.md

@@ -0,0 +1,68 @@
++++
+title = "View and edit a user account"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/view-user-account-details.md"]
+weight = 110
++++
+
+# View user details
+
+View user details when you want to see login, and organizations and permissions settings associated with a user.
+
+## Before you begin:
+
+- Ensure you have Grafana server administrator privileges
+
+**To view user details**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+
+A user account contains the following sections.
+
+### User information
+
+This section contains basic user information, which users can update.
+
+![Server Admin user information section](/static/img/docs/manage-users/server-admin-user-information-7-3.png)
+
+### Permissions
+
+This indicates whether the user account has the Grafana administrator flag applied. If the flag is set to **Yes**, then the user is a Grafana server administrator.
+
+![Server Admin Permissions section](/static/img/docs/manage-users/server-admin-permissions-7-3.png)
+
+### Organisations
+
+This section lists the organizations the user belongs to and their assigned role.
+
+![Server Admin Organizations section](/static/img/docs/manage-users/server-admin-organisations-7-3.png)
+
+### Sessions
+
+This section includes recent user sessions and information about the time the user logged in and they system they used. You can force logouts, if necessary.
+
+![Server Admin Sessions section](/static/img/docs/manage-users/server-admin-sessions-7-3.png)
+
+# Edit a user account
+
+Edit a user account when you want to modify user login credentials, or delete, disable, or enable a user.
+
+## Before you begin
+
+- Ensure you have Grafana server administrator privileges
+
+**To edit a user account**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+1. Click a user.
+1. Complete any of the following actions, as necessary.
+
+| Action                          | Description                                                                                                                                                     |
+| ------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Update name, email, or username | **Is the user notified of these changes?**. Click **Save** after you make a change.                                                                             |
+| Change the user's password      | The new password must be at least four characters long. Click **Save** after you make a change.                                                                 |
+| Delete a user                   | This action permanently removes the user from the Grafana server. The user can no longer sign in after you make this change.                                    |
+| Disable user account            | This action prevents a user from signing in with this account, but does not delete the account. You might disable an account if a colleague goes on sabbatical. |
+| Enable a user account           | This action enables a user account.                                                                                                                             |

docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md

@@ -0,0 +1,22 @@
++++
+title = "View a list of users"
+aliases = ["docs/sources/administration/manage-users-and-permissions/manage-server-users/view-list-users.md"]
+weight = 100
++++
+
+# View a list of users
+
+You can see a list of users with accounts on your Grafana server. This action might be useful when you want to know which role you assigned to each user.
+
+## Before you begin
+
+- Ensure you have Grafana server administrator privileges
+
+**To view a list of users**:
+
+1. Sign in to Grafana as a server administrator.
+1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**.
+
+![Server Admin user list](/static/img/docs/manage-users/server-user-list-7-3.png)
+
+> **Note:** If you have [organization administrator]({{< relref "../about-users-and-permissions.md#organization-roles">}}) permissions and _not_ [server administrator]({{< relref "../about-users-and-permissions.md#grafana-server-administrators">}}) permissions, you can still [view of list of users in a given organization]({{< relref "../../manage-users-and-permissions/manage-org-users/view-list-org-users.md" >}}).

docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md

@@ -0,0 +1,129 @@
++++
+title = "Manage teams"
+aliases = ["/docs/grafana/latest/manage-users/add-or-remove-user-from-team/","/docs/grafana/latest/manage-users/create-or-remove-team/", "docs/sources/manage-users/manage-teams/index.md", "docs/sources/administration/manage-users-and-permissions/manage-teams/_index.md"]
+weight = 600
++++
+
+# Manage teams
+
+A team is a group of users within an organization that have common dashboard and data source permission needs. For example, instead of assigning five users access to the same dashboard, you can create a team that consists of those users and assign dashboard permissions to the team. A user can belong to multiple teams.
+
+A user can be a Member or an Administrator for a given team. Members of a team inherit permissions from the team, but they cannot edit the team itself. Team Administrators can add members to a team and update its settings, such as the team name, team member's team roles, UI preferences, and home dashboard.
+
+For more information about teams, refer to [Teams and permissions]({{< relref "../about-users-and-permissions/#teams-and-permissions">}}).
+
+## Create a team
+
+A team is a group of users within an organization that have common dashboard and data source permission needs. Use teams to help make user-permission management more efficient.
+
+A user can belong to multiple teams.
+
+### Before you begin
+
+- Ensure that you have either organization administrator permissions or team administrator permissions
+- Make a plan for which users belong to which teams and the permissions team members receive
+
+**To create a team**:
+
+1. Sign in to Grafana as an organization administrator or team administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
+1. Click **New Team**.
+1. Complete the fields and click **Create**.
+1. Click **Add member**.
+1. In the **Add team member** field, locate and select a user.
+1. Click **Add to team**.
+
+## Add a team member
+
+Add a team member to an existing team whenever you want to provide access to team dashboards and folders to another user.
+
+### Before you begin
+
+- Ensure that you have organization administrator permissions
+- [Create a team](#create-a-team).
+
+**To add a team member**:
+
+1. Sign in to Grafana as an organization administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
+1. Click the name of the team to which you want to add members, and click **Add member**.
+1. In the **Add team member** field, locate and select a user.
+1. Click **Add to team**.
+
+![Add team member](/static/img/docs/manage-users/add-team-member-7-3.png)
+
+## Grant team member permissions
+
+Complete this task when you want to add or modify team member permissions.
+
+### Before you begin
+
+- Ensure that you have either organization administrator permissions or team administrator permissions
+
+**To grant team member permissions**:
+
+1. Sign in to Grafana as an organization administrator or a team administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
+1. Click the name of the team for which you want to add or modify team member permissions.
+1. In the team member list, find and click the user account that you want to change. You can use the search field to filter the list if necessary.
+1. Click the **Permission** list, and then click the new user permission level.
+
+![Change team member permissions](/static/img/docs/manage-users/change-team-permissions-7-3.png)
+
+## Remove a team member
+
+You can remove a team member when you no longer want to apply team permissions to the user.
+
+### Before you begin
+
+- Ensure that you have either organization administrator permissions or team administrator permissions
+
+**To remove a team member**:
+
+1. Sign in to Grafana as an organization administrator or team administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
+1. Click a team from which you want to remove a user.
+1. Click the **X** next to the name of the user.
+1. Click **Delete**.
+
+## Delete a team
+
+Delete a team when you no longer need it. This action permanently deletes the team and removes all team permissions from dashboards and folders.
+
+### Before you begin
+
+- Ensure that you have organization administrator permissions
+
+**To delete a team**:
+
+1. Sign in to Grafana as an organization administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
+1. Click the **X** next to the name of the team.
+1. Click **Delete**.
+
+## View a list of teams
+
+See the complete list of teams in your Grafana organization.
+
+### Before you begin
+
+- Ensure that you have either organization administrator permissions or team administrator permissions
+
+**To view a list of teams**:
+
+1. Sign in to Grafana as an organization administrator or a team administrator.
+1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Teams**.
+
+The role you use to sign in to Grafana determines how you see team lists.
+
+**Organization administrator view**
+
+The following example shows a list as it appears to an organization administrator.
+
+![Team list](/static/img/docs/manage-users/org-admin-team-list-7-3.png)
+
+**Team administrator view**
+
+The following example shows a list as it appears to a team administrator.
+
+![Team list](/static/img/docs/manage-users/team-admin-team-list-7-3.png)

docs/sources/administration/preferences/_index.md

@@ -10,9 +10,9 @@ Grafana preferences are basic settings. They control the Grafana UI theme, home
 
 Preferences are sometimes confusing because they can be set at four different levels, listed from highest level to lowest:
 
-- **Server -** Affects all users on the Grafana server. Set by a [Grafana Server Admin]({{< relref "../../permissions/_index.md#grafana-server-admin-role" >}}).
-- **Organization -** Affects all users in an organization. Set by an [Organization Admin]({{< relref "../../permissions/organization_roles.md#organization-admin-role" >}}).
-- **Team -** Affects all users assigned to a team. Set by an Organization Admin or Team Admin. To learn more about these roles, refer to [Organization roles]({{< relref "../../permissions/organization_roles.md" >}}).
+- **Server -** Affects all users on the Grafana server. Set by a [Grafana server admin]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#grafana-server-administrators" >}}).
+- **Organization -** Affects all users in an organization. Set by an [Organization admin]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#organization-roles" >}}).
+- **Team -** Affects all users assigned to a team. Set by an Organization Admin or Team Admin. To learn more about these roles, refer to [Teams and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md#teams-and-permissions" >}}).
 - **User account -** Affects the individual user. Set by the user on their own account.
 
 The lowest level always takes precedence. For example, if a user sets their theme to **Light**, then their visualization of Grafana displays the light theme. Nothing at any higher level can override that.

docs/sources/administration/preferences/change-grafana-name.md

@@ -53,4 +53,4 @@ To change the team name or email, follow these steps:
 
 ## Change user name or email
 
-To learn how to edit your user information, refer to [Grafana user account profile]({{< relref "../../manage-users/user-admin/user-profile.md" >}}).
+To learn how to edit your user information, refer to [Edit your profile]({{< relref "../manage-user-preferences/_index.md#edit-your-profile" >}}).

docs/sources/administration/security.md

@@ -40,7 +40,7 @@ Users with the Viewer role can enter _any possible query_ in _any_ of the data s
 
 To address this vulnerability, you can restrict data source query access in the following ways:
 
-- Create multiple data sources with some restrictions added in data source configuration that restrict access (like database name or credentials). Then use the [Data Source Permissions]({{< relref "../permissions/datasource_permissions.md" >}}) Enterprise feature to restrict user access to the data source in Grafana.
+- Create multiple data sources with some restrictions added in data source configuration that restrict access (like database name or credentials). Then use the [Data Source Permissions]({{< relref "../enterprise/datasource_permissions.md" >}}) Enterprise feature to restrict user access to the data source in Grafana.
 - Create a separate Grafana organization, and in that organization, create a separate data source. Make sure the data source has some option/user/credentials setting that limits access to a subset of the data. Not all data sources have an option to limit access.
 
 ## Implications of enabling anonymous access to dashboards

docs/sources/administration/view-server/internal-metrics.md

@@ -30,7 +30,7 @@ These instructions assume you have already added Prometheus as a data source in
 1. Enable Prometheus to scrape metrics from Grafana. In your configuration file (`grafana.ini` or `custom.ini` depending on your operating system) remove the semicolon to enable the following configuration options:
 
    ```
-   # Metrics available at HTTP API Url /metrics
+   # Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
    [metrics]
    # Disable / Enable internal metrics
    enabled           = true
@@ -39,7 +39,7 @@ These instructions assume you have already added Prometheus as a data source in
    disable_total_stats = false
    ```
 
-1. (optional) If you want to require authorization to view the metrics endpoint, then uncomment and set the following options:
+1. (optional) If you want to require authorization to view the metrics endpoints, then uncomment and set the following options:
 
    ```
    basic_auth_username =
@@ -92,3 +92,48 @@ These instructions assume you have already added Graphite as a data source in Gr
    ```
 
 1. Restart Grafana. Grafana now exposes metrics at http://localhost:3000/metrics and sends them to the Graphite location you specified.
+
+## Pull metrics from Grafana backend plugin into Prometheus
+
+Any installed [backend plugin]({{< relref "../../developers/plugins/backend/_index.md" >}}) exposes a metrics endpoint through Grafana that you can configure Prometheus to scrape.
+
+These instructions assume you have already added Prometheus as a data source in Grafana.
+
+1. Enable Prometheus to scrape backend plugin metrics from Grafana. In your configuration file (`grafana.ini` or `custom.ini` depending on your operating system) remove the semicolon to enable the following configuration options:
+
+   ```
+   # Metrics available at HTTP URL /metrics and /metrics/plugins/:pluginId
+   [metrics]
+   # Disable / Enable internal metrics
+   enabled           = true
+
+   # Disable total stats (stat_totals_*) metrics to be generated
+   disable_total_stats = false
+   ```
+
+1. (optional) If you want to require authorization to view the metrics endpoints, then uncomment and set the following options:
+
+   ```
+   basic_auth_username =
+   basic_auth_password =
+   ```
+
+1. Restart Grafana. Grafana now exposes metrics at `http://localhost:3000/metrics/plugins/<plugin id>`, e.g. http://localhost:3000/metrics/plugins/grafana-github-datasource if you have the [Grafana GitHub datasource](https://grafana.com/grafana/plugins/grafana-github-datasource/) installed.
+1. Add the job to your prometheus.yml file.
+   Example:
+
+   ```
+   - job_name: 'grafana_github_datasource'
+
+      scrape_interval: 15s
+      scrape_timeout: 5s
+      metrics_path: /metrics/plugins/grafana-test-datasource
+
+      static_configs:
+        - targets: ['localhost:3000']
+   ```
+
+1. Restart Prometheus. Your new job should appear on the Targets tab.
+1. In Grafana, hover your mouse over the **Configuration** (gear) icon on the left sidebar and then click **Data Sources**.
+1. Select the **Prometheus** data source.
+1. Import a Golang application metrics dashboard - for example [Go Processes](https://grafana.com/grafana/dashboards/6671).

docs/sources/administration/view-server/view-server-settings.md

@@ -12,7 +12,7 @@ weight = 300
 
 If you are a Grafana server administrator, use the Settings tab to view the settings that are applied to your Grafana server via the [Configuration]({{< relref "../configuration.md#config-file-locations" >}}) file and any environmental variables.
 
-> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [Grafana server admin]({{< relref "../../permissions/_index.md" >}}).
+> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md" >}}).
 
 ## View server settings
 

docs/sources/administration/view-server/view-server-stats.md

@@ -11,7 +11,7 @@ weight = 400
 
 If you are a Grafana server admin, then you can view useful statistics about your Grafana server in the Stats & Licensing tab.
 
-> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [Grafana server admin]({{< relref "../../permissions/_index.md" >}}).
+> **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [About users and permissions]({{< relref "../manage-users-and-permissions/about-users-and-permissions.md" >}}).
 
 ## View server stats
 

docs/sources/alerting/_index.md

@@ -10,15 +10,16 @@ Alerts allow you to learn about problems in your systems moments after they occu
 Grafana 8.0 introduced new and improved alerting that centralizes alerting information in a single, searchable view. It allows you to:
 
 - Create and manage Grafana alerts
-- Create and manage Cortex and Loki managed alerts
+- Create and manage Grafana Mimir and Loki managed alerts
 - View alerting information from Prometheus and Alertmanager compatible data sources
 
 Grafana alerting is enabled by default for new OSS installations. For older installations, it is still an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature.
 
-| Release     | Cloud         | Enterprise | OSS                              |
-| ----------- | ------------- | ---------- | -------------------------------- |
-| Grafana 8.2 | On by default | Opt-in     | Opt-in                           |
-| Grafana 8.3 | On by default | Opt-in     | On by default for new installs\* |
+| Release                  | Cloud         | Enterprise    | OSS                              |
+| ------------------------ | ------------- | ------------- | -------------------------------- |
+| Grafana 8.2              | On by default | Opt-in        | Opt-in                           |
+| Grafana 8.3              | On by default | Opt-in        | On by default for new installs\* |
+| Grafana 9.0 (unreleased) | On by default | On by default | On by default                    |
 
 > **Note:** New installs include existing installs which do not have any alerts configured.