"Release: Updated versions in package to 9.0.2" (#396)

In plugin E2E, changing the default download to enterprise version of grafana.

(cherry picked from commit 5aab8b710b)

Co-authored-by: Sriram <yesoreyeram@gmail.com>

.betterer.ts

@@ -1,72 +1,16 @@
 import { regexp } from '@betterer/regexp';
-import { BettererFileTest } from '@betterer/betterer';
-import { ESLint, Linter } from 'eslint';
-import { existsSync } from 'fs';
+import { eslint } from '@betterer/eslint';
 
 export default {
   'no enzyme tests': () => regexp(/from 'enzyme'/g).include('**/*.test.*'),
-  'better eslint': () => countEslintErrors().include('**/*.{ts,tsx}'),
-  'no undocumented stories': () => countUndocumentedStories().include('**/*.story.tsx'),
+  'better eslint': () =>
+    eslint({
+      '@typescript-eslint/no-explicit-any': 'error',
+      '@typescript-eslint/consistent-type-assertions': [
+        'error',
+        {
+          assertionStyle: 'never',
+        },
+      ],
+    }).include('**/*.{ts,tsx}'),
 };
-
-function countUndocumentedStories() {
-  return new BettererFileTest(async (filePaths, fileTestResult) => {
-    filePaths.forEach((filePath) => {
-      if (!existsSync(filePath.replace(/\.story.tsx$/, '.mdx'))) {
-        // In this case the file contents don't matter:
-        const file = fileTestResult.addFile(filePath, '');
-        // Add the issue to the first character of the file:
-        file.addIssue(0, 0, 'No undocumented stories are allowed, please add an .mdx file with some documentation');
-      }
-    });
-  });
-}
-
-function countEslintErrors() {
-  return new BettererFileTest(async (filePaths, fileTestResult, resolver) => {
-    const { baseDirectory } = resolver;
-    const cli = new ESLint({ cwd: baseDirectory });
-
-    await Promise.all(
-      filePaths.map(async (filePath) => {
-        const linterOptions = (await cli.calculateConfigForFile(filePath)) as Linter.Config;
-
-        const rules: Partial<Linter.RulesRecord> = {
-          '@typescript-eslint/no-explicit-any': 'error',
-        };
-
-        const isTestFile =
-          filePath.endsWith('.test.tsx') || filePath.endsWith('.test.ts') || filePath.includes('__mocks__');
-
-        if (!isTestFile) {
-          rules['@typescript-eslint/consistent-type-assertions'] = [
-            'error',
-            {
-              assertionStyle: 'never',
-            },
-          ];
-        }
-
-        const runner = new ESLint({
-          baseConfig: {
-            ...linterOptions,
-            rules,
-          },
-          useEslintrc: false,
-          cwd: baseDirectory,
-        });
-
-        const lintResults = await runner.lintFiles([filePath]);
-        lintResults
-          .filter((lintResult) => lintResult.source)
-          .forEach((lintResult) => {
-            const { messages } = lintResult;
-            const file = fileTestResult.addFile(filePath, '');
-            messages.forEach((message, index) => {
-              file.addIssue(0, 0, message.message, `${index}`);
-            });
-          });
-      })
-    );
-  });
-}

.bingo/Variables.mk

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 GOPATH ?= $(shell go env GOPATH)
@@ -7,45 +7,21 @@ GO     ?= $(shell which go)
 
 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
 # will be used; reinstalling only if needed.
-# For example for bra variable:
+# For example for drone variable:
 #
 # In your main Makefile (for non array binaries):
 #
 #include .bingo/Variables.mk # Assuming -dir was set to .bingo .
 #
-#command: $(BRA)
-#	@echo "Running bra"
-#	@$(BRA) <flags/args..>
+#command: $(DRONE)
+#	@echo "Running drone"
+#	@$(DRONE) <flags/args..>
 #
-BRA := $(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8
-$(BRA): $(BINGO_DIR)/bra.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bra.mod -o=$(GOBIN)/bra-v0.0.0-20200517080246-1e3013ecaff8 "github.com/unknwon/bra"
-
-DRONE := $(GOBIN)/drone-v1.5.0
+DRONE := $(GOBIN)/drone-v1.4.0
 $(DRONE): $(BINGO_DIR)/drone.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/drone-v1.5.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.5.0 "github.com/drone/drone-cli/drone"
-
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.51.2
-$(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.51.2"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.51.2 "github.com/golangci/golangci-lint/cmd/golangci-lint"
-
-JB := $(GOBIN)/jb-v0.5.1
-$(JB): $(BINGO_DIR)/jb.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/jb-v0.5.1"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.5.1 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
-
-SWAGGER := $(GOBIN)/swagger-v0.30.2
-$(SWAGGER): $(BINGO_DIR)/swagger.mod
-	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/swagger-v0.30.2"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=swagger.mod -o=$(GOBIN)/swagger-v0.30.2 "github.com/go-swagger/go-swagger/cmd/swagger"
+	@echo "(re)installing $(GOBIN)/drone-v1.4.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=drone.mod -o=$(GOBIN)/drone-v1.4.0 "github.com/drone/drone-cli/drone"
 
 WIRE := $(GOBIN)/wire-v0.5.0
 $(WIRE): $(BINGO_DIR)/wire.mod

.bingo/bra.mod

@@ -1,7 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.17
-
-require github.com/unknwon/bra v0.0.0-20200517080246-1e3013ecaff8
-
-replace golang.org/x/sys => golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c

.bingo/drone.mod

@@ -4,4 +4,4 @@ go 1.17
 
 replace github.com/docker/docker => github.com/docker/engine v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible
 
-require github.com/drone/drone-cli v1.5.0 // drone
+require github.com/drone/drone-cli v1.4.0 // drone

.bingo/golangci-lint.mod

@@ -1,5 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.19
-
-require github.com/golangci/golangci-lint v1.51.2 // cmd/golangci-lint

.bingo/swagger.mod

@@ -1,5 +0,0 @@
-module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
-
-go 1.18
-
-require github.com/go-swagger/go-swagger v0.30.2 // cmd/swagger

.bingo/variables.env

@@ -1,4 +1,4 @@
-# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.8. DO NOT EDIT.
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.5.1. DO NOT EDIT.
 # All tools are designed to be build inside $GOBIN.
 # Those variables will work only until 'bingo get' was invoked, or if tools were installed via Makefile's Variables.mk.
 GOBIN=${GOBIN:=$(go env GOBIN)}
@@ -8,15 +8,7 @@ if [ -z "$GOBIN" ]; then
 fi
 
 
-BRA="${GOBIN}/bra-v0.0.0-20200517080246-1e3013ecaff8"
-
-DRONE="${GOBIN}/drone-v1.5.0"
-
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.51.2"
-
-JB="${GOBIN}/jb-v0.5.1"
-
-SWAGGER="${GOBIN}/swagger-v0.30.2"
+DRONE="${GOBIN}/drone-v1.4.0"
 
 WIRE="${GOBIN}/wire-v0.5.0"
 

.bra.toml

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

.changelog-archive/CHANGELOG.1.md

@@ -1,477 +0,0 @@
-# 1.9.1 (2014-12-29)
-
-**Enhancements**
-
-- [Issue #1028](https://github.com/grafana/grafana/issues/1028). Graph: New legend option `hideEmpty` to hide series with only null values from legend
-- [Issue #1242](https://github.com/grafana/grafana/issues/1242). OpenTSDB: Downsample query field now supports interval template variable
-- [Issue #1126](https://github.com/grafana/grafana/issues/1126). InfluxDB: Support more than 10 series name segments when using alias `$number` patterns
-
-**Fixes**
-
-- [Issue #1251](https://github.com/grafana/grafana/issues/1251). Graph: Fix for y axis and scaled units (GiB etc) caused rounding, for example 400 GiB instead of 378 GiB
-- [Issue #1199](https://github.com/grafana/grafana/issues/1199). Graph: fix for series tooltip when one series is hidden/disabled
-- [Issue #1207](https://github.com/grafana/grafana/issues/1207). Graphite: movingAverage / movingMedian parameter type improvement, now handles int and interval parameter
-
-# 1.9.0 (2014-12-02)
-
-**Enhancements**
-
-- [Issue #1130](https://github.com/grafana/grafana/issues/1130). SinglestatPanel: Added null point handling, and value to text mapping
-
-**Fixes**
-
-- [Issue #1087](https://github.com/grafana/grafana/issues/1087). Panel: Fixed IE9 crash due to angular drag drop
-- [Issue #1093](https://github.com/grafana/grafana/issues/1093). SingleStatPanel: Fixed position for drilldown link tooltip when dashboard requires scrolling
-- [Issue #1095](https://github.com/grafana/grafana/issues/1095). DrilldownLink: template variables in params property was not interpolated
-- [Issue #1114](https://github.com/grafana/grafana/issues/1114). Graphite: Lexer fix, allow equal sign (=) in metric paths
-- [Issue #1136](https://github.com/grafana/grafana/issues/1136). Graph: Fix to legend value Max and negative values
-- [Issue #1150](https://github.com/grafana/grafana/issues/1150). SinglestatPanel: Fixed absolute drilldown link issue
-- [Issue #1123](https://github.com/grafana/grafana/issues/1123). Firefox: Workaround for Firefox bug, caused input text fields to not be selectable and not have placeable cursor
-- [Issue #1108](https://github.com/grafana/grafana/issues/1108). Graph: Fix for tooltip series order when series draw order was changed with zindex property
-
-# 1.9.0-rc1 (2014-11-17)
-
-**UI Improvements**
-
-- [Issue #770](https://github.com/grafana/grafana/issues/770). UI: Panel dropdown menu replaced with a new panel menu
-
-**Graph**
-
-- [Issue #877](https://github.com/grafana/grafana/issues/877). Graph: Smart auto decimal precision when using scaled unit formats
-- [Issue #850](https://github.com/grafana/grafana/issues/850). Graph: Shared tooltip that shows multiple series & crosshair line, thx @toni-moreno
-- [Issue #940](https://github.com/grafana/grafana/issues/940). Graph: New series style override option "Fill below to", useful to visualize max & min as a shadow for the mean
-- [Issue #1030](https://github.com/grafana/grafana/issues/1030). Graph: Legend table display/look changed, now includes column headers for min/max/avg, and full width (unless on right side)
-- [Issue #861](https://github.com/grafana/grafana/issues/861). Graph: Export graph time series data as csv file
-
-**New Panels**
-
-- [Issue #951](https://github.com/grafana/grafana/issues/951). SingleStat: New singlestat panel
-
-**Misc**
-
-- [Issue #864](https://github.com/grafana/grafana/issues/846). Panel: Share panel feature, get a link to panel with the current time range
-- [Issue #938](https://github.com/grafana/grafana/issues/938). Panel: Plugin panels now reside outside of app/panels directory
-- [Issue #952](https://github.com/grafana/grafana/issues/952). Help: Shortcut "?" to open help modal with list of all shortcuts
-- [Issue #991](https://github.com/grafana/grafana/issues/991). ScriptedDashboard: data source services are now available in scripted dashboards, you can query data source for metric keys, generate dashboards, and even save them in a scripted dashboard (see scripted_gen_and_save.js for example)
-- [Issue #1041](https://github.com/grafana/grafana/issues/1041). Panel: All panels can now have links to other dashboards or absolute links, these links are available in the panel menu.
-
-**Changes**
-
-- [Issue #1007](https://github.com/grafana/grafana/issues/1007). Graph: Series hide/show toggle changed to be default exclusive, so clicking on a series name will show only that series. (SHIFT or meta)+click will toggle hide/show.
-
-**OpenTSDB**
-
-- [Issue #930](https://github.com/grafana/grafana/issues/930). OpenTSDB: Adding counter max and counter reset value to open tsdb query editor, thx @rsimiciuc
-- [Issue #917](https://github.com/grafana/grafana/issues/917). OpenTSDB: Templating support for OpenTSDB series name and tags, thx @mchataigner
-
-**InfluxDB**
-
-- [Issue #714](https://github.com/grafana/grafana/issues/714). InfluxDB: Support for sub second resolution graphs
-
-**Fixes**
-
-- [Issue #925](https://github.com/grafana/grafana/issues/925). Graph: bar width calculation fix for some edge cases (bars would render on top of each other)
-- [Issue #505](https://github.com/grafana/grafana/issues/505). Graph: fix for second y axis tick unit labels wrapping on the next line
-- [Issue #987](https://github.com/grafana/grafana/issues/987). Dashboard: Collapsed rows became invisible when hide controls was enabled
-
-=======
-
-# 1.8.1 (2014-09-30)
-
-**Fixes**
-
-- [Issue #855](https://github.com/grafana/grafana/issues/855). Graph: Fix for scroll issue in graph edit mode when dropdown goes below screen
-- [Issue #847](https://github.com/grafana/grafana/issues/847). Graph: Fix for series draw order not being the same after hiding/unhiding series
-- [Issue #851](https://github.com/grafana/grafana/issues/851). Annotations: Fix for annotations not reloaded when switching between 2 dashboards with annotations
-- [Issue #846](https://github.com/grafana/grafana/issues/846). Edit panes: Issue when open row or json editor when scrolled down the page, unable to scroll and you did not see editor
-- [Issue #840](https://github.com/grafana/grafana/issues/840). Import: Fixes to import from json file and import from graphite. Issues was lingering state from previous dashboard.
-- [Issue #859](https://github.com/grafana/grafana/issues/859). InfluxDB: Fix for bug when saving dashboard where title is the same as slugified url id
-- [Issue #852](https://github.com/grafana/grafana/issues/852). White theme: Fixes for hidden series legend text and disabled annotations color
-
-# 1.8.0 (2014-09-22)
-
-Read this [blog post](https://grafana.com/blog/2014/09/11/grafana-1.8.0-rc1-released) for an overview of all improvements.
-
-**Fixes**
-
-- [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB data source
-- [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode
-- [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format
-- [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted.
-- [Issue #830](https://github.com/grafana/grafana/issues/830). Annotations: Fix for elasticsearch annotations and mapping nested fields
-
-# 1.8.0-RC1 (2014-09-12)
-
-**UI polish / changes**
-
-- [Issue #725](https://github.com/grafana/grafana/issues/725). UI: All modal editors are removed and replaced by an edit pane under menu. The look of editors is also updated and polished. Search dropdown is also shown as pane under menu and has seen some UI polish.
-
-**Filtering/Templating feature overhaul**
-
-- Filtering renamed to Templating, and filter items to variables
-- Filter editing has gotten its own edit pane with much improved UI and options
-- [Issue #296](https://github.com/grafana/grafana/issues/296). Templating: Can now retrieve variable values from a non-default data source
-- [Issue #219](https://github.com/grafana/grafana/issues/219). Templating: Template variable value selection is now a typeahead autocomplete dropdown
-- [Issue #760](https://github.com/grafana/grafana/issues/760). Templating: Extend template variable syntax to include \$variable syntax replacement
-- [Issue #234](https://github.com/grafana/grafana/issues/234). Templating: Interval variable type for time intervals summarize/group by parameter, included "auto" option, and auto step counts option.
-- [Issue #262](https://github.com/grafana/grafana/issues/262). Templating: Ability to use template variables for function parameters via custom variable type, can be used as parameter for movingAverage or scaleToSeconds for example
-- [Issue #312](https://github.com/grafana/grafana/issues/312). Templating: Can now use template variables in panel titles
-- [Issue #613](https://github.com/grafana/grafana/issues/613). Templating: Full support for InfluxDB, filter by part of series names, extract series substrings, nested queries, multiple where clauses!
-- Template variables can be initialized from url, with var-my_varname=value, breaking change, before it was just my_varname.
-- Templating and url state sync has some issues that are not solved for this release, see [Issue #772](https://github.com/grafana/grafana/issues/772) for more details.
-
-**InfluxDB Breaking changes**
-
-- To better support templating, fill(0) and group by time low limit some changes has been made to the editor and query model schema
-- Currently some of these changes are breaking
-- If you used custom condition filter you need to open the graph in edit mode, the editor will update the schema, and the queries should work again
-- If you used a raw query you need to remove the time filter and replace it with \$timeFilter (this is done automatically when you switch from query editor to raw query, but old raw queries needs to updated)
-- If you used group by and later removed the group by the graph could break, open in editor and should correct it
-- InfluxDB annotation queries that used [[timeFilter]] should be updated to use \$timeFilter syntax instead
-- Might write an upgrade tool to update dashboards automatically, but right now master (1.8) includes the above breaking changes
-
-**InfluxDB query editor enhancements**
-
-- [Issue #756](https://github.com/grafana/grafana/issues/756). InfluxDB: Add option for fill(0) and fill(null), integrated help in editor for why this option is important when stacking series
-- [Issue #743](https://github.com/grafana/grafana/issues/743). InfluxDB: A group by time option for all queries in graph panel that supports a low limit for auto group by time, very important for stacking and fill(0)
-- The above to enhancements solves the problems associated with stacked bars and lines when points are missing, these issues are solved:
-- [Issue #673](https://github.com/grafana/grafana/issues/673). InfluxDB: stacked bars missing intermediate data points, unless lines also enabled
-- [Issue #674](https://github.com/grafana/grafana/issues/674). InfluxDB: stacked chart ignoring series without latest values
-- [Issue #534](https://github.com/grafana/grafana/issues/534). InfluxDB: No order in stacked bars mode
-
-**New features and improvements**
-
-- [Issue #117](https://github.com/grafana/grafana/issues/117). Graphite: Graphite query builder can now handle functions that multiple series as arguments!
-- [Issue #281](https://github.com/grafana/grafana/issues/281). Graphite: Metric node/segment selection is now a textbox with autocomplete dropdown, allow for custom glob expression for single node segment without entering text editor mode.
-- [Issue #304](https://github.com/grafana/grafana/issues/304). Dashboard: View dashboard json, edit/update any panel using json editor, makes it possible to quickly copy a graph from one dashboard to another.
-- [Issue #578](https://github.com/grafana/grafana/issues/578). Dashboard: Row option to display row title even when the row is visible
-- [Issue #672](https://github.com/grafana/grafana/issues/672). Dashboard: panel fullscreen & edit state is present in url, can now link to graph in edit & fullscreen mode.
-- [Issue #709](https://github.com/grafana/grafana/issues/709). Dashboard: Small UI look polish to search results, made dashboard title link are larger
-- [Issue #425](https://github.com/grafana/grafana/issues/425). Graph: New section in 'Display Styles' tab to override any display setting on per series bases (mix and match lines, bars, points, fill, stack, line width etc)
-- [Issue #634](https://github.com/grafana/grafana/issues/634). Dashboard: Dashboard tags now in different colors (from fixed palette) determined by tag name.
-- [Issue #685](https://github.com/grafana/grafana/issues/685). Dashboard: New config.js option to change/remove window title prefix.
-- [Issue #781](https://github.com/grafana/grafana/issues/781). Dashboard: Title URL is now slugified for greater URL readability, works with both ES & InfluxDB storage, is backward compatible
-- [Issue #785](https://github.com/grafana/grafana/issues/785). Elasticsearch: Support for full elasticsearch lucene search grammar when searching for dashboards, better async search
-- [Issue #787](https://github.com/grafana/grafana/issues/787). Dashboard: time range can now be read from URL parameters, will override dashboard saved time range
-
-**Fixes**
-
-- [Issue #696](https://github.com/grafana/grafana/issues/696). Graph: Fix for y-axis format 'none' when values are in scientific notation (ex 2.3e-13)
-- [Issue #733](https://github.com/grafana/grafana/issues/733). Graph: Fix for tooltip current value decimal precision when 'none' axis format was selected
-- [Issue #697](https://github.com/grafana/grafana/issues/697). Graphite: Fix for Glob syntax in graphite queries ([1-9] and ?) that made the query editor / parser bail and fallback to a text box.
-- [Issue #702](https://github.com/grafana/grafana/issues/702). Graphite: Fix for nonNegativeDerivative function, now possible to not include optional first parameter maxValue
-- [Issue #277](https://github.com/grafana/grafana/issues/277). Dashboard: Fix for timepicker date & tooltip when UTC timezone selected.
-- [Issue #699](https://github.com/grafana/grafana/issues/699). Dashboard: Fix for bug when adding rows from dashboard settings dialog.
-- [Issue #723](https://github.com/grafana/grafana/issues/723). Dashboard: Fix for hide controls setting not used/initialized on dashboard load
-- [Issue #724](https://github.com/grafana/grafana/issues/724). Dashboard: Fix for zoom out causing right hand "to" range to be set in the future.
-
-**Tech**
-
-- Upgraded from angularjs 1.1.5 to 1.3 beta 17;
-- Switch from underscore to lodash
-- helpers to easily unit test angularjs controllers and services
-- Test coverage through coveralls
-- Upgrade from jquery 1.8.0 to 2.1.1 (**Removes support for IE7 & IE8**)
-
-# 1.7.1 (unreleased)
-
-**Fixes**
-
-- [Issue #691](https://github.com/grafana/grafana/issues/691). Dashboard: Tooltip fixes, sometimes they would not show, and sometimes they would get stuck.
-- [Issue #695](https://github.com/grafana/grafana/issues/695). Dashboard: Tooltip on goto home menu icon would get stuck after clicking on it
-
-# 1.7.0 (2014-08-11)
-
-**Fixes**
-
-- [Issue #652](https://github.com/grafana/grafana/issues/652). Timepicker: Entering custom date range impossible when refresh is low (now is constantly reset)
-- [Issue #450](https://github.com/grafana/grafana/issues/450). Graph: Tooltip does not disappear sometimes and would get stuck
-- [Issue #655](https://github.com/grafana/grafana/issues/655). General: Auto refresh not initiated / started after dashboard loading
-- [Issue #657](https://github.com/grafana/grafana/issues/657). General: Fix for refresh icon in IE browsers
-- [Issue #661](https://github.com/grafana/grafana/issues/661). Annotations: Elasticsearch querystring with filter template replacements was not interpolated
-- [Issue #660](https://github.com/grafana/grafana/issues/660). OpenTSDB: fix opentsdb queries that returned more than one series
-
-**Change**
-
-- [Issue #681](https://github.com/grafana/grafana/issues/681). Dashboard: The panel error bar has been replaced with a small error indicator, this indicator does not change panel height and is a lot less intrusive. Hover over it for short details, click on it for more details.
-
-# 1.7.0-rc1 (2014-08-05)
-
-**New features or improvements**
-
-- [Issue #581](https://github.com/grafana/grafana/issues/581). InfluxDB: Add continuous query in series results (series typeahead).
-- [Issue #584](https://github.com/grafana/grafana/issues/584). InfluxDB: Support for alias & alias patterns when using raw query mode
-- [Issue #394](https://github.com/grafana/grafana/issues/394). InfluxDB: Annotation support
-- [Issue #633](https://github.com/grafana/grafana/issues/633). InfluxDB: InfluxDB can now act as a datastore for dashboards
-- [Issue #610](https://github.com/grafana/grafana/issues/610). InfluxDB: Support for InfluxdB v0.8 list series response schema (series typeahead)
-- [Issue #525](https://github.com/grafana/grafana/issues/525). InfluxDB: Enhanced series aliasing (legend names) with pattern replacements
-- [Issue #266](https://github.com/grafana/grafana/issues/266). Graphite: New option cacheTimeout to override graphite default memcache timeout
-- [Issue #606](https://github.com/grafana/grafana/issues/606). General: New global option in config.js to specify admin password (useful to hinder users from accidentally make changes)
-- [Issue #201](https://github.com/grafana/grafana/issues/201). Annotations: Elasticsearch data source support for events
-- [Issue #344](https://github.com/grafana/grafana/issues/344). Annotations: Annotations can now be fetched from non default data sources
-- [Issue #631](https://github.com/grafana/grafana/issues/631). Search: max_results config.js option & scroll in search results (To show more or all dashboards)
-- [Issue #511](https://github.com/grafana/grafana/issues/511). Text panel: Allow [[..]] filter notation in all text panels (markdown/html/text)
-- [Issue #136](https://github.com/grafana/grafana/issues/136). Graph: New legend display option "Align as table"
-- [Issue #556](https://github.com/grafana/grafana/issues/556). Graph: New legend display option "Right side", will show legend to the right of the graph
-- [Issue #604](https://github.com/grafana/grafana/issues/604). Graph: New axis format, 'bps' (SI unit in steps of 1000) useful for network gear metrics
-- [Issue #626](https://github.com/grafana/grafana/issues/626). Graph: Downscale y axis to more precise unit, value of 0.1 for seconds format will be formatted as 100 ms. Thanks @kamaradclimber
-- [Issue #618](https://github.com/grafana/grafana/issues/618). OpenTSDB: Series alias option to override metric name returned from opentsdb. Thanks @heldr
-
-**Documentation**
-
-- [Issue #635](https://github.com/grafana/grafana/issues/635). Docs for features and changes in v1.7, new troubleshooting guide, new Getting started guide, improved install & config guide.
-
-**Changes**
-
-- [Issue #536](https://github.com/grafana/grafana/issues/536). Graphite: Use unix epoch for Graphite from/to for absolute time ranges
-- [Issue #641](https://github.com/grafana/grafana/issues/536). General: Dashboard save temp copy feature settings moved from dashboard to config.js, default is enabled, and ttl to 30 days
-- [Issue #532](https://github.com/grafana/grafana/issues/532). Schema: Dashboard schema changes, "Unsaved changes" should not appear for schema changes. All changes are backward compatible with old schema.
-
-**Fixes**
-
-- [Issue #545](https://github.com/grafana/grafana/issues/545). Graph: Fix formatting negative values (axis formats, legend values)
-- [Issue #460](https://github.com/grafana/grafana/issues/460). Graph: fix for max legend value when max value is zero
-- [Issue #628](https://github.com/grafana/grafana/issues/628). Filtering: Fix for nested filters, changing a child filter could result in infinite recursion in some cases
-- [Issue #528](https://github.com/grafana/grafana/issues/528). Graphite: Fix for graphite expressions parser failure when metric expressions starts with curly brace segment
-
-# 1.6.1 (2014-06-24)
-
-**New features or improvements**
-
-- [Issue #360](https://github.com/grafana/grafana/issues/360). Ability to set y min/max for right y-axis (RR #519)
-
-**Fixes**
-
-- [Issue #500](https://github.com/grafana/grafana/issues/360). Fixes regex InfluxDB queries introduced in 1.6.0
-- [Issue #506](https://github.com/grafana/grafana/issues/506). Bug in when using % sign in legends (aliases), fixed by removing url decoding of metric names
-- [Issue #522](https://github.com/grafana/grafana/issues/522). Series names and column name typeahead cache fix
-- [Issue #504](https://github.com/grafana/grafana/issues/504). Fixed influxdb issue with raw query that caused wrong value column detection
-- [Issue #526](https://github.com/grafana/grafana/issues/526). Default property that marks which data source is default in config.js is now optional
-- [Issue #342](https://github.com/grafana/grafana/issues/342). Auto-refresh caused 2 refreshes (and hence multiple queries) each time (at least in firefox)
-
-# 1.6.0 (2014-06-16)
-
-#### New features or improvements
-
-- [Issue #427](https://github.com/grafana/grafana/issues/427). New Y-axis formater for metric values that represent seconds, Thanks @jippi
-- [Issue #390](https://github.com/grafana/grafana/issues/390). Allow special characters in series names (influxdb data source), Thanks @majst01
-- [Issue #428](https://github.com/grafana/grafana/issues/428). Refactoring of filterSrv, Thanks @Tetha
-- [Issue #445](https://github.com/grafana/grafana/issues/445). New config for playlist feature. Set playlist_timespan to set default playlist interval, Thanks @rmca
-- [Issue #461](https://github.com/grafana/grafana/issues/461). New graphite function definition added isNonNull, Thanks @tmonk42
-- [Issue #455](https://github.com/grafana/grafana/issues/455). New InfluxDB function difference add to function dropdown
-- [Issue #459](https://github.com/grafana/grafana/issues/459). Added parameter to keepLastValue graphite function definition (default 100)
-  [Issue #418](https://github.com/grafana/grafana/issues/418). to the browser cache when upgrading grafana and improve load performance
-- [Issue #327](https://github.com/grafana/grafana/issues/327). Partial support for url encoded metrics when using Graphite data source. Thanks @axe-felix
-- [Issue #473](https://github.com/grafana/grafana/issues/473). Improvement to InfluxDB query editor and function/value column selection
-- [Issue #375](https://github.com/grafana/grafana/issues/375). Initial support for filtering (templated queries) for InfluxDB. Thanks @mavimo
-- [Issue #475](https://github.com/grafana/grafana/issues/475). Row editing and adding new panel is now a lot quicker and easier with the new row menu
-- [Issue #211](https://github.com/grafana/grafana/issues/211). New data source! Initial support for OpenTSDB, Thanks @mpage
-- [Issue #492](https://github.com/grafana/grafana/issues/492). Improvement and polish to the OpenTSDB query editor
-- [Issue #441](https://github.com/grafana/grafana/issues/441). Influxdb group by support, Thanks @piis3
-- improved asset (css/js) build pipeline, added revision to css and js. Will remove issues related
-
-#### Changes
-
-- [Issue #475](https://github.com/grafana/grafana/issues/475). Add panel icon and Row edit button is replaced by the Row edit menu
-- New graphs now have a default empty query
-- Add Row button now creates a row with default height of 250px (no longer opens dashboard settings modal)
-- Clean up of config.sample.js, graphiteUrl removed (still works, but deprecated, removed in future)
-  Use data sources config instead. panel_names removed from config.js. Use plugins.panels to add custom panels
-- Graphite panel is now renamed graph (Existing dashboards will still work)
-
-#### Fixes
-
-- [Issue #126](https://github.com/grafana/grafana/issues/126). Graphite query lexer change, can now handle regex parameters for aliasSub function
-- [Issue #447](https://github.com/grafana/grafana/issues/447). Filter option loading when having multiple nested filters now works better. Options are now reloaded correctly and there are no multiple renders/refresh in between.
-- [Issue #412](https://github.com/grafana/grafana/issues/412). After a filter option is changed and a nested template param is reloaded, if the current value exists after the options are reloaded the current selected value is kept.
-- [Issue #460](https://github.com/grafana/grafana/issues/460). Legend Current value did not display when value was zero
-- [Issue #328](https://github.com/grafana/grafana/issues/328). Fix to series toggling bug that caused annotations to be hidden when toggling/hiding series.
-- [Issue #293](https://github.com/grafana/grafana/issues/293). Fix for graphite function selection menu that some times draws outside screen. It now displays upward
-- [Issue #350](https://github.com/grafana/grafana/issues/350). Fix for exclusive series toggling (hold down CTRL, SHIFT or META key) and left click a series for exclusive toggling
-- [Issue #472](https://github.com/grafana/grafana/issues/472). CTRL does not work on MAC OSX but SHIFT or META should (depending on browser)
-
-# 1.5.4 (2014-05-13)
-
-### New features and improvements
-
-- InfluxDB enhancement: support for multiple hosts (with retries) and raw queries ([Issue #318](https://github.com/grafana/grafana/issues/318), thx @toddboom)
-- Added rounding for graphites from and to time range filters
-  for very short absolute ranges ([Issue #320](https://github.com/grafana/grafana/issues/320))
-- Increased resolution for graphite datapoints (maxDataPoints), now equal to panel pixel width. ([Issue #5](https://github.com/grafana/grafana/issues/5))
-- Improvement to influxdb query editor, can now add where clause and alias ([Issue #331](https://github.com/grafana/grafana/issues/331), thanks @mavimo)
-- New config setting for graphite data source to control if json render request is POST or GET ([Issue #345](https://github.com/grafana/grafana/issues/345))
-- Unsaved changes warning feature ([Issue #324](https://github.com/grafana/grafana/issues/324))
-- Improvement to series toggling, CTRL+MouseClick on series name will now hide all others ([Issue #350](https://github.com/grafana/grafana/issues/350))
-
-### Changes
-
-- Graph default setting for Y-Min changed from zero to auto scaling (will not effect existing dashboards). ([Issue #386](https://github.com/grafana/grafana/issues/386)) - thx @kamaradclimber
-
-### Fixes
-
-- Fixes to filters and "All" option. It now never uses "\*" as value, but all options in a {node1, node2, node3} expression ([Issue #228](https://github.com/grafana/grafana/issues/228), #359)
-- Fix for InfluxDB query generation with columns containing dots or dashes ([Issue #369](https://github.com/grafana/grafana/issues/369), #348) - Thanks to @jbripley
-
-# 1.5.3 (2014-04-17)
-
-- Add support for async scripted dashboards ([Issue #274](https://github.com/grafana/grafana/issues/274))
-- Text panel now accepts html (for links to other dashboards, etc) ([Issue #236](https://github.com/grafana/grafana/issues/236))
-- Fix for Text panel, now changes take effect directly ([Issue #251](https://github.com/grafana/grafana/issues/251))
-- Fix when adding functions without params that did not cause graph to update ([Issue #267](https://github.com/grafana/grafana/issues/267))
-- Graphite errors are now much easier to see and troubleshoot with the new inspector ([Issue #265](https://github.com/grafana/grafana/issues/265))
-- Use influxdb aliases to distinguish between multiple columns ([Issue #283](https://github.com/grafana/grafana/issues/283))
-- Correction to ms axis formater, now formats days correctly. ([Issue #189](https://github.com/grafana/grafana/issues/189))
-- Css fix for Firefox and using top menu dropdowns in panel fullscreen / edit mode ([Issue #106](https://github.com/grafana/grafana/issues/106))
-- Browser page title is now Grafana - {{dashboard title}} ([Issue #294](https://github.com/grafana/grafana/issues/294))
-- Disable auto refresh zooming in (every time you change to an absolute time range), refresh will be restored when you change time range back to relative ([Issue #282](https://github.com/grafana/grafana/issues/282))
-- More graphite functions
-
-# 1.5.2 (2014-03-24)
-
-### New Features and improvements
-
-- Support for second optional params for functions like aliasByNode ([Issue #167](https://github.com/grafana/grafana/issues/167)). Read the wiki on the [Function Editor](https://github.com/torkelo/grafana/wiki/Graphite-Function-Editor) for more info.
-- More functions added to InfluxDB query editor ([Issue #218](https://github.com/grafana/grafana/issues/218))
-- Filters can now be used inside other filters (templated segments) ([Issue #128](https://github.com/grafana/grafana/issues/128))
-- More graphite functions added
-
-### Fixes
-
-- Float arguments now work for functions like scale ([Issue #223](https://github.com/grafana/grafana/issues/223))
-- Fix for graphite function editor, the graph & target was not updated after adding a function and leaving default params as is #191
-
-The zip files now contains a sub folder with project name and version prefix. ([Issue #209](https://github.com/grafana/grafana/issues/209))
-
-# 1.5.1 (2014-03-10)
-
-### Fixes
-
-- maxDataPoints must be an integer #184 (thanks @frejsoya for fixing this)
-
-For people who are find Grafana slow for large time spans or high resolution metrics. This is most likely due to graphite returning a large number of datapoints. The maxDataPoints parameter solves this issue. For maxDataPoints to work you need to run the latest graphite-web (some builds of 0.9.12 does not include this feature).
-
-Read this for more info:
-[Performance for large time spans](https://github.com/torkelo/grafana/wiki/Performance-for-large-time-spans)
-
-# 1.5.0 (2014-03-09)
-
-### New Features and improvements
-
-- New function editor [video demo](http://youtu.be/I90WHRwE1ZM) ([Issue #178](https://github.com/grafana/grafana/issues/178))
-- Links to function documentation from function editor ([Issue #3](https://github.com/grafana/grafana/issues/3))
-- Reorder functions ([Issue #130](https://github.com/grafana/grafana/issues/130))
-- [Initial support for InfluxDB](https://github.com/torkelo/grafana/wiki/InfluxDB) as metric data source (#103), need feedback!
-- [Dashboard playlist](https://github.com/torkelo/grafana/wiki/Dashboard-playlist) ([Issue #36](https://github.com/grafana/grafana/issues/36))
-- When adding aliasByNode smartly set node number ([Issue #175](https://github.com/grafana/grafana/issues/175))
-- Support graphite identifiers with embedded colons ([Issue #173](https://github.com/grafana/grafana/issues/173))
-- Typeahead & autocomplete when adding new function ([Issue #164](https://github.com/grafana/grafana/issues/164))
-- More graphite function definitions
-- Make "ms" axis format include hour, day, weeks, month and year ([Issue #149](https://github.com/grafana/grafana/issues/149))
-- Microsecond axis format ([Issue #146](https://github.com/grafana/grafana/issues/146))
-- Specify template parameters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123))
-
-### Fixes
-
-- Basic Auth fix ([Issue #152](https://github.com/grafana/grafana/issues/152))
-- Fix to annotations with graphite source & null values ([Issue #138](https://github.com/grafana/grafana/issues/138))
-
-# 1.4.0 (2014-02-21)
-
-### New Features
-
-- #44 Annotations! Required a lot of work to get right. Read wiki article for more info. Supported annotations data sources are graphite metrics and graphite events. Support for more will be added in the future!
-- #35 Support for multiple graphite servers! (Read wiki article for more)
-- #116 Back to dashboard link in top menu to easily exist full screen / edit mode.
-- #114, #97 Legend values now use the same y axes formatter
-- #77 Improvements and polish to the light theme
-
-### Changes
-
-- #98 Stack is no longer by default turned on in graph display settings.
-- Hide controls (Ctrl+h) now hides the sub menu row (where filtering, and annotations are). So if you had filtering enabled and hide controls enabled you will not see the filtering sub menu.
-
-### Fixes:
-
-- #94 Fix for bug that caused dashboard settings to sometimes not contain timepicker tab.
-- #110 Graph with many many metrics caused legend to push down graph editor below screen. You can now scroll in edit mode & full screen mode for graphs with lots of series & legends.
-- #104 Improvement to graphite target editor, select wildcard now gives you a "select metric" link for the next node.
-- #105 Added zero as a possible node value in groupByAlias function
-
-# 1.3.0 (2014-02-13)
-
-### New features or improvements
-
-- #86 Dashboard tags and search (see wiki article for details)
-- #54 Enhancement to filter / template. "Include All" improvement
-- #82 Dashboard search result sorted in alphabetical order
-
-### Fixes
-
-- #91 Custom date selector is one day behind
-- #89 Filter / template does not work after switching dashboard
-- #88 Closed / Minimized row css bug
-- #85 Added all parameters to summarize function
-- #83 Stack as percent should now work a lot better!
-
-# 1.2.0 (2014-02-10)
-
-### New features
-
-- #70 Grid Thresholds (warning and error regions or lines in graph)
-- #72 Added an example of a scripted dashboard and a short wiki article documenting scripted dashboards.
-
-### Fixes
-
-- #81 Grid min/max values are ignored bug
-- #80 "stacked as percent" graphs should always use "max" value of 100 bug
-- #73 Left Y format change did not work
-- #42 Fixes to grid min/max auto scaling
-- #69 Fixes to lexer/parser for metrics segments like "10-20".
-- #67 Allow decimal input for scale function
-- #68 Bug when trying to open dashboard while in edit mode
-
-# 1.1.0 (2014-02-06)
-
-### New features:
-
-- #22 Support for native graphite png renderer, does not support click and select zoom yet
-- #60 Support for legend values (cactiStyle, min, max, current, total, avg). The options for these are found in the new "Axes & Grid" tab for now.
-- #62 There is now a "New" button in the search/open dashboard view to quickly open a clean empty dashboard.
-- #55 Basic auth is now supported for elastic search as well
-- some new function definitions added (will focus more on this for next release).
-
-### Fixes
-
-- #45 zero values from graphite was handled as null.
-- #63 Kibana / Grafana on same host would use same localStorage keys, now fixed
-- #46 Impossible to edit graph without a name fixed.
-- #24 fix for dashboard search when elastic search is configured to disable \_all field.
-- #38 Improvement to lexer / parser to support pure numeric literals in metric segments
-
-Thanks to everyone who contributed fixes and provided feedback :+1:
-
-# 1.0.4 (2014-01-24)
-
-- [Issue #28](https://github.com/grafana/grafana/issues/28) - Relative time range caused 500 graphite error in some cases (thx rsommer for the fix)
-
-# 1.0.3 (2014-01-23)
-
-- #9 Add Y-axis format for milliseconds
-- #16 Add support for Basic Auth (use http://username:password@yourgraphitedomain.com)
-- #13 Relative time ranges now uses relative time ranges when issuing graphite query
-
-# 1.0.2 (2014-01-21)
-
-- [Issue #12](https://github.com/grafana/grafana/issues/12), should now work ok without ElasticSearch
-
-# 1.0.1 (2014-01-21)
-
-- Resize fix
-- Improvements to drag & drop
-- Added a few graphite function definitions
-- Fixed duplicate panel bug
-- Updated default dashboard with welcome message and randomWalk graph
-
-# 1.0.0 (2014-01-19)
-
-First public release

.changelog-archive/CHANGELOG.2.md

@@ -1,322 +0,0 @@
-# 2.6.1 (unreleased, 2.6.x branch)
-
-### New Features
-
-- **Elasticsearch**: Support for derivative unit option, closes [#3512](https://github.com/grafana/grafana/issues/3512)
-
-### Bug fixes
-
-- **Graph Panel**: Fixed typehead when adding series style override, closes [#3554](https://github.com/grafana/grafana/issues/3554)
-
-# 2.6.0 (2015-12-14)
-
-### New Features
-
-- **Elasticsearch**: Support for pipeline aggregations Moving average and derivative, closes [#2715](https://github.com/grafana/grafana/issues/2715)
-- **Elasticsearch**: Support for inline script and missing options for metrics, closes [#3500](https://github.com/grafana/grafana/issues/3500)
-- **Syslog**: Support for syslog logging, closes [#3161](https://github.com/grafana/grafana/pull/3161)
-- **Timepicker**: Always show refresh button even with refresh rate, closes [#3498](https://github.com/grafana/grafana/pull/3498)
-- **Login**: Make it possible to change the login hint on the login page, closes [#2571](https://github.com/grafana/grafana/pull/2571)
-
-### Bug Fixes
-
-- **metric editors**: Fix for clicking typeahead auto dropdown option, fixes [#3428](https://github.com/grafana/grafana/issues/3428)
-- **influxdb**: Fixed issue showing Group By label only on first query, fixes [#3453](https://github.com/grafana/grafana/issues/3453)
-- **logging**: Add more verbose info logging for http requests, closes [#3405](https://github.com/grafana/grafana/pull/3405)
-
-# 2.6.0-Beta1 (2015-12-04)
-
-### New Table Panel
-
-- **table**: New powerful and flexible table panel, closes [#215](https://github.com/grafana/grafana/issues/215)
-
-### Enhancements
-
-- **CloudWatch**: Support for multiple AWS Credentials, closes [#3053](https://github.com/grafana/grafana/issues/3053), [#3080](https://github.com/grafana/grafana/issues/3080)
-- **Elasticsearch**: Support for dynamic daily indices for annotations, closes [#3061](https://github.com/grafana/grafana/issues/3061)
-- **Elasticsearch**: Support for setting min_doc_count for date histogram, closes [#3416](https://github.com/grafana/grafana/issues/3416)
-- **Graph Panel**: Option to hide series with all zeroes from legend and tooltip, closes [#1381](https://github.com/grafana/grafana/issues/1381), [#3336](https://github.com/grafana/grafana/issues/3336)
-
-### Bug Fixes
-
-- **cloudwatch**: fix for handling of period for long time ranges, fixes [#3086](https://github.com/grafana/grafana/issues/3086)
-- **dashboard**: fix for collapse row by clicking on row title, fixes [#3065](https://github.com/grafana/grafana/issues/3065)
-- **influxdb**: fix for relative time ranges `last x months` and `last x years`, fixes [#3067](https://github.com/grafana/grafana/issues/3067)
-- **graph**: layout fix for color picker when right side legend was enabled, fixes [#3093](https://github.com/grafana/grafana/issues/3093)
-- **elasticsearch**: disabling elastic query (via eye) caused error, fixes [#3300](https://github.com/grafana/grafana/issues/3300)
-
-### Breaking changes
-
-- **elasticsearch**: Manual json edited queries are not supported any more (They very barely worked in 2.5)
-
-# 2.5 (2015-10-28)
-
-**New Feature: Mix data sources**
-
-- A built in data source is now available named `-- Mixed --`, When picked in the metrics tab,
-  it allows you to add queries of different data source types & instances to the same graph/panel!
-  [Issue #436](https://github.com/grafana/grafana/issues/436)
-
-**New Feature: Elasticsearch Metrics Query Editor and Viz Support**
-
-- Feature rich query editor and processing features enables you to issues all kind of metric queries to Elasticsearch
-- See [Issue #1034](https://github.com/grafana/grafana/issues/1034) for more info.
-
-**New Feature: New and much improved time picker**
-
-- Support for quick ranges like `Today`, `This day last week`, `This week`, `The day so far`, etc.
-- Improved UI and improved support for UTC, [Issue #2761](https://github.com/grafana/grafana/issues/2761) for more info.
-
-**User Onboarding**
-
-- Org admin can now send email invites (or invite links) to people who are not yet Grafana users
-- Sign up flow now supports email verification (if enabled)
-- See [Issue #2353](https://github.com/grafana/grafana/issues/2353) for more info.
-
-**Other new Features && Enhancements**
-
-- [Pull #2720](https://github.com/grafana/grafana/pull/2720). Admin: Initial basic quota support (per Org)
-- [Issue #2577](https://github.com/grafana/grafana/issues/2577). Panel: Resize handles in panel bottom right corners for easy width and height change
-- [Issue #2457](https://github.com/grafana/grafana/issues/2457). Admin: admin page for all grafana organizations (list / edit view)
-- [Issue #1186](https://github.com/grafana/grafana/issues/1186). Time Picker: New option `today`, will set time range from midnight to now
-- [Issue #2647](https://github.com/grafana/grafana/issues/2647). InfluxDB: You can now set group by time interval on each query
-- [Issue #2599](https://github.com/grafana/grafana/issues/2599). InfluxDB: Improved alias support, you can now use the `AS` clause for each select statement
-- [Issue #2708](https://github.com/grafana/grafana/issues/2708). InfluxDB: You can now set math expression for select clauses.
-- [Issue #1575](https://github.com/grafana/grafana/issues/1575). Drilldown link: now you can click on the external link icon in the panel header to access drilldown links!
-- [Issue #1646](https://github.com/grafana/grafana/issues/1646). OpenTSDB: Fetch list of aggregators from OpenTSDB
-- [Issue #2955](https://github.com/grafana/grafana/issues/2955). Graph: More axis units (Length, Volume, Temperature, Pressure, etc), thanks @greglook
-- [Issue #2928](https://github.com/grafana/grafana/issues/2928). LDAP: Support for searching for groups memberships, i.e. POSIX (no memberOf) schemas, also multiple ldap servers, and root ca cert, thanks @abligh
-
-**Fixes**
-
-- [Issue #2413](https://github.com/grafana/grafana/issues/2413). InfluxDB 0.9: Fix for handling empty series object in response from influxdb
-- [Issue #2574](https://github.com/grafana/grafana/issues/2574). Snapshot: Fix for snapshot with expire 7 days option, 7 days option not correct, was 7 hours
-- [Issue #2568](https://github.com/grafana/grafana/issues/2568). AuthProxy: Fix for server side rendering of panel when using auth proxy
-- [Issue #2490](https://github.com/grafana/grafana/issues/2490). Graphite: Dashboard import was broken in 2.1 and 2.1.1, working now
-- [Issue #2565](https://github.com/grafana/grafana/issues/2565). TimePicker: Fix for when you applied custom time range it did not refresh dashboard
-- [Issue #2563](https://github.com/grafana/grafana/issues/2563). Annotations: Fixed issue when html sanitizer fails for title to annotation body, now fallbacks to html escaping title and text
-- [Issue #2564](https://github.com/grafana/grafana/issues/2564). Templating: Another attempt at fixing #2534 (Init multi value template var used in repeat panel from url)
-- [Issue #2620](https://github.com/grafana/grafana/issues/2620). Graph: multi series tooltip did no highlight correct point when stacking was enabled and series were of different resolution
-- [Issue #2636](https://github.com/grafana/grafana/issues/2636). InfluxDB: Do no show template vars in dropdown for tag keys and group by keys
-- [Issue #2604](https://github.com/grafana/grafana/issues/2604). InfluxDB: More alias options, can now use `$[0-9]` syntax to reference part of a measurement name (separated by dots)
-
-**Breaking Changes**
-
-- Notice to makers/users of custom data sources, there is a minor breaking change in 2.2 that
-  require an update to custom data sources for them to work in 2.2. [Read this doc](https://github.com/grafana/grafana/tree/master/docs/sources/datasources/plugin_api.md) for more on the
-  data source api change.
-- Data source api changes, [PLUGIN_CHANGES.md](https://github.com/grafana/grafana/blob/master/public/app/plugins/PLUGIN_CHANGES.md)
-- The duplicate query function used in data source editors is changed, and moveMetricQuery function was renamed
-
-**Tech (Note for devs)**
-Started using Typescript (transpiled to ES5), uncompiled typescript files and less files are in public folder (in source tree)
-This folder is never modified by build steps. Compiled css and javascript files are put in public_gen, all other files
-that do not undergo transformation are just copied from public to public_gen, it is public_gen that is used by grafana-server
-if it is found.
-
-Grunt & Watch tasks:
-
-- `grunt` : default task, will remove public_gen, copy over all files from public, do less & typescript compilation
-- `grunt watch`: will watch for changes to less, and typescript files and compile them to public_gen, and for other files it will just copy them to public_gen
-
-# 2.1.3 (2015-08-24)
-
-**Fixes**
-
-- [Issue #2580](https://github.com/grafana/grafana/issues/2580). Packaging: ldap.toml was not marked as config file and could be overwritten in upgrade
-- [Issue #2564](https://github.com/grafana/grafana/issues/2564). Templating: Another attempt at fixing #2534 (Init multi value template var used in repeat panel from url)
-
-# 2.1.2 (2015-08-20)
-
-**Fixes**
-
-- [Issue #2558](https://github.com/grafana/grafana/issues/2558). DragDrop: Fix for broken drag drop behavior
-- [Issue #2534](https://github.com/grafana/grafana/issues/2534). Templating: fix for setting template variable value via url and having repeated panels or rows
-
-# 2.1.1 (2015-08-11)
-
-**Fixes**
-
-- [Issue #2443](https://github.com/grafana/grafana/issues/2443). Templating: Fix for buggy repeat row behavior when combined with with repeat panel due to recent change before 2.1 release
-- [Issue #2442](https://github.com/grafana/grafana/issues/2442). Templating: Fix text panel when using template variables in text in in repeated panel
-- [Issue #2446](https://github.com/grafana/grafana/issues/2446). InfluxDB: Fix for using template vars inside alias field (InfluxDB 0.9)
-- [Issue #2460](https://github.com/grafana/grafana/issues/2460). SinglestatPanel: Fix to handle series with no data points
-- [Issue #2461](https://github.com/grafana/grafana/issues/2461). LDAP: Fix for ldap users with empty email address
-- [Issue #2484](https://github.com/grafana/grafana/issues/2484). Graphite: Fix bug when using series ref (#A-Z) and referenced series is hidden in query editor.
-- [Issue #1896](https://github.com/grafana/grafana/issues/1896). Postgres: Dashboard search is now case insensitive when using Postgres
-
-**Enhancements**
-
-- [Issue #2477](https://github.com/grafana/grafana/issues/2477). InfluxDB(0.9): Added more condition operators (`<`, `>`, `<>`, `!~`), thx @thuck
-- [Issue #2483](https://github.com/grafana/grafana/issues/2484). InfluxDB(0.9): Use \$col as option in alias patterns, thx @thuck
-
-# 2.1.0 (2015-08-04)
-
-**Data sources**
-
-- [Issue #1525](https://github.com/grafana/grafana/issues/1525). InfluxDB: Full support for InfluxDB 0.9 with new adapted query editor
-- [Issue #2191](https://github.com/grafana/grafana/issues/2191). KariosDB: Grafana now ships with a KariosDB data source plugin, thx @masaori335
-- [Issue #1177](https://github.com/grafana/grafana/issues/1177). OpenTSDB: Limit tags by metric, OpenTSDB config option tsd.core.meta.enable_realtime_ts must enabled for OpenTSDB lookup api
-- [Issue #1250](https://github.com/grafana/grafana/issues/1250). OpenTSDB: Support for template variable values lookup queries
-
-**New dashboard features**
-
-- [Issue #1144](https://github.com/grafana/grafana/issues/1144). Templating: You can now select multiple template variables values at the same time.
-- [Issue #1922](https://github.com/grafana/grafana/issues/1922). Templating: Specify multiple variable values via URL params.
-- [Issue #1888](https://github.com/grafana/grafana/issues/1144). Templating: Repeat panel or row for each selected template variable value
-- [Issue #1888](https://github.com/grafana/grafana/issues/1944). Dashboard: Custom Navigation links & dynamic links to related dashboards
-- [Issue #590](https://github.com/grafana/grafana/issues/590). Graph: Define series color using regex rule
-- [Issue #2162](https://github.com/grafana/grafana/issues/2162). Graph: New series style override, negative-y transform and stack groups
-- [Issue #2096](https://github.com/grafana/grafana/issues/2096). Dashboard list panel: Now supports search by multiple tags
-- [Issue #2203](https://github.com/grafana/grafana/issues/2203). Singlestat: Now support string values
-
-**User or Organization admin**
-
-- [Issue #1899](https://github.com/grafana/grafana/issues/1899). Organization: You can now update the organization user role directly (without removing and readding the organization user).
-- [Issue #2088](https://github.com/grafana/grafana/issues/2088). Roles: New user role `Read Only Editor` that replaces the old `Viewer` role behavior
-
-**Backend**
-
-- [Issue #2218](https://github.com/grafana/grafana/issues/2218). Auth: You can now authenticate against api with username / password using basic auth
-- [Issue #2095](https://github.com/grafana/grafana/issues/2095). Search: Search now supports filtering by multiple dashboard tags
-- [Issue #1905](https://github.com/grafana/grafana/issues/1905). GitHub OAuth: You can now configure a GitHub team membership requirement, thx @dewski
-- [Issue #2052](https://github.com/grafana/grafana/issues/2052). GitHub OAuth: You can now configure a GitHub organization requirement, thx @indrekj
-- [Issue #1891](https://github.com/grafana/grafana/issues/1891). Security: New config option to disable the use of gravatar for profile images
-- [Issue #1921](https://github.com/grafana/grafana/issues/1921). Auth: Support for user authentication via reverse proxy header (like X-Authenticated-User, or X-WEBAUTH-USER)
-- [Issue #960](https://github.com/grafana/grafana/issues/960). Search: Backend can now index a folder with json files, will be available in search (saving back to folder is not supported, this feature is meant for static generated json dashboards)
-
-**Breaking changes**
-
-- [Issue #1826](https://github.com/grafana/grafana/issues/1826). User role 'Viewer' are now prohibited from entering edit mode (and doing other transient dashboard edits). A new role `Read Only Editor` will replace the old Viewer behavior
-- [Issue #1928](https://github.com/grafana/grafana/issues/1928). HTTP API: GET /api/dashboards/db/:slug response changed property `model` to `dashboard` to match the POST request naming
-- Backend render URL changed from `/render/dashboard/solo` `render/dashboard-solo/` (in order to have consistent dashboard url `/dashboard/:type/:slug`)
-- Search HTTP API response has changed (simplified), tags list moved to separate HTTP resource URI
-- Data source HTTP api breaking change, ADD data source is now POST /api/datasources/, update is now PUT /api/datasources/:id
-
-**Fixes**
-
-- [Issue #2185](https://github.com/grafana/grafana/issues/2185). Graph: fixed PNG rendering of panels with legend table to the right
-- [Issue #2163](https://github.com/grafana/grafana/issues/2163). Backend: Load dashboards with capital letters in the dashboard url slug (url id)
-
-# 2.0.3 (unreleased - 2.0.x branch)
-
-**Fixes**
-
-- [Issue #1872](https://github.com/grafana/grafana/issues/1872). Firefox/IE issue, invisible text in dashboard search fixed
-- [Issue #1857](https://github.com/grafana/grafana/issues/1857). /api/login/ping Fix for issue when behind reverse proxy and subpath
-- [Issue #1863](https://github.com/grafana/grafana/issues/1863). MySQL: Dashboard.data column type changed to mediumtext (sql migration added)
-
-# 2.0.2 (2015-04-22)
-
-**Fixes**
-
-- [Issue #1832](https://github.com/grafana/grafana/issues/1832). Graph Panel + Legend Table mode: Many series caused zero height graph, now legend will never reduce the height of the graph below 50% of row height.
-- [Issue #1846](https://github.com/grafana/grafana/issues/1846). Snapshots: Fixed issue with snapshotting dashboards with an interval template variable
-- [Issue #1848](https://github.com/grafana/grafana/issues/1848). Panel timeshift: You can now use panel timeshift without a relative time override
-
-# 2.0.1 (2015-04-20)
-
-**Fixes**
-
-- [Issue #1784](https://github.com/grafana/grafana/issues/1784). Data source proxy: Fixed issue with using data source proxy when grafana is behind nginx suburl
-- [Issue #1749](https://github.com/grafana/grafana/issues/1749). Graph Panel: Table legends are now visible when rendered to PNG
-- [Issue #1786](https://github.com/grafana/grafana/issues/1786). Graph Panel: Legend in table mode now aligns, graph area is reduced depending on how many series
-- [Issue #1734](https://github.com/grafana/grafana/issues/1734). Support for unicode / international characters in dashboard title (improved slugify)
-- [Issue #1782](https://github.com/grafana/grafana/issues/1782). GitHub OAuth: Now works with GitHub for Enterprise, thanks @williamjoy
-- [Issue #1780](https://github.com/grafana/grafana/issues/1780). Dashboard snapshot: Should not require login to view snapshot, Fixes #1780
-
-# 2.0.0-Beta3 (2015-04-12)
-
-**RPM / DEB Package changes (to follow HFS)**
-
-- binary name changed to grafana-server
-- does not install to `/opt/grafana` any more, installs to `/usr/share/grafana`
-- binary to `/usr/sbin/grafana-server`
-- init.d script improvements, renamed to `/etc/init.d/grafana-server`
-- added default file with environment variables,
-
-  - `/etc/default/grafana-server` (deb/ubuntu)
-  - `/etc/sysconfig/grafana-server` (centos/redhat)
-
-- added systemd service file, tested on debian jessie and centos7
-- config file in same location `/etc/grafana/grafana.ini` (now complete config file but with every setting commented out)
-- data directory (where sqlite3) file is stored is now by default `/var/lib/grafana`
-- no symlinking current to versions anymore
-- For more info see [Issue #1758](https://github.com/grafana/grafana/issues/1758).
-
-**Config breaking change (setting rename)**
-
-- `[log] root_path` has changed to `[paths] logs`
-
-# 2.0.0-Beta2 (...)
-
-**Enhancements**
-
-- [Issue #1701](https://github.com/grafana/grafana/issues/1701). Share modal: Override UI theme via URL param for Share link, rendered panel, or embedded panel
-- [Issue #1660](https://github.com/grafana/grafana/issues/1660). OAuth: Specify allowed email address domains for google or and github oauth logins
-
-**Fixes**
-
-- [Issue #1649](https://github.com/grafana/grafana/issues/1649). HTTP API: grafana /render calls nows with api keys
-- [Issue #1667](https://github.com/grafana/grafana/issues/1667). Data source proxy & session timeout fix (caused 401 Unauthorized error after a while)
-- [Issue #1707](https://github.com/grafana/grafana/issues/1707). Unsaved changes: Do not show for snapshots, scripted and file based dashboards
-- [Issue #1703](https://github.com/grafana/grafana/issues/1703). Unsaved changes: Do not show for users with role `Viewer`
-- [Issue #1675](https://github.com/grafana/grafana/issues/1675). Data source proxy: Fixed issue with Gzip enabled and data source proxy
-- [Issue #1681](https://github.com/grafana/grafana/issues/1681). MySQL session: fixed problem using mysql as session store
-- [Issue #1671](https://github.com/grafana/grafana/issues/1671). Data sources: Fixed issue with changing default data source (should not require full page load to take effect, now fixed)
-- [Issue #1685](https://github.com/grafana/grafana/issues/1685). Search: Dashboard results should be sorted alphabetically
-- [Issue #1673](https://github.com/grafana/grafana/issues/1673). Basic auth: Fixed issue when using basic auth proxy infront of Grafana
-
-# 2.0.0-Beta1 (2015-03-30)
-
-**Important Note**
-
-Grafana 2.x is fundamentally different from 1.x; it now ships with an integrated backend server. Please read the [Documentation](http://docs.grafana.org) for more detailed about this SIGNIFICANT change to Grafana
-
-**New features**
-
-- [Issue #1623](https://github.com/grafana/grafana/issues/1623). Share Dashboard: Dashboard snapshot sharing (dash and data snapshot), save to local or save to public snapshot dashboard snapshots.raintank.io site
-- [Issue #1622](https://github.com/grafana/grafana/issues/1622). Share Panel: The share modal now has an embed option, gives you an iframe that you can use to embed a single graph on another web site
-- [Issue #718](https://github.com/grafana/grafana/issues/718). Dashboard: When saving a dashboard and another user has made changes in between the user is prompted with a warning if he really wants to overwrite the other's changes
-- [Issue #1331](https://github.com/grafana/grafana/issues/1331). Graph & Singlestat: New axis/unit format selector and more units (kbytes, Joule, Watt, eV), and new design for graph axis & grid tab and single stat options tab views
-- [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change `now` to be for example `now-1m`, useful when you want to ignore last minute because it contains incomplete data
-- [Issue #171](https://github.com/grafana/grafana/issues/171). Panel: Different time periods, panels can override dashboard relative time and/or add a time shift
-- [Issue #1488](https://github.com/grafana/grafana/issues/1488). Dashboard: Clone dashboard / Save as
-- [Issue #1458](https://github.com/grafana/grafana/issues/1458). User: persisted user option for dark or light theme (no longer an option on a dashboard)
-- [Issue #452](https://github.com/grafana/grafana/issues/452). Graph: Adds logarithmic scale option for base 10, base 16 and base 1024
-
-**Enhancements**
-
-- [Issue #1366](https://github.com/grafana/grafana/issues/1366). Graph & Singlestat: Support for additional units, Fahrenheit (°F) and Celsius (°C), Humidity (%H), kW, watt-hour (Wh), kilowatt-hour (kWh), velocities (m/s, km/h, mpg, knot)
-- [Issue #978](https://github.com/grafana/grafana/issues/978). Graph: Shared tooltip improvement, can now support metrics of different resolution/intervals
-- [Issue #1297](https://github.com/grafana/grafana/issues/1297). Graphite: Added cumulative and minimumBelow graphite functions
-- [Issue #1296](https://github.com/grafana/grafana/issues/1296). InfluxDB: Auto escape column names with special characters. Thanks @steven-aerts
-- [Issue #1321](https://github.com/grafana/grafana/issues/1321). SingleStatPanel: You can now use template variables in pre & postfix
-- [Issue #599](https://github.com/grafana/grafana/issues/599). Graph: Added right y axis label setting and graph support
-- [Issue #1253](https://github.com/grafana/grafana/issues/1253). Graph & Singlestat: Users can now set decimal precision for legend and tooltips (override auto precision)
-- [Issue #1255](https://github.com/grafana/grafana/issues/1255). Templating: Dashboard will now wait to load until all template variables that have refresh on load set or are initialized via url to be fully loaded and so all variables are in valid state before panels start issuing metric requests.
-- [Issue #1344](https://github.com/grafana/grafana/issues/1344). OpenTSDB: Alias patterns (reference tag values), syntax is: \$tag_tagname or [[tag_tagname]]
-
-**Fixes**
-
-- [Issue #1298](https://github.com/grafana/grafana/issues/1298). InfluxDB: Fix handling of empty array in templating variable query
-- [Issue #1309](https://github.com/grafana/grafana/issues/1309). Graph: Fixed issue when using zero as a grid threshold
-- [Issue #1345](https://github.com/grafana/grafana/issues/1345). UI: Fixed position of confirm modal when scrolled down
-- [Issue #1372](https://github.com/grafana/grafana/issues/1372). Graphite: Fix for nested complex queries, where a query references a query that references another query (ie the #[A-Z] syntax)
-- [Issue #1363](https://github.com/grafana/grafana/issues/1363). Templating: Fix to allow custom template variables to contain white space, now only splits on ','
-- [Issue #1359](https://github.com/grafana/grafana/issues/1359). Graph: Fix for all series tooltip showing series with all null values when `Hide Empty` option is enabled
-- [Issue #1497](https://github.com/grafana/grafana/issues/1497). Dashboard: Fixed memory leak when switching dashboards
-
-**Changes**
-
-- Dashboard title change & save will no longer create a new dashboard, it will just change the title.
-
-**OpenTSDB breaking change**
-
-- [Issue #1438](https://github.com/grafana/grafana/issues/1438). OpenTSDB: Automatic downsample interval passed to OpenTSDB (depends on timespan and graph width)
-- NOTICE, Downsampling is now enabled by default, so if you have not picked a downsample aggregator in your metric query do so or your graphs will be misleading
-- This will make Grafana a lot quicker for OpenTSDB users when viewing large time spans without having to change the downsample interval manually.
-
-**Tech**
-
-- [Issue #1311](https://github.com/grafana/grafana/issues/1311). Tech: Updated Font-Awesome from 3.2 to 4.2

.changelog-archive/CHANGELOG.3.md

@@ -1,226 +0,0 @@
-# 3.1.2 (unreleased)
-
-- **Templating**: Fixed issue when combining row & panel repeats, fixes [#5790](https://github.com/grafana/grafana/issues/5790)
-- **Drag&Drop**: Fixed issue with drag and drop in latest Chrome(51+), fixes [#5767](https://github.com/grafana/grafana/issues/5767)
-- **Internal Metrics**: Fixed issue with dots in instance_name when sending internal metrics to Graphite, fixes [#5739](https://github.com/grafana/grafana/issues/5739)
-- **Grafana-CLI**: Add default plugin path for MAC OS, fixes [#5806](https://github.com/grafana/grafana/issues/5806)
-- **Grafana-CLI**: Improve error message for upgrade-all command, fixes [#5885](https://github.com/grafana/grafana/issues/5885)
-
-# 3.1.1 (2016-08-01)
-
-- **IFrame embedding**: Fixed issue of using full iframe height, fixes [#5605](https://github.com/grafana/grafana/issues/5606)
-- **Panel PNG rendering**: Fixed issue detecting render completion, fixes [#5605](https://github.com/grafana/grafana/issues/5606)
-- **Elasticsearch**: Fixed issue with templating query and json parse error, fixes [#5615](https://github.com/grafana/grafana/issues/5615)
-- **Tech**: Upgraded JQuery to 2.2.4 to fix Security vulnerabilities in 2.1.4, fixes [#5627](https://github.com/grafana/grafana/issues/5627)
-- **Graphite**: Fixed issue with mixed data sources and Graphite, fixes [#5617](https://github.com/grafana/grafana/issues/5617)
-- **Templating**: Fixed issue with template variable query was issued multiple times during dashboard load, fixes [#5637](https://github.com/grafana/grafana/issues/5637)
-- **Zoom**: Fixed issues with zoom in and out on embedded (iframed) panel, fixes [#4489](https://github.com/grafana/grafana/issues/4489), [#5666](https://github.com/grafana/grafana/issues/5666)
-
-# 3.1.0 stable (2016-07-12)
-
-### Bugfixes & Enhancements,
-
-- **User Alert Notices**: Backend error alert popups did not show properly, fixes [#5435](https://github.com/grafana/grafana/issues/5435)
-- **Table**: Added sanitize HTML option to allow links in table cells, fixes [#4596](https://github.com/grafana/grafana/issues/4596)
-- **Apps**: App dashboards are automatically synced to DB at startup after plugin update, fixes [#5529](https://github.com/grafana/grafana/issues/5529)
-
-# 3.1.0-beta1 (2016-06-23)
-
-### Enhancements
-
-- **Dashboard Export/Import**: Dashboard export now templatize data sources and constant variables, users pick these on import, closes [#5084](https://github.com/grafana/grafana/issues/5084)
-- **Dashboard Url**: Time range changes updates url, closes [#458](https://github.com/grafana/grafana/issues/458)
-- **Dashboard Url**: Template variable change updates url, closes [#5002](https://github.com/grafana/grafana/issues/5002)
-- **Singlestat**: Add support for range to text mappings, closes [#1319](https://github.com/grafana/grafana/issues/1319)
-- **Graph**: Adds sort order options for graph tooltip, closes [#1189](https://github.com/grafana/grafana/issues/1189)
-- **Theme**: Add default theme to config file [#5011](https://github.com/grafana/grafana/pull/5011)
-- **Page Footer**: Added page footer with links to docs, shows Grafana version and info if new version is available, closes [#4889](https://github.com/grafana/grafana/pull/4889)
-- **InfluxDB**: Add spread function, closes [#5211](https://github.com/grafana/grafana/issues/5211)
-- **Scripts**: Use restart instead of start for deb package script, closes [#5282](https://github.com/grafana/grafana/pull/5282)
-- **Logging**: Moved to structured logging lib, and moved to component specific level filters via config file, closes [#4590](https://github.com/grafana/grafana/issues/4590)
-- **OpenTSDB**: Support nested template variables in tag_values function, closes [#4398](https://github.com/grafana/grafana/issues/4398)
-- **Data Source**: Pending data source requests are canceled before new ones are issues (Graphite & Prometheus), closes [#5321](https://github.com/grafana/grafana/issues/5321)
-
-### Breaking changes
-
-- **Logging** : Changed default logging output format (now structured into message, and key value pairs, with logger key acting as component). You can also no change in config to json log output.
-- **Graphite** : The Graph panel no longer have a Graphite PNG option. closes [#5367](https://github.com/grafana/grafana/issues/5367)
-
-### Bug fixes
-
-- **PNG rendering**: Fixed phantomjs rendering and y-axis label rotation. fixes [#5220](https://github.com/grafana/grafana/issues/5220)
-- **CLI**: The cli tool now supports reading plugin.json from dist/plugin.json. fixes [#5410](https://github.com/grafana/grafana/issues/5410)
-
-# 3.0.4 Patch release (2016-05-25)
-
-- **Panel**: Fixed blank dashboard issue when switching to other dashboard while in fullscreen edit mode, fixes [#5163](https://github.com/grafana/grafana/pull/5163)
-- **Templating**: Fixed issue with nested multi select variables and cascading and updating child variable selection state, fixes [#4861](https://github.com/grafana/grafana/pull/4861)
-- **Templating**: Fixed issue with using templated data source in another template variable query, fixes [#5165](https://github.com/grafana/grafana/pull/5165)
-- **Singlestat gauge**: Fixed issue with gauge render position, fixes [#5143](https://github.com/grafana/grafana/pull/5143)
-- **Home dashboard**: Fixes broken home dashboard api, fixes [#5167](https://github.com/grafana/grafana/issues/5167)
-
-# 3.0.3 Patch release (2016-05-23)
-
-- **Annotations**: Annotations can now use a template variable as data source, closes [#5054](https://github.com/grafana/grafana/issues/5054)
-- **Time picker**: Fixed issue timepicker and UTC when reading time from URL, fixes [#5078](https://github.com/grafana/grafana/issues/5078)
-- **CloudWatch**: Support for Multiple Account by AssumeRole, closes [#3522](https://github.com/grafana/grafana/issues/3522)
-- **Singlestat**: Fixed alignment and minimum height issue, fixes [#5113](https://github.com/grafana/grafana/issues/5113), fixes [#4679](https://github.com/grafana/grafana/issues/4679)
-- **Share modal**: Fixed link when using grafana under dashboard sub url, fixes [#5109](https://github.com/grafana/grafana/issues/5109)
-- **Prometheus**: Fixed bug in query editor that caused it not to load when reloading page, fixes [#5107](https://github.com/grafana/grafana/issues/5107)
-- **Elasticsearch**: Fixed bug when template variable query returns numeric values, fixes [#5097](https://github.com/grafana/grafana/issues/5097), fixes [#5088](https://github.com/grafana/grafana/issues/5088)
-- **Logging**: Fixed issue with reading logging level value, fixes [#5079](https://github.com/grafana/grafana/issues/5079)
-- **Timepicker**: Fixed issue with timepicker and UTC when reading time from URL, fixes [#5078](https://github.com/grafana/grafana/issues/5078)
-- **Docs**: Added docs for org & user preferences HTTP API, closes [#5069](https://github.com/grafana/grafana/issues/5069)
-- **Plugin list panel**: Now shows correct enable state for apps when not enabled, fixes [#5068](https://github.com/grafana/grafana/issues/5068)
-- **Elasticsearch**: Templating & Annotation queries that use template variables are now formatted correctly, fixes [#5135](https://github.com/grafana/grafana/issues/5135)
-
-# 3.0.2 Patch release (2016-05-16)
-
-- **Templating**: Fixed issue mixing row repeat and panel repeats, fixes [#4988](https://github.com/grafana/grafana/issues/4988)
-- **Templating**: Fixed issue detecting dependencies in nested variables, fixes [#4987](https://github.com/grafana/grafana/issues/4987), fixes [#4986](https://github.com/grafana/grafana/issues/4986)
-- **Graph**: Fixed broken PNG rendering in graph panel, fixes [#5025](https://github.com/grafana/grafana/issues/5025)
-- **Graph**: Fixed broken xaxis on graph panel, fixes [#5024](https://github.com/grafana/grafana/issues/5024)
-
-- **Influxdb**: Fixes crash when hiding middle series, fixes [#5005](https://github.com/grafana/grafana/issues/5005)
-
-# 3.0.1 Stable (2016-05-11)
-
-### Bug fixes
-
-- **Templating**: Fixed issue with new data source variable not persisting current selected value, fixes [#4934](https://github.com/grafana/grafana/issues/4934)
-
-# 3.0.0-beta7 (2016-05-02)
-
-### Bug fixes
-
-- **Dashboard title**: Fixed max dashboard title width (media query) for large screens, fixes [#4859](https://github.com/grafana/grafana/issues/4859)
-- **Annotations**: Fixed issue with entering annotation edit view, fixes [#4857](https://github.com/grafana/grafana/issues/4857)
-- **Remove query**: Fixed issue with removing query for data sources without collapsible query editors, fixes [#4856](https://github.com/grafana/grafana/issues/4856)
-- **Graphite PNG**: Fixed issue graphite png rendering option, fixes [#4864](https://github.com/grafana/grafana/issues/4864)
-- **InfluxDB**: Fixed issue missing plus group by iconn, fixes [#4862](https://github.com/grafana/grafana/issues/4862)
-- **Graph**: Fixes missing line mode for thresholds, fixes [#4902](https://github.com/grafana/grafana/pull/4902)
-
-### Enhancements
-
-- **InfluxDB**: Added new functions moving_average and difference to query editor, closes [#4698](https://github.com/grafana/grafana/issues/4698)
-
-# 3.0.0-beta6 (2016-04-29)
-
-### Enhancements
-
-- **Singlestat**: Support for gauges in singlestat panel. closes [#3688](https://github.com/grafana/grafana/pull/3688)
-- **Templating**: Support for data source as variable, closes [#816](https://github.com/grafana/grafana/pull/816)
-
-### Bug fixes
-
-- **InfluxDB 0.12**: Fixed issue templating and `show tag values` query only returning tags for first measurement, fixes [#4726](https://github.com/grafana/grafana/issues/4726)
-- **Templating**: Fixed issue with regex formatting when matching multiple values, fixes [#4755](https://github.com/grafana/grafana/issues/4755)
-- **Templating**: Fixed issue with custom all value and escaping, fixes [#4736](https://github.com/grafana/grafana/issues/4736)
-- **Dashlist**: Fixed issue dashboard list panel and caching tags, fixes [#4768](https://github.com/grafana/grafana/issues/4768)
-- **Graph**: Fixed issue with unneeded scrollbar in legend for Firefox, fixes [#4760](https://github.com/grafana/grafana/issues/4760)
-- **Table panel**: Fixed issue table panel formatting string array properties, fixes [#4791](https://github.com/grafana/grafana/issues/4791)
-- **grafana-cli**: Improve error message when failing to install plugins due to corrupt response, fixes [#4651](https://github.com/grafana/grafana/issues/4651)
-- **Singlestat**: Fixes prefix an postfix for gauges, fixes [#4812](https://github.com/grafana/grafana/issues/4812)
-- **Singlestat**: Fixes auto-refresh on change for some options, fixes [#4809](https://github.com/grafana/grafana/issues/4809)
-
-### Breaking changes
-
-**Data Source Query Editors**: Issue [#3900](https://github.com/grafana/grafana/issues/3900)
-
-Query editors have been updated to use the new form styles. External data source plugins needs to be
-updated to work. Sorry to introduce breaking change this late in beta phase. We wanted to get this change
-in before 3.0 stable is released so we don't have to break data sources in next release (3.1). If you are
-a data source plugin author and want help for how the new form styles work please ask for help in
-slack channel (link to slack channel in readme).
-
-# 3.0.0-beta5 (2016-04-15)
-
-### Bug fixes
-
-- **grafana-cli**: Fixed issue grafana-cli tool, did not detect the right plugin dir, fixes [#4723](https://github.com/grafana/grafana/issues/4723)
-- **Graph**: Fixed issue with light theme text color issue in tooltip, fixes [#4702](https://github.com/grafana/grafana/issues/4702)
-- **Snapshot**: Fixed issue with empty snapshots, fixes [#4706](https://github.com/grafana/grafana/issues/4706)
-
-# 3.0.0-beta4 (2016-04-13)
-
-### Bug fixes
-
-- **Home dashboard**: Fixed issue with permission denied error on home dashboard, fixes [#4686](https://github.com/grafana/grafana/issues/4686)
-- **Templating**: Fixed issue templating variables that use regex extraction, fixes [#4672](https://github.com/grafana/grafana/issues/4672)
-
-# 3.0.0-beta3 (2016-04-12)
-
-### Enhancements
-
-- **InfluxDB**: Changed multi query encoding to work with InfluxDB 0.11 & 0.12, closes [#4533](https://github.com/grafana/grafana/issues/4533)
-- **Timepicker**: Add arrows and shortcuts for moving back and forth in current dashboard, closes [#119](https://github.com/grafana/grafana/issues/119)
-
-### Bug fixes
-
-- **Postgres**: Fixed page render crash when using postgres, fixes [#4558](https://github.com/grafana/grafana/issues/4558)
-- **Table panel**: Fixed table panel bug when trying to show annotations in table panel, fixes [#4563](https://github.com/grafana/grafana/issues/4563)
-- **App Config**: Fixed app config issue showing content of other app config, fixes [#4575](https://github.com/grafana/grafana/issues/4575)
-- **Graph Panel**: Fixed legend option max not updating, fixes [#4601](https://github.com/grafana/grafana/issues/4601)
-- **Graph Panel**: Fixed issue where newly added graph panels shared same axes config, fixes [#4582](https://github.com/grafana/grafana/issues/4582)
-- **Graph Panel**: Fixed issue with axis labels overlapping Y-axis, fixes [#4626](https://github.com/grafana/grafana/issues/4626)
-- **InfluxDB**: Fixed issue with templating query containing template variable, fixes [#4602](https://github.com/grafana/grafana/issues/4602)
-- **Graph Panel**: Fixed issue with hiding series and stacking, fixes [#4557](https://github.com/grafana/grafana/issues/4557)
-- **Graph Panel**: Fixed issue with legend height in table mode with few series, affected iframe embedding as well, fixes [#4640](https://github.com/grafana/grafana/issues/4640)
-
-# 3.0.0-beta2 (2016-04-04)
-
-### New Features (introduces since 3.0-beta1)
-
-- **Preferences**: Set home dashboard on user and org level, closes [#1678](https://github.com/grafana/grafana/issues/1678)
-- **Preferences**: Set timezone on user and org level, closes [#3214](https://github.com/grafana/grafana/issues/3214), [#1200](https://github.com/grafana/grafana/issues/1200)
-- **Preferences**: Set theme on user and org level, closes [#3214](https://github.com/grafana/grafana/issues/3214), [#1917](https://github.com/grafana/grafana/issues/1917)
-
-### Bug fixes
-
-- **Dashboard**: Fixed dashboard panel layout for mobile devices, fixes [#4529](https://github.com/grafana/grafana/issues/4529)
-- **Table Panel**: Fixed issue with table panel sort, fixes [#4532](https://github.com/grafana/grafana/issues/4532)
-- **Page Load Crash**: A data source with null jsonData would make Grafana fail to load page, fixes [#4536](https://github.com/grafana/grafana/issues/4536)
-- **Metrics tab**: Fix for missing data source name in data source selector, fixes [#4541](https://github.com/grafana/grafana/issues/4540)
-- **Graph**: Fix legend in table mode with series on right-y axis, fixes [#4551](https://github.com/grafana/grafana/issues/4551), [#1145](https://github.com/grafana/grafana/issues/1145)
-
-# 3.0.0-beta1 (2016-03-31)
-
-### New Features
-
-- **Playlists**: Playlists can now be persisted and started from urls, closes [#3655](https://github.com/grafana/grafana/issues/3655)
-- **Metadata**: Settings panel now shows dashboard metadata, closes [#3304](https://github.com/grafana/grafana/issues/3304)
-- **InfluxDB**: Support for policy selection in query editor, closes [#2018](https://github.com/grafana/grafana/issues/2018)
-- **Snapshots UI**: Dashboard snapshots list can be managed through UI, closes[#1984](https://github.com/grafana/grafana/issues/1984)
-- **Prometheus**: Prometheus annotation support, closes[#2883](https://github.com/grafana/grafana/pull/2883)
-- **Cli**: New cli tool for downloading and updating plugins
-- **Annotations**: Annotations can now contain links that can be clicked (you can navigate on to annotation popovers), closes [#1588](https://github.com/grafana/grafana/issues/1588)
-- **Opentsdb**: Opentsdb 2.2 filters support, closes[#3077](https://github.com/grafana/grafana/issues/3077)
-
-### Breaking changes
-
-- **Plugin API**: Both data source and panel plugin api (and plugin.json schema) have been updated, requiring an update to plugins. See [plugin api](https://github.com/grafana/grafana/blob/master/public/app/plugins/plugin_api.md) for more info.
-- **InfluxDB 0.8.x** The data source for the old version of influxdb (0.8.x) is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3523](https://github.com/grafana/grafana/issues/3523)
-- **KairosDB** The data source is no longer included in default builds, but can easily be installed via improved plugin system, closes [#3524](https://github.com/grafana/grafana/issues/3524)
-- **Templating**: Templating value formats (glob/regex/pipe etc) are now handled automatically and not specified by the user, this makes variable values possible to reuse in many contexts. It can in some edge cases break existing dashboards that have template variables that do not reload on dashboard load. To fix any issue just go into template variable options and update the variable (so it's values are reloaded.).
-
-### Enhancements
-
-- **LDAP**: Support for nested LDAP Groups, closes [#4401](https://github.com/grafana/grafana/issues/4401), [#3808](https://github.com/grafana/grafana/issues/3808)
-- **Sessions**: Support for memcached as session storage, closes [#3458](https://github.com/grafana/grafana/issues/3458)
-- **mysql**: Grafana now supports ssl for mysql, closes [#3584](https://github.com/grafana/grafana/issues/3584)
-- **snapshot**: Annotations are now included in snapshots, closes [#3635](https://github.com/grafana/grafana/issues/3635)
-- **Admin**: Admin can now have global overview of Grafana setup, closes [#3812](https://github.com/grafana/grafana/issues/3812)
-- **graph**: Right side legend height is now fixed at row height, closes [#1277](https://github.com/grafana/grafana/issues/1277)
-- **Table**: All content in table panel is now html escaped, closes [#3673](https://github.com/grafana/grafana/issues/3673)
-- **graph**: Template variables can now be used in TimeShift and TimeFrom, closes[#1960](https://github.com/grafana/grafana/issues/1960)
-- **Tooltip**: Optionally add milliseconds to timestamp in tool tip, closes[#2248](https://github.com/grafana/grafana/issues/2248)
-- **Opentsdb**: Support milliseconds when using openTSDB data source, closes [#2865](https://github.com/grafana/grafana/issues/2865)
-- **Opentsdb**: Add support for annotations, closes[#664](https://github.com/grafana/grafana/issues/664)
-
-### Bug fixes
-
-- **Playlist**: Fix for memory leak when running a playlist, closes [#3794](https://github.com/grafana/grafana/pull/3794)
-- **InfluxDB**: Fix for InfluxDB and table panel when using Format As Table and having group by time, fixes [#3928](https://github.com/grafana/grafana/issues/3928)
-- **Panel Time shift**: Fix for panel time range and using dashboard times like `Today` and `This Week`, fixes [#3941](https://github.com/grafana/grafana/issues/3941)
-- **Row repeat**: Repeated rows will now appear next to each other and not by the bottom of the dashboard, fixes [#3942](https://github.com/grafana/grafana/issues/3942)
-- **Png renderer**: Fix for phantomjs path on windows, fixes [#3657](https://github.com/grafana/grafana/issues/3657)

.changelog-archive/CHANGELOG.4.md

@@ -1,566 +0,0 @@
-# 4.6.4 (2018-08-29)
-
-### Important fix for LDAP & OAuth login vulnerability
-
-See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
-
-# 4.6.3 (2017-12-14)
-
-## Fixes
-
-- **Gzip**: Fixes bug gravatar images when gzip was enabled [#5952](https://github.com/grafana/grafana/issues/5952)
-- **Alert list**: Now shows alert state changes even after adding manual annotations on dashboard [#9951](https://github.com/grafana/grafana/issues/9951)
-- **Alerting**: Fixes bug where rules evaluated as firing when all conditions was false and using OR operator. [#9318](https://github.com/grafana/grafana/issues/9318)
-- **Cloudwatch**: CloudWatch no longer display metrics' default alias [#10151](https://github.com/grafana/grafana/issues/10151), thx [@mtanda](https://github.com/mtanda)
-
-# 4.6.2 (2017-11-16)
-
-## Important
-
-- **Prometheus**: Fixes bug with new prometheus alerts in Grafana. Make sure to download this version if you're using Prometheus for alerting. More details in the issue. [#9777](https://github.com/grafana/grafana/issues/9777)
-
-## Fixes
-
-- **Color picker**: Bug after using textbox input field to change/paste color string [#9769](https://github.com/grafana/grafana/issues/9769)
-- **Cloudwatch**: Fix for cloudwatch templating query `ec2_instance_attribute` [#9667](https://github.com/grafana/grafana/issues/9667), thanks [@mtanda](https://github.com/mtanda)
-- **Heatmap**: Fixed tooltip for "time series buckets" mode [#9332](https://github.com/grafana/grafana/issues/9332)
-- **InfluxDB**: Fixed query editor issue when using `>` or `<` operators in WHERE clause [#9871](https://github.com/grafana/grafana/issues/9871)
-
-# 4.6.1 (2017-11-01)
-
-- **Singlestat**: Lost thresholds when using save dashboard as [#9681](https://github.com/grafana/grafana/issues/9681)
-- **Graph**: Fix for series override color picker [#9715](https://github.com/grafana/grafana/issues/9715)
-- **Go**: build using golang 1.9.2 [#9713](https://github.com/grafana/grafana/issues/9713)
-- **Plugins**: Fixed problem with loading plugin js files behind auth proxy [#9509](https://github.com/grafana/grafana/issues/9509)
-- **Graphite**: Annotation tooltip should render empty string when undefined [#9707](https://github.com/grafana/grafana/issues/9707)
-
-# 4.6.0 (2017-10-26)
-
-## Fixes
-
-- **Alerting**: Viewer can no longer pause alert rules [#9640](https://github.com/grafana/grafana/issues/9640)
-- **Playlist**: Bug where playlist controls was missing [#9639](https://github.com/grafana/grafana/issues/9639)
-- **Firefox**: Creating region annotations now work in firefox [#9638](https://github.com/grafana/grafana/issues/9638)
-
-# 4.6.0-beta3 (2017-10-23)
-
-## Fixes
-
-- **Prometheus**: Fix for browser crash for short time ranges. [#9575](https://github.com/grafana/grafana/issues/9575)
-- **Heatmap**: Fix for y-axis not showing. [#9576](https://github.com/grafana/grafana/issues/9576)
-- **Save to file**: Fix for save to file in export modal. [#9586](https://github.com/grafana/grafana/issues/9586)
-- **Postgres**: modify group by time macro so it can be used in select clause [#9527](https://github.com/grafana/grafana/pull/9527), thanks [@svenklemm](https://github.com/svenklemm)
-
-# 4.6.0-beta2 (2017-10-17)
-
-## Fixes
-
-- **ColorPicker**: Fix for color picker not showing [#9549](https://github.com/grafana/grafana/issues/9549)
-- **Alerting**: Fix for broken test rule button in alert tab [#9539](https://github.com/grafana/grafana/issues/9539)
-- **Cloudwatch**: Provide error message when failing to add cloudwatch data source [#9534](https://github.com/grafana/grafana/pull/9534), thx [@mtanda](https://github.com/mtanda)
-- **Cloudwatch**: Fix unused period parameter [#9536](https://github.com/grafana/grafana/pull/9536), thx [@mtanda](https://github.com/mtanda)
-- **CSV Export**: Fix for broken CSV export [#9525](https://github.com/grafana/grafana/issues/9525)
-- **Text panel**: Fix for issue with break lines in Firefox [#9491](https://github.com/grafana/grafana/issues/9491)
-- **Annotations**: Fix for issue saving annotation event in MySQL DB [#9550](https://github.com/grafana/grafana/issues/9550), thanks [@krise3k](https://github.com/krise3k)
-
-# 4.6.0-beta1 (2017-10-13)
-
-## New Features
-
-- **Annotations**: Add support for creating annotations from graph panel [#8197](https://github.com/grafana/grafana/pull/8197)
-- **GCS**: Adds support for Google Cloud Storage [#8370](https://github.com/grafana/grafana/issues/8370) thx [@chuhlomin](https://github.com/chuhlomin)
-- **Prometheus**: Adds /metrics endpoint for exposing Grafana metrics. [#9187](https://github.com/grafana/grafana/pull/9187)
-- **Graph**: Add support for local formatting in axis. [#1395](https://github.com/grafana/grafana/issues/1395), thx [@m0nhawk](https://github.com/m0nhawk)
-- **Jaeger**: Add support for open tracing using jaeger in Grafana. [#9213](https://github.com/grafana/grafana/pull/9213)
-- **Unit types**: New date & time unit types added, useful in singlestat to show dates & times. [#3678](https://github.com/grafana/grafana/issues/3678), [#6710](https://github.com/grafana/grafana/issues/6710), [#2764](https://github.com/grafana/grafana/issues/2764)
-- **CLI**: Make it possible to install plugins from any url [#5873](https://github.com/grafana/grafana/issues/5873)
-- **Prometheus**: Add support for instant queries [#5765](https://github.com/grafana/grafana/issues/5765), thx [@mtanda](https://github.com/mtanda)
-- **Cloudwatch**: Add support for alerting using the cloudwatch data source [#8050](https://github.com/grafana/grafana/pull/8050), thx [@mtanda](https://github.com/mtanda)
-- **Pagerduty**: Include triggering series in pagerduty notification [#8479](https://github.com/grafana/grafana/issues/8479), thx [@rickymoorhouse](https://github.com/rickymoorhouse)
-- **Timezone**: Time ranges like Today & Yesterday now work correctly when timezone setting is set to UTC [#8916](https://github.com/grafana/grafana/issues/8916), thx [@ctide](https://github.com/ctide)
-- **Prometheus**: Align \$\_\_interval with the step parameters. [#9226](https://github.com/grafana/grafana/pull/9226), thx [@alin-amana](https://github.com/alin-amana)
-- **Prometheus**: Autocomplete for label name and label value [#9208](https://github.com/grafana/grafana/pull/9208), thx [@mtanda](https://github.com/mtanda)
-- **Postgres**: New Postgres data source [#9209](https://github.com/grafana/grafana/pull/9209), thx [@svenklemm](https://github.com/svenklemm)
-- **Data sources**: Make data source HTTP requests verify TLS by default. closes [#9371](https://github.com/grafana/grafana/issues/9371), [#5334](https://github.com/grafana/grafana/issues/5334), [#8812](https://github.com/grafana/grafana/issues/8812), thx [@mattbostock](https://github.com/mattbostock)
-- **OAuth**: Verify TLS during OAuth callback [#9373](https://github.com/grafana/grafana/issues/9373), thx [@mattbostock](https://github.com/mattbostock)
-
-## Minor
-
-- **SMTP**: Make it possible to set specific HELO for smtp client. [#9319](https://github.com/grafana/grafana/issues/9319)
-- **Dataproxy**: Allow grafana to renegotiate tls connection [#9250](https://github.com/grafana/grafana/issues/9250)
-- **HTTP**: set net.Dialer.DualStack to true for all http clients [#9367](https://github.com/grafana/grafana/pull/9367)
-- **Alerting**: Add diff and percent diff as series reducers [#9386](https://github.com/grafana/grafana/pull/9386), thx [@shanhuhai5739](https://github.com/shanhuhai5739)
-- **Slack**: Allow images to be uploaded to slack when Token is present [#7175](https://github.com/grafana/grafana/issues/7175), thx [@xginn8](https://github.com/xginn8)
-- **Opsgenie**: Use their latest API instead of old version [#9399](https://github.com/grafana/grafana/pull/9399), thx [@cglrkn](https://github.com/cglrkn)
-- **Table**: Add support for displaying the timestamp with milliseconds [#9429](https://github.com/grafana/grafana/pull/9429), thx [@s1061123](https://github.com/s1061123)
-- **Hipchat**: Add metrics, message and image to hipchat notifications [#9110](https://github.com/grafana/grafana/issues/9110), thx [@eloo](https://github.com/eloo)
-- **Kafka**: Add support for sending alert notifications to kafka [#7104](https://github.com/grafana/grafana/issues/7104), thx [@utkarshcmu](https://github.com/utkarshcmu)
-- **Alerting**: add count_non_null as series reducer [#9516](https://github.com/grafana/grafana/issues/9516)
-
-## Tech
-
-- **Go**: Grafana is now built using golang 1.9
-- **Webpack**: Changed from systemjs to webpack (see readme or building from source guide for new build instructions). Systemjs is still used to load plugins but now plugins can only import a limited set of dependencies. See [PLUGIN_DEV.md](https://github.com/grafana/grafana/blob/master/PLUGIN_DEV.md) for more details on how this can effect some plugins.
-
-# 4.5.2 (2017-09-22)
-
-## Fixes
-
-- **Graphite**: Fix for issues with jsonData & graphiteVersion null errors [#9258](https://github.com/grafana/grafana/issues/9258)
-- **Graphite**: Fix for Grafana internal metrics to Graphite sending NaN values [#9279](https://github.com/grafana/grafana/issues/9279)
-- **HTTP API**: Fix for HEAD method requests [#9307](https://github.com/grafana/grafana/issues/9307)
-- **Templating**: Fix for duplicate template variable queries when refresh is set to time range change [#9185](https://github.com/grafana/grafana/issues/9185)
-- **Metrics**: don't write NaN values to graphite [#9279](https://github.com/grafana/grafana/issues/9279)
-
-# 4.5.1 (2017-09-15)
-
-## Fixes
-
-- **MySQL**: Fixed issue with query editor not showing [#9247](https://github.com/grafana/grafana/issues/9247)
-
-## Breaking changes
-
-- **Metrics**: The metric structure for internal metrics about Grafana published to graphite has changed. This might break dashboards for internal metrics.
-
-# 4.5.0 (2017-09-14)
-
-## Fixes & Enhancements since beta1
-
-- **Security**: Security fix for api vulnerability (in multiple org setups).
-- **Shortcuts**: Adds shortcut for creating new dashboard [#8876](https://github.com/grafana/grafana/pull/8876) thx [@mtanda](https://github.com/mtanda)
-- **Graph**: Right Y-Axis label position fixed [#9172](https://github.com/grafana/grafana/pull/9172)
-- **General**: Improve rounding of time intervals [#9197](https://github.com/grafana/grafana/pull/9197), thx [@alin-amana](https://github.com/alin-amana)
-
-# 4.5.0-beta1 (2017-09-05)
-
-## New Features
-
-- **Table panel**: Render cell values as links that can have an url template that uses variables from current table row. [#3754](https://github.com/grafana/grafana/issues/3754)
-- **Elasticsearch**: Add ad hoc filters directly by clicking values in table panel [#8052](https://github.com/grafana/grafana/issues/8052).
-- **MySQL**: New rich query editor with syntax highlighting
-- **Prometheus**: New rich query editor with syntax highlighting, metric & range auto complete and integrated function docs. [#5117](https://github.com/grafana/grafana/issues/5117)
-
-## Enhancements
-
-- **GitHub OAuth**: Support for GitHub organizations with 100+ teams. [#8846](https://github.com/grafana/grafana/issues/8846), thx [@skwashd](https://github.com/skwashd)
-- **Graphite**: Calls to Graphite api /metrics/find now include panel or dashboard time range (from & until) in most cases, [#8055](https://github.com/grafana/grafana/issues/8055)
-- **Graphite**: Added new graphite 1.0 functions, available if you set version to 1.0.x in data source settings. New Functions: mapSeries, reduceSeries, isNonNull, groupByNodes, offsetToZero, grep, weightedAverage, removeEmptySeries, aggregateLine, averageOutsidePercentile, delay, exponentialMovingAverage, fallbackSeries, integralByInterval, interpolate, invert, linearRegression, movingMin, movingMax, movingSum, multiplySeriesWithWildcards, pow, powSeries, removeBetweenPercentile, squareRoot, timeSlice, closes [#8261](https://github.com/grafana/grafana/issues/8261)
-
-- **Elasticsearch**: Ad-hoc filters now use query phrase match filters instead of term filters, works on non keyword/raw fields [#9095](https://github.com/grafana/grafana/issues/9095).
-
-### Breaking change
-
-- **InfluxDB/Elasticsearch**: The panel & data source option named "Group by time interval" is now named "Min time interval" and does now always define a lower limit for the auto group by time. Without having to use `>` prefix (that prefix still works). This should in theory have close to zero actual impact on existing dashboards. It does mean that if you used this setting to define a hard group by time interval of, say "1d", if you zoomed to a time range wide enough the time range could increase above the "1d" range as the setting is now always considered a lower limit.
-- **Elasticsearch**: Elasticsearch metric queries without date histogram now return table formatted data making table panel much easier to use for this use case. Should not break/change existing dashboards with stock panels but external panel plugins can be affected.
-
-## Changes
-
-- **InfluxDB**: Change time range filter for absolute time ranges to be inclusive instead of exclusive [#8319](https://github.com/grafana/grafana/issues/8319), thx [@Oxydros](https://github.com/Oxydros)
-- **InfluxDB**: Added parenthesis around tag filters in queries [#9131](https://github.com/grafana/grafana/pull/9131)
-
-## Bug Fixes
-
-- **Modals**: Maintain scroll position after opening/leaving modal [#8800](https://github.com/grafana/grafana/issues/8800)
-- **Templating**: You cannot select data source variables as data source for other template variables [#7510](https://github.com/grafana/grafana/issues/7510)
-- **MySQL/Postgres**: Fix for max_idle_conn option default which was wrongly set to zero which does not mean unlimited but means zero, which in practice kind of disables connection pooling, which is not good. Fixes [#8513](https://github.com/grafana/grafana/issues/8513)
-
-# 4.4.3 (2017-08-07)
-
-## Bug Fixes
-
-- **Search**: Fix for issue that caused search view to hide when you clicked starred or tags filters, fixes [#8981](https://github.com/grafana/grafana/issues/8981)
-- **Modals**: ESC key now closes modal again, fixes [#8981](https://github.com/grafana/grafana/issues/8988), thx [@j-white](https://github.com/j-white)
-
-# 4.4.2 (2017-08-01)
-
-## Bug Fixes
-
-- **GrafanaDB(mysql)**: Fix for dashboard_version.data column type, now changed to MEDIUMTEXT, fixes [#8813](https://github.com/grafana/grafana/issues/8813)
-- **Dashboard(settings)**: Closing setting views using ESC key did not update url correctly, fixes [#8869](https://github.com/grafana/grafana/issues/8869)
-- **InfluxDB**: Wrong username/password parameter name when using direct access, fixes [#8789](https://github.com/grafana/grafana/issues/8789)
-- **Forms(TextArea)**: Bug fix for no scroll in text areas [#8797](https://github.com/grafana/grafana/issues/8797)
-- **Png Render API**: Bug fix for timeout url parameter. It now works as it should. Default value was also increased from 30 to 60 seconds [#8710](https://github.com/grafana/grafana/issues/8710)
-- **Search**: Fix for not being able to close search by clicking on right side of search result container, [8848](https://github.com/grafana/grafana/issues/8848)
-- **Cloudwatch**: Fix for using variables in templating metrics() query, [8965](https://github.com/grafana/grafana/issues/8965)
-
-## Changes
-
-- **Settings(defaults)**: allow_sign_up default changed from true to false [#8743](https://github.com/grafana/grafana/issues/8743)
-- **Settings(defaults)**: allow_org_create default changed from true to false
-
-# 4.4.1 (2017-07-05)
-
-## Bug Fixes
-
-- **Migrations**: migration fails where dashboard.created_by is null [#8783](https://github.com/grafana/grafana/issues/8783)
-
-# 4.4.0 (2017-07-04)
-
-## New Features
-
-**Dashboard History**: View dashboard version history, compare any two versions (summary & json diffs), restore to old version. This big feature
-was contributed by **Walmart Labs**. Big thanks to them for this massive contribution!
-Initial feature request: [#4638](https://github.com/grafana/grafana/issues/4638)
-Pull Request: [#8472](https://github.com/grafana/grafana/pull/8472)
-
-## Enhancements
-
-- **Elasticsearch**: Added filter aggregation label [#8420](https://github.com/grafana/grafana/pull/8420), thx [@tianzk](github.com/tianzk)
-- **Sensu**: Added option for source and handler [#8405](https://github.com/grafana/grafana/pull/8405), thx [@joemiller](github.com/joemiller)
-- **CSV**: Configurable csv export datetime format [#8058](https://github.com/grafana/grafana/issues/8058), thx [@cederigo](github.com/cederigo)
-- **Table Panel**: Column style that preserves formatting/indentation (like pre tag) [#6617](https://github.com/grafana/grafana/issues/6617)
-- **DingDing**: Add DingDing Alert Notifier [#8473](https://github.com/grafana/grafana/pull/8473) thx [@jiamliang](https://github.com/jiamliang)
-
-## Minor Enhancements
-
-- **Elasticsearch**: Add option for result set size in raw_document [#3426](https://github.com/grafana/grafana/issues/3426) [#8527](https://github.com/grafana/grafana/pull/8527), thx [@mk-dhia](github.com/mk-dhia)
-
-## Bug Fixes
-
-- **Graph**: Bug fix for negative values in histogram mode [#8628](https://github.com/grafana/grafana/issues/8628)
-
-# 4.3.2 (2017-05-31)
-
-## Bug fixes
-
-- **InfluxDB**: Fixed issue with query editor not showing ALIAS BY input field when in text editor mode [#8459](https://github.com/grafana/grafana/issues/8459)
-- **Graph Log Scale**: Fixed issue with log scale going below x-axis [#8244](https://github.com/grafana/grafana/issues/8244)
-- **Playlist**: Fixed dashboard play order issue [#7688](https://github.com/grafana/grafana/issues/7688)
-- **Elasticsearch**: Fixed table query issue with ES 2.x [#8467](https://github.com/grafana/grafana/issues/8467), thx [@goldeelox](https://github.com/goldeelox)
-
-## Changes
-
-- **Lazy Loading Of Panels**: Panels are no longer loaded as they are scrolled into view, this was reverted due to Chrome bug, might be reintroduced when Chrome fixes it's JS blocking behavior on scroll. [#8500](https://github.com/grafana/grafana/issues/8500)
-
-# 4.3.1 (2017-05-23)
-
-## Bug fixes
-
-- **S3 image upload**: Fixed image url issue for us-east-1 (us standard) region. If you were missing slack images for alert notifications this should fix it. [#8444](https://github.com/grafana/grafana/issues/8444)
-
-# 4.3.0-stable (2017-05-23)
-
-## Bug fixes
-
-- **Gzip**: Fixed crash when gzip was enabled [#8380](https://github.com/grafana/grafana/issues/8380)
-- **Graphite**: Fixed issue with Toggle edit mode did in query editor [#8377](https://github.com/grafana/grafana/issues/8377)
-- **Alerting**: Fixed issue with state history not showing query execution errors [#8412](https://github.com/grafana/grafana/issues/8412)
-- **Alerting**: Fixed issue with missing state history events/annotations when using sqlite3 database [#7992](https://github.com/grafana/grafana/issues/7992)
-- **Sqlite**: Fixed with database table locked and using sqlite3 database [#7992](https://github.com/grafana/grafana/issues/7992)
-- **Alerting**: Fixed issue with annotations showing up in unsaved dashboards, new graph & alert panel. [#8361](https://github.com/grafana/grafana/issues/8361)
-- **webdav**: Fixed http proxy env variable support for webdav image upload [#7922](https://github.com/grafana/grafana/issues/79222), thx [@berghauz](https://github.com/berghauz)
-- **Prometheus**: Fixed issue with hiding query [#8413](https://github.com/grafana/grafana/issues/8413)
-
-## Enhancements
-
-- **VictorOps**: Now supports panel image & auto resolve [#8431](https://github.com/grafana/grafana/pull/8431), thx [@davidmscott](https://github.com/davidmscott)
-- **Alerting**: Alert annotations now provide more info [#8421](https://github.com/grafana/grafana/pull/8421)
-
-# 4.3.0-beta1 (2017-05-12)
-
-## Enhancements
-
-- **InfluxDB**: influxdb query builder support for ORDER BY and LIMIT (allows TOPN queries) [#6065](https://github.com/grafana/grafana/issues/6065) Support influxdb's SLIMIT Feature [#7232](https://github.com/grafana/grafana/issues/7232) thx [@thuck](https://github.com/thuck)
-- **Panels**: Delay loading & Lazy load panels as they become visible (scrolled into view) [#5216](https://github.com/grafana/grafana/issues/5216) thx [@jifwin](https://github.com/jifwin)
-- **Graph**: Support auto grid min/max when using log scale [#3090](https://github.com/grafana/grafana/issues/3090), thx [@bigbenhur](https://github.com/bigbenhur)
-- **Graph**: Support for histograms [#600](https://github.com/grafana/grafana/issues/600)
-- **Prometheus**: Support table response formats (column per label) [#6140](https://github.com/grafana/grafana/issues/6140), thx [@mtanda](https://github.com/mtanda)
-- **Single Stat Panel**: support for non time series data [#6564](https://github.com/grafana/grafana/issues/6564)
-- **Server**: Monitoring Grafana (health check endpoint) [#3302](https://github.com/grafana/grafana/issues/3302)
-- **Heatmap**: Heatmap Panel [#7934](https://github.com/grafana/grafana/pull/7934)
-- **Elasticsearch**: histogram aggregation [#3164](https://github.com/grafana/grafana/issues/3164)
-
-## Minor Enhancements
-
-- **InfluxDB**: Small fix for the "glow" when focus the field for LIMIT and SLIMIT [#7799](https://github.com/grafana/grafana/pull/7799) thx [@thuck](https://github.com/thuck)
-- **Prometheus**: Make Prometheus query field a textarea [#7663](https://github.com/grafana/grafana/issues/7663), thx [@hagen1778](https://github.com/hagen1778)
-- **Prometheus**: Step parameter changed semantics to min step to reduce the load on Prometheus and rendering in browser [#8073](https://github.com/grafana/grafana/pull/8073), thx [@bobrik](https://github.com/bobrik)
-- **Templating**: Should not be possible to create self-referencing (recursive) template variable definitions [#7614](https://github.com/grafana/grafana/issues/7614) thx [@thuck](https://github.com/thuck)
-- **Cloudwatch**: Correctly obtain IAM roles within ECS container tasks [#7892](https://github.com/grafana/grafana/issues/7892) thx [@gomlgs](https://github.com/gomlgs)
-- **Units**: New number format: Scientific notation [#7781](https://github.com/grafana/grafana/issues/7781) thx [@cadnce](https://github.com/cadnce)
-- **Oauth**: Add common type for oauth authorization errors [#6428](https://github.com/grafana/grafana/issues/6428) thx [@amenzhinsky](https://github.com/amenzhinsky)
-- **Templating**: Data source variable now supports multi value and panel repeats [#7030](https://github.com/grafana/grafana/issues/7030) thx [@mtanda](https://github.com/mtanda)
-- **Telegram**: Telegram alert is not sending metric and legend. [#8110](https://github.com/grafana/grafana/issues/8110), thx [@bashgeek](https://github.com/bashgeek)
-- **Graph**: Support dashed lines [#514](https://github.com/grafana/grafana/issues/514), thx [@smalik03](https://github.com/smalik03)
-- **Table**: Support to change column header text [#3551](https://github.com/grafana/grafana/issues/3551)
-- **Alerting**: Better error when SMTP is not configured [#8093](https://github.com/grafana/grafana/issues/8093)
-- **Pushover**: Add an option to attach graph image link in Pushover notification [#8043](https://github.com/grafana/grafana/issues/8043) thx [@devkid](https://github.com/devkid)
-- **WebDAV**: Allow to set different ImageBaseUrl for WebDAV upload and image link [#7914](https://github.com/grafana/grafana/issues/7914)
-- **Panels**: type-ahead mixed data source selection [#7697](https://github.com/grafana/grafana/issues/7697) thx [@mtanda](https://github.com/mtanda)
-- **Security**:User enumeration problem [#7619](https://github.com/grafana/grafana/issues/7619)
-- **InfluxDB**: Register new queries available in InfluxDB - Holt Winters [#5619](https://github.com/grafana/grafana/issues/5619) thx [@rikkuness](https://github.com/rikkuness)
-- **Server**: Support listening on a UNIX socket [#4030](https://github.com/grafana/grafana/issues/4030), thx [@mitjaziv](https://github.com/mitjaziv)
-- **Graph**: Support log scaling for values smaller 1 [#5278](https://github.com/grafana/grafana/issues/5278)
-- **InfluxDB**: Slow 'select measurement' rendering for InfluxDB [#2524](https://github.com/grafana/grafana/issues/2524), thx [@sbhenderson](https://github.com/sbhenderson)
-- **Config**: Configurable signout menu activation [#7968](https://github.com/grafana/grafana/pull/7968), thx [@seuf](https://github.com/seuf)
-
-## Fixes
-
-- **Table Panel**: Fixed annotation display in table panel, [#8023](https://github.com/grafana/grafana/issues/8023)
-- **Dashboard**: If refresh is blocked due to tab not visible, then refresh when it becomes visible [#8076](https://github.com/grafana/grafana/issues/8076) thanks [@SimenB](https://github.com/SimenB)
-- **Snapshots**: Fixed problem with annotations & snapshots [#7659](https://github.com/grafana/grafana/issues/7659)
-- **Graph**: MetricSegment loses type when value is an asterisk [#8277](https://github.com/grafana/grafana/issues/8277), thx [@Gordiychuk](https://github.com/Gordiychuk)
-- **Alerting**: Alert notifications do not show charts when using a non public S3 bucket [#8250](https://github.com/grafana/grafana/issues/8250) thx [@rogerswingle](https://github.com/rogerswingle)
-- **Graph**: 100% client CPU usage on red alert glow animation [#8222](https://github.com/grafana/grafana/issues/8222)
-- **InfluxDB**: Templating: "All" query does match too much [#8165](https://github.com/grafana/grafana/issues/8165)
-- **Dashboard**: Description tooltip is not fully displayed [#7970](https://github.com/grafana/grafana/issues/7970)
-- **Proxy**: Redirect after switching Org does not obey sub path in root_url (using reverse proxy) [#8089](https://github.com/grafana/grafana/issues/8089)
-- **Templating**: Restoration of ad-hoc variable from URL does not work correctly [#8056](https://github.com/grafana/grafana/issues/8056) thx [@tamayika](https://github.com/tamayika)
-- **InfluxDB**: timeFilter cannot be used twice in alerts [#7969](https://github.com/grafana/grafana/issues/7969)
-- **MySQL**: 4-byte UTF8 not supported when using MySQL database (allows Emojis) [#7958](https://github.com/grafana/grafana/issues/7958)
-- **Alerting**: api/alerts and api/alert/:id hold previous data for "message" and "Message" field when field value is changed from "some string" to empty string. [#7927](https://github.com/grafana/grafana/issues/7927)
-- **Graph**: Cannot add fill below to series override [#7916](https://github.com/grafana/grafana/issues/7916)
-- **InfluxDB**: Influxb Data source test passes even if the Database doesn't exist [#7864](https://github.com/grafana/grafana/issues/7864)
-- **Prometheus**: Displaying Prometheus annotations is incredibly slow [#7750](https://github.com/grafana/grafana/issues/7750), thx [@mtanda](https://github.com/mtanda)
-- **Graphite**: grafana generates empty find query to graphite -> 422 Unprocessable Entity [#7740](https://github.com/grafana/grafana/issues/7740)
-- **Admin**: make organization filter case insensitive [#8194](https://github.com/grafana/grafana/issues/8194), thx [@Alexander-N](https://github.com/Alexander-N)
-
-## Changes
-
-- **Elasticsearch**: Changed elasticsearch Terms aggregation to default to Min Doc Count to 1, and sort order to Top [#8321](https://github.com/grafana/grafana/issues/8321)
-
-## Tech
-
-- **Library Upgrade**: inconshreveable/log15 outdated - no support for solaris [#8262](https://github.com/grafana/grafana/issues/8262)
-- **Library Upgrade**: Upgrade Macaron [#7600](https://github.com/grafana/grafana/issues/7600)
-
-# 4.2.0 (2017-03-22)
-
-## Minor Enhancements
-
-- **Templates**: Prevent use of the prefix `__` for templates in web UI [#7678](https://github.com/grafana/grafana/issues/7678)
-- **Threema**: Add emoji to Threema alert notifications [#7676](https://github.com/grafana/grafana/pull/7676) thx [@dbrgn](https://github.com/dbrgn)
-- **Panels**: Support dm3 unit [#7695](https://github.com/grafana/grafana/issues/7695) thx [@mitjaziv](https://github.com/mitjaziv)
-- **Docs**: Added some details about Sessions in Postgres [#7694](https://github.com/grafana/grafana/pull/7694) thx [@rickard-von-essen](https://github.com/rickard-von-essen)
-- **Influxdb**: Allow commas in template variables [#7681](https://github.com/grafana/grafana/issues/7681) thx [@thuck](https://github.com/thuck)
-- **Cloudwatch**: stop using deprecated session.New() [#7736](https://github.com/grafana/grafana/issues/7736) thx [@mtanda](https://github.com/mtanda)
-  \*TSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges**: Pass dropcounter rate option if no max counter and no reset value or reset value as 0 is specified [#7743](https://github.com/grafana/grafana/pull/7743) thx [@r4um](https://github.com/r4um)
-- **Templating**: support full resolution for \$interval variable [#7696](https://github.com/grafana/grafana/pull/7696) thx [@mtanda](https://github.com/mtanda)
-- **Elasticsearch**: Unique Count on string fields in ElasticSearch [#3536](https://github.com/grafana/grafana/issues/3536), thx [@pyro2927](https://github.com/pyro2927)
-- **Templating**: Data source template variable that refers to other variable in regex filter [#6365](https://github.com/grafana/grafana/issues/6365) thx [@rlodge](https://github.com/rlodge)
-- **Admin**: Global User List: add search and pagination [#7469](https://github.com/grafana/grafana/issues/7469)
-- **User Management**: Invite UI is now disabled when login form is disabled [#7875](https://github.com/grafana/grafana/issues/7875)
-
-## Bugfixes
-
-- **Webhook**: Use proxy settings from environment variables [#7710](https://github.com/grafana/grafana/issues/7710)
-- **Panels**: Deleting a dashboard with unsaved changes raises an error message [#7591](https://github.com/grafana/grafana/issues/7591) thx [@thuck](https://github.com/thuck)
-- **Influxdb**: Query builder detects regex to easily for measurement [#7276](https://github.com/grafana/grafana/issues/7276) thx [@thuck](https://github.com/thuck)
-- **Docs**: router_logging not documented [#7723](https://github.com/grafana/grafana/issues/7723)
-- **Alerting**: Spelling mistake [#7739](https://github.com/grafana/grafana/pull/7739) thx [@woutersmit](https://github.com/woutersmit)
-- **Alerting**: Graph legend scrolls to top when an alias is toggled/clicked [#7680](https://github.com/grafana/grafana/issues/7680) thx [@p4ddy1](https://github.com/p4ddy1)
-- **Panels**: Fixed panel tooltip description after scrolling down [#7708](https://github.com/grafana/grafana/issues/7708) thx [@askomorokhov](https://github.com/askomorokhov)
-
-# 4.2.0-beta1 (2017-02-27)
-
-## Enhancements
-
-- **Telegram**: Added Telegram alert notifier [#7098](https://github.com/grafana/grafana/pull/7098), thx [@leonoff](https://github.com/leonoff)
-- **Templating**: Make $\_\_interval and $\_\_interval_ms global built in variables that can be used in by any data source (in panel queries), closes [#7190](https://github.com/grafana/grafana/issues/7190), closes [#6582](https://github.com/grafana/grafana/issues/6582)
-- **S3 Image Store**: External s3 image store (used in alert notifications) now support AWS IAM Roles, closes [#6985](https://github.com/grafana/grafana/issues/6985), [#7058](https://github.com/grafana/grafana/issues/7058) thx [@mtanda](https://github.com/mtanda)
-- **SingleStat**: Implements diff aggregation method for singlestat [#7234](https://github.com/grafana/grafana/issues/7234), thx [@oliverpool](https://github.com/oliverpool)
-- **Dataproxy**: Added setting to enable more verbose logging in dataproxy [#7209](https://github.com/grafana/grafana/pull/7209), thx [@Ricky-N](https://github.com/Ricky-N)
-- **Alerting**: Better information about why an alert triggered [#7035](https://github.com/grafana/grafana/issues/7035)
-- **LINE**: Add LINE as alerting notification channel [#7301](https://github.com/grafana/grafana/pull/7301), thx [@huydx](https://github.com/huydx)
-- **LINE**: Adds image to notification message [#7417](https://github.com/grafana/grafana/pull/7417), thx [@Erliz](https://github.com/Erliz)
-- **Hipchat**: Adds support for sending alert notifications to hipchat [#6451](https://github.com/grafana/grafana/issues/6451), thx [@jregovic](https://github.com/jregovic)
-- **Alerting**: Uploading images for alert notifications is now optional [#7419](https://github.com/grafana/grafana/issues/7419)
-- **Dashboard**: Adds shortcut for collapsing/expanding all rows [#552](https://github.com/grafana/grafana/issues/552), thx [@mtanda](https://github.com/mtanda)
-- **Alerting**: Adds de duping of alert notifications [#7632](https://github.com/grafana/grafana/pull/7632)
-- **Orgs**: Sharing dashboards using Grafana share feature will now redirect to correct org. [#1613](https://github.com/grafana/grafana/issues/1613)
-- **Pushover**: Add Pushover alert notifications [#7526](https://github.com/grafana/grafana/pull/7526) thx [@devkid](https://github.com/devkid)
-- **Threema**: Add Threema Gateway alert notification integration [#7482](https://github.com/grafana/grafana/pull/7482) thx [@dbrgn](https://github.com/dbrgn)
-
-## Minor Enhancements
-
-- **Optimization**: Never issue refresh event when Grafana tab is not visible [#7218](https://github.com/grafana/grafana/issues/7218), thx [@mtanda](https://github.com/mtanda)
-- **Browser History**: Browser back/forward now works time ranges / zoom, [#7259](https://github.com/grafana/grafana/issues/7259)
-- **Elasticsearch**: Support for Min Doc Count options in Terms aggregation [#7324](https://github.com/grafana/grafana/pull/7324), thx [@lpic10](https://github.com/lpic10)
-- **Elasticsearch**: Term aggregation limit can now be changed in template queries [#7112](https://github.com/grafana/grafana/issues/7112), thx [@FFalcon](https://github.com/FFalcon)
-- **Elasticsearch**: Ad-hoc filters now support all operators [#7612](https://github.com/grafana/grafana/issues/7612), thx [@tamayika](https://github.com/tamayika)
-- **Graph**: Add full series name as title for legends. [#7493](https://github.com/grafana/grafana/pull/7493), thx [@kolobaev](https://github.com/kolobaev)
-- **Table**: Add a message when queries returns no data. [#6109](https://github.com/grafana/grafana/issues/6109), thx [@xginn8](https://github.com/xginn8)
-- **Graph**: Set max width for series names in legend tables. [#2385](https://github.com/grafana/grafana/issues/2385), thx [@kolobaev](https://github.com/kolobaev)
-- **Database**: Allow max db connection pool configuration [#7427](https://github.com/grafana/grafana/issues/7427), thx [@huydx](https://github.com/huydx)
-- **Data Sources** Delete datsource by name [#7476](https://github.com/grafana/grafana/issues/7476), thx [@huydx](https://github.com/huydx)
-- **Dataproxy**: Only allow get that begins with api/ to access Prometheus [#7459](https://github.com/grafana/grafana/pull/7459), thx [@mtanda](https://github.com/mtanda)
-- **Snapshot**: Make timeout for snapshot creation configurable [#7449](https://github.com/grafana/grafana/pull/7449) thx [@ryu1-sakai](https://github.com/ryu1-sakai)
-- **Panels**: Add more physics units [#7554](https://github.com/grafana/grafana/pull/7554) thx [@ryantxu](https://github.com/ryantxu)
-- **Email**: Add sender's name on email [#2131](https://github.com/grafana/grafana/issues/2131) thx [@jacobbednarz](https://github.com/jacobbednarz)
-- **HTTPS**: Set tls 1.2 as lowest tls version. [#7347](https://github.com/grafana/grafana/pull/7347) thx [@roman-vynar](https://github.com/roman-vynar)
-- **Table**: Added suppressing of empty results to table plugin. [#7602](https://github.com/grafana/grafana/pull/7602) thx [@LLIyRiK](https://github.com/LLIyRiK)
-
-## Tech
-
-- **Library Upgrade**: Upgraded angularjs from 1.5.8 to 1.6.1 [#7274](https://github.com/grafana/grafana/issues/7274)
-- **Backend**: Grafana is now built using golang 1.8
-
-## Bugfixes
-
-- **Alerting**: Fixes missing support for no_data and execution error when testing alerts [#7149](https://github.com/grafana/grafana/issues/7149)
-- **Dashboard**: Avoid duplicate data in dashboard json for panels with alerts [#7256](https://github.com/grafana/grafana/pull/7256)
-- **Alertlist**: Only show scrollbar when required [#7269](https://github.com/grafana/grafana/issues/7269)
-- **SMTP**: Set LocalName to hostname [#7223](https://github.com/grafana/grafana/issues/7223)
-- **Sidemenu**: Disable sign out in sidemenu for AuthProxyEnabled [#7377](https://github.com/grafana/grafana/pull/7377), thx [@solugebefola](https://github.com/solugebefola)
-- **Prometheus**: Add support for basic auth in Prometheus tsdb package [#6799](https://github.com/grafana/grafana/issues/6799), thx [@hagen1778](https://github.com/hagen1778)
-- **OAuth**: Redirect to original page when logging in with OAuth [#7513](https://github.com/grafana/grafana/issues/7513)
-- **Annotations**: Wrap text in annotations tooltip [#7542](https://github.com/grafana/grafana/pull/7542), thx [@xginn8](https://github.com/xginn8)
-- **Templating**: Fixes error when using numeric sort on empty strings [#7382](https://github.com/grafana/grafana/issues/7382)
-- **Templating**: Fixed issue detecting template variable dependency [#7354](https://github.com/grafana/grafana/issues/7354)
-
-# 4.1.2 (2017-02-13)
-
-### Bugfixes
-
-- **Table**: Fixes broken annotation rendering mode in the table panel [#7268](https://github.com/grafana/grafana/issues/7268)
-- **Data Sources**: Sorting for lists of data sources in UI is now case insensitive [#7491](https://github.com/grafana/grafana/issues/7491)
-- **Admin**: Support more then 1000 users in global users list [#7469](https://github.com/grafana/grafana/issues/7469)
-
-# 4.1.1 (2017-01-11)
-
-### Bugfixes
-
-- **Graph Panel**: Fixed issue with legend height in table mode [#7221](https://github.com/grafana/grafana/issues/7221)
-
-# 4.1.0 (2017-01-11)
-
-### Bugfixes
-
-- **Server side PNG rendering**: Fixed issue with y-axis label rotation in phantomjs rendered images [#6924](https://github.com/grafana/grafana/issues/6924)
-- **Graph**: Fixed centering of y-axis label [#7099](https://github.com/grafana/grafana/issues/7099)
-- **Graph**: Fixed graph legend table mode and always visible scrollbar [#6828](https://github.com/grafana/grafana/issues/6828)
-- **Templating**: Fixed template variable value groups/tags feature [#6752](https://github.com/grafana/grafana/issues/6752)
-- **Webhook**: Fixed webhook username mismatch [#7195](https://github.com/grafana/grafana/pull/7195), thx [@theisenmark](https://github.com/theisenmark)
-- **Influxdb**: Handles time(auto) the same way as time(\$interval) [#6997](https://github.com/grafana/grafana/issues/6997)
-
-## Enhancements
-
-- **Elasticsearch**: Added support for all moving average options [#7154](https://github.com/grafana/grafana/pull/7154), thx [@vaibhavinbayarea](https://github.com/vaibhavinbayarea)
-
-# 4.1-beta1 (2016-12-21)
-
-### Enhancements
-
-- **Postgres**: Add support for Certs for Postgres database [#6655](https://github.com/grafana/grafana/issues/6655)
-- **Victorops**: Add VictorOps notification integration [#6411](https://github.com/grafana/grafana/issues/6411), thx [@ichekrygin](https://github.com/ichekrygin)
-- **Opsgenie**: Add OpsGenie notification integration [#6687](https://github.com/grafana/grafana/issues/6687), thx [@kylemcc](https://github.com/kylemcc)
-- **Singlestat**: New aggregation on singlestat panel [#6740](https://github.com/grafana/grafana/pull/6740), thx [@dirk-leroux](https://github.com/dirk-leroux)
-- **Cloudwatch**: Make it possible to specify access and secret key on the data source config page [#6697](https://github.com/grafana/grafana/issues/6697)
-- **Table**: Added Hidden Column Style for Table Panel [#5677](https://github.com/grafana/grafana/pull/5677), thx [@bmundt](https://github.com/bmundt)
-- **Graph**: Shared crosshair option renamed to shared tooltip, shows tooltip on all graphs as you hover over one graph. [#1578](https://github.com/grafana/grafana/pull/1578), [#6274](https://github.com/grafana/grafana/pull/6274)
-- **Elasticsearch**: Added support for Missing option (bucket) for terms aggregation [#4244](https://github.com/grafana/grafana/pull/4244), thx [@shanielh](https://github.com/shanielh)
-- **Elasticsearch**: Added support for Elasticsearch 5.x [#5740](https://github.com/grafana/grafana/issues/5740), thx [@lpic10](https://github.com/lpic10)
-- **CLI**: Make it possible to reset the admin password using the grafana-cli. [#5479](https://github.com/grafana/grafana/issues/5479)
-- **Influxdb**: Support multiple tags in InfluxDB annotations. [#4550](https://github.com/grafana/grafana/pull/4550), thx [@adrianlzt](https://github.com/adrianlzt)
-- **LDAP**: Basic Auth now supports LDAP username and password, [#6940](https://github.com/grafana/grafana/pull/6940), thx [@utkarshcmu](https://github.com/utkarshcmu)
-- **LDAP**: Now works with Auth Proxy, role and organization mapping & sync will regularly be performed. [#6895](https://github.com/grafana/grafana/pull/6895), thx [@Seuf](https://github.com/seuf)
-- **Alerting**: Adds OK as no data option. [#6866](https://github.com/grafana/grafana/issues/6866)
-- **Alert list**: Order alerts based on state. [#6676](https://github.com/grafana/grafana/issues/6676)
-- **Alerting**: Add api endpoint for pausing all alerts. [#6589](https://github.com/grafana/grafana/issues/6589)
-- **Panel**: Added help text for panels. [#4079](https://github.com/grafana/grafana/issues/4079), thx [@utkarshcmu](https://github.com/utkarshcmu)
-
-### Bugfixes
-
-- **API**: HTTP API for deleting org returning incorrect message for a non-existing org [#6679](https://github.com/grafana/grafana/issues/6679)
-- **Dashboard**: Posting empty dashboard result in corrupted dashboard [#5443](https://github.com/grafana/grafana/issues/5443)
-- **Logging**: Fixed logging level config issue [#6978](https://github.com/grafana/grafana/issues/6978)
-- **Notifications**: Remove html escaping the email subject. [#6905](https://github.com/grafana/grafana/issues/6905)
-- **Influxdb**: Fixes broken field dropdown when using template vars as measurement. [#6473](https://github.com/grafana/grafana/issues/6473)
-
-# 4.0.2 (2016-12-08)
-
-### Enhancements
-
-- **Playlist**: Add support for kiosk mode [#6727](https://github.com/grafana/grafana/issues/6727)
-
-### Bugfixes
-
-- **Alerting**: Add alert message to webhook notifications [#6807](https://github.com/grafana/grafana/issues/6807)
-- **Alerting**: Fixes a bug where avg() reducer treated null as zero. [#6879](https://github.com/grafana/grafana/issues/6879)
-- **PNG Rendering**: Fix for server side rendering when using non default http addr bind and domain setting [#6813](https://github.com/grafana/grafana/issues/6813)
-- **PNG Rendering**: Fix for server side rendering when setting enforce_domain to true [#6769](https://github.com/grafana/grafana/issues/6769)
-- **Webhooks**: Add content type json to outgoing webhooks [#6822](https://github.com/grafana/grafana/issues/6822)
-- **Keyboard shortcut**: Fixed zoom out shortcut [#6837](https://github.com/grafana/grafana/issues/6837)
-- **Webdav**: Adds basic auth headers to webdav uploader [#6779](https://github.com/grafana/grafana/issues/6779)
-
-# 4.0.1 (2016-12-02)
-
-> **Notice**
-> 4.0.0 had serious connection pooling issue when using a data source in proxy access. This bug caused lots of resource issues
-> due to too many connections/file handles on the data source backend. This problem is fixed in this release.
-
-### Bugfixes
-
-- **Metrics**: Fixes nil pointer dereference on my arm build [#6749](https://github.com/grafana/grafana/issues/6749)
-- **Data proxy**: Fixes a tcp pooling issue in the data source reverse proxy [#6759](https://github.com/grafana/grafana/issues/6759)
-
-# 4.0-stable (2016-11-29)
-
-### Bugfixes
-
-- **Server-side rendering**: Fixed address used when rendering panel via phantomjs and using non default http_addr config [#6660](https://github.com/grafana/grafana/issues/6660)
-- **Graph panel**: Fixed graph panel tooltip sort order issue [#6648](https://github.com/grafana/grafana/issues/6648)
-- **Unsaved changes**: You now navigate to the intended page after saving in the unsaved changes dialog [#6675](https://github.com/grafana/grafana/issues/6675)
-- **TLS Client Auth**: Support for TLS client authentication for data source proxies [#2316](https://github.com/grafana/grafana/issues/2316)
-- **Alerts out of sync**: Saving dashboards with broken alerts causes sync problem[#6576](https://github.com/grafana/grafana/issues/6576)
-- **Alerting**: Saving an alert with condition "HAS NO DATA" throws an error[#6701](https://github.com/grafana/grafana/issues/6701)
-- **Config**: Improve error message when parsing broken config file [#6731](https://github.com/grafana/grafana/issues/6731)
-- **Table**: Render empty dates as - instead of current date [#6728](https://github.com/grafana/grafana/issues/6728)
-
-# 4.0-beta2 (2016-11-21)
-
-### Bugfixes
-
-- **Graph Panel**: Log base scale on right Y-axis had no effect, max value calc was not applied, [#6534](https://github.com/grafana/grafana/issues/6534)
-- **Graph Panel**: Bar width if bars was only used in series override, [#6528](https://github.com/grafana/grafana/issues/6528)
-- **UI/Browser**: Fixed issue with page/view header gradient border not showing in Safari, [#6530](https://github.com/grafana/grafana/issues/6530)
-- **Cloudwatch**: Fixed cloudwatch data source requesting to many datapoints, [#6544](https://github.com/grafana/grafana/issues/6544)
-- **UX**: Panel Drop zone visible after duplicating panel, and when entering fullscreen/edit view, [#6598](https://github.com/grafana/grafana/issues/6598)
-- **Templating**: Newly added variable was not visible directly only after dashboard reload, [#6622](https://github.com/grafana/grafana/issues/6622)
-
-### Enhancements
-
-- **Singlestat**: Support repeated template variables in prefix/postfix [#6595](https://github.com/grafana/grafana/issues/6595)
-- **Templating**: Don't persist variable options with refresh option [#6586](https://github.com/grafana/grafana/issues/6586)
-- **Alerting**: Add ability to have OR conditions (and mixing AND & OR) [#6579](https://github.com/grafana/grafana/issues/6579)
-- **InfluxDB**: Fix for Ad-Hoc Filters variable & changing dashboards [#6821](https://github.com/grafana/grafana/issues/6821)
-
-# 4.0-beta1 (2016-11-09)
-
-### Enhancements
-
-- **Login**: Adds option to disable username/password logins, closes [#4674](https://github.com/grafana/grafana/issues/4674)
-- **SingleStat**: Add seriesName as option in singlestat panel, closes [#4740](https://github.com/grafana/grafana/issues/4740)
-- **Localization**: Week start day now dependent on browser locale setting, closes [#3003](https://github.com/grafana/grafana/issues/3003)
-- **Templating**: Update panel repeats for variables that change on time refresh, closes [#5021](https://github.com/grafana/grafana/issues/5021)
-- **Templating**: Add support for numeric and alphabetical sorting of variable values, closes [#2839](https://github.com/grafana/grafana/issues/2839)
-- **Elasticsearch**: Support to set Precision Threshold for Unique Count metric, closes [#4689](https://github.com/grafana/grafana/issues/4689)
-- **Navigation**: Add search to org switcher, closes [#2609](https://github.com/grafana/grafana/issues/2609)
-- **Database**: Allow database config using one property, closes [#5456](https://github.com/grafana/grafana/pull/5456)
-- **Graphite**: Add support for groupByNodes, closes [#5613](https://github.com/grafana/grafana/pull/5613)
-- **Influxdb**: Add support for elapsed(), closes [#5827](https://github.com/grafana/grafana/pull/5827)
-- **OpenTSDB**: Add support for explicitTags for OpenTSDB>=2.3, closes [#6360](https://github.com/grafana/grafana/pull/6361)
-- **OAuth**: Add support for generic oauth, closes [#4718](https://github.com/grafana/grafana/pull/4718)
-- **Cloudwatch**: Add support to expand multi select template variable, closes [#5003](https://github.com/grafana/grafana/pull/5003)
-- **Background Tasks**: Now support automatic purging of old snapshots, closes [#4087](https://github.com/grafana/grafana/issues/4087)
-- **Background Tasks**: Now support automatic purging of old rendered images, closes [#2172](https://github.com/grafana/grafana/issues/2172)
-- **Dashboard**: After inactivity hide nav/row actions, fade to nice clean view, can be toggled with `d v`, also added kiosk mode, toggled via `d k` [#6476](https://github.com/grafana/grafana/issues/6476)
-- **Dashboard**: Improved dashboard row menu & add panel UX [#6442](https://github.com/grafana/grafana/issues/6442)
-- **Graph Panel**: Support for stacking null values [#2912](https://github.com/grafana/grafana/issues/2912), [#6287](https://github.com/grafana/grafana/issues/6287), thanks @benrubson!
-
-### Breaking changes
-
-- **SystemD**: Change systemd description, closes [#5971](https://github.com/grafana/grafana/pull/5971)
-- **lodash upgrade**: Upgraded lodash from 2.4.2 to 4.15.0, this contains a number of breaking changes that could effect plugins. closes [#6021](https://github.com/grafana/grafana/pull/6021)
-
-### Bug fixes
-
-- **Table Panel**: Fixed problem when switching to Mixed data source in metrics tab, fixes [#5999](https://github.com/grafana/grafana/pull/5999)
-- **Playlist**: Fixed problem with play order not matching order defined in playlist, fixes [#5467](https://github.com/grafana/grafana/pull/5467)
-- **Graph panel**: Fixed problem with auto decimals on y axis when datamin=datamax, fixes [#6070](https://github.com/grafana/grafana/pull/6070)
-- **Snapshot**: Can view embedded panels/png rendered panels in snapshots without login, fixes [#3769](https://github.com/grafana/grafana/pull/3769)
-- **Elasticsearch**: Fix for query template variable when looking up terms without query, no longer relies on elasticsearch default field, fixes [#3887](https://github.com/grafana/grafana/pull/3887)
-- **Elasticsearch**: Fix for displaying IP address used in terms aggregations, fixes [#4393](https://github.com/grafana/grafana/pull/4393)
-- **PNG Rendering**: Fix for server side rendering when using auth proxy, fixes [#5906](https://github.com/grafana/grafana/pull/5906)
-- **OpenTSDB**: Fixed multi-value nested templating for opentsdb, fixes [#6455](https://github.com/grafana/grafana/pull/6455)
-- **Playlist**: Remove playlist items when dashboard is removed, fixes [#6292](https://github.com/grafana/grafana/issues/6292)

.changelog-archive/CHANGELOG.5.md

@@ -1,661 +0,0 @@
-# 5.4.5 (2019-08-29)
-
-- **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/08/29/grafana-5.4.5-and-6.3.4-released-with-important-security-fix/)
-
-# 5.4.4 (2019-04-29)
-
-- **Security**: Urgent security patch release. Please read more in our [blog](https://grafana.com/blog/2019/04/29/grafana-5.4.4-and-6.1.6-released-with-important-security-fix/)
-
-# 5.4.3 (2019-01-14)
-
-### Tech
-
-- **Docker**: Build and publish docker images for armv7 and arm64 [#14617](https://github.com/grafana/grafana/pull/14617), thx [@johanneswuerbach](https://github.com/johanneswuerbach)
-- **Backend**: Upgrade to golang 1.11.4 [#14580](https://github.com/grafana/grafana/issues/14580)
-- **MySQL** only update session in mysql database when required [#14540](https://github.com/grafana/grafana/pull/14540)
-
-### Bug fixes
-
-- **Alerting** Invalid frequency causes division by zero in alert scheduler [#14810](https://github.com/grafana/grafana/issues/14810)
-- **Dashboard** Dashboard links do not update when time range changes [#14493](https://github.com/grafana/grafana/issues/14493)
-- **Limits** Support more than 1000 data sources per org [#13883](https://github.com/grafana/grafana/issues/13883)
-- **Backend** fix signed in user for orgId=0 result should return active org id [#14574](https://github.com/grafana/grafana/pull/14574)
-- **Provisioning** Adds orgId to user dto for provisioned dashboards [#14678](https://github.com/grafana/grafana/pull/14678)
-
-# 5.4.2 (2018-12-13)
-
-- **Data Source admin**: Fix for issue creating new data source when same name exists [#14467](https://github.com/grafana/grafana/issues/14467)
-- **OAuth**: Fix for oauth auto login setting, can now be set using env variable [#14435](https://github.com/grafana/grafana/issues/14435)
-- **Dashboard search**: Fix for searching tags in tags filter dropdown.
-
-# 5.4.1 (2018-12-10)
-
-- **Stackdriver**: Fixes issue with data proxy and Authorization header [#14262](https://github.com/grafana/grafana/issues/14262)
-- **Units**: fixedUnit for Flow:l/min and mL/min [#14294](https://github.com/grafana/grafana/issues/14294), thx [@flopp999](https://github.com/flopp999).
-- **Logging**: Fix for issue where data proxy logged a secret when debug logging was enabled, now redacted. [#14319](https://github.com/grafana/grafana/issues/14319)
-- TSDB**: Fix always take dashboard timezone into consideration when handle custom time ranges**: Add support for alerting on InfluxDB queries that use the cumulative_sum function. [#14314](https://github.com/grafana/grafana/pull/14314), thx [@nitti](https://github.com/nitti)
-- **Plugins**: Panel plugins should no receive the panel-initialized event again as usual.
-- **Embedded Graphs**: Iframe graph panels should now work as usual. [#14284](https://github.com/grafana/grafana/issues/14284)
-- **Postgres**: Improve PostgreSQL Query Editor if using different Schemas, [#14313](https://github.com/grafana/grafana/pull/14313)
-- **Quotas**: Fixed for updating org & user quotas. [#14347](https://github.com/grafana/grafana/pull/14347), thx [#moznion](https://github.com/moznion)
-- **Cloudwatch**: Add the AWS/SES Cloudwatch metrics of BounceRate and ComplaintRate to auto complete list. [#14401](https://github.com/grafana/grafana/pull/14401), thx [@sglajchEG](https://github.com/sglajchEG)
-- **Dashboard Search**: Fixed filtering by tag issues.
-- **Graph**: Fixed time region issues, [#14425](https://github.com/grafana/grafana/issues/14425), [#14280](https://github.com/grafana/grafana/issues/14280)
-- **Graph**: Fixed issue with series color picker popover being placed outside window.
-
-# 5.4.0 (2018-12-03)
-
-- **Cloudwatch**: Fix invalid time range causes segmentation fault [#14150](https://github.com/grafana/grafana/issues/14150)
-- **Cloudwatch**: AWS/CodeBuild metrics and dimensions [#14167](https://github.com/grafana/grafana/issues/14167), thx [@mmcoltman](https://github.com/mmcoltman)
-- **MySQL**: Fix `$__timeFrom()` and `$__timeTo()` should respect local time zone [#14228](https://github.com/grafana/grafana/issues/14228)
-
-### 5.4.0-beta1 fixes
-
-- **Graph**: Fix legend always visible even if configured to be hidden [#14144](https://github.com/grafana/grafana/issues/14144)
-- **Elasticsearch**: Fix regression when using data source version 6.0+ and alerting [#14175](https://github.com/grafana/grafana/pull/14175)
-
-# 5.4.0-beta1 (2018-11-20)
-
-### New Features
-
-- **Alerting**: Introduce alert debouncing with the `FOR` setting. [#7886](https://github.com/grafana/grafana/issues/7886) & [#6202](https://github.com/grafana/grafana/issues/6202)
-- **Alerting**: Option to disable OK alert notifications [#12330](https://github.com/grafana/grafana/issues/12330) & [#6696](https://github.com/grafana/grafana/issues/6696), thx [@davewat](https://github.com/davewat)
-- **Postgres/MySQL/MSSQL**: Adds support for configuration of max open/idle connections and connection max lifetime. Also, panels with multiple SQL queries will now be executed concurrently [#11711](https://github.com/grafana/grafana/issues/11711), thx [@connection-reset](https://github.com/connection-reset)
-- **MySQL**: Graphical query builder [#13762](https://github.com/grafana/grafana/issues/13762), thx [svenklemm](https://github.com/svenklemm)
-- **MySQL**: Support connecting thru Unix socket for MySQL data source [#12342](https://github.com/grafana/grafana/issues/12342), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
-- **MSSQL**: Add encrypt setting to allow configuration of how data sent between client and server are encrypted [#13629](https://github.com/grafana/grafana/issues/13629), thx [@ramiro](https://github.com/ramiro)
-- **Stackdriver**: Not possible to authenticate using GCE metadata server [#13669](https://github.com/grafana/grafana/issues/13669)
-- **Teams**: Team preferences (theme, home dashboard, timezone) support [#12550](https://github.com/grafana/grafana/issues/12550)
-- **Graph**: Time regions support enabling highlight of weekdays and/or certain timespans [#5930](https://github.com/grafana/grafana/issues/5930)
-- **OAuth**: Automatic redirect to sign-in with OAuth [#11893](https://github.com/grafana/grafana/issues/11893), thx [@Nick-Triller](https://github.com/Nick-Triller)
-- **Stackdriver**: Template query editor [#13561](https://github.com/grafana/grafana/issues/13561)
-
-### Minor
-
-- **Security**: Upgrade macaron session package to fix security issue. [#14043](https://github.com/grafana/grafana/pull/14043)
-- **Cloudwatch**: Show all available CloudWatch regions [#12308](https://github.com/grafana/grafana/issues/12308), thx [@mtanda](https://github.com/mtanda)
-- **Cloudwatch**: AWS/Connect metrics and dimensions [#13970](https://github.com/grafana/grafana/pull/13970), thx [@zcoffy](https://github.com/zcoffy)
-- **Cloudwatch**: CloudHSM metrics and dimensions [#14129](https://github.com/grafana/grafana/pull/14129), thx [@daktari](https://github.com/daktari)
-- **Cloudwatch**: Enable using variables in the stats field [#13810](https://github.com/grafana/grafana/issues/13810), thx [@mtanda](https://github.com/mtanda)
-- **Postgres**: Add delta window function to postgres query builder [#13925](https://github.com/grafana/grafana/issues/13925), thx [svenklemm](https://github.com/svenklemm)
-- **Elasticsearch**: Fix switching to/from es raw document metric query [#6367](https://github.com/grafana/grafana/issues/6367)
-- **Elasticsearch**: Fix deprecation warning about terms aggregation order key in Elasticsearch 6.x [#11977](https://github.com/grafana/grafana/issues/11977)
-- **Graph**: Render dots when no connecting line can be made [#13605](https://github.com/grafana/grafana/issues/13605), thx [@jsferrei](https://github.com/jsferrei)
-- **Table**: Fix CSS alpha background-color applied twice in table cell with link [#13606](https://github.com/grafana/grafana/issues/13606), thx [@grisme](https://github.com/grisme)
-- **Singlestat**: Fix XSS in prefix/postfix [#13946](https://github.com/grafana/grafana/issues/13946), thx [@cinaglia](https://github.com/cinaglia)
-- **Units**: New clock time format, to format ms or second values as for example `01h:59m`, [#13635](https://github.com/grafana/grafana/issues/13635), thx [@franciscocpg](https://github.com/franciscocpg)
-- **Alerting**: Increase default duration for queries [#13945](https://github.com/grafana/grafana/pull/13945)
-- **Alerting**: More options for the Slack Alert notifier [#13993](https://github.com/grafana/grafana/issues/13993), thx [@andreykaipov](https://github.com/andreykaipov)
-- **Alerting**: Can't receive DingDing alert when alert is triggered [#13723](https://github.com/grafana/grafana/issues/13723), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
-- **Alerting**: Increase Telegram captions length limit [#13876](https://github.com/grafana/grafana/pull/13876), thx [@skgsergio](https://github.com/skgsergio)
-- **Internal metrics**: Renamed `grafana_info` to `grafana_build_info` and added branch, goversion and revision [#13876](https://github.com/grafana/grafana/pull/13876)
-- **Data Source Proxy**: Keep trailing slash for data source proxy requests [#13326](https://github.com/grafana/grafana/pull/13326), thx [@ryantxu](https://github.com/ryantxu)
-- **OAuth**: Fix Google OAuth relies on email, not google account id [#13924](https://github.com/grafana/grafana/issues/13924), thx [@vinicyusmacedo](https://github.com/vinicyusmacedo)
-- **Dashboard**: Toggle legend using keyboard shortcut [#13655](https://github.com/grafana/grafana/issues/13655), thx [@davewat](https://github.com/davewat)
-- **Dashboard**: Fix render dashboard row drag handle only in edit mode [#13555](https://github.com/grafana/grafana/issues/13555), thx [@praveensastry](https://github.com/praveensastry)
-- **Teams**: Fix cannot select team if not included in initial search [#13425](https://github.com/grafana/grafana/issues/13425)
-- **Render**: Support full height screenshots using phantomjs render script [#13352](https://github.com/grafana/grafana/pull/13352), thx [@amuraru](https://github.com/amuraru)
-- **HTTP API**: Support retrieving teams by user [#14120](https://github.com/grafana/grafana/pull/14120), thx [@supercharlesliu](https://github.com/supercharlesliu)
-- **Metrics**: Add basic authentication to metrics endpoint [#13577](https://github.com/grafana/grafana/issues/13577), thx [@bobmshannon](https://github.com/bobmshannon)
-
-### Breaking changes
-
-- Postgres/MySQL/MSSQL data sources now per default uses `max open connections` = `unlimited` (earlier 10), `max idle connections` = `2` (earlier 10) and `connection max lifetime` = `4` hours (earlier unlimited).
-
-# 5.3.4 (2018-11-13)
-
-- **Alerting**: Delete alerts when parent folder was deleted [#13322](https://github.com/grafana/grafana/issues/13322)
-- **MySQL**: Fix `$__timeFilter()` should respect local time zone [#13769](https://github.com/grafana/grafana/issues/13769)
-- **Dashboard**: Fix data source selection in panel by enter key [#13932](https://github.com/grafana/grafana/issues/13932)
-- **Graph**: Fix table legend height when positioned below graph and using Internet Explorer 11 [#13903](https://github.com/grafana/grafana/issues/13903)
-- **Dataproxy**: Drop origin and referer http headers [#13328](https://github.com/grafana/grafana/issues/13328) [#13949](https://github.com/grafana/grafana/issues/13949), thx [@roidelapluie](https://github.com/roidelapluie)
-
-# 5.3.3 (2018-11-13)
-
-### File Exfiltration vulnerability Security fix
-
-See [security announcement](https://community.grafana.com/t/grafana-5-3-3-and-4-6-5-security-update/11961) for details.
-
-# 5.3.2 (2018-10-24)
-
-- **InfluxDB/Graphite/Postgres**: Prevent cross site scripting (XSS) in query editor [#13667](https://github.com/grafana/grafana/issues/13667), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres**: Fix template variables error [#13692](https://github.com/grafana/grafana/issues/13692), thx [@svenklemm](https://github.com/svenklemm)
-- **Cloudwatch**: Fix service panic because of race conditions [#13674](https://github.com/grafana/grafana/issues/13674), thx [@mtanda](https://github.com/mtanda)
-- **Cloudwatch**: Fix check for invalid percentile statistics [#13633](https://github.com/grafana/grafana/issues/13633), thx [@apalaniuk](https://github.com/apalaniuk)
-- **Stackdriver/Cloudwatch**: Allow user to change unit in graph panel if cloudwatch/stackdriver data source response doesn't include unit [#13718](https://github.com/grafana/grafana/issues/13718), thx [@mtanda](https://github.com/mtanda)
-- **Stackdriver**: stackdriver user-metrics duplicated response when multiple resource types [#13691](https://github.com/grafana/grafana/issues/13691)
-- **Variables**: Fix text box template variable doesn't work properly without a default value [#13666](https://github.com/grafana/grafana/issues/13666)
-- **Variables**: Fix variable dependency check when using `${var}` format [#13600](https://github.com/grafana/grafana/issues/13600)
-- **Dashboard**: Fix kiosk=1 url parameter should put dashboard in kiosk mode [#13764](https://github.com/grafana/grafana/pull/13764)
-- **LDAP**: Fix super admins can also be admins of orgs [#13710](https://github.com/grafana/grafana/issues/13710), thx [@adrien-f](https://github.com/adrien-f)
-- **Provisioning**: Fix deleting provisioned dashboard folder should cleanup provisioning meta data [#13280](https://github.com/grafana/grafana/issues/13280)
-
-### Minor
-
-- **Docker**: adds curl back into the docker image for utility. [#13794](https://github.com/grafana/grafana/pull/13794)
-
-# 5.3.1 (2018-10-16)
-
-- **Render**: Fix PhantomJS render of graph panel when legend displayed as table to the right [#13616](https://github.com/grafana/grafana/issues/13616)
-- **Stackdriver**: Filter option disappears after removing initial filter [#13607](https://github.com/grafana/grafana/issues/13607)
-- **Elasticsearch**: Fix no limit size in terms aggregation for alerting queries [#13172](https://github.com/grafana/grafana/issues/13172), thx [@Yukinoshita-Yukino](https://github.com/Yukinoshita-Yukino)
-- **InfluxDB**: Fix for annotation issue that caused text to be shown twice [#13553](https://github.com/grafana/grafana/issues/13553)
-- **Variables**: Fix nesting variables leads to exception and missing refresh [#13628](https://github.com/grafana/grafana/issues/13628)
-- **Variables**: Prometheus: Single letter labels are not supported [#13641](https://github.com/grafana/grafana/issues/13641), thx [@olshansky](https://github.com/olshansky)
-- **Graph**: Fix graph time formatting for Last 24h ranges [#13650](https://github.com/grafana/grafana/issues/13650)
-- **Playlist**: Fix cannot add dashboards with long names to playlist [#13464](https://github.com/grafana/grafana/issues/13464), thx [@neufeldtech](https://github.com/neufeldtech)
-- **HTTP API**: Fix /api/org/users so that query and limit querystrings works
-
-# 5.3.0 (2018-10-10)
-
-- **Stackdriver**: Filter wildcards and regex matching are not yet supported [#13495](https://github.com/grafana/grafana/issues/13495)
-- **Stackdriver**: Support the distribution metric type for heatmaps [#13559](https://github.com/grafana/grafana/issues/13559)
-- **Cloudwatch**: Automatically set graph yaxis unit [#13575](https://github.com/grafana/grafana/issues/13575), thx [@mtanda](https://github.com/mtanda)
-
-# 5.3.0-beta3 (2018-10-03)
-
-- **Stackdriver**: Fix for missing ngInject [#13511](https://github.com/grafana/grafana/pull/13511)
-- **Permissions**: Fix for broken permissions selector [#13507](https://github.com/grafana/grafana/issues/13507)
-- **Alerting**: Alert reminders deduping not working as expected when running multiple Grafana instances [#13492](https://github.com/grafana/grafana/issues/13492)
-
-# 5.3.0-beta2 (2018-10-01)
-
-### New Features
-
-- **Annotations**: Enable template variables in tagged annotations queries [#9735](https://github.com/grafana/grafana/issues/9735)
-- **Stackdriver**: Support for Google Stackdriver data source [#13289](https://github.com/grafana/grafana/pull/13289)
-
-### Minor
-
-- **Provisioning**: Dashboard Provisioning now support symlinks that changes target [#12534](https://github.com/grafana/grafana/issues/12534), thx [@auhlig](https://github.com/auhlig)
-- **OAuth**: Allow oauth email attribute name to be configurable [#12986](https://github.com/grafana/grafana/issues/12986), thx [@bobmshannon](https://github.com/bobmshannon)
-- **Tags**: Default sort order for GetDashboardTags [#11681](https://github.com/grafana/grafana/pull/11681), thx [@Jonnymcc](https://github.com/Jonnymcc)
-- **Prometheus**: Label completion queries respect dashboard time range [#12251](https://github.com/grafana/grafana/pull/12251), thx [@mtanda](https://github.com/mtanda)
-- **Prometheus**: Allow to display annotations based on Prometheus series value [#10159](https://github.com/grafana/grafana/issues/10159), thx [@mtanda](https://github.com/mtanda)
-- **Prometheus**: Adhoc-filtering for Prometheus dashboards [#13212](https://github.com/grafana/grafana/issues/13212)
-- **Singlestat**: Fix gauge display accuracy for percents [#13270](https://github.com/grafana/grafana/issues/13270), thx [@tianon](https://github.com/tianon)
-- **Dashboard**: Prevent auto refresh from starting when loading dashboard with absolute time range [#12030](https://github.com/grafana/grafana/issues/12030)
-- **Templating**: New templating variable type `Text box` that allows free text input [#3173](https://github.com/grafana/grafana/issues/3173)
-- **Alerting**: Link to view full size image in Microsoft Teams alert notifier [#13121](https://github.com/grafana/grafana/issues/13121), thx [@holiiveira](https://github.com/holiiveira)
-- **Alerting**: Fixes a bug where all alerts would send reminders after upgrade & restart [#13402](https://github.com/grafana/grafana/pull/13402)
-- **Alerting**: Concurrent render limit for graphs used in notifications [#13401](https://github.com/grafana/grafana/pull/13401)
-- **Postgres/MySQL/MSSQL**: Add support for replacing $\_\_interval and $\_\_interval_ms in alert queries [#11555](https://github.com/grafana/grafana/issues/11555), thx [@svenklemm](https://github.com/svenklemm)
-
-# 5.3.0-beta1 (2018-09-06)
-
-### New Major Features
-
-- **Alerting**: Notification reminders [#7330](https://github.com/grafana/grafana/issues/7330), thx [@jbaublitz](https://github.com/jbaublitz)
-- **Dashboard**: TV & Kiosk mode changes, new cycle view mode button in dashboard toolbar [#13025](https://github.com/grafana/grafana/pull/13025)
-- **OAuth**: Gitlab OAuth with support for filter by groups [#5623](https://github.com/grafana/grafana/issues/5623), thx [@BenoitKnecht](https://github.com/BenoitKnecht)
-- **Postgres**: Graphical query builder [#10095](https://github.com/grafana/grafana/issues/10095), thx [svenklemm](https://github.com/svenklemm)
-
-### New Features
-
-- **LDAP**: Define Grafana Admin permission in ldap group mappings [#2469](https://github.com/grafana/grafana/issues/2496), PR [#12622](https://github.com/grafana/grafana/issues/12622)
-- **LDAP**: Client certificates support [#12805](https://github.com/grafana/grafana/issues/12805), thx [@nyxi](https://github.com/nyxi)
-- **Profile**: List teams that the user is member of in current/active organization [#12476](https://github.com/grafana/grafana/issues/12476)
-- **Configuration**: Allow auto-assigning users to specific organization (other than Main. Org) [#1823](https://github.com/grafana/grafana/issues/1823) [#12801](https://github.com/grafana/grafana/issues/12801), thx [@gzzo](https://github.com/gzzo) and [@ofosos](https://github.com/ofosos)
-- **Dataproxy**: Pass configured/auth headers to a data source [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
-- **CloudWatch**: GetMetricData support [#11487](https://github.com/grafana/grafana/issues/11487), thx [@mtanda](https://github.com/mtanda)
-- **Postgres**: TimescaleDB support, e.g. use `time_bucket` for grouping by time when option enabled [#12680](https://github.com/grafana/grafana/pull/12680), thx [svenklemm](https://github.com/svenklemm)
-- **Cleanup**: Make temp file time to live configurable [#11607](https://github.com/grafana/grafana/issues/11607), thx [@xapon](https://github.com/xapon)
-
-### Minor
-
-- **Alerting**: Its now possible to configure the default value for how to handle errors and no data in alerting. [#10424](https://github.com/grafana/grafana/issues/10424)
-- **Alerting**: Fix diff and percent_diff reducers [#11563](https://github.com/grafana/grafana/issues/11563), thx [@jessetane](https://github.com/jessetane)
-- **Alerting**: Fix rendering timeout which could cause notifications to not be sent due to rendering timing out [#12151](https://github.com/grafana/grafana/issues/12151)
-- **Docker**: Make it possible to set a specific plugin url [#12861](https://github.com/grafana/grafana/pull/12861), thx [ClementGautier](https://github.com/ClementGautier)
-- **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
-- **Provisioning**: Should allow one default data source per organization [#12229](https://github.com/grafana/grafana/issues/12229)
-- **GitHub OAuth**: Allow changes of user info at GitHub to be synched to Grafana when signing in [#11818](https://github.com/grafana/grafana/issues/11818), thx [@rwaweber](https://github.com/rwaweber)
-- **OAuth**: Fix overriding tls_skip_verify_insecure using environment variable [#12747](https://github.com/grafana/grafana/issues/12747), thx [@jangaraj](https://github.com/jangaraj)
-- **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
-- **Prometheus**: Heatmap - fix unhandled error when some points are missing [#12484](https://github.com/grafana/grafana/issues/12484)
-- **Prometheus**: Add $**interval, $**interval_ms, \$**range, $**range_s & $\_\_range_ms support for dashboard and template queries [#12597](https://github.com/grafana/grafana/issues/12597) [#12882](https://github.com/grafana/grafana/issues/12882), thx [@roidelapluie](https://github.com/roidelapluie)
-- **Elasticsearch**: For alerting/backend, support having index name to the right of pattern in index pattern [#12731](https://github.com/grafana/grafana/issues/12731)
-- **Graphite**: Fix for quoting of int function parameters (when using variables) [#11927](https://github.com/grafana/grafana/pull/11927)
-- **InfluxDB**: Support timeFilter in query templating for InfluxDB [#12598](https://github.com/grafana/grafana/pull/12598), thx [kichristensen](https://github.com/kichristensen)
-- **Postgres/MySQL/MSSQL**: New $\_\_unixEpochGroup and $\_\_unixEpochGroupAlias macros [#12892](https://github.com/grafana/grafana/issues/12892), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: Add previous fill mode to \$\_\_timeGroup macro which will fill in previously seen value when point is missing [#12756](https://github.com/grafana/grafana/issues/12756), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: Use floor rounding in \$\_\_timeGroup macro function [#12460](https://github.com/grafana/grafana/issues/12460), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: Use metric column as prefix when returning multiple value columns [#12727](https://github.com/grafana/grafana/issues/12727), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: New $\_\_timeGroupAlias macro. Postgres $\_\_timeGroup no longer automatically adds time column alias [#12749](https://github.com/grafana/grafana/issues/12749), thx [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: Escape single quotes in variables [#12785](https://github.com/grafana/grafana/issues/12785), thx [@eMerzh](https://github.com/eMerzh)
-- **Postgres/MySQL/MSSQL**: Min time interval support [#13157](https://github.com/grafana/grafana/issues/13157), thx [@svenklemm](https://github.com/svenklemm)
-- **MySQL/MSSQL**: Use datetime format instead of epoch for $\_\_timeFilter, $**timeFrom and \$**timeTo macros [#11618](https://github.com/grafana/grafana/issues/11618) [#11619](https://github.com/grafana/grafana/issues/11619), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
-- **Postgres**: Escape ssl mode parameter in connectionstring [#12644](https://github.com/grafana/grafana/issues/12644), thx [@yogyrahmawan](https://github.com/yogyrahmawan)
-- **Cloudwatch**: Improved error handling [#12489](https://github.com/grafana/grafana/issues/12489), thx [@mtanda](https://github.com/mtanda)
-- **Cloudwatch**: AppSync metrics and dimensions [#12300](https://github.com/grafana/grafana/issues/12300), thx [@franciscocpg](https://github.com/franciscocpg)
-- **Cloudwatch**: Direct Connect metrics and dimensions [#12762](https://github.com/grafana/grafana/pulls/12762), thx [@mindriot88](https://github.com/mindriot88)
-- **Cloudwatch**: Added BurstBalance metric to list of AWS RDS metrics [#12561](https://github.com/grafana/grafana/pulls/12561), thx [@activeshadow](https://github.com/activeshadow)
-- **Cloudwatch**: Add new Redshift metrics and dimensions [#12063](https://github.com/grafana/grafana/pulls/12063), thx [@A21z](https://github.com/A21z)
-- **Dashboard**: Fix selecting current dashboard from search should not reload dashboard [#12248](https://github.com/grafana/grafana/issues/12248)
-- **Dashboard**: Use uid when linking to dashboards internally in a dashboard [#10705](https://github.com/grafana/grafana/issues/10705)
-- **Graph**: Option to hide series from tooltip [#3341](https://github.com/grafana/grafana/issues/3341), thx [@mtanda](https://github.com/mtanda)
-- **Singlestat**: Make colorization of prefix and postfix optional in singlestat [#11892](https://github.com/grafana/grafana/pull/11892), thx [@ApsOps](https://github.com/ApsOps)
-- **Table**: Adjust header contrast for the light theme [#12668](https://github.com/grafana/grafana/issues/12668)
-- **Table**: Fix link color when using light theme and thresholds in use [#12766](https://github.com/grafana/grafana/issues/12766)
-- **Table**: Fix for useless horizontal scrollbar for table panel [#9964](https://github.com/grafana/grafana/issues/9964)
-- **Table**: Make table sorting stable when null values exist [#12362](https://github.com/grafana/grafana/pull/12362), thx [@bz2](https://github.com/bz2)
-- **Heatmap**: Fix broken tooltip and crosshair on Firefox [#12486](https://github.com/grafana/grafana/issues/12486)
-- **Data Source**: Fix UI issue with secret fields after updating data source [#11270](https://github.com/grafana/grafana/issues/11270)
-- **Variables**: Skip unneeded extra query request when de-selecting variable values used for repeated panels [#8186](https://github.com/grafana/grafana/issues/8186), thx [@mtanda](https://github.com/mtanda)
-- **Variables**: Limit amount of queries executed when updating variable that other variable(s) are dependent on [#11890](https://github.com/grafana/grafana/issues/11890)
-- **Variables**: Support query variable refresh when another variable referenced in `Regex` field change its value [#12952](https://github.com/grafana/grafana/issues/12952), thx [@franciscocpg](https://github.com/franciscocpg)
-- **Variables**: Support variables in query variable `Custom all value` field [#12965](https://github.com/grafana/grafana/issues/12965), thx [@franciscocpg](https://github.com/franciscocpg)
-- **Units**: Change units to include characters for power of 2 and 3 [#12744](https://github.com/grafana/grafana/pull/12744), thx [@Worty](https://github.com/Worty)
-- **Units**: Polish złoty currency [#12691](https://github.com/grafana/grafana/pull/12691), thx [@mwegrzynek](https://github.com/mwegrzynek)
-- **Units**: Adds bitcoin axes unit. [#13125](https://github.com/grafana/grafana/pull/13125)
-- **Api**: Delete nonexistent data source should return 404 [#12313](https://github.com/grafana/grafana/issues/12313), thx [@AustinWinstanley](https://github.com/AustinWinstanley)
-- **Logging**: Reopen log files after receiving a SIGHUP signal [#13112](https://github.com/grafana/grafana/pull/13112), thx [@filewalkwithme](https://github.com/filewalkwithme)
-- **Login**: Show loading animation while waiting for authentication response on login [#12865](https://github.com/grafana/grafana/issues/12865)
-- **UI**: Fix iOS home screen "app" icon and Windows 10 app experience [#12752](https://github.com/grafana/grafana/issues/12752), thx [@andig](https://github.com/andig)
-- **Plugins**: Convert URL-like text to links in plugins readme [#12843](https://github.com/grafana/grafana/pull/12843), thx [pgiraud](https://github.com/pgiraud)
-
-### Breaking changes
-
-- Postgres data source no longer automatically adds time column alias when using the \$\_\_timeGroup alias. However, there's code in place which should make this change backward compatible and shouldn't create any issues.
-- Kiosk mode now also hides submenu (variables)
-- ?inactive url parameter no longer supported, replaced with kiosk=tv url parameter
-
-### New experimental features
-
-These are new features that's still being worked on and are in an experimental phase. We encourage users to try these out and provide any feedback in related issue.
-
-- **Dashboard**: Auto fit dashboard panels to optimize space used for current TV / Monitor [#12768](https://github.com/grafana/grafana/issues/12768)
-
-### Tech
-
-- **Frontend**: Convert all Frontend Karma tests to Jest tests [#12224](https://github.com/grafana/grafana/issues/12224)
-- **Backend**: Upgrade to golang 1.11 [#13030](https://github.com/grafana/grafana/issues/13030)
-
-# 5.2.4 (2018-09-07)
-
-- **GrafanaCli**: Fixed issue with grafana-cli install plugin resulting in corrupt http response from source error. Fixes [#13079](https://github.com/grafana/grafana/issues/13079)
-
-# 5.2.3 (2018-08-29)
-
-### Important fix for LDAP & OAuth login vulnerability
-
-See [security announcement](https://community.grafana.com/t/grafana-5-2-3-and-4-6-4-security-update/10050) for details.
-
-# 5.2.2 (2018-07-25)
-
-### Minor
-
-- **Prometheus**: Fix graph panel bar width issue in aligned prometheus queries [#12379](https://github.com/grafana/grafana/issues/12379)
-- **Dashboard**: Dashboard links not updated when changing variables [#12506](https://github.com/grafana/grafana/issues/12506)
-- **Postgres/MySQL/MSSQL**: Fix connection leak [#12636](https://github.com/grafana/grafana/issues/12636) [#9827](https://github.com/grafana/grafana/issues/9827)
-- **Plugins**: Fix loading of external plugins [#12551](https://github.com/grafana/grafana/issues/12551)
-- **Dashboard**: Remove unwanted scrollbars in embedded panels [#12589](https://github.com/grafana/grafana/issues/12589)
-- **Prometheus**: Prevent error using \$\_\_interval_ms in query [#12533](https://github.com/grafana/grafana/pull/12533), thx [@mtanda](https://github.com/mtanda)
-
-# 5.2.1 (2018-06-29)
-
-### Minor
-
-- **Auth Proxy**: Important security fix for whitelist of IP address feature [#12444](https://github.com/grafana/grafana/pull/12444)
-- **UI**: Fix - Grafana footer overlapping page [#12430](https://github.com/grafana/grafana/issues/12430)
-- **Logging**: Errors should be reported before crashing [#12438](https://github.com/grafana/grafana/issues/12438)
-
-# 5.2.0-stable (2018-06-27)
-
-### Minor
-
-- **Plugins**: Handle errors correctly when loading data source plugin [#12383](https://github.com/grafana/grafana/pull/12383) thx [@rozetko](https://github.com/rozetko)
-- **Render**: Enhance error message if phantomjs executable is not found [#11868](https://github.com/grafana/grafana/issues/11868)
-- **Dashboard**: Set correct text in drop down when variable is present in url [#11968](https://github.com/grafana/grafana/issues/11968)
-
-### 5.2.0-beta3 fixes
-
-- **LDAP**: Handle "dn" ldap attribute more gracefully [#12385](https://github.com/grafana/grafana/pull/12385), reverts [#10970](https://github.com/grafana/grafana/pull/10970)
-
-# 5.2.0-beta3 (2018-06-21)
-
-### Minor
-
-- **Build**: All rpm packages should be signed [#12359](https://github.com/grafana/grafana/issues/12359)
-
-# 5.2.0-beta2 (2018-06-20)
-
-### New Features
-
-- **Dashboard**: Import dashboard to folder [#10796](https://github.com/grafana/grafana/issues/10796)
-
-### Minor
-
-- **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
-- **Dashboard**: Fix so panel titles doesn't wrap [#11074](https://github.com/grafana/grafana/issues/11074)
-- **Dashboard**: Prevent double-click when saving dashboard [#11963](https://github.com/grafana/grafana/issues/11963)
-- **Dashboard**: AutoFocus the add-panel search filter [#12189](https://github.com/grafana/grafana/pull/12189) thx [@ryantxu](https://github.com/ryantxu)
-- **Units**: W/m2 (energy), l/h (flow) and kPa (pressure) [#11233](https://github.com/grafana/grafana/pull/11233), thx [@flopp999](https://github.com/flopp999)
-- **Units**: Liter/min (flow) and milliLiter/min (flow) [#12282](https://github.com/grafana/grafana/pull/12282), thx [@flopp999](https://github.com/flopp999)
-- **Alerting**: Fix mobile notifications for Microsoft Teams alert notifier [#11484](https://github.com/grafana/grafana/pull/11484), thx [@manacker](https://github.com/manacker)
-- **Influxdb**: Add support for mode function [#12286](https://github.com/grafana/grafana/issues/12286)
-- **Cloudwatch**: Fixes panic caused by bad timerange settings [#12199](https://github.com/grafana/grafana/issues/12199)
-- **Auth Proxy**: Whitelist proxy IP address instead of client IP address [#10707](https://github.com/grafana/grafana/issues/10707)
-- **User Management**: Make sure that a user always has a current org assigned [#11076](https://github.com/grafana/grafana/issues/11076)
-- **Snapshots**: Fix: annotations not properly extracted leading to incorrect rendering of annotations [#12278](https://github.com/grafana/grafana/issues/12278)
-- **LDAP**: Allow use of DN in group_search_filter_user_attribute and member_of [#3132](https://github.com/grafana/grafana/issues/3132), thx [@mmolnar](https://github.com/mmolnar)
-- **Graph**: Fix legend decimals precision calculation [#11792](https://github.com/grafana/grafana/issues/11792)
-- **Dashboard**: Make sure to process panels in collapsed rows when exporting dashboard [#12256](https://github.com/grafana/grafana/issues/12256)
-
-### 5.2.0-beta1 fixes
-
-- **Dashboard**: Dashboard link doesn't work when "As dropdown" option is checked [#12315](https://github.com/grafana/grafana/issues/12315)
-- **Dashboard**: Fix regressions after save modal changes, including adhoc template issues [#12240](https://github.com/grafana/grafana/issues/12240)
-- **Docker**: Config keys ending with \_FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
-
-# 5.2.0-beta1 (2018-06-05)
-
-### New Features
-
-- **Elasticsearch**: Alerting support [#5893](https://github.com/grafana/grafana/issues/5893), thx [@WPH95](https://github.com/WPH95)
-- **Build**: Crosscompile and packages Grafana on arm, windows, linux and darwin [#11920](https://github.com/grafana/grafana/pull/11920), thx [@fg2it](https://github.com/fg2it)
-- **Login**: Change admin password after first login [#11882](https://github.com/grafana/grafana/issues/11882)
-- **Alert list panel**: Updated to support filtering alerts by name, dashboard title, folder, tags [#11500](https://github.com/grafana/grafana/issues/11500), [#8168](https://github.com/grafana/grafana/issues/8168), [#6541](https://github.com/grafana/grafana/issues/6541)
-
-### Minor
-
-- **Dashboard**: Modified time range and variables are now not saved by default [#10748](https://github.com/grafana/grafana/issues/10748), [#8805](https://github.com/grafana/grafana/issues/8805)
-- **Graph**: Show invisible highest value bucket in histogram [#11498](https://github.com/grafana/grafana/issues/11498)
-- **Dashboard**: Enable "Save As..." if user has edit permission [#11625](https://github.com/grafana/grafana/issues/11625)
-- **Prometheus**: Query dates are now step-aligned [#10434](https://github.com/grafana/grafana/pull/10434)
-- **Prometheus**: Table columns order now changes when rearrange queries [#11690](https://github.com/grafana/grafana/issues/11690), thx [@mtanda](https://github.com/mtanda)
-- **Variables**: Fix variable interpolation when using multiple formatting types [#11800](https://github.com/grafana/grafana/issues/11800), thx [@svenklemm](https://github.com/svenklemm)
-- **Dashboard**: Fix date selector styling for dark/light theme in time picker control [#11616](https://github.com/grafana/grafana/issues/11616)
-- **Discord**: Alert notification channel type for Discord, [#7964](https://github.com/grafana/grafana/issues/7964) thx [@jereksel](https://github.com/jereksel),
-- **InfluxDB**: Support SELECT queries in templating query, [#5013](https://github.com/grafana/grafana/issues/5013)
-- **InfluxDB**: Support count distinct aggregation [#11645](https://github.com/grafana/grafana/issues/11645), thx [@kichristensen](https://github.com/kichristensen)
-- **Dashboard**: JSON Model under dashboard settings can now be updated & changes saved, [#1429](https://github.com/grafana/grafana/issues/1429), thx [@jereksel](https://github.com/jereksel)
-- **Security**: Fix XSS vulnerabilities in dashboard links [#11813](https://github.com/grafana/grafana/pull/11813)
-- **Singlestat**: Fix "time of last point" shows local time when dashboard timezone set to UTC [#10338](https://github.com/grafana/grafana/issues/10338)
-- **Prometheus**: Add support for passing timeout parameter to Prometheus [#11788](https://github.com/grafana/grafana/pull/11788), thx [@mtanda](https://github.com/mtanda)
-- **Login**: Add optional option sign out url for generic oauth [#9847](https://github.com/grafana/grafana/issues/9847), thx [@roidelapluie](https://github.com/roidelapluie)
-- **Login**: Use proxy server from environment variable if available [#9703](https://github.com/grafana/grafana/issues/9703), thx [@iyeonok](https://github.com/iyeonok)
-- **Invite users**: Friendlier error message when smtp is not configured [#12087](https://github.com/grafana/grafana/issues/12087), thx [@thurt](https://github.com/thurt)
-- **Graphite**: Don't send distributed tracing headers when using direct/browser access mode [#11494](https://github.com/grafana/grafana/issues/11494)
-- **Sidenav**: Show create dashboard link for viewers if at least editor in one folder [#11858](https://github.com/grafana/grafana/issues/11858)
-- **SQL**: Second epochs are now correctly converted to ms. [#12085](https://github.com/grafana/grafana/pull/12085)
-- **Singlestat**: Fix singlestat threshold tooltip [#11971](https://github.com/grafana/grafana/issues/11971)
-- **Dashboard**: Hide grid controls in fullscreen/low-activity views [#11771](https://github.com/grafana/grafana/issues/11771)
-- **Dashboard**: Validate uid when importing dashboards [#11515](https://github.com/grafana/grafana/issues/11515)
-- **Docker**: Support for env variables ending with \_FILE [grafana-docker #166](https://github.com/grafana/grafana-docker/pull/166), thx [@efrecon](https://github.com/efrecon)
-- **Alert list panel**: Show alerts for user with viewer role [#11167](https://github.com/grafana/grafana/issues/11167)
-- **Provisioning**: Verify checksum of dashboards before updating to reduce load on database [#11670](https://github.com/grafana/grafana/issues/11670)
-- **Provisioning**: Support symlinked files in dashboard provisioning config files [#11958](https://github.com/grafana/grafana/issues/11958)
-- **Dashboard list panel**: Search dashboards by folder [#11525](https://github.com/grafana/grafana/issues/11525)
-- **Sidenav**: Always show server admin link in sidenav if grafana admin [#11657](https://github.com/grafana/grafana/issues/11657)
-
-# 5.1.5 (2018-06-27)
-
-- **Docker**: Config keys ending with \_FILE are not respected [#170](https://github.com/grafana/grafana-docker/issues/170)
-
-# 5.1.4 (2018-06-19)
-
-- **Permissions**: Important security fix for API keys with viewer role [#12343](https://github.com/grafana/grafana/issues/12343)
-
-# 5.1.3 (2018-05-16)
-
-- **Scroll**: Graph panel / legend texts shifts on the left each time we move scrollbar on firefox [#11830](https://github.com/grafana/grafana/issues/11830)
-
-# 5.1.2 (2018-05-09)
-
-- **Database**: Fix MySql migration issue [#11862](https://github.com/grafana/grafana/issues/11862)
-- **Google Analytics**: Enable Google Analytics anonymizeIP setting for GDPR [#11656](https://github.com/grafana/grafana/pull/11656)
-
-# 5.1.1 (2018-05-07)
-
-- **LDAP**: LDAP login with MariaDB/MySQL database and dn>100 chars not possible [#11754](https://github.com/grafana/grafana/issues/11754)
-- **Build**: AppVeyor Windows build missing version and commit info [#11758](https://github.com/grafana/grafana/issues/11758)
-- **Scroll**: Scroll can't start in graphs on Chrome mobile [#11710](https://github.com/grafana/grafana/issues/11710)
-- **Units**: Revert renaming of unit key ppm [#11743](https://github.com/grafana/grafana/issues/11743)
-
-# 5.1.0 (2018-04-26)
-
-- **Folders**: Default permissions on folder are not shown as inherited in its dashboards [#11668](https://github.com/grafana/grafana/issues/11668)
-- **Templating**: Allow more than 20 previews when creating a variable [#11508](https://github.com/grafana/grafana/issues/11508)
-- **Dashboard**: Row edit icon not shown [#11466](https://github.com/grafana/grafana/issues/11466)
-- **SQL**: Unsupported data types for value column using time series query [#11703](https://github.com/grafana/grafana/issues/11703)
-- **Prometheus**: Prometheus query inspector expands to be very large on autocomplete queries [#11673](https://github.com/grafana/grafana/issues/11673)
-
-# 5.1.0-beta1 (2018-04-20)
-
-- **MSSQL**: New Microsoft SQL Server data source [#10093](https://github.com/grafana/grafana/pull/10093), [#11298](https://github.com/grafana/grafana/pull/11298), thx [@linuxchips](https://github.com/linuxchips)
-- **Prometheus**: The heatmap panel now support Prometheus histograms [#10009](https://github.com/grafana/grafana/issues/10009)
-- **Postgres/MySQL**: Ability to insert 0s or nulls for missing intervals [#9487](https://github.com/grafana/grafana/issues/9487), thanks [@svenklemm](https://github.com/svenklemm)
-- **Postgres/MySQL/MSSQL**: Fix precision for the time column in table mode [#11306](https://github.com/grafana/grafana/issues/11306)
-- **Graph**: Align left and right Y-axes to one level [#1271](https://github.com/grafana/grafana/issues/1271) & [#2740](https://github.com/grafana/grafana/issues/2740) thx [@ilgizar](https://github.com/ilgizar)
-- **Graph**: Thresholds for Right Y axis [#7107](https://github.com/grafana/grafana/issues/7107), thx [@ilgizar](https://github.com/ilgizar)
-- **Graph**: Support multiple series stacking in histogram mode [#8151](https://github.com/grafana/grafana/issues/8151), thx [@mtanda](https://github.com/mtanda)
-- **Alerting**: Pausing/un alerts now updates new_state_date [#10942](https://github.com/grafana/grafana/pull/10942)
-- **Alerting**: Support Pagerduty notification channel using Pagerduty V2 API [#10531](https://github.com/grafana/grafana/issues/10531), thx [@jbaublitz](https://github.com/jbaublitz)
-- **Templating**: Add comma templating format [#10632](https://github.com/grafana/grafana/issues/10632), thx [@mtanda](https://github.com/mtanda)
-- **Prometheus**: Show template variable candidate in query editor [#9210](https://github.com/grafana/grafana/issues/9210), thx [@mtanda](https://github.com/mtanda)
-- **Prometheus**: Support POST for query and query_range [#9859](https://github.com/grafana/grafana/pull/9859), thx [@mtanda](https://github.com/mtanda)
-- **Alerting**: Add support for retries on alert queries [#5855](https://github.com/grafana/grafana/issues/5855), thx [@Thib17](https://github.com/Thib17)
-- **Table**: Table plugin value mappings [#7119](https://github.com/grafana/grafana/issues/7119), thx [infernix](https://github.com/infernix)
-- **IE11**: IE 11 compatibility [#11165](https://github.com/grafana/grafana/issues/11165)
-- **Scrolling**: Better scrolling experience [#11053](https://github.com/grafana/grafana/issues/11053), [#11252](https://github.com/grafana/grafana/issues/11252), [#10836](https://github.com/grafana/grafana/issues/10836), [#11185](https://github.com/grafana/grafana/issues/11185), [#11168](https://github.com/grafana/grafana/issues/11168)
-- **Docker**: Improved docker image (breaking changes regarding file ownership) [grafana-docker #141](https://github.com/grafana/grafana-docker/issues/141), thx [@Spindel](https://github.com/Spindel), [@ChristianKniep](https://github.com/ChristianKniep), [@brancz](https://github.com/brancz) and [@jangaraj](https://github.com/jangaraj)
-- **Folders**: A folder admin cannot add user/team permissions for folder/its dashboards [#11173](https://github.com/grafana/grafana/issues/11173)
-- **Provisioning**: Improved workflow for provisioned dashboards [#10883](https://github.com/grafana/grafana/issues/10883)
-
-### Minor
-
-- **OpsGenie**: Add triggered alerts as description [#11046](https://github.com/grafana/grafana/pull/11046), thx [@llamashoes](https://github.com/llamashoes)
-- **Cloudwatch**: Support high resolution metrics [#10925](https://github.com/grafana/grafana/pull/10925), thx [@mtanda](https://github.com/mtanda)
-- **Cloudwatch**: Add dimension filtering to CloudWatch `dimension_values()` [#10029](https://github.com/grafana/grafana/issues/10029), thx [@willyhutw](https://github.com/willyhutw)
-- **Units**: Second to HH:mm:ss formatter [#11107](https://github.com/grafana/grafana/issues/11107), thx [@gladdiologist](https://github.com/gladdiologist)
-- **Singlestat**: Add color to prefix and postfix in singlestat panel [#11143](https://github.com/grafana/grafana/pull/11143), thx [@ApsOps](https://github.com/ApsOps)
-- **Dashboards**: Version cleanup fails on old databases with many entries [#11278](https://github.com/grafana/grafana/issues/11278)
-- **Server**: Adjust permissions of unix socket [#11343](https://github.com/grafana/grafana/pull/11343), thx [@corny](https://github.com/corny)
-- **Shortcuts**: Add shortcut for duplicate panel [#11102](https://github.com/grafana/grafana/issues/11102)
-- **AuthProxy**: Support IPv6 in Auth proxy white list [#11330](https://github.com/grafana/grafana/pull/11330), thx [@corny](https://github.com/corny)
-- **SMTP**: Don't connect to STMP server using TLS unless configured. [#7189](https://github.com/grafana/grafana/issues/7189)
-- **Prometheus**: Escape backslash in labels correctly. [#10555](https://github.com/grafana/grafana/issues/10555), thx [@roidelapluie](https://github.com/roidelapluie)
-- **Variables**: Case-insensitive sorting for template values [#11128](https://github.com/grafana/grafana/issues/11128) thx [@cross](https://github.com/cross)
-- **Annotations (native)**: Change default limit from 10 to 100 when querying api [#11569](https://github.com/grafana/grafana/issues/11569), thx [@flopp999](https://github.com/flopp999)
-- **MySQL/Postgres/MSSQL**: PostgreSQL data source generates invalid query with dates before 1970 [#11530](https://github.com/grafana/grafana/issues/11530) thx [@ryantxu](https://github.com/ryantxu)
-- **Kiosk**: Adds url parameter for starting a dashboard in inactive mode [#11228](https://github.com/grafana/grafana/issues/11228), thx [@towolf](https://github.com/towolf)
-- **Dashboard**: Enable closing timepicker using escape key [#11332](https://github.com/grafana/grafana/issues/11332)
-- **Data Sources**: Rename direct access mode in the data source settings [#11391](https://github.com/grafana/grafana/issues/11391)
-- **Search**: Display dashboards in folder indented [#11073](https://github.com/grafana/grafana/issues/11073)
-- **Units**: Use B/s instead Bps for Bytes per second [#9342](https://github.com/grafana/grafana/pull/9342), thx [@mayli](https://github.com/mayli)
-- **Units**: Radiation units [#11001](https://github.com/grafana/grafana/issues/11001), thx [@victorclaessen](https://github.com/victorclaessen)
-- **Units**: Timeticks unit [#11183](https://github.com/grafana/grafana/pull/11183), thx [@jtyr](https://github.com/jtyr)
-- **Units**: Concentration units and "Normal cubic meter" [#11211](https://github.com/grafana/grafana/issues/11211), thx [@flopp999](https://github.com/flopp999)
-- **Units**: New currency - Czech koruna [#11384](https://github.com/grafana/grafana/pull/11384), thx [@Rohlik](https://github.com/Rohlik)
-- **Avatar**: Fix DISABLE_GRAVATAR option [#11095](https://github.com/grafana/grafana/issues/11095)
-- **Heatmap**: Disable log scale when using time time series buckets [#10792](https://github.com/grafana/grafana/issues/10792)
-- **Provisioning**: Remove `id` from json when provisioning dashboards, [#11138](https://github.com/grafana/grafana/issues/11138)
-- **Prometheus**: tooltip for legend format not showing properly [#11516](https://github.com/grafana/grafana/issues/11516), thx [@svenklemm](https://github.com/svenklemm)
-- **Playlist**: Empty playlists cannot be deleted [#11133](https://github.com/grafana/grafana/issues/11133), thx [@kichristensen](https://github.com/kichristensen)
-- **Switch Orgs**: Alphabetic order in Switch Organization modal [#11556](https://github.com/grafana/grafana/issues/11556)
-- **Postgres**: improve `$__timeFilter` macro [#11578](https://github.com/grafana/grafana/issues/11578), thx [@svenklemm](https://github.com/svenklemm)
-- **Permission list**: Improved ux [#10747](https://github.com/grafana/grafana/issues/10747)
-- **Dashboard**: Sizing and positioning of settings menu icons [#11572](https://github.com/grafana/grafana/pull/11572)
-- **Dashboard**: Add search filter/tabs to new panel control [#10427](https://github.com/grafana/grafana/issues/10427)
-- **Folders**: User with org viewer role should not be able to save/move dashboards in/to general folder [#11553](https://github.com/grafana/grafana/issues/11553)
-- **Influxdb**: Don't assume the first column in table response is time. [#11476](https://github.com/grafana/grafana/issues/11476), thx [@hahnjo](https://github.com/hahnjo)
-
-### Tech
-
-- Backend code simplification [#11613](https://github.com/grafana/grafana/pull/11613), thx [@knweiss](https://github.com/knweiss)
-- Add codespell to CI [#11602](https://github.com/grafana/grafana/pull/11602), thx [@mjtrangoni](https://github.com/mjtrangoni)
-- Migrated JavaScript files to TypeScript
-
-# 5.0.4 (2018-03-28)
-
-- **Docker** Can't start Grafana on Kubernetes 1.7.14, 1.8.9, or 1.9.4 [#140 in grafana-docker repo](https://github.com/grafana/grafana-docker/issues/140) thx [@suquant](https://github.com/suquant)
-- **Dashboard** Fixed bug where collapsed panels could not be directly linked to/renderer [#11114](https://github.com/grafana/grafana/issues/11114) & [#11086](https://github.com/grafana/grafana/issues/11086) & [#11296](https://github.com/grafana/grafana/issues/11296)
-- **Dashboard** Provisioning dashboard with alert rules should create alerts [#11247](https://github.com/grafana/grafana/issues/11247)
-- **Snapshots** For snapshots, the Graph panel renders the legend incorrectly on right hand side [#11318](https://github.com/grafana/grafana/issues/11318)
-- **Alerting** Link back to Grafana returns wrong URL if root_path contains sub-path components [#11403](https://github.com/grafana/grafana/issues/11403)
-- **Alerting** Incorrect default value for upload images setting for alert notifiers [#11413](https://github.com/grafana/grafana/pull/11413)
-
-# 5.0.3 (2018-03-16)
-
-- **Mysql**: Mysql panic occurring occasionally upon Grafana dashboard access (a bigger patch than the one in 5.0.2) [#11155](https://github.com/grafana/grafana/issues/11155)
-
-# 5.0.2 (2018-03-14)
-
-- **Mysql**: Mysql panic occurring occasionally upon Grafana dashboard access [#11155](https://github.com/grafana/grafana/issues/11155)
-- **Dashboards**: Should be possible to browse dashboard using only uid [#11231](https://github.com/grafana/grafana/issues/11231)
-- **Alerting**: Fixes bug where alerts from hidden panels where deleted [#11222](https://github.com/grafana/grafana/issues/11222)
-- **Import**: Fixes bug where dashboards with alerts couldn't be imported [#11227](https://github.com/grafana/grafana/issues/11227)
-- **Teams**: Remove quota restrictions from teams [#11220](https://github.com/grafana/grafana/issues/11220)
-- **Render**: Fixes bug with legacy url redirection for panel rendering [#11180](https://github.com/grafana/grafana/issues/11180)
-
-# 5.0.1 (2018-03-08)
-
-- **Postgres**: PostgreSQL error when using ipv6 address as hostname in connection string [#11055](https://github.com/grafana/grafana/issues/11055), thanks [@svenklemm](https://github.com/svenklemm)
-- **Dashboards**: Changing templated value from dropdown is causing unsaved changes [#11063](https://github.com/grafana/grafana/issues/11063)
-- **Prometheus**: Fixes bundled Prometheus 2.0 dashboard [#11016](https://github.com/grafana/grafana/issues/11016), thx [@roidelapluie](https://github.com/roidelapluie)
-- **Sidemenu**: Profile menu "invisible" when gravatar is disabled [#11097](https://github.com/grafana/grafana/issues/11097)
-- **Dashboard**: Fixes a bug with resizable handles for panels [#11103](https://github.com/grafana/grafana/issues/11103)
-- **Alerting**: Telegram inline image mode fails when caption too long [#10975](https://github.com/grafana/grafana/issues/10975)
-- **Alerting**: Fixes silent failing validation [#11145](https://github.com/grafana/grafana/pull/11145)
-- **OAuth**: Only use jwt token if it contains an email address [#11127](https://github.com/grafana/grafana/pull/11127)
-
-# 5.0.0-stable (2018-03-01)
-
-### Fixes
-
-- **oauth** Fix GitHub OAuth not working with private Organizations [#11028](https://github.com/grafana/grafana/pull/11028) [@lostick](https://github.com/lostick)
-- **kiosk** white area over bottom panels in kiosk mode [#11010](https://github.com/grafana/grafana/issues/11010)
-- **alerting** Fix OK state doesn't show up in Microsoft Teams [#11032](https://github.com/grafana/grafana/pull/11032), thx [@manacker](https://github.com/manacker)
-
-# 5.0.0-beta5 (2018-02-26)
-
-### Fixes
-
-- **Orgs** Unable to switch org when too many orgs listed [#10774](https://github.com/grafana/grafana/issues/10774)
-- **Folders** Make it easier/explicit to access/modify folders using the API [#10630](https://github.com/grafana/grafana/issues/10630)
-- **Dashboard** Scrollbar works incorrectly in Grafana 5.0 Beta4 in some cases [#10982](https://github.com/grafana/grafana/issues/10982)
-- **ElasticSearch** Custom aggregation sizes no longer allowed for Elasticsearch [#10124](https://github.com/grafana/grafana/issues/10124)
-- **oauth** GitHub OAuth with allowed organizations fails to login [#10964](https://github.com/grafana/grafana/issues/10964)
-- **heatmap** Heatmap panel has partially hidden legend [#10793](https://github.com/grafana/grafana/issues/10793)
-- **snapshots** Expired snapshots not being cleaned up [#10996](https://github.com/grafana/grafana/pull/10996)
-
-# 5.0.0-beta4 (2018-02-19)
-
-### Fixes
-
-- **Dashboard** Fixed dashboard overwrite permission issue [#10814](https://github.com/grafana/grafana/issues/10814)
-- **Keyboard shortcuts** Fixed Esc key when in panel edit/view mode [#10945](https://github.com/grafana/grafana/issues/10945)
-- **Save dashboard** Fixed issue with time range & variable reset after saving [#10946](https://github.com/grafana/grafana/issues/10946)
-
-# 5.0.0-beta3 (2018-02-16)
-
-### Fixes
-
-- **MySQL** Fixed new migration issue with index length [#10931](https://github.com/grafana/grafana/issues/10931)
-- **Modal** Escape key no closes modals everywhere, fixes [#10887](https://github.com/grafana/grafana/issues/10887)
-- **Row repeats** Fix for repeating rows issue, fixes [#10932](https://github.com/grafana/grafana/issues/10932)
-- **Docs** Team api documented, fixes [#10832](https://github.com/grafana/grafana/issues/10832)
-- **Plugins** Plugin info page broken, fixes [#10943](https://github.com/grafana/grafana/issues/10943)
-
-# 5.0.0-beta2 (2018-02-15)
-
-### Fixes
-
-- **Permissions** Fixed search permissions issues [#10822](https://github.com/grafana/grafana/issues/10822)
-- **Permissions** Fixed problem issues displaying permissions lists [#10864](https://github.com/grafana/grafana/issues/10864)
-- **PNG-Rendering** Fixed problem rendering legend to the right [#10526](https://github.com/grafana/grafana/issues/10526)
-- **Reset password** Fixed problem with reset password form [#10870](https://github.com/grafana/grafana/issues/10870)
-- **Light theme** Fixed problem with light theme in safari, [#10869](https://github.com/grafana/grafana/issues/10869)
-- **Provisioning** Now handles deletes when dashboard json files removed from disk [#10865](https://github.com/grafana/grafana/issues/10865)
-- **MySQL** Fixed issue with schema migration on old mysql (index too long) [#10779](https://github.com/grafana/grafana/issues/10779)
-- **GitHub OAuth** Fixed fetching github orgs from private github org [#10823](https://github.com/grafana/grafana/issues/10823)
-- **Embedding** Fixed issues embedding panel [#10787](https://github.com/grafana/grafana/issues/10787)
-
-# 5.0.0-beta1 (2018-02-05)
-
-Grafana v5.0 is going to be the biggest and most foundational release Grafana has ever had, coming with a ton of UX improvements, a new dashboard grid engine, dashboard folders, user teams and permissions. Checkout out this [video preview](https://www.youtube.com/watch?v=Izr0IBgoTZQ) of Grafana v5.
-
-### New Major Features
-
-- **Dashboards** Dashboard folders, [#1611](https://github.com/grafana/grafana/issues/1611)
-- **Teams** User groups (teams) implemented. Can be used in folder & dashboard permission list.
-- **Dashboard grid**: Panels are now laid out in a two dimensional grid (with x, y, w, h). [#9093](https://github.com/grafana/grafana/issues/9093).
-- **Templating**: Vertical repeat direction for panel repeats.
-- **UX**: Major update to page header and navigation
-- **Dashboard settings**: Combine dashboard settings views into one with side menu, [#9750](https://github.com/grafana/grafana/issues/9750)
-- **Persistent dashboard url's**: New url's for dashboards that allows renaming dashboards without breaking links. [#7883](https://github.com/grafana/grafana/issues/7883)
-
-## Breaking changes
-
-- **[dashboard.json]** have been replaced with [dashboard provisioning](http://docs.grafana.org/administration/provisioning/).
-  Config files for provisioning data sources as configuration have changed from `/conf/datasources` to `/conf/provisioning/datasources`.
-  From `/etc/grafana/datasources` to `/etc/grafana/provisioning/datasources` when installed with deb/rpm packages.
-
-- **Pagerduty** The notifier now defaults to not auto resolve incidents. More details at [#10222](https://github.com/grafana/grafana/issues/10222)
-
-- **HTTP API**
-  - `GET /api/alerts` property dashboardUri renamed to url and is now the full url (that is including app sub url).
-
-## New Dashboard Grid
-
-The new grid engine is a major upgrade for how you can position and move panels. It enables new layouts and a much easier dashboard building experience. The change is backward compatible. So you can upgrade your current version to 5.0 without breaking dashboards, but you cannot downgrade from 5.0 to previous versions. Grafana will automatically upgrade your dashboards to the new schema and position panels to match your existing layout. There might be minor differences in panel height. If you upgrade to 5.0 and for some reason want to rollback to the previous version you can restore dashboards to previous versions using dashboard history. But that should only be seen as an emergency solution.
-
-Dashboard panels and rows are positioned using a gridPos object `{x: 0, y: 0, w: 24, h: 5}`. Units are in grid dimensions (24 columns, 1 height unit 30px). Rows and Panels objects exist (together) in a flat array directly on the dashboard root object. Rows are not needed for layouts anymore and are mainly there for backward compatibility. Some panel plugins that do not respect their panel height might require an update.
-
-## New Features
-
-- **Alerting**: Add support for internal image store [#6922](https://github.com/grafana/grafana/issues/6922), thx [@FunkyM](https://github.com/FunkyM)
-- **Data Source Proxy**: Add support for whitelisting specified cookies that will be passed through to the data source when proxying data source requests [#5457](https://github.com/grafana/grafana/issues/5457), thanks [@robingustafsson](https://github.com/robingustafsson)
-- **Postgres/MySQL**: add \_\_timeGroup macro for mysql [#9596](https://github.com/grafana/grafana/pull/9596), thanks [@svenklemm](https://github.com/svenklemm)
-- **Text**: Text panel are now edited in the ace editor. [#9698](https://github.com/grafana/grafana/pull/9698), thx [@mtanda](https://github.com/mtanda)
-- **Teams**: Add Microsoft Teams notifier as [#8523](https://github.com/grafana/grafana/issues/8523), thx [@anthu](https://github.com/anthu)
-- **Data Sources**: Its now possible to configure data sources with config files [#1789](https://github.com/grafana/grafana/issues/1789)
-- **Graphite**: Query editor updated to support new query by tag features [#9230](https://github.com/grafana/grafana/issues/9230)
-- **Dashboard history**: New config file option versions_to_keep sets how many versions per dashboard to store, [#9671](https://github.com/grafana/grafana/issues/9671)
-- **Dashboard as cfg**: Load dashboards from file into Grafana on startup/change [#9654](https://github.com/grafana/grafana/issues/9654) [#5269](https://github.com/grafana/grafana/issues/5269)
-- **Prometheus**: Grafana can now send alerts to Prometheus Alertmanager while firing [#7481](https://github.com/grafana/grafana/issues/7481), thx [@Thib17](https://github.com/Thib17) and [@mtanda](https://github.com/mtanda)
-- **Table**: Support multiple table formatted queries in table panel [#9170](https://github.com/grafana/grafana/issues/9170), thx [@davkal](https://github.com/davkal)
-- **Security**: Protect against brute force (frequent) login attempts [#7616](https://github.com/grafana/grafana/issues/7616)
-
-## Minor
-
-- **Graph**: Don't hide graph display options (Lines/Points) when draw mode is unchecked [#9770](https://github.com/grafana/grafana/issues/9770), thx [@Jonnymcc](https://github.com/Jonnymcc)
-- **Prometheus**: Show label name in paren after by/without/on/ignoring/group_left/group_right [#9664](https://github.com/grafana/grafana/pull/9664), thx [@mtanda](https://github.com/mtanda)
-- **Alert panel**: Adds placeholder text when no alerts are within the time range [#9624](https://github.com/grafana/grafana/issues/9624), thx [@straend](https://github.com/straend)
-- **Mysql**: MySQL enable MaxOpenCon and MaxIdleCon regards how constring is configured. [#9784](https://github.com/grafana/grafana/issues/9784), thx [@dfredell](https://github.com/dfredell)
-- **Cloudwatch**: Fixes broken query inspector for cloudwatch [#9661](https://github.com/grafana/grafana/issues/9661), thx [@mtanda](https://github.com/mtanda)
-- **Dashboard**: Make it possible to start dashboards from search and dashboard list panel [#1871](https://github.com/grafana/grafana/issues/1871)
-- **Annotations**: Posting annotations now return the id of the annotation [#9798](https://github.com/grafana/grafana/issues/9798)
-- **Systemd**: Use systemd notification ready flag [#10024](https://github.com/grafana/grafana/issues/10024), thx [@jgrassler](https://github.com/jgrassler)
-- **GitHub**: Use organizations_url provided from github to verify user belongs in org. [#10111](https://github.com/grafana/grafana/issues/10111), thx
-  [@adiletmaratov](https://github.com/adiletmaratov)
-- **Backend**: Fixed bug where Grafana exited before all sub routines where finished [#10131](https://github.com/grafana/grafana/issues/10131)
-- **Azure**: Adds support for Azure blob storage as external image stor [#8955](https://github.com/grafana/grafana/issues/8955), thx [@saada](https://github.com/saada)
-- **Telegram**: Add support for inline image uploads to telegram notifier plugin [#9967](https://github.com/grafana/grafana/pull/9967), thx [@rburchell](https://github.com/rburchell)
-
-## Fixes
-
-- **Sensu**: Send alert message to sensu output [#9551](https://github.com/grafana/grafana/issues/9551), thx [@cjchand](https://github.com/cjchand)
-- **Singlestat**: suppress error when result contains no datapoints [#9636](https://github.com/grafana/grafana/issues/9636), thx [@utkarshcmu](https://github.com/utkarshcmu)
-- **Postgres/MySQL**: Control quoting in SQL-queries when using template variables [#9030](https://github.com/grafana/grafana/issues/9030), thanks [@svenklemm](https://github.com/svenklemm)
-- **Pagerduty**: Pagerduty don't auto resolve incidents by default anymore. [#10222](https://github.com/grafana/grafana/issues/10222)
-- **Cloudwatch**: Fix for multi-valued templated queries. [#9903](https://github.com/grafana/grafana/issues/9903)
-
-## Tech
-
-- **RabbitMq**: Remove support for publishing events to RabbitMQ [#9645](https://github.com/grafana/grafana/issues/9645)
-
-## Deprecation notes
-
-### HTTP API
-
-The following operations have been deprecated and will be removed in a future release:
-
-- `GET /api/dashboards/db/:slug` -> Use `GET /api/dashboards/uid/:uid` instead
-- `DELETE /api/dashboards/db/:slug` -> Use `DELETE /api/dashboards/uid/:uid` instead
-
-The following properties have been deprecated and will be removed in a future release:
-
-- `uri` property in `GET /api/search` -> Use new `url` or `uid` property instead
-- `meta.slug` property in `GET /api/dashboards/uid/:uid` and `GET /api/dashboards/db/:slug` -> Use new `meta.url` or `dashboard.uid` property instead

.dockerignore

@@ -2,6 +2,7 @@
 .dockerignore
 .git
 .gitignore
+.github
 .vscode
 bin
 data*

.drone.star

@@ -3,66 +3,19 @@
 # 2. Login to drone and export the env variables (token and server) shown here: https://drone.grafana.net/account
 # 3. Run `make drone`
 # More information about this process here: https://github.com/grafana/deployment_tools/blob/master/docs/infrastructure/drone/signing.md
-"""
-This module returns a Drone configuration including pipelines and secrets.
-"""
 
-load("scripts/drone/events/pr.star", "pr_pipelines")
-load("scripts/drone/events/main.star", "main_pipelines")
-load(
-    "scripts/drone/events/release.star",
-    "artifacts_page_pipeline",
-    "enterprise2_pipelines",
-    "enterprise_pipelines",
-    "integration_test_pipelines",
-    "oss_pipelines",
-    "publish_artifacts_pipelines",
-    "publish_npm_pipelines",
-    "publish_packages_pipeline",
-)
-load(
-    "scripts/drone/pipelines/publish_images.star",
-    "publish_image_pipelines_public",
-    "publish_image_pipelines_security",
-)
-load(
-    "scripts/drone/pipelines/ci_images.star",
-    "publish_ci_windows_test_image_pipeline",
-)
-load("scripts/drone/pipelines/github.star", "publish_github_pipeline")
-load("scripts/drone/pipelines/aws_marketplace.star", "publish_aws_marketplace_pipeline")
-load(
-    "scripts/drone/pipelines/windows.star",
-    "windows_test_backend",
-)
-load("scripts/drone/version.star", "version_branch_pipelines")
-load("scripts/drone/events/cron.star", "cronjobs")
-load("scripts/drone/vault.star", "secrets")
+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')
+load('scripts/drone/vault.star', 'secrets')
 
-def main(_ctx):
-    return (
-        pr_pipelines() +
-        main_pipelines() +
-        oss_pipelines() +
-        enterprise_pipelines() +
-        enterprise2_pipelines() +
-        publish_image_pipelines_public() +
-        publish_image_pipelines_security() +
-        publish_github_pipeline("public") +
-        publish_github_pipeline("security") +
-        publish_aws_marketplace_pipeline("public") +
-        publish_artifacts_pipelines("security") +
-        publish_artifacts_pipelines("public") +
-        publish_npm_pipelines() +
-        publish_packages_pipeline() +
-        [windows_test_backend({
-            "event": ["promote"],
-            "target": ["test-windows"],
-        }, "oss", "testing")] +
-        artifacts_page_pipeline() +
-        version_branch_pipelines() +
-        integration_test_pipelines() +
-        publish_ci_windows_test_image_pipeline() +
-        cronjobs() +
-        secrets()
-    )
+def main(ctx):
+    edition = 'oss'
+    return pr_pipelines(edition=edition) + main_pipelines(edition=edition) + release_pipelines() + \
+        publish_image_pipelines('public') + publish_image_pipelines('security') + \
+        publish_artifacts_pipelines('security') + publish_artifacts_pipelines('public') + \
+        publish_npm_pipelines('public') + publish_packages_pipeline() + \
+        version_branch_pipelines() + cronjobs(edition=edition) + secrets()

.eslintignore

@@ -17,7 +17,7 @@ vendor
 # TS generate from cue by cuetsy
 **/*.gen.ts
 
-# Auto-generated internationalization files
+# Auto-generated localisation files
 public/locales/_build/
 public/locales/**/*.js
 

.eslintrc

@@ -1,7 +1,7 @@
 {
   "extends": ["@grafana/eslint-config"],
   "root": true,
-  "plugins": ["@emotion", "lodash", "jest", "import", "jsx-a11y"],
+  "plugins": ["@emotion", "lodash", "jest", "import"],
   "settings": {
     "import/internal-regex": "^(app/)|(@grafana)",
     "import/external-module-folders": ["node_modules", ".yarn"]
@@ -18,82 +18,7 @@
         "newlines-between": "always",
         "alphabetize": { "order": "asc" }
       }
-    ],
-    "no-restricted-imports": [
-      "warn",
-      {
-        "paths": [
-          {
-            "name": "react-redux",
-            "importNames": ["useDispatch", "useSelector"],
-            "message": "Please import from app/types instead."
-          }
-        ]
-      }
-    ],
-
-    // Use typescript's no-redeclare for compatibility with overrides
-    "no-redeclare": "off",
-    "@typescript-eslint/no-redeclare": ["error"],
-
-
-    // these are all the rules listed in the strict preset
-    // we should fix them one by one and mark them as errors
-    // once they're all fixed, we can remove them all and instead extend the strict preset
-    // with "extends": ["plugin:jsx-a11y/strict"]
-    "jsx-a11y/alt-text": "off",
-    "jsx-a11y/anchor-has-content": "error",
-    "jsx-a11y/anchor-is-valid": "off",
-    "jsx-a11y/aria-activedescendant-has-tabindex": "error",
-    "jsx-a11y/aria-props": "error",
-    "jsx-a11y/aria-proptypes": "error",
-    "jsx-a11y/aria-role": "off",
-    "jsx-a11y/aria-unsupported-elements": "error",
-    "jsx-a11y/autocomplete-valid": "error",
-    "jsx-a11y/click-events-have-key-events": "off",
-    "jsx-a11y/heading-has-content": "error",
-    "jsx-a11y/html-has-lang": "error",
-    "jsx-a11y/iframe-has-title": "off",
-    "jsx-a11y/img-redundant-alt": "off",
-    "jsx-a11y/interactive-supports-focus": [
-      "off",
-      {
-        "tabbable": [
-          "button",
-          "checkbox",
-          "link",
-          "progressbar",
-          "searchbox",
-          "slider",
-          "spinbutton",
-          "switch",
-          "textbox"
-        ]
-      }
-    ],
-    "jsx-a11y/label-has-associated-control": "off",
-    "jsx-a11y/media-has-caption": "error",
-    "jsx-a11y/mouse-events-have-key-events": "off",
-    "jsx-a11y/no-access-key": "error",
-    "jsx-a11y/no-autofocus": "off",
-    "jsx-a11y/no-distracting-elements": "error",
-    "jsx-a11y/no-interactive-element-to-noninteractive-role": "error",
-    "jsx-a11y/no-noninteractive-element-interactions": [
-      "off",
-      {
-        "body": ["onError", "onLoad"],
-        "iframe": ["onError", "onLoad"],
-        "img": ["onError", "onLoad"]
-      }
-    ],
-    "jsx-a11y/no-noninteractive-element-to-interactive-role": "off",
-    "jsx-a11y/no-noninteractive-tabindex": "off",
-    "jsx-a11y/no-redundant-roles": "error",
-    "jsx-a11y/no-static-element-interactions": "off",
-    "jsx-a11y/role-has-required-aria-props": "off",
-    "jsx-a11y/role-supports-aria-props": "off",
-    "jsx-a11y/scope": "error",
-    "jsx-a11y/tabindex-no-positive": "off"
+    ]
   },
   "overrides": [
     {
@@ -110,13 +35,6 @@
         "react/jsx-uses-react": "off",
         "react/react-in-jsx-scope": "off"
       }
-    },
-    {
-      "files": ["public/dashboards/scripted*.js"],
-      "rules": {
-        "no-redeclare": "error",
-        "@typescript-eslint/no-redeclare": "off"
-      }
     }
   ]
 }

.github/CODEOWNERS

@@ -11,602 +11,173 @@
 # In each subsection folders are ordered first by depth, then alphabetically.
 # This should make it easy to add new rules without breaking existing ones.
 
-# Documentation
-/docs/ @grafana/docs-grafana
-/contribute/ @grafana/docs-grafana
-/docs/sources/developers/plugins/ @grafana/docs-grafana @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
-/docs/sources/developers/plugins/backend/ @grafana/docs-grafana @grafana/plugins-platform-backend
-/.changelog-archive @grafana/docs-grafana
-CHANGELOG.md @grafana/docs-grafana
-CODE_OF_CONDUCT.md @grafana/docs-grafana
-CONTRIBUTING.md @grafana/docs-grafana
-GOVERNANCE.md @RichiH
-HALL_OF_FAME.md @grafana/docs-grafana
-ISSUE_TRIAGE.md @grafana/grafana-community-support
-LICENSE @torkelo
-LICENSING.md @torkelo
-MAINTAINERS.md @RichiH
-NOTICE.md @torkelo
-README.md @grafana/docs-grafana
-ROADMAP.md @torkelo
-SECURITY.md @grafana/security-team
-SUPPORT.md @torkelo
-UPGRADING_DEPENDENCIES.md @grafana/docs-grafana
-WORKFLOW.md @torkelo
-
-
-# Set up, dashboards/visualization, best practices: Chris Moyer
-# Alerting: Brenda Muir
-/docs/sources/administration/ @Eve832 @GrafanaWriter
-/docs/sources/alerting/ @brendamuir
-/docs/sources/dashboards/ @chri2547
-/docs/sources/datasources/ @Eve832 @GrafanaWriter
-/docs/sources/explore/ @Eve832 @GrafanaWriter
-/docs/sources/getting-started/ @chri2547
-/docs/sources/old-alerting/ @brendamuir
-/docs/sources/release-notes/ @Eve832 @GrafanaWriter
-/docs/sources/setup-grafana/ @chri2547
-/docs/sources/whatsnew/ @Eve832 @GrafanaWriter
+# Documentation owner: Jita Chatterjee
+/docs/ @grafana/docs-squad @pkolyvas
+/contribute/ @marcusolsson @grafana/docs-squad @pkolyvas
+/docs/sources/developers/plugins/ @marcusolsson @grafana/docs-squad @grafana/plugins-platform-frontend @grafana/plugins-platform-backend
+/docs/sources/developers/plugins/backend @marcusolsson @grafana/docs-squad @grafana/plugins-platform-backend
+/docs/sources/enterprise/ @osg-grafana @grafana/docs-squad
 
 # Backend code
-/go.mod @grafana/backend-platform
-/go.sum @grafana/backend-platform
-/.bingo/ @grafana/backend-platform
-/pkg/README.md @grafana/backend-platform
-/pkg/ruleguard.rules.go @grafana/backend-platform
-/.bra.toml @grafana/backend-platform
-/.golangci.toml @grafana/backend-platform
-/build.go @grafana/backend-platform
-
-/pkg/api/ @grafana/backend-platform
-/pkg/bus/ @grafana/backend-platform
-/pkg/cmd/ @grafana/backend-platform
-/pkg/components/apikeygen/ @grafana/grafana-authnz-team
-/pkg/components/apikeygenprefixed/ @grafana/grafana-authnz-team
-/pkg/components/dashdiffs/ @grafana/backend-platform
-/pkg/components/imguploader/ @grafana/backend-platform
-/pkg/components/loki/ @grafana/backend-platform
-/pkg/components/null/ @grafana/backend-platform
-/pkg/components/simplejson/ @grafana/backend-platform
-/pkg/events/ @grafana/backend-platform
-/pkg/extensions/ @grafana/backend-platform
-/pkg/ifaces/ @grafana/backend-platform
-/pkg/infra/appcontext/ @grafana/backend-platform
-/pkg/infra/db/ @grafana/backend-platform
-/pkg/infra/grn/ @grafana/backend-platform
-/pkg/infra/localcache/ @grafana/backend-platform
-/pkg/infra/log/ @grafana/backend-platform
-/pkg/infra/metrics/ @grafana/backend-platform
-/pkg/infra/network/ @grafana/backend-platform
-/pkg/infra/process/ @grafana/backend-platform
-/pkg/infra/remotecache/ @grafana/backend-platform
-/pkg/infra/serverlock/ @grafana/backend-platform
-/pkg/infra/slugify/ @grafana/backend-platform
-/pkg/infra/tracing/ @grafana/backend-platform
-/pkg/infra/usagestats/ @grafana/backend-platform
-/pkg/middleware/ @grafana/backend-platform
-/pkg/mocks/ @grafana/backend-platform
-/pkg/models/ @grafana/backend-platform
-/pkg/server/ @grafana/backend-platform
-/pkg/services/annotations/ @grafana/backend-platform
-/pkg/services/apikey/ @grafana/backend-platform
-/pkg/services/cleanup/ @grafana/backend-platform
-/pkg/services/comments/ @grafana/backend-platform
-/pkg/services/contexthandler/ @grafana/backend-platform
-/pkg/services/correlations/ @grafana/backend-platform
-/pkg/services/dashboardimport/ @grafana/backend-platform
-/pkg/services/dashboards/ @grafana/backend-platform
-/pkg/services/dashboardsnapshots/ @grafana/backend-platform
-/pkg/services/dashboardversion/ @grafana/backend-platform
-/pkg/services/encryption/ @grafana/backend-platform
-/pkg/services/featuremgmt/ @grafana/backend-platform
-/pkg/services/folder/ @grafana/backend-platform
-/pkg/services/hooks/ @grafana/backend-platform
-/pkg/services/kmsproviders/ @grafana/backend-platform
-/pkg/services/licensing/ @grafana/backend-platform
-/pkg/services/navtree/ @grafana/backend-platform
-/pkg/services/notifications/ @grafana/backend-platform
-/pkg/services/org/ @grafana/backend-platform
-/pkg/services/playlist/ @grafana/backend-platform
-/pkg/services/plugindashboards/ @grafana/backend-platform
-/pkg/services/pluginsettings/ @grafana/backend-platform
-/pkg/services/preference/ @grafana/backend-platform
-/pkg/services/provisioning/ @grafana/backend-platform
-/pkg/services/publicdashboards/ @grafana/dashboards-squad
-/pkg/services/query/ @grafana/backend-platform
-/pkg/services/queryhistory/ @grafana/backend-platform
-/pkg/services/quota/ @grafana/backend-platform
-/pkg/services/rendering/ @grafana/backend-platform
-/pkg/services/screenshot/ @grafana/backend-platform
-/pkg/services/search/ @grafana/backend-platform
-/pkg/services/searchusers/ @grafana/backend-platform
-/pkg/services/secrets/ @grafana/backend-platform
-/pkg/services/shorturls/ @grafana/backend-platform
-/pkg/services/sqlstore/ @grafana/backend-platform
-/pkg/services/star/ @grafana/backend-platform
-/pkg/services/stats/ @grafana/backend-platform
-/pkg/services/tag/ @grafana/backend-platform
-/pkg/services/team/ @grafana/grafana-authnz-team
-/pkg/services/temp_user/ @grafana/backend-platform
-/pkg/services/updatechecker/ @grafana/backend-platform
-/pkg/services/user/ @grafana/backend-platform
-/pkg/services/validations/ @grafana/backend-platform
-/pkg/setting/ @grafana/backend-platform
-/pkg/tests/ @grafana/backend-platform
-/pkg/tsdb/grafanads/ @grafana/backend-platform
-/pkg/tsdb/intervalv2/ @grafana/backend-platform
-/pkg/tsdb/legacydata/ @grafana/backend-platform
-/pkg/tsdb/opentsdb/ @grafana/backend-platform
-/pkg/tsdb/sqleng/ @grafana/backend-platform
-/pkg/util/ @grafana/backend-platform
-/pkg/web/ @grafana/backend-platform
-
-/pkg/services/grpcserver/ @grafana/backend-platform
-/pkg/infra/kvstore/ @grafana/backend-platform
-/pkg/infra/fs/ @grafana/backend-platform
-/pkg/infra/x/ @grafana/backend-platform
-
-
-# devenv
-# Backend code, developers environment
-/devenv/docker/blocks/auth/ @grafana/grafana-authnz-team
-
-# Logs code, developers environment
-/devenv/docker/blocks/loki* @grafana/observability-logs
-/devenv/docker/blocks/elastic* @grafana/observability-logs
-
-# Performance tests
-/devenv/docker/loadtest-ts/ @grafana/multitenancy-squad
-
-/devenv/bulk-dashboards/ @grafana/dashboards-squad
-/devenv/bulk_alerting_dashboards/ @grafana/alerting-squad-backend
-/devenv/create_docker_compose.sh @grafana/backend-platform
-/devenv/dashboards.yaml @grafana/dashboards-squad
-/devenv/datasources.yaml @grafana/backend-platform
-/devenv/datasources_docker.yaml @grafana/backend-platform
-/devenv/dev-dashboards-without-uid/ @grafana/dashboards-squad
-/devenv/dev-dashboards/ @grafana/dashboards-squad
-/devenv/docker/blocks/alert_webhook_listener/ @grafana/alerting-squad-backend
-/devenv/docker/blocks/clickhouse/ @grafana/partner-plugins
-/devenv/docker/blocks/collectd/ @grafana/observability-metrics
-/devenv/docker/blocks/grafana/ @grafana/grafana-as-code
-/devenv/docker/blocks/graphite/ @grafana/observability-metrics
-/devenv/docker/blocks/graphite09/ @grafana/observability-metrics
-/devenv/docker/blocks/graphite1/ @grafana/observability-metrics
-/devenv/docker/blocks/influxdb/ @grafana/observability-metrics
-/devenv/docker/blocks/influxdb1/ @grafana/observability-metrics
-/devenv/docker/blocks/jaeger/ @grafana/observability-traces-and-profiling
-/devenv/docker/blocks/maildev/ @grafana/alerting-squad-frontend
-/devenv/docker/blocks/memcached/ @grafana/backend-platform
-/devenv/docker/blocks/mssql/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mssql_arm64/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mssql_tests/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mssql_tls/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mysql/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mysql_exporter/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mysql_opendata/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/mysql_tests/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/opentsdb/ @grafana/observability-metrics
-/devenv/docker/blocks/phlare/ @grafana/observability-traces-and-profiling
-/devenv/docker/blocks/postgres/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/postgres_tests/ @grafana/grafana-bi-squad
-/devenv/docker/blocks/prometheus/ @grafana/observability-metrics
-/devenv/docker/blocks/prometheus_random_data/ @grafana/observability-metrics
-/devenv/docker/blocks/redis/ @bergquist
-/devenv/docker/blocks/sensugo/ @grafana/backend-platform
-/devenv/docker/blocks/slow_proxy/ @bergquist
-/devenv/docker/blocks/smtp/ @bergquist
-/devenv/docker/blocks/tempo/ @grafana/observability-traces-and-profiling
-/devenv/docker/blocks/traefik/ @mckn
-/devenv/docker/blocks/zipkin/ @grafana/observability-traces-and-profiling
-/devenv/docker/buildcontainer/ @bergquist
-/devenv/docker/compose_header.yml @grafana/backend-platform
-/devenv/docker/debtest/ @bergquist
-/devenv/docker/ha-test-unified-alerting/ @grafana/alerting-squad-backend
-/devenv/docker/ha_test/ @grafana/backend-platform
-/devenv/docker/loadtest/ @grafana/backend-platform
-/devenv/docker/rpmtest/ @grafana/backend-platform
-/devenv/jsonnet/ @grafana/grafana-edge-squad
-/devenv/local-npm/ @grafana/frontend-ops
-/devenv/vscode/ @grafana/frontend-ops
-/devenv/setup.sh @grafana/backend-platform
-
-# Emails
-/emails/ @grafana/alerting-squad-frontend
-
-#Packaging
-/packaging/ @DanCech
-
+*.go @grafana/backend-platform
+go.mod @grafana/backend-platform
+go.sum @grafana/backend-platform
+/.bingo @grafana/backend-platform
 
 # Continuous Integration
-.drone.yml @grafana/grafana-delivery
-.drone.star @grafana/grafana-delivery
-/scripts/drone/ @grafana/grafana-delivery
-/pkg/build/ @grafana/grafana-delivery
-/.dockerignore @grafana/grafana-delivery
-/Dockerfile @grafana/grafana-delivery
-/Makefile @grafana/grafana-delivery
-/scripts/build/ @grafana/grafana-delivery
+.drone.yml @grafana/grafana-release-eng
+.drone.star @grafana/grafana-release-eng
+/scripts/drone/ @grafana/grafana-release-eng
+/pkg/build/ @grafana/grafana-release-eng
 
-# OSS Plugin Partnerships backend code
-/pkg/tsdb/cloudwatch/ @grafana/aws-plugins
-/pkg/tsdb/azuremonitor/ @grafana/partner-plugins
-/pkg/tsdb/cloudmonitoring/ @grafana/partner-plugins
+# Cloud Datasources backend code
+/pkg/tsdb/cloudwatch @grafana/cloud-datasources
+/pkg/tsdb/azuremonitor @grafana/cloud-datasources
+/pkg/tsdb/cloudmonitoring @grafana/cloud-datasources
 
 # Observability backend code
-/pkg/tsdb/prometheus/ @grafana/observability-metrics
-/pkg/tsdb/influxdb/ @grafana/observability-metrics
-/pkg/tsdb/elasticsearch/ @grafana/observability-logs
-/pkg/tsdb/graphite/ @grafana/observability-metrics
-/pkg/tsdb/loki/ @grafana/observability-logs
-/pkg/tsdb/tempo/ @grafana/observability-traces-and-profiling
-/pkg/tsdb/phlare/ @grafana/observability-traces-and-profiling
-/pkg/tsdb/parca/ @grafana/observability-traces-and-profiling
+/pkg/tsdb/prometheus @grafana/observability-metrics
+/pkg/tsdb/influxdb @grafana/observability-metrics
+/pkg/tsdb/elasticsearch @grafana/observability-logs-and-traces
+/pkg/tsdb/graphite @grafana/observability-metrics
+/pkg/tsdb/jaeger @grafana/observability-logs-and-traces
+/pkg/tsdb/loki @grafana/observability-logs-and-traces
+/pkg/tsdb/zipkin @grafana/observability-logs-and-traces
+/pkg/tsdb/tempo @grafana/observability-logs-and-traces
 
 # BI backend code
-/pkg/tsdb/mysql/ @grafana/grafana-bi-squad
-/pkg/tsdb/postgres/ @grafana/grafana-bi-squad
-/pkg/tsdb/mssql/ @grafana/grafana-bi-squad
+/pkg/tsdb/mysql @grafana/grafana-bi-squad
+/pkg/tsdb/postgres @grafana/grafana-bi-squad
+/pkg/tsdb/mssql @grafana/grafana-bi-squad
 
 # Database migrations
-/pkg/services/sqlstore/migrations/ @grafana/backend-platform @grafana/hosted-grafana-team
+/pkg/services/sqlstore/migrations @grafana/backend-platform @grafana/hosted-grafana-team
 *_mig.go @grafana/backend-platform @grafana/hosted-grafana-team
 
-# Grafana multitenancy
-/pkg/services/live/ @grafana/multitenancy-squad
-/pkg/services/searchV2/ @grafana/multitenancy-squad
-/pkg/services/store/ @grafana/multitenancy-squad
-/pkg/services/querylibrary/ @grafana/multitenancy-squad
-/pkg/services/export/ @grafana/multitenancy-squad
-/pkg/infra/filestorage/ @grafana/multitenancy-squad
-/pkg/util/converter/ @grafana/multitenancy-squad
+# Grafana edge
+/pkg/services/live/ @grafana/grafana-edge-squad
+/pkg/services/searchV2/ @grafana/grafana-edge-squad
+/pkg/services/store/ @grafana/grafana-edge-squad
+/pkg/services/export/ @grafana/grafana-edge-squad
+/pkg/infra/filestore/ @grafana/grafana-edge-squad
+pkg/tsdb/testdatasource/sims/ @grafana/grafana-edge-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
+/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
-/pkg/services/librarypanels/ @grafana/user-essentials
+/pkg/services/libraryelements @grafana/user-essentials
+/pkg/services/librarypanels @grafana/user-essentials
 
 # Plugins
-/pkg/api/pluginproxy/ @grafana/plugins-platform-backend
-/pkg/infra/httpclient/ @grafana/plugins-platform-backend
-/pkg/plugins/ @grafana/plugins-platform-backend
-/pkg/services/datasourceproxy/ @grafana/plugins-platform-backend
-/pkg/services/datasources/ @grafana/plugins-platform-backend
-/pkg/services/pluginsintegration/ @grafana/plugins-platform-backend
-/pkg/plugins/pfs/ @grafana/plugins-platform-backend @grafana/grafana-as-code
-/pkg/tsdb/testdatasource/ @grafana/plugins-platform-backend
+/pkg/api/pluginproxy @grafana/plugins-platform-backend
+/pkg/plugins @grafana/plugins-platform-backend
+/pkg/services/datasourceproxy @grafana/plugins-platform-backend
+/pkg/services/datasources @grafana/plugins-platform-backend
 
 # Dashboard previews / crawler (behind feature flag)
-/pkg/services/thumbs/ @grafana/multitenancy-squad
+/pkg/services/thumbs @grafana/grafana-edge-squad
 
 # Backend code docs
-/contribute/backend/ @grafana/backend-platform
+/contribute/style-guides/backend.md @grafana/backend-platform
+/contribute/architecture/backend @grafana/backend-platform
+/contribute/engineering/backend @grafana/backend-platform
 
-
-/crowdin.yml @grafana/user-essentials
-/public/locales/ @grafana/user-essentials
-/public/app/core/internationalization/ @grafana/user-essentials
-/e2e/ @grafana/user-essentials
-/e2e/cloud-plugins-suite/ @grafana/partner-plugins
-/packages/ @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/packages/grafana-e2e-selectors/ @grafana/user-essentials
-/packages/grafana-e2e/ @grafana/user-essentials
-/packages/grafana-toolkit/ @grafana/plugins-platform-frontend
-/packages/grafana-ui/.storybook/ @grafana/plugins-platform-frontend
-/packages/grafana-ui/src/components/DateTimePickers/ @grafana/user-essentials
-/packages/grafana-ui/src/components/GraphNG/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/Logs/ @grafana/observability-logs
-/packages/grafana-ui/src/components/Table/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/TimeSeries/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/components/uPlot/ @grafana/grafana-bi-squad
-/packages/grafana-ui/src/utils/storybook/ @grafana/plugins-platform-frontend
-/packages/grafana-data/src/**/*logs* @grafana/observability-logs
-/plugins-bundled/ @grafana/plugins-platform-frontend
-
-
-# root files, mostly frontend
-.browserslistrc @grafana/frontend-ops
+/e2e @grafana/user-essentials
+/packages @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/packages/grafana-e2e-selectors @grafana/user-essentials
+/packages/grafana-e2e @grafana/user-essentials
+/packages/grafana-toolkit @grafana/plugins-platform-frontend
+/packages/grafana-ui/.storybook @grafana/plugins-platform-frontend
+/packages/grafana-ui/src/components/DateTimePickers @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/GraphNG @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/Table @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/TimeSeries @grafana/grafana-bi-squad
+/packages/grafana-ui/src/components/uPlot @grafana/grafana-bi-squad
+/packages/grafana-ui/src/utils/storybook @grafana/plugins-platform-frontend
+/packages/jaeger-ui-components/ @grafana/observability-logs-and-traces
+/plugins-bundled @grafana/plugins-platform-frontend
+# public folder
+/public/app/core/components/TimePicker @grafana/grafana-bi-squad
+/public/app/core/components/Layers @grafana/grafana-edge-squad
+/public/app/features/canvas/ @grafana/grafana-edge-squad
+/public/app/features/comments/ @grafana/grafana-edge-squad
+/public/app/features/dimensions/ @grafana/grafana-edge-squad
+/public/app/features/geo/ @grafana/grafana-edge-squad
+/public/app/features/live/ @grafana/grafana-edge-squad
+/public/app/features/explore/ @grafana/observability-experience-squad
+/public/app/features/plugins @grafana/plugins-platform-frontend
+/public/app/features/transformers/spatial @grafana/grafana-edge-squad
+/public/app/plugins/panel/alertlist @grafana/alerting-squad
+/public/app/plugins/panel/barchart @grafana/grafana-bi-squad
+/public/app/plugins/panel/heatmap @grafana/grafana-bi-squad
+/public/app/plugins/panel/histogram @grafana/grafana-bi-squad
+/public/app/plugins/panel/logs @grafana/observability-logs-and-traces
+/public/app/plugins/panel/nodeGraph @grafana/observability-logs-and-traces
+/public/app/plugins/panel/piechart @grafana/grafana-bi-squad
+/public/app/plugins/panel/state-timeline @grafana/grafana-bi-squad
+/public/app/plugins/panel/status-history @grafana/grafana-bi-squad
+/public/app/plugins/panel/table @grafana/grafana-bi-squad
+/public/app/plugins/panel/timeseries @grafana/grafana-bi-squad
+/public/app/plugins/panel/geomap @grafana/grafana-edge-squad
+/public/app/plugins/panel/canvas @grafana/grafana-edge-squad
+/public/app/plugins/panel/candlestick @grafana/grafana-edge-squad
+/public/app/plugins/panel/icon @grafana/grafana-edge-squad
+/scripts/build/release-packages.sh @grafana/plugins-platform-frontend
+/scripts/circle-release-next-packages.sh @grafana/plugins-platform-frontend
+/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
+/scripts/ci-reference-docs-build.sh @grafana/plugins-platform-frontend
+/scripts/ci-reference-docs-lint.sh @grafana/plugins-platform-frontend
+/scripts/grunt @grafana/frontend-ops
+/scripts/webpack @grafana/frontend-ops
+/scripts/generate-a11y-report.sh @grafana/user-essentials
 package.json @grafana/frontend-ops
 tsconfig.json @grafana/frontend-ops
-/.editorconfig @grafana/frontend-ops
-/.eslintignore @grafana/frontend-ops
-/.gitattributes @grafana/frontend-ops
-/.gitignore @grafana/frontend-ops
-/.husky/pre-commit @grafana/frontend-ops
-/.nvmrc @grafana/frontend-ops
-/.prettierignore @grafana/frontend-ops
-/.yarn @grafana/frontend-ops
-/.yarnrc.yml @grafana/frontend-ops
-/yarn.lock @grafana/frontend-ops
-/.linguirc @grafana/user-essentials
-/babel.config.json @grafana/frontend-ops
 lerna.json @grafana/frontend-ops
-/.prettierrc.js @grafana/frontend-ops
-/.eslintrc @grafana/frontend-ops
-/.vim @zoltanbedi
-/jest.config.js @grafana/frontend-ops
-/latest.json @grafana/frontend-ops
-/metadata.md @grafana/plugins-platform
-/stylelint.config.js @grafana/frontend-ops
-/tools/ @grafana/frontend-ops
-
-
-# public folder
-/public/app/core/ @grafana/user-essentials
-/public/app/core/components/TimePicker/ @grafana/user-essentials
-/public/app/core/components/Layers/ @grafana/grafana-edge-squad
-/public/app/features/all.ts @grafana/user-essentials
-/public/app/features/admin/ @grafana/grafana-authnz-team
-/public/app/features/annotations/ @grafana/user-essentials
-/public/app/features/api-keys/ @grafana/user-essentials
-/public/app/features/canvas/ @grafana/grafana-edge-squad
-/public/app/features/commandPalette/ @grafana/user-essentials
-/public/app/features/comments/ @grafana/grafana-edge-squad
-/public/app/features/connections/ @grafana/plugins-platform-frontend
-/public/app/features/correlations/ @grafana/explore-squad
-/public/app/features/dashboard/ @grafana/dashboards-squad
-/public/app/features/datasources/ @grafana/user-essentials
-/public/app/features/dimensions/ @grafana/grafana-edge-squad
-/public/app/features/explore/ @grafana/explore-squad
-/public/app/features/expressions/ @grafana/observability-metrics
-/public/app/features/folders/ @grafana/user-essentials
-/public/app/features/inspector/ @grafana/user-essentials
-/public/app/features/invites/ @grafana/user-essentials
-/public/app/features/geo/ @grafana/grafana-edge-squad
-/public/app/features/library-panels/ @grafana/user-essentials
-/public/app/features/logs/ @grafana/observability-logs
-/public/app/features/live/ @grafana/multitenancy-squad
-/public/app/features/manage-dashboards/ @grafana/dashboards-squad
-/public/app/features/notifications/ @grafana/user-essentials
-/public/app/features/org/ @grafana/user-essentials
-/public/app/features/panel/ @grafana/user-essentials
-/public/app/features/playlist/ @grafana/dashboards-squad
-/public/app/features/plugins/ @grafana/plugins-platform-frontend
-/public/app/features/profile/ @grafana/user-essentials
-/public/app/features/runtime/ @ryantxu
-/public/app/features/query/ @grafana/dashboards-squad
-/public/app/features/query-library/ @grafana/grafana-edge-squad
-/public/app/features/sandbox/ @grafana/user-essentials
-/public/app/features/scenes/ @grafana/dashboards-squad
-/public/app/features/search/ @grafana/user-essentials
-/public/app/features/serviceaccounts/ @grafana/grafana-authnz-team
-/public/app/features/storage/ @grafana/multitenancy-squad
-/public/app/features/teams/ @grafana/grafana-authnz-team
-/public/app/features/templating/ @grafana/dashboards-squad
-/public/app/features/transformers/ @grafana/grafana-edge-squad
-/public/app/features/users/ @grafana/grafana-authnz-team
-/public/app/features/variables/ @grafana/dashboards-squad
-/public/app/plugins/panel/alertGroups/ @grafana/alerting-squad-frontend
-/public/app/plugins/panel/alertlist/ @grafana/alerting-squad-frontend
-/public/app/plugins/panel/annolist/ @grafana/user-essentials
-/public/app/plugins/panel/barchart/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/bargauge/ @grafana/user-essentials
-/public/app/plugins/panel/dashlist/ @grafana/user-essentials
-/public/app/plugins/panel/debug/ @ryantxu
-/public/app/plugins/panel/gauge/ @grafana/user-essentials
-/public/app/plugins/panel/gettingstarted/ @grafana/user-essentials
-/public/app/plugins/panel/graph/ @grafana/user-essentials
-/public/app/plugins/panel/heatmap/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/histogram/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/logs/ @grafana/observability-logs
-/public/app/plugins/panel/nodeGraph/ @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/traces/ @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/flamegraph/ @grafana/observability-traces-and-profiling
-/public/app/plugins/panel/piechart/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/state-timeline/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/status-history/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/table/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/table-old/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/timeseries/ @grafana/grafana-bi-squad
-/public/app/plugins/panel/geomap/ @grafana/grafana-edge-squad
-/public/app/plugins/panel/canvas/ @grafana/grafana-edge-squad
-/public/app/plugins/panel/candlestick/ @grafana/grafana-edge-squad
-/public/app/plugins/panel/icon/ @grafana/grafana-edge-squad
-/public/app/plugins/panel/live/ @grafana/multitenancy-squad
-/public/app/plugins/panel/news/ @grafana/user-essentials
-/public/app/plugins/panel/stat/ @grafana/user-essentials
-/public/app/plugins/panel/text/ @grafana/user-essentials
-/public/app/plugins/panel/welcome/ @grafana/user-essentials
-/public/app/plugins/panel/xychart/ @grafana/grafana-bi-squad
-/public/app/plugins/sdk.ts @grafana/plugins-platform-frontend
-/public/app/polyfills/old-mediaquerylist.ts @grafana/user-essentials
-/public/app/routes/ @grafana/user-essentials
-/public/app/store/ @grafana/user-essentials
-/public/app/types/ @grafana/user-essentials
-/public/dashboards/ @grafana/dashboards-squad
-/public/fonts/ @grafana/alerting-squad-frontend
-/public/emails/ @grafana/user-essentials
-/public/gazetteer/ @ryantxu
-/public/img/ @grafana/user-essentials
-/public/lib/ @grafana/user-essentials
-/public/maps/ @ryantxu
-/public/robots.txt @grafana/frontend-ops
-/public/sass/ @grafana/user-essentials
-/public/test/ @grafana/user-essentials
-/public/testdata/ @grafana/user-essentials
-/public/views/ @grafana/user-essentials
-
-/public/app/features/explore/Logs.tsx @grafana/observability-logs
-/public/app/features/explore/LogsContainer.tsx @grafana/observability-logs
-
-/public/app/features/explore/TraceView/ @grafana/observability-traces-and-profiling
-
-/public/api-merged.json @grafana/backend-platform
-/public/api-spec.json @grafana/backend-platform
-/public/openapi3.json @grafana/backend-platform
-/public/app/angular/ @torkelo
-/public/app/app.ts @grafana/frontend-ops
-/public/app/dev.ts @grafana/frontend-ops
-/public/app/index.ts @grafana/frontend-ops
-/public/app/AppWrapper.tsx @grafana/frontend-ops
-/public/app/partials/ @grafana/user-essentials
-
-
-
-
-/scripts/benchmark-access-control.sh @grafana/grafana-authnz-team
-/scripts/check-breaking-changes.sh @grafana/plugins-platform-frontend
-/scripts/ci-* @grafana/grafana-delivery
-/scripts/circle-* @grafana/grafana-delivery
-/scripts/ci-frontend-metrics.sh @grafana/user-essentials @grafana/plugins-platform-frontend @grafana/grafana-bi-squad
-/scripts/cli/ @grafana/user-essentials
-/scripts/clean-git-or-error.sh @grafana/grafana-as-code
-/scripts/grafana-server/ @grafana/user-essentials
-/scripts/helpers/ @grafana/grafana-delivery
-/scripts/import_many_dashboards.sh @torkelo
-/scripts/mixin-check.sh @bergquist
-/scripts/openapi3/ @grafana/grafana-partnerships-team
-/scripts/prepare-packagejson.js @grafana/frontend-ops
-/scripts/protobuf-check.sh @grafana/plugins-platform-backend
-/scripts/stripnulls.sh @grafana/grafana-as-code
-/scripts/tag_release.sh @grafana/grafana-delivery
-/scripts/trigger_docker_build.sh @grafana/grafana-delivery
-/scripts/trigger_grafana_packer.sh @grafana/grafana-delivery
-/scripts/trigger_windows_build.sh @grafana/grafana-delivery
-/scripts/validate-devenv-dashboards.sh @grafana/grafana-delivery
-/scripts/verify-repo-update/ @grafana/grafana-delivery
-
-/scripts/webpack/ @grafana/frontend-ops
-/scripts/generate-a11y-report.sh @grafana/user-essentials
+.babelrc @grafana/frontend-ops
+.prettierrc.js @grafana/frontend-ops
+.eslintrc @grafana/frontend-ops
 .pa11yci.conf.js @grafana/user-essentials
 .pa11yci-pr.conf.js @grafana/user-essentials
-.betterer.results @joshhunt
-.betterer.ts @joshhunt
 
 # @grafana/ui component documentation
-*.mdx @grafana/plugins-platform-frontend
-
-# Design system
-/public/img/icons/unicons/ @grafana/design-system
+*.mdx @marcusolsson @jessover9000 @grafana/plugins-platform-frontend
 
 # Core datasources
-/public/app/plugins/datasource/dashboard/ @grafana/dashboards-squad
-/public/app/plugins/datasource/cloudwatch/ @grafana/aws-plugins
-/public/app/plugins/datasource/elasticsearch/ @grafana/observability-logs
-/public/app/plugins/datasource/grafana/ @grafana/user-essentials
-/public/app/plugins/datasource/testdata/ @grafana/plugins-platform-frontend
-/public/app/plugins/datasource/grafana-azure-monitor-datasource/ @grafana/partner-plugins
-/public/app/plugins/datasource/graphite/ @grafana/observability-metrics
-/public/app/plugins/datasource/influxdb/ @grafana/observability-metrics
-/public/app/plugins/datasource/jaeger/ @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/loki/ @grafana/observability-logs
-/public/app/plugins/datasource/mixed/ @grafana/dashboards-squad
-/public/app/plugins/datasource/mssql/ @grafana/grafana-bi-squad
-/public/app/plugins/datasource/mysql/ @grafana/grafana-bi-squad
-/public/app/plugins/datasource/opentsdb/ @grafana/backend-platform
-/public/app/plugins/datasource/postgres/ @grafana/grafana-bi-squad
-/public/app/plugins/datasource/prometheus/ @grafana/observability-metrics
-/public/app/plugins/datasource/cloud-monitoring/ @grafana/partner-plugins
-/public/app/plugins/datasource/zipkin/ @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/tempo/ @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/phlare/ @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/parca/ @grafana/observability-traces-and-profiling
-/public/app/plugins/datasource/alertmanager/ @grafana/alerting-squad
-
-# SSE - Server Side Expressions
-/pkg/expr/ @grafana/observability-metrics
+/public/app/plugins/datasource/cloudwatch @grafana/cloud-datasources
+/public/app/plugins/datasource/elasticsearch @grafana/observability-logs-and-traces
+/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/cloud-datasources
+/public/app/plugins/datasource/graphite @grafana/observability-metrics
+/public/app/plugins/datasource/influxdb @grafana/observability-metrics
+/public/app/plugins/datasource/jaeger @grafana/observability-logs-and-traces
+/public/app/plugins/datasource/loki @grafana/observability-logs-and-traces
+/public/app/plugins/datasource/mssql @grafana/grafana-bi-squad
+/public/app/plugins/datasource/mysql @grafana/grafana-bi-squad
+/public/app/plugins/datasource/opentsdb @grafana/backend-platform
+/public/app/plugins/datasource/postgres @grafana/grafana-bi-squad
+/public/app/plugins/datasource/prometheus @grafana/observability-metrics
+/public/app/plugins/datasource/cloud-monitoring @grafana/cloud-datasources
+/public/app/plugins/datasource/zipkin @grafana/observability-logs-and-traces
+/public/app/plugins/datasource/tempo @grafana/observability-logs-and-traces
+/public/app/plugins/datasource/alertmanager @grafana/alerting-squad
 
 # Cloud middleware
 /grafana-mixin/ @grafana/hosted-grafana-team
 
 # Grafana authentication and authorization
-/pkg/login/ @grafana/grafana-authnz-team
-/pkg/services/accesscontrol/ @grafana/grafana-authnz-team
-/pkg/services/auth/ @grafana/grafana-authnz-team
+/pkg/services/accesscontrol @grafana/grafana-authnz-team
+/pkg/services/auth @grafana/grafana-authnz-team
 /pkg/services/dashboards/accesscontrol.go @grafana/grafana-authnz-team
-/pkg/services/datasources/permissions/ @grafana/grafana-authnz-team
-/pkg/services/guardian/ @grafana/grafana-authnz-team
-/pkg/services/ldap/ @grafana/grafana-authnz-team
-/pkg/services/login/ @grafana/grafana-authnz-team
-/pkg/services/multildap/ @grafana/grafana-authnz-team
-/pkg/services/oauthtoken/ @grafana/grafana-authnz-team
-/pkg/services/teamguardian/ @grafana/grafana-authnz-team
-/pkg/services/serviceaccounts/ @grafana/grafana-authnz-team
-/pkg/services/loginattempt/ @grafana/grafana-authnz-team
-/pkg/services/authn/ @grafana/grafana-authnz-team
-
-# Support bundles
-/public/app/features/support-bundles/ @grafana/grafana-authnz-team
-/pkg/services/supportbundles/ @grafana/grafana-authnz-team
-
-# Grafana Partnerships Team
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware.go @grafana/grafana-partnerships-team
-/pkg/infra/httpclient/httpclientprovider/sigv4_middleware_test.go @grafana/grafana-partnerships-team
-
-# Kind definitions
-/kinds/dashboard @grafana/dashboards-squad
-/kinds/ @grafana/grafana-as-code
-
-# Kind system and code generation
-embed.go @grafana/grafana-as-code
-/pkg/kinds/ @grafana/grafana-as-code
-/pkg/cuectx/ @grafana/grafana-as-code
-/pkg/registry/ @grafana/grafana-as-code
-/pkg/codegen/ @grafana/grafana-as-code
-/pkg/kindsys/ @grafana/grafana-as-code
-/pkg/kindsys/kindcat_custom.cue @grafana/cloud-app-platform-squad
-/pkg/kinds/*/*_gen.go @grafana/grafana-as-code
-/pkg/registry/corekind/ @grafana/grafana-as-code
-/public/app/plugins/*gen.go @grafana/grafana-as-code
-/cue.mod/ @grafana/grafana-as-code
-
-# GitHub Workflows and Templates
-/.github/CODEOWNERS @tolzhabayev
-/.github/ISSUE_TEMPLATE/ @torkelo
-/.github/PULL_REQUEST_TEMPLATE.md @torkelo
-/.github/bot.md @torkelo
-/.github/commands.json @torkelo
-/.github/dependabot.yml @grafana/frontend-ops
-/.github/metrics-collector.json @torkelo
-/.github/pr-checks.json @marefr
-/.github/pr-commands.json @marefr
-/.github/renovate.json5 @grafana/frontend-ops
-/.github/teams.yml @armandgrillet
-/.github/workflows/backport.yml @grafana/grafana-delivery
-/.github/workflows/bump-version.yml @grafana/grafana-delivery
-/.github/workflows/close-milestone.yml @grafana/grafana-delivery
-/.github/workflows/cloud-data-sources-code-coverage.yml @grafana/partner-plugins @grafana/aws-plugins
-/.github/workflows/codeowners-validator.yml @tolzhabayev
-/.github/workflows/codeql-analysis.yml @DanCech
-/.github/workflows/commands.yml @torkelo
-/.github/workflows/detect-breaking-changes-* @grafana/plugins-platform-frontend
-/.github/workflows/doc-validator.yml @grafana/docs-grafana
-/.github/workflows/epic-add-to-platform-ux-parent-project.yml @meanmina
-/.github/workflows/github-release.yml @torkelo
-/.github/workflows/issue-labeled.yml @armandgrillet
-/.github/workflows/metrics-collector.yml @torkelo
-/.github/workflows/milestone.yml @marefr
-/.github/workflows/ox-code-coverage.yml @grafana/explore-squad
-/.github/workflows/pr-checks.yml @marefr
-/.github/workflows/pr-codeql-analysis-go.yml @DanCech
-/.github/workflows/pr-codeql-analysis-javascript.yml @DanCech
-/.github/workflows/pr-codeql-analysis-python.yml @DanCech
-/.github/workflows/pr-commands-closed.yml @tolzhabayev
-/.github/workflows/pr-commands.yml @marefr
-/.github/workflows/publish-technical-documentation-next.yml @grafana/docs-grafana
-/.github/workflows/publish-technical-documentation-release.yml @grafana/docs-grafana
-/.github/workflows/remove-milestone.yml @grafana/user-essentials
-/.github/workflows/sbom-report.yml @grafana/security-team
-/.github/workflows/scripts/json-file-to-job-output.js @grafana/plugins-platform-frontend
-/.github/workflows/scripts/pr-get-job-link.js @grafana/plugins-platform-frontend
-/.github/workflows/stale.yml @grafana/user-essentials
-/.github/workflows/update-changelog.yml @grafana/grafana-delivery
-/.github/workflows/snyk.yml @grafana/security-team
-
-# Conf
-/conf/defaults.ini @torkelo
-/conf/sample.ini @torkelo
-/conf/ldap.toml @grafana/grafana-authnz-team
-/conf/ldap_multiple.toml @grafana/grafana-authnz-team
-/conf/provisioning/access-control/ @grafana/grafana-authnz-team
-/conf/provisioning/alerting/ @grafana/alerting-squad-backend
-/conf/provisioning/dashboards/ @grafana/dashboards-squad
-/conf/provisioning/datasources/ @grafana/plugins-platform-backend
-/conf/provisioning/notifiers/ @bergquist
-/conf/provisioning/plugins/ @grafana/plugins-platform-backend
+/pkg/services/datasources/permissions @grafana/grafana-authnz-team
+/pkg/services/datasources/permissions/accesscontrol.go @grafana/grafana-authnz-team
+/pkg/services/guardian @grafana/grafana-authnz-team
+/pkg/services/ldap @grafana/grafana-authnz-team
+/pkg/services/login @grafana/grafana-authnz-team
+/pkg/services/multildap @grafana/grafana-authnz-team
+/pkg/services/oauthtoken @grafana/grafana-authnz-team
+/pkg/services/teamguardian @grafana/grafana-authnz-team
+/pkg/services/serviceaccounts @grafana/grafana-authnz-team

.github/commands.json

@@ -41,7 +41,6 @@
     "type":"label",
     "name":"bot/no new info",
     "action":"close",
-    "removeLabel":"needs more info",
     "comment":"We've closed this issue since it needs more information and hasn't had any activity recently. We can re-open it after you you add more information. To avoid having your issue closed in the future, please read our [CONTRIBUTING](https://github.com/grafana/grafana/blob/main/CONTRIBUTING.md) guidelines.\n\nHappy graphing!"
   },
   {
@@ -80,7 +79,7 @@
     "name":"datasource/Azure",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/190"
+      "url":"https://github.com/orgs/grafana/projects/97"
     }
   },
   {
@@ -104,7 +103,7 @@
     "name":"datasource/GoogleCloudMonitoring",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/190"
+      "url":"https://github.com/orgs/grafana/projects/97"
     }
   },
   {
@@ -139,12 +138,20 @@
       "url":"https://github.com/orgs/grafana/projects/112"
     }
   },
+  {
+    "type":"label",
+    "name":"datasource/OpenSearch",
+    "action":"addToProject",
+    "addToProject":{
+      "url":"https://github.com/orgs/grafana/projects/110"
+    }
+  },
   {
     "type":"label",
     "name":"datasource/Loki",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/203"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -152,7 +159,7 @@
     "name":"datasource/Tempo",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/221"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -160,7 +167,7 @@
     "name":"datasource/Elasticsearch",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/203"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -168,7 +175,7 @@
     "name":"datasource/Jaeger",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/221"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -176,7 +183,7 @@
     "name":"datasource/Zipkin",
     "action":"addToProject",
     "addToProject":{
-      "url":"https://github.com/orgs/grafana/projects/221"
+      "url":"https://github.com/orgs/grafana/projects/110"
     }
   },
   {
@@ -210,93 +217,5 @@
     "addToProject": {
       "url": "https://github.com/orgs/grafana/projects/87"
     }
-  },
-  {
-    "type": "label",
-    "name": "team/grafana-authnz",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/rbac",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/serviceaccount",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/authproxy",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/oauth",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/ldap",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/saml",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/apikeys",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/dspermissions",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
-  },
-  {
-    "type": "label",
-    "name": "area/auth/teamsync",
-    "action": "addToProject",
-    "addToProject": {
-      "url": "https://github.com/orgs/grafana/projects/86"
-    }
   }
 ]

.github/metrics-collector.json

@@ -16,10 +16,6 @@
       "name": "needs_more_info",
       "query": "label:\"needs more info\" is:open"
     },
-    {
-      "name": "triage_needs_confirmation",
-      "query": "label:\"triage/needs-confirmation\" is:open"
-    },
     {
       "name": "unlabeled",
       "query": "is:open is:issue no:label"
@@ -27,6 +23,10 @@
     {
       "name": "open_prs",
       "query": "is:open is:pr"
+    },
+    {
+      "name": "milestone_7_4_open",
+      "query": "is:open is:issue milestone:7.4"
     }
   ]
 }

.github/pr-commands.json

@@ -38,7 +38,8 @@
         "go.mod",
         "go.sum",
         "contribute/style-guides/backend.md",
-        "contribute/architecture/backend/**/*"
+        "contribute/architecture/backend/**/*",
+        "scripts/go/**/*"
     ],
     "action": "updateLabel",
     "addLabel": "area/backend"
@@ -66,7 +67,8 @@
       "scripts/build/**/*",
       "scripts/*.sh",
       "Makefile",
-      "Dockerfile"
+      "Dockerfile",
+      "Dockerfile.ubuntu"
     ],
     "action": "updateLabel",
     "addLabel": "type/build-packaging"

.github/renovate.json5

@@ -4,10 +4,12 @@
   ],
   "enabledManagers": ["npm"],
   "ignoreDeps": [
+    "@grafana/slate-react", // should be updated when the `slate` package is updated
     "@types/systemjs",
     "@types/d3-force", // we should bump this once we move to esm modules
     "@types/d3-interpolate", // we should bump this once we move to esm modules
     "@types/d3-scale-chromatic", // we should bump this once we move to esm modules
+    "@types/grafana__slate-react", // should be updated when the `slate` package is updated
     "@types/react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
     "commander", // we are planning to remove this, so no need to update it
     "d3",
@@ -16,29 +18,21 @@
     "d3-scale-chromatic", // we should bump this once we move to esm modules
     "execa", // we should bump this once we move to esm modules
     "history", // we should bump this together with react-router-dom
-    "@mdx-js/react", // storybook peer-depends on its 1.x version, we should upgrade this when we upgrade storybook
+    "@mdx-js/react", // storybook peer-depends on it's 1.x version, we should upgrade this when we upgrade storybook
     "monaco-editor", // due to us exposing this via @grafana/ui/CodeEditor's props bumping can break plugins
     "node-fetch", // we should bump this once we move to esm modules
     "react-hook-form", // due to us exposing these hooks via @grafana/ui form components bumping can break plugins
     "react-icons", // jaeger-ui-components is being refactored to use @grafana/ui icons instead
-    "react-redux", // react-beautiful-dnd depends on react-redux 7.x, we need to update that one first
     "react-router-dom", // we should bump this together with history
+    "slate",
+    "slate-plain-serializer",
     "systemjs",
     "copy-webpack-plugin", // try to upgrade with newer yarn release. Not working with 3.1.1
     "ts-loader", // we should remove ts-loader and use babel-loader instead
-    "ora", // we should bump this once we move to esm modules
-
-    // dep updates blocked by React 18
-    "@testing-library/react",
-    "@types/react",
-    "@types/react-dom",
-    "@types/react-test-renderer",
-    "react",
-    "react-dom",
-    "react-test-renderer"
+    "ora" // we should bump this once we move to esm modules
   ],
   "ignorePaths": ["packages/grafana-toolkit/package.json", "emails/**", "plugins-bundled/**", "**/mocks/**"],
-  "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
+  "labels": ["area/frontend", "dependencies"],
   "packageRules": [
     {
       "matchUpdateTypes": ["patch"],

.github/teams.yml

@@ -1,11 +0,0 @@
-# The first keys are labels used on issues. All fields are optional.
-# Example
-test:
-  # channel-label is used to send a message to a specific channel
-  # when the label "test" is added to an issue.
-  channel-label: CXXXXXXXXXX
-
-# Alerting team
-area/alerting:
-  github-board: 52
-  channel-label: C02B9MXQE0J

.github/workflows/backport.yml

@@ -22,5 +22,5 @@ jobs:
         with:
           metricsWriteAPIKey: ${{secrets.GRAFANA_MISC_STATS_API_KEY}}
           token: ${{secrets.GH_BOT_ACCESS_TOKEN}}
-          labelsToAdd: "backport,no-changelog"
+          labelsToAdd: "backport"
           title: "[{{base}}] {{originalTitle}}"

.github/workflows/bump-version.yml

@@ -3,12 +3,12 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
         required: true
+        default: '7.x.x'
   workflow_call:
     inputs:
       version_call:
-        description: 'Needs to match, exactly, the name of a milestone. The version to be released please respect: major.minor.patch or major.minor.patch-beta<number> format. example: 7.4.3 or 7.4.3-beta1'
+        description: Needs to match, exactly, the name of a version
         required: true
         type: string
     secrets:
@@ -74,7 +74,7 @@ jobs:
           repository: "grafana/grafana-github-actions"
           path: ./actions
           ref: main
-      - uses: actions/setup-node@v3.4.0
+      - uses: actions/setup-node@v3.2.0
         with:
           node-version: '16'
       - name: Install Actions

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

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

.github/workflows/codeql-analysis.yml

@@ -6,7 +6,6 @@
 name: "CodeQL"
 
 on:
-  workflow_dispatch:
   push:
     branches: [main, v1.8.x, v2.0.x, v2.1.x, v2.6.x, v3.0.x, v3.1.x, v4.0.x, v4.1.x, v4.2.x, v4.3.x, v4.4.x, v4.5.x, v4.6.x, v4.7.x, v5.0.x, v5.1.x, v5.2.x, v5.3.x, v5.4.x, v6.0.x, v6.1.x, v6.2.x, v6.3.x, v6.4.x, v6.5.x, v6.6.x, v6.7.x, v7.0.x, v7.1.x, v7.2.x]
     paths-ignore:
@@ -40,15 +39,9 @@ jobs:
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    - if: matrix.language == 'go'
-      name: Set go version
-      uses: actions/setup-go@v3
-      with:
-        go-version: '1.19.2'
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,11 +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
 
-    - if: matrix.language == 'go'
-      name: Build go files
-      run: |
-        go mod verify
-        make build-go
-
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

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

@@ -1,34 +0,0 @@
-# Workflow for skipping the Levitate detection
-# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github.
-# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.)
-
-name: Levitate / Detect breaking changes
-
-on:
-  pull_request:
-    paths-ignore:
-      - "packages/**"
-    branches:
-      - 'main'
-
-jobs:
-  detect:
-    name: Detect breaking changes
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Skipping
-        run: echo "No modifications in the public API (packages/), skipping."
-
-        # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped)
-      - name: Persisting the check output
-        run: |
-          mkdir -p ./levitate
-          echo "{ \"shouldSkip\": true }" > ./levitate/result.json
-
-      # Upload artifact (so it can be used in the more privileged "report" workflow)
-      - name: Upload check output as artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: levitate
-          path: levitate/

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

@@ -1,11 +1,6 @@
 name: Levitate / Detect breaking changes
 
-on: 
-  pull_request:
-    paths:
-      - 'packages/**'
-    branches:
-      - 'main'
+on: pull_request
 
 jobs:
   buildPR:
@@ -17,16 +12,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
+      with: 
         path: './pr'
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 16.16.0
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-
+    
     - name: Restore yarn cache
       uses: actions/cache@v2
       id: yarn-cache
@@ -35,21 +27,18 @@ jobs:
         key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
         restore-keys: |
           yarn-cache-folder-
-
+      
     - name: Install dependencies
       run: yarn install --immutable
 
     - name: Build packages
       run: yarn packages:build
 
-    - name: Pack packages
-      run: yarn packages:pack --out ./%s.tgz
-
-    - name: Zip built tarballed packages
-      run: zip -r ./pr_built_packages.zip ./packages/**/*.tgz
+    - name: Zip built packages
+      run: zip -r ./pr_built_packages.zip ./packages/**/dist
 
     - name: Upload build output as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: buildPr
         path: './pr/pr_built_packages.zip'
@@ -63,18 +52,14 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
+      with: 
         path: './base'
         ref: ${{ github.event.pull_request.base.ref }}
 
-    - uses: actions/setup-node@v3
-      with:
-        node-version: 16.16.0
-
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
-
+    
     - name: Restore yarn cache
       uses: actions/cache@v2
       id: yarn-cache
@@ -83,21 +68,18 @@ jobs:
         key: yarn-cache-folder-${{ hashFiles('**/yarn.lock', '.yarnrc.yml') }}
         restore-keys: |
           yarn-cache-folder-
-
+      
     - name: Install dependencies
       run: yarn install --immutable
 
     - name: Build packages
       run: yarn packages:build
 
-    - name: Pack packages
-      run: yarn packages:pack --out ./%s.tgz
-
-    - name: Zip built tarballed packages
-      run: zip -r ./base_built_packages.zip ./packages/**/*.tgz
+    - name: Zip built packages
+      run: zip -r ./base_built_packages.zip ./packages/**/dist
 
     - name: Upload build output as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v2
       with:
         name: buildBase
         path: './base/base_built_packages.zip'
@@ -121,12 +103,12 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: buildBase
-
+      
       - name: Unzip artifact from pr
-        run: unzip -j pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
+        run: unzip pr_built_packages.zip -d ./pr && rm pr_built_packages.zip
 
       - name: Unzip artifact from base
-        run: unzip -j base_built_packages.zip -d ./base && rm base_built_packages.zip
+        run: unzip base_built_packages.zip -d ./base && rm base_built_packages.zip
 
       - name: Get link for the Github Action job
         id: job
@@ -138,7 +120,7 @@ jobs:
 
       - name: Detect breaking changes
         id: breaking-changes
-        run: ./scripts/check-breaking-changes.sh
+        run: ./scripts/check-breaking-changes.sh 
         env:
           FORCE_COLOR: 3
           GITHUB_JOB_LINK: ${{ steps.job.outputs.link }}
@@ -149,11 +131,11 @@ jobs:
             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@v3
+        uses: actions/upload-artifact@v2
         with:
           name: levitate
           path: levitate/
-
+        
       - name: Exit
         run: exit ${{ steps.breaking-changes.outputs.is_breaking }}
         shell: bash

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

@@ -104,7 +104,7 @@ jobs:
     - 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.19.0
+      uses: slackapi/slack-github-action@v1.18.0
       with:
         payload: |
           {

.github/workflows/doc-validator.yml

@@ -1,16 +0,0 @@
-name: "doc-validator"
-on:
-  pull_request:
-    paths: ["docs/sources/**"]
-  workflow_dispatch:
-jobs:
-  doc-validator:
-    runs-on: "ubuntu-latest"
-    container:
-      image: "grafana/doc-validator:v1.5.0"
-    steps:
-      - name: "Checkout code"
-        uses: "actions/checkout@v3"
-      - name: "Run doc-validator tool"
-        # Ensure that the CI always passes until all errors are resolved.
-        run: "doc-validator ./docs/sources || true"

.github/workflows/enterprise-pr-check.yml

@@ -0,0 +1,26 @@
+name: Enterprise PR check
+on:
+  pull_request:
+    branches:
+      - main
+      - 'v[0-9]+.[0-9]+.x'
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: "grafana/grafana-github-actions"
+          path: ./actions
+          ref: main
+      - name: Install Actions
+        run: npm install --production --prefix ./actions
+      - name: Repository Dispatch
+        uses: ./actions/repository-dispatch
+        with:
+          token: ${{ secrets.GH_BOT_ACCESS_TOKEN }}
+          repository: grafana/grafana-enterprise
+          event_type: oss-pull-request
+          client_payload:
+            '{"source_branch": "${{ github.head_ref }}", "target_branch": "${{ github.base_ref }}", "pr_number": "${{ github.event.number }}"}'

.github/workflows/issue-labeled.yml

@@ -1,71 +0,0 @@
-name: Notify Slack channel based on issue label
-
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  notify:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "Download teams.yml to know which label is for which team"
-        run: wget https://raw.githubusercontent.com/grafana/grafana/main/.github/teams.yml
-
-      - name: "Determine which team to notify"
-        run: |
-          # Default to null values.
-          BOARD="null"
-          CHANNEL="null"
-
-          echo "${{ github.event.label.name }} label added"
-          export CURRENT_LABEL="${{ github.event.label.name }}" # Enable the use of the label in yq evaluations
-          # yq is installed by default in ubuntu-latest
-          if [[ $(yq e 'keys | .[] | select(. == env(CURRENT_LABEL))' teams.yml ) ]]; then
-            # Check if we have a board set to use.
-            if [[ $(yq '.[env(CURRENT_LABEL)] | has("github-board")' teams.yml ) == true ]]; then
-              BOARD=$(yq '.[env(CURRENT_LABEL)].github-board' teams.yml)
-              echo "Ready to add issue to Grafana board ${BOARD}"
-            fi
-            # Check if we have a channel set to notify on comments.
-            if [[ $(yq '.[env(CURRENT_LABEL)] | has("channel-label")' teams.yml ) == true ]]; then
-              CHANNEL=$(yq '.[env(CURRENT_LABEL)].channel-label' teams.yml)
-              echo "Ready to send issue to channel ID ${CHANNEL}"
-            fi
-          fi
-
-          # set environment for next step
-          echo "BOARD=${BOARD}" >> $GITHUB_ENV
-          echo "CHANNEL=${CHANNEL}" >> $GITHUB_ENV
-
-      - name: "Add to GitHub board"
-        if: ${{ env.BOARD != 'null' }}
-        uses: leonsteinhaeuser/project-beta-automations@v1.3.0
-        with:
-          project_id: ${{ env.BOARD }}
-          organization: grafana
-          resource_node_id: ${{ github.event.issue.node_id }}
-          gh_token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Prepare payload"
-        uses: frabert/replace-string-action@v2.0
-        id: preparePayload
-        with:
-          # replace double quotes with single quotes to avoid breaking the JSON payload sent to Slack
-          string: ${{ github.event.issue.title }}
-          pattern: '"'
-          replace-with: "'"
-          flags: 'g'
-
-      - name: "Send Slack notification"
-        if: ${{ env.CHANNEL != 'null' }}
-        uses: slackapi/slack-github-action@v1.14.0
-        with:
-          payload: >
-            {
-              "icon_emoji": ":grafana:",
-              "username": "Grafana issue labeled",
-              "text": "Issue \"${{ steps.preparePayload.outputs.replaced }}\" labeled \"${{ github.event.label.name }}\": ${{ github.event.issue.html_url }}",
-              "channel": "${{ env.CHANNEL }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

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

@@ -1,17 +0,0 @@
-name: Observability Experience test code coverage
-on:
-  pull_request:
-    paths:
-      - 'pkg/services/queryhistory/**'
-      - 'public/app/features/explore/**'
-      - 'public/app/features/correlations/**'
-    branches-ignore:
-      - dependabot/**
-      - backport-*
-
-jobs:
-  workflow-call:
-    uses: grafana/code-coverage/.github/workflows/code-coverage.yml@v0.1.12
-    with:
-      frontend-path-regexp: public\/app\/features\/(explore|correlations)
-      backend-path-regexp: pkg\/services\/(queryhistory)

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

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

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

@@ -1,7 +1,6 @@
 name: "CodeQL for PR / javascript"
 
 on:
-  workflow_dispatch:
   pull_request:
     branches: [main]
     paths:
@@ -24,9 +23,9 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: "javascript"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

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

@@ -1,7 +1,6 @@
 name: "CodeQL for PR / python"
 
 on:
-  workflow_dispatch:
   pull_request:
     branches: [main]
     paths:
@@ -22,9 +21,9 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v1
       with:
         languages: "python"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v1

.github/workflows/prepare-release.yml

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

.github/workflows/publish-technical-documentation-next.yml

@@ -1,38 +0,0 @@
-name: "publish-technical-documentation-next"
-
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "docs/sources/**"
-  workflow_dispatch:
-jobs:
-  sync:
-    if: "github.repository == 'grafana/grafana'"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-
-      - name: "Clone website-sync Action"
-        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-        # GitHub administrator to update the organization secret.
-        # The IT helpdesk can update the organization secret.
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to website repository (next)"
-        uses: "./.github/actions/website-sync"
-        id: "publish-next"
-        with:
-          repository: "grafana/website"
-          branch: "master"
-          host: "github.com"
-          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-          # GitHub administrator to update the organization secret.
-          # The IT helpdesk can update the organization secret.
-          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
-          source_folder: "docs/sources"
-          target_folder: "content/docs/grafana/next"

.github/workflows/publish-technical-documentation-release.yml

@@ -1,68 +0,0 @@
-name: "publish-technical-documentation-release"
-
-on:
-  push:
-    branches:
-      - v[0-9]+.[0-9]+.x
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-    paths:
-      - "docs/sources/**"
-  workflow_dispatch:
-jobs:
-  sync:
-    if: "github.repository == 'grafana/grafana'"
-    runs-on: "ubuntu-latest"
-    steps:
-      - name: "Checkout Grafana repo"
-        uses: "actions/checkout@v3"
-        with:
-          fetch-depth: 0
-
-      - name: "Checkout Actions library"
-        uses: "actions/checkout@v3"
-        with:
-          repository: "grafana/grafana-github-actions"
-          path: "./actions"
-
-      - name: "Install Actions from library"
-        run: "npm install --production --prefix ./actions"
-
-      - name: "Determine if there is a matching release tag"
-        id: "has-matching-release-tag"
-        uses: "./actions/has-matching-release-tag"
-        with:
-          ref_name: "${{ github.ref_name }}"
-          release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
-          release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
-
-      - name: "Determine technical documentation version"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./actions/docs-target"
-        id: "target"
-        with:
-          ref_name: "${{ github.ref_name }}"
-
-      - name: "Clone website-sync Action"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        # WEBSITE_SYNC_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-        # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-        # GitHub administrator to update the organization secret.
-        # The IT helpdesk can update the organization secret.
-        run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync"
-
-      - name: "Publish to website repository (release)"
-        if: "steps.has-matching-release-tag.outputs.bool == 'true'"
-        uses: "./.github/actions/website-sync"
-        id: "publish-release"
-        with:
-          repository: "grafana/website"
-          branch: "master"
-          host: "github.com"
-          # PUBLISH_TO_WEBSITE_TOKEN is a fine-grained GitHub Personal Access Token that expires.
-          # It must be regenerated in the grafanabot GitHub account and requires a Grafana organization
-          # GitHub administrator to update the organization secret.
-          # The IT helpdesk can update the organization secret.
-          github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_TOKEN }}"
-          source_folder: "docs/sources"
-          target_folder: "content/docs/grafana/${{ steps.target.outputs.target }}"

.github/workflows/publish.yml

@@ -0,0 +1,49 @@
+name: publish_docs
+
+on:
+  push:
+    branches:
+    - v9.0.x
+    paths:
+    - 'docs/sources/**'
+    - 'packages/grafana-*/**'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
+    - name: generate-packages-docs
+      uses: actions/setup-node@v3.2.0
+      id: generate-docs
+      with:
+        node-version: '16'
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
+    - uses: actions/cache@v2.1.7
+      with:
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: yarn-${{ hashFiles('**/yarn.lock') }}
+        restore-keys: |
+            yarn-
+    - run: yarn install --immutable
+    - run: ./scripts/ci-reference-docs-build.sh
+    - name: publish-to-git
+      uses: ./.github/actions/website-sync
+      id: publish
+      with:
+        repository: grafana/website
+        branch: master
+        host: github.com
+        github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
+        source_folder: docs/sources
+        target_folder: content/docs/grafana/latest
+        allow_no_changes: 'true'
+    - shell: bash
+      run: |
+        test -n "${{ steps.publish.outputs.commit_hash }}"
+        test -n "${{ steps.publish.outputs.working_directory }}"

.github/workflows/sbom-report.yml

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

.github/workflows/update-changelog.yml

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

.gitignore

@@ -40,8 +40,6 @@ tsconfig.tsbuildinfo
 # Enterprise devenv
 /devenv/docker/blocks/grafana-enterprise
 /devenv/docker/blocks/saml-enterprise
-# This is the new place of the block, but I leave the previous here for a while
-/devenv/docker/blocks/auth/saml-enterprise
 
 /tmp
 tools/phantomjs/phantomjs
@@ -61,7 +59,6 @@ public/css/*.min.css
 *.sublime-workspace
 *.swp
 .idea/
-.fleet/
 *.iml
 *.tmp
 .DS_Store
@@ -76,9 +73,7 @@ public/css/*.min.css
 
 # devenv
 /devenv/docker-compose.yaml
-/devenv/docker-compose.override.yaml
 /devenv/.env
-/devenv/docker/blocks/tempo/tempo-data/
 
 conf/custom.ini
 /conf/provisioning/**/custom.yaml
@@ -104,7 +99,6 @@ debug.test
 /packaging/**/*.deb
 /packaging/**/*.tar.gz
 /packaging/**/*.tar.gz.sha256
-pkg/cmd/grafana-server/__debug_bin
 
 # Ignore OSX indexing
 .DS_Store
@@ -123,20 +117,12 @@ pkg/cmd/grafana-server/__debug_bin
 
 /scripts/build/release_publisher/release_publisher
 *.patch
-!.yarn/patches/*.patch
 
 # Ignoring frontend packages specifics
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
 /packages/**/tsdoc-metadata.json
-/packages/**/package.tgz
-/packages/grafana-toolkit/sass
-## CI places the packages in a different location
-/npm-artifacts/*.tgz
-
-# Ignore frontend build manifest
-manifest.json
 
 # Ignore go local build dependencies
 /scripts/go/bin/**
@@ -172,12 +158,8 @@ compilation-stats.json
 # auto generated Go files
 *_gen.go
 !pkg/services/featuremgmt/toggles_gen.go
-!pkg/coremodel/**/*_gen.go
-!pkg/framework/**/*_gen.go
-!pkg/plugins/pfs/**/*_gen.go
-!public/app/plugins/**/*_gen.go
 
-# Auto-generated internationalization files
+# Auto-generated localisation files
 public/locales/_build/
 public/locales/**/*.js
 

.golangci.toml

@@ -1,144 +0,0 @@
-[run]
-timeout = "10m"
-
-[linters-settings.goconst]
-min-len = 5
-min-occurrences = 5
-
-[linters-settings.exhaustive]
-default-signifies-exhaustive = true
-
-[linters-settings.revive]
-ignore-generated-header = false
-severity = "warning"
-confidence = 3
-
-[linters-settings.depguard]
-list-type = "blacklist"
-include-go-root = true
-packages = ["io/ioutil"]
-[[linters-settings.depguard.packages-with-error-message]]
-"io/ioutil" = "Deprecated: As of Go 1.16, the same functionality is now provided by package io or package os, and those implementations should be preferred in new code. See the specific function documentation for details."
-
-[linters-settings.gocritic]
-enabled-checks = ["ruleguard"]
-[linters-settings.gocritic.settings.ruleguard]
-rules = "pkg/ruleguard.rules.go"
-
-[linters]
-disable-all = true
-enable = [
-  "bodyclose",
-  "depguard",
-  "dogsled",
-  "errcheck",
-  # "gochecknoinits",
-  "goconst",
-  # "gocritic", # Temporarily disabled on 2022-09-09, running into weird bug "ruleguard: execution error: used Run() with an empty rule set; forgot to call Load() first?"
-  "goimports",
-  "goprintffuncname",
-  "gosec",
-  "gosimple",
-  "govet",
-  "ineffassign",
-  "misspell",
-  "nakedret",
-  "rowserrcheck",
-  "exportloopref",
-  "staticcheck",
-  "stylecheck",
-  "typecheck",
-  "unconvert",
-  "unused",
-  "whitespace",
-  "gocyclo",
-  "exhaustive",
-  "typecheck",
-  "asciicheck",
-  "errorlint",
-  "revive",
-]
-
-# Disabled linters (might want them later)
-# "unparam"
-
-[issues]
-exclude-use-default = false
-
-# Enable when appropriate
-# Poorly chosen identifier
-[[issues.exclude-rules]]
-linters = ["stylecheck"]
-text = "ST1003"
-
-# Enable when appropriate
-# Dot imports that aren't in external test packages are discouraged.
-[[issues.exclude-rules]]
-linters = ["stylecheck"]
-text = "ST1001"
-
-# Enable when appropriate
-# strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly.
-# Use golang.org/x/text/cases instead.
-[[issues.exclude-rules]]
-linters = ["staticcheck"]
-text = "SA1019"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "G108"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "G110"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "G201"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "G202"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "G306"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "401"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "402"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "501"
-
-[[issues.exclude-rules]]
-linters = ["gosec"]
-text = "404"
-
-[[issues.exclude-rules]]
-linters = ["misspell"]
-text = "Unknwon` is a misspelling of `Unknown"
-
-[[issues.exclude-rules]]
-linters = ["errorlint"]
-text = "non-wrapping format verb for fmt.Errorf"
-
-# TODO: Enable
-[[issues.exclude-rules]]
-linters = ["stylecheck"]
-text = "ST1000"
-
-# TODO: Enable
-[[issues.exclude-rules]]
-linters = ["stylecheck"]
-text = "ST1020"
-
-# TODO: Enable
-[[issues.exclude-rules]]
-linters = ["stylecheck"]
-text = "ST1021"

.linguirc

@@ -1,8 +1,8 @@
 {
   "locales": [
-    "en-US",
-    "fr-FR",
-    "es-ES",
+    "en",
+    "fr",
+    "es",
     "pseudo-LOCALE"
   ],
   "catalogs": [
@@ -20,11 +20,11 @@
     }
   ],
   "fallbackLocales": {
-    "pseudo-LOCALE": "en-US",
-    "default": "en-US"
+    "pseudo-LOCALE": "en",
+    "default": "en"
   },
   "pseudoLocale": "pseudo-LOCALE",
-  "sourceLocale": "en-US",
+  "sourceLocale": "en",
   "format": "po",
   "formatOptions": {
     "lineNumbers": false

.pa11yci-pr.conf.js

@@ -1,54 +1,8 @@
-var dashboardSettings = [
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 0,
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=annotations',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 0,
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=templating',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 0,
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=links',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 0,
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=versions',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 0,
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=permissions',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 9,
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=dashboard_json',
-    wait: 500,
-    rootElement: '.main-view',
-    threshold: 2,
-  },
-];
-
 var config = {
   defaults: {
     concurrency: 1,
     runners: ['axe'],
     useIncognitoBrowserContext: false,
-    standard: 'WCAG2AA',
     chromeLaunchConfig: {
       args: ['--no-sandbox'],
     },
@@ -62,7 +16,7 @@ var config = {
       url: '${HOST}/login',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 13,
+      threshold: 12,
     },
     {
       url: '${HOST}/login',
@@ -74,7 +28,7 @@ var config = {
         "click element button[aria-label='Login button']",
         "wait for element [aria-label='Skip change password button'] to be visible",
       ],
-      threshold: 14,
+      threshold: 13,
       rootElement: '.main-view',
     },
     {
@@ -88,7 +42,12 @@ var config = {
       rootElement: '.main-view',
       threshold: 0,
     },
-    ...dashboardSettings,
+    {
+      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
+      wait: 500,
+      rootElement: '.main-view',
+      threshold: 0,
+    },
     {
       url: '${HOST}/?orgId=1&search=open',
       wait: 500,
@@ -101,49 +60,49 @@ var config = {
       rootElement: '.main-view',
       // the unified alerting promotion alert's content contrast is too low
       // see https://github.com/grafana/grafana/pull/41829
-      threshold: 6,
+      threshold: 5,
     },
     {
       url: '${HOST}/datasources',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/org/users',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/org/teams',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/plugins',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/org',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
     {
       url: '${HOST}/org/apikeys',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 4,
+      threshold: 0,
     },
     {
       url: '${HOST}/dashboards',
       wait: 500,
       rootElement: '.main-view',
-      threshold: 1,
+      threshold: 0,
     },
   ],
 };

.pa11yci.conf.js

@@ -1,46 +1,8 @@
-var dashboardSettings = [
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=annotations',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=templating',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=links',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=versions',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=permissions',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-  {
-    url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=dashboard_json',
-    wait: 500,
-    rootElement: '.main-view',
-  },
-];
 var config = {
   defaults: {
     concurrency: 1,
     runners: ['axe'],
     useIncognitoBrowserContext: false,
-    standard: 'WCAG2AA',
     chromeLaunchConfig: {
       args: ['--no-sandbox'],
     },
@@ -76,7 +38,11 @@ var config = {
       wait: 500,
       rootElement: '.main-view',
     },
-    ...dashboardSettings,
+    {
+      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
+      wait: 500,
+      rootElement: '.main-view',
+    },
     {
       url: '${HOST}/?orgId=1&search=open',
       wait: 500,

.prettierignore

@@ -18,15 +18,10 @@ vendor
 # TS generate from cue by cuetsy
 **/*.gen.ts
 
-# Auto-generated internationalization files
+# Auto-generated localisation files
 public/locales/_build/
 public/locales/**/*.js
 
 # Auto-generated theme files
 theme.light.generated.json
 theme.dark.generated.json
-
-# Generated Swagger API specs
-public/api-spec.json
-public/api-merged.json
-public/openapi3.json

.yarn/sdks/eslint/bin/eslint.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/eslint/lib/api.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/eslint/package.json

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

.yarn/sdks/integrations.yml

@@ -2,5 +2,5 @@
 # Manual changes might be lost!
 
 integrations:
-  - vim
   - vscode
+  - vim

.yarn/sdks/prettier/index.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/prettier/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "2.7.1-sdk",
+  "version": "2.6.0-sdk",
   "main": "./index.js",
   "type": "commonjs"
 }

.yarn/sdks/typescript/bin/tsc

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/typescript/bin/tsserver

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/typescript/lib/tsc.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/typescript/lib/tsserver.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 const moduleWrapper = tsserver => {
   if (!process.versions.pnp) {
@@ -61,18 +61,14 @@ const moduleWrapper = tsserver => {
           //
           // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
           //
-          // 2021-10-08: VSCode changed the format in 1.61.
+          // Update 2021-10-08: VSCode changed their format in 1.61.
           // Before | ^zip:/c:/foo/bar.zip/package.json
           // After  | ^/zip//c:/foo/bar.zip/package.json
           //
-          // 2022-04-06: VSCode changed the format in 1.66.
+          // Update 2022-04-06: VSCode changed the format in 1.66.
           // Before | ^/zip//c:/foo/bar.zip/package.json
           // After  | ^/zip/c:/foo/bar.zip/package.json
           //
-          // 2022-05-06: VSCode changed the format in 1.68
-          // Before | ^/zip/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
           case `vscode <1.61`: {
             str = `^zip:${str}`;
           } break;
@@ -81,12 +77,8 @@ const moduleWrapper = tsserver => {
             str = `^/zip/${str}`;
           } break;
 
-          case `vscode <1.68`: {
-            str = `^/zip${str}`;
-          } break;
-
           case `vscode`: {
-            str = `^/zip/${str}`;
+            str = `^/zip${str}`;
           } break;
 
           // To make "go to definition" work,
@@ -135,7 +127,9 @@ const moduleWrapper = tsserver => {
 
       case `vscode`:
       default: {
-        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+        return process.platform === `win32`
+          ? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
+          : str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
       } break;
     }
   }
@@ -175,19 +169,10 @@ const moduleWrapper = tsserver => {
       ) {
         hostInfo = parsedMessage.arguments.hostInfo;
         if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
-          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
-            // The RegExp from https://semver.org/ but without the caret at the start
-            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-          ) ?? []).map(Number)
-
-          if (major === 1) {
-            if (minor < 61) {
-              hostInfo += ` <1.61`;
-            } else if (minor < 66) {
-              hostInfo += ` <1.66`;
-            } else if (minor < 68) {
-              hostInfo += ` <1.68`;
-            }
+          if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.61`;
+          } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.66`;
           }
         }
       }

.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 const moduleWrapper = tsserver => {
   if (!process.versions.pnp) {
@@ -61,18 +61,14 @@ const moduleWrapper = tsserver => {
           //
           // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
           //
-          // 2021-10-08: VSCode changed the format in 1.61.
+          // Update 2021-10-08: VSCode changed their format in 1.61.
           // Before | ^zip:/c:/foo/bar.zip/package.json
           // After  | ^/zip//c:/foo/bar.zip/package.json
           //
-          // 2022-04-06: VSCode changed the format in 1.66.
+          // Update 2022-04-06: VSCode changed the format in 1.66.
           // Before | ^/zip//c:/foo/bar.zip/package.json
           // After  | ^/zip/c:/foo/bar.zip/package.json
           //
-          // 2022-05-06: VSCode changed the format in 1.68
-          // Before | ^/zip/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
           case `vscode <1.61`: {
             str = `^zip:${str}`;
           } break;
@@ -81,12 +77,8 @@ const moduleWrapper = tsserver => {
             str = `^/zip/${str}`;
           } break;
 
-          case `vscode <1.68`: {
-            str = `^/zip${str}`;
-          } break;
-
           case `vscode`: {
-            str = `^/zip/${str}`;
+            str = `^/zip${str}`;
           } break;
 
           // To make "go to definition" work,
@@ -135,7 +127,9 @@ const moduleWrapper = tsserver => {
 
       case `vscode`:
       default: {
-        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+        return process.platform === `win32`
+          ? str.replace(/^\^?(zip:|\/zip)\/+/, ``)
+          : str.replace(/^\^?(zip:|\/zip)\/+/, `/`);
       } break;
     }
   }
@@ -175,19 +169,10 @@ const moduleWrapper = tsserver => {
       ) {
         hostInfo = parsedMessage.arguments.hostInfo;
         if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
-          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
-            // The RegExp from https://semver.org/ but without the caret at the start
-            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-          ) ?? []).map(Number)
-
-          if (major === 1) {
-            if (minor < 61) {
-              hostInfo += ` <1.61`;
-            } else if (minor < 66) {
-              hostInfo += ` <1.66`;
-            } else if (minor < 68) {
-              hostInfo += ` <1.68`;
-            }
+          if (/(\/|-)1\.([1-5][0-9]|60)\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.61`;
+          } else if (/(\/|-)1\.(6[1-5])\./.test(process.env.VSCODE_IPC_HOOK)) {
+            hostInfo += ` <1.66`;
           }
         }
       }

.yarn/sdks/typescript/lib/typescript.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
 const {existsSync} = require(`fs`);
-const {createRequire} = require(`module`);
+const {createRequire, createRequireFromPath} = require(`module`);
 const {resolve} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.cjs";
 
 const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absRequire = createRequire(absPnpApiPath);
+const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
 
 if (existsSync(absPnpApiPath)) {
   if (!process.versions.pnp) {

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.8.2-sdk",
+  "version": "4.6.4-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs"
 }

.yarnrc.yml

@@ -3,12 +3,12 @@ enableTelemetry: false
 nodeLinker: pnp
 
 packageExtensions:
+  "@grafana/slate-react@0.22.10-grafana":
+    peerDependencies:
+      slate-react: ">=0.22.0"
   "@mdx-js/loader@1.6.22":
     peerDependencies:
       react: 17.0.1
-  "@npmcli/run-script@4.1.3":
-    dependencies:
-      which: ^2.0.2
   "@storybook/addon-docs@6.4.21":
     peerDependencies:
       "@storybook/manager-webpack5": 6.4.21
@@ -34,9 +34,9 @@ packageExtensions:
   doctrine@3.0.0:
     dependencies:
       assert: 2.0.0
-  moveable@0.30.0:
+  moveable@0.29.8:
     dependencies:
-      "@daybrush/utils": 1.7.0
+      "@daybrush/utils": 1.6.0
       framework-utils: ^1.1.0
   rc-time-picker@3.7.3:
     peerDependencies:
@@ -48,18 +48,21 @@ packageExtensions:
       react-dom: 17.0.1
   react-compat-css-styled@1.0.8:
     dependencies:
-      react-simple-compat: 1.2.2
-  react-compat-moveable@0.18.0:
+      react-simple-compat: 1.2.1
+  react-compat-moveable@0.17.8:
     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.9.0
+      gesto: ^1.7.0
       overlap-area: ^1.0.0
-      react-simple-compat: 1.2.2
+      react-simple-compat: 1.2.1
     peerDependencies:
       framework-utils: ^1.1.0
+  react-docgen-typescript-loader@3.7.2:
+    peerDependencies:
+      webpack: 4.41.5
   react-icons@2.2.7:
     peerDependencies:
       prop-types: "*"
@@ -75,4 +78,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v2"
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-3.2.1.cjs

Dockerfile

@@ -1,166 +1,96 @@
-# syntax=docker/dockerfile:1
-
-ARG BASE_IMAGE=alpine:3.17
-ARG JS_IMAGE=node:16-alpine3.17
-ARG GO_IMAGE=golang:1.20.4-alpine3.17
-
-ARG GO_SRC=go-builder
-ARG JS_SRC=js-builder
-
-FROM ${JS_IMAGE} as js-builder
+FROM node:16-alpine3.15 as js-builder
 
 ENV NODE_OPTIONS=--max_old_space_size=8000
 
-WORKDIR /tmp/grafana
+WORKDIR /grafana
 
 COPY package.json yarn.lock .yarnrc.yml ./
 COPY .yarn .yarn
 COPY packages packages
 COPY plugins-bundled plugins-bundled
 
-RUN apk add --update python3 make g++\
-   && rm -rf /var/cache/apk/*
-
 RUN yarn install
 
 COPY tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js babel.config.json .linguirc ./
 COPY public public
+COPY tools tools
 COPY scripts scripts
 COPY emails emails
 
 ENV NODE_ENV production
 RUN yarn build
 
-FROM ${GO_IMAGE} as go-builder
+FROM golang:1.17.11-alpine3.15 as go-builder
 
-# Install build dependencies
-RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache gcc g++ make binutils-gold; \
-    fi
+RUN apk add --no-cache gcc g++ make
 
-WORKDIR /tmp/grafana
+WORKDIR /grafana
 
-COPY go.* ./
-COPY .bingo .bingo
-
-RUN go mod download && \
-    go install github.com/bwplotka/bingo@latest && \
-    bingo get
-
-COPY embed.go Makefile build.go package.json ./
-COPY cue.mod cue.mod
-COPY local local
+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 conf conf
-COPY .github .github
+COPY cue.mod cue.mod
+COPY .bingo .bingo
 
+RUN go mod verify
 RUN make build-go
 
-FROM ${BASE_IMAGE} as tgz-builder
-
-WORKDIR /tmp/grafana
-
-ARG GRAFANA_TGZ="grafana-latest.linux-x64-musl.tar.gz"
-
-COPY ${GRAFANA_TGZ} /tmp/grafana.tar.gz
-
-# add -v to make tar print every file it extracts
-RUN tar x -z -f /tmp/grafana.tar.gz --strip-components=1
-
-# helpers for COPY --from
-FROM ${GO_SRC} as go-src
-FROM ${JS_SRC} as js-src
-
 # Final stage
-FROM ${BASE_IMAGE}
+FROM alpine:3.15
 
-LABEL maintainer="Grafana Labs <hello@grafana.com>"
+LABEL maintainer="Grafana team <hello@grafana.com>"
 
 ARG GF_UID="472"
 ARG GF_GID="0"
 
 ENV PATH="/usr/share/grafana/bin:$PATH" \
-    GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
-    GF_PATHS_DATA="/var/lib/grafana" \
-    GF_PATHS_HOME="/usr/share/grafana" \
-    GF_PATHS_LOGS="/var/log/grafana" \
-    GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
-    GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
+  GF_PATHS_CONFIG="/etc/grafana/grafana.ini" \
+  GF_PATHS_DATA="/var/lib/grafana" \
+  GF_PATHS_HOME="/usr/share/grafana" \
+  GF_PATHS_LOGS="/var/log/grafana" \
+  GF_PATHS_PLUGINS="/var/lib/grafana/plugins" \
+  GF_PATHS_PROVISIONING="/etc/grafana/provisioning"
 
 WORKDIR $GF_PATHS_HOME
 
-# Install dependencies
-RUN if grep -i -q alpine /etc/issue; then \
-      apk add --no-cache ca-certificates bash tzdata musl-utils && \
-      apk info -vv | sort; \
-    elif grep -i -q ubuntu /etc/issue; then \
-      DEBIAN_FRONTEND=noninteractive && \
-      apt-get update && \
-      apt-get install -y ca-certificates curl tzdata && \
-      apt-get autoremove -y && \
-      rm -rf /var/lib/apt/lists/*; \
-    else \
-      echo 'ERROR: Unsupported base image' && /bin/false; \
-    fi
+RUN apk add --no-cache ca-certificates bash tzdata musl-utils
+RUN apk add --no-cache openssl ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk upgrade ncurses-libs ncurses-terminfo-base --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk info -vv | sort
 
-# glibc support for alpine x86_64 only
-RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
-      wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
-        -O /tmp/glibc-2.35-r0.apk && \
-      wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
-        -O /tmp/glibc-bin-2.35-r0.apk && \
-      apk add --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
-      rm -f /lib64/ld-linux-x86-64.so.2 && \
-      ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
-      rm -f /tmp/glibc-2.35-r0.apk && \
-      rm -f /tmp/glibc-bin-2.35-r0.apk && \
-      rm -f /lib/ld-linux-x86-64.so.2 && \
-      rm -f /etc/ld.so.cache; \
-    fi
-
-COPY --from=go-src /tmp/grafana/conf ./conf
+COPY conf ./conf
 
 RUN if [ ! $(getent group "$GF_GID") ]; then \
-      if grep -i -q alpine /etc/issue; then \
-        addgroup -S -g $GF_GID grafana; \
-      else \
-        addgroup --system --gid $GF_GID grafana; \
-      fi; \
-    fi && \
-    GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
-    mkdir -p "$GF_PATHS_HOME/.aws" && \
-    if grep -i -q alpine /etc/issue; then \
-      adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana; \
-    else \
-      adduser --system --uid $GF_UID --ingroup "$GF_GID_NAME" grafana; \
-    fi && \
-    mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
-             "$GF_PATHS_PROVISIONING/dashboards" \
-             "$GF_PATHS_PROVISIONING/notifiers" \
-             "$GF_PATHS_PROVISIONING/plugins" \
-             "$GF_PATHS_PROVISIONING/access-control" \
-             "$GF_PATHS_PROVISIONING/alerting" \
-             "$GF_PATHS_LOGS" \
-             "$GF_PATHS_PLUGINS" \
-             "$GF_PATHS_DATA" && \
-    cp conf/sample.ini "$GF_PATHS_CONFIG" && \
-    cp conf/ldap.toml /etc/grafana/ldap.toml && \
-    chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
-    chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
+  addgroup -S -g $GF_GID grafana; \
+  fi
 
-COPY --from=go-src /tmp/grafana/bin/grafana* /tmp/grafana/bin/*/grafana* ./bin/
-COPY --from=js-src /tmp/grafana/public ./public
+RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \
+  mkdir -p "$GF_PATHS_HOME/.aws" && \
+  adduser -S -u $GF_UID -G "$GF_GID_NAME" grafana && \
+  mkdir -p "$GF_PATHS_PROVISIONING/datasources" \
+  "$GF_PATHS_PROVISIONING/dashboards" \
+  "$GF_PATHS_PROVISIONING/notifiers" \
+  "$GF_PATHS_PROVISIONING/plugins" \
+  "$GF_PATHS_PROVISIONING/access-control" \
+  "$GF_PATHS_LOGS" \
+  "$GF_PATHS_PLUGINS" \
+  "$GF_PATHS_DATA" && \
+  cp "$GF_PATHS_HOME/conf/sample.ini" "$GF_PATHS_CONFIG" && \
+  cp "$GF_PATHS_HOME/conf/ldap.toml" /etc/grafana/ldap.toml && \
+  chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
+  chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
+
+COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli ./bin/
+COPY --from=js-builder /grafana/public ./public
+COPY --from=js-builder /grafana/tools ./tools
 
 EXPOSE 3000
 
-ARG RUN_SH=./packaging/docker/run.sh
+COPY ./packaging/docker/run.sh /run.sh
 
-COPY ${RUN_SH} /run.sh
-
-USER "$GF_UID"
+USER grafana
 ENTRYPOINT [ "/run.sh" ]

Dockerfile.ubuntu

@@ -21,7 +21,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.19.4 AS go-builder
+FROM golang:1.17.11 AS go-builder
 
 WORKDIR /src/grafana
 
@@ -29,6 +29,7 @@ COPY go.mod go.sum embed.go ./
 COPY Makefile build.go package.json ./
 COPY .bingo .bingo
 COPY pkg pkg/
+COPY cue cue/
 COPY cue.mod cue.mod/
 COPY packages/grafana-schema packages/grafana-schema/
 COPY public/app/plugins public/app/plugins/
@@ -68,7 +69,6 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
              "$GF_PATHS_PROVISIONING/notifiers" \
              "$GF_PATHS_PROVISIONING/plugins" \
              "$GF_PATHS_PROVISIONING/access-control" \
-             "$GF_PATHS_PROVISIONING/alerting" \
              "$GF_PATHS_LOGS" \
              "$GF_PATHS_PLUGINS" \
              "$GF_PATHS_DATA" && \
@@ -77,7 +77,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli /grafana/bin/*/grafana bin/
+COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli bin/
 COPY --from=js-builder /usr/src/app/public public
 COPY --from=js-builder /usr/src/app/tools tools
 

LICENSING.md

@@ -21,8 +21,6 @@ pkg/coremodel/
 pkg/framework/coremodel/
 grafana-mixin/
 cue/
-public/img/icons/solid/
-public/img/icons/unicons/
 ```
 
 The following directories and their subdirectories are licensed under their original upstream licenses:

MAINTAINERS.md

@@ -6,7 +6,3 @@
   - @ryantxu
 - UX/UI:
   - @davkal
-- Docs:
-  - @chri2547
-  - @brendamuir
-  - @gguillotte-grafana

Makefile

@@ -7,11 +7,13 @@ WIRE_TAGS = "oss"
 -include local/Makefile
 include .bingo/Variables.mk
 
-.PHONY: all deps-go deps-js deps build-go build-backend 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 gen-go gen-cue
+.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))
 
@@ -35,40 +37,53 @@ SPEC_TARGET = public/api-spec.json
 MERGED_SPEC_TARGET := public/api-merged.json
 NGALERT_SPEC_TARGET = pkg/services/ngalert/api/tooling/api.json
 
-$(NGALERT_SPEC_TARGET):
-	+$(MAKE) -C pkg/services/ngalert/api/tooling api.json
-
-$(MERGED_SPEC_TARGET): $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) $(SWAGGER) ## Merge generated and ngalert API specs
-	# known conflicts DsPermissionType, AddApiKeyCommand, Json, Duration (identical models referenced by both specs)
-	$(SWAGGER) mixin $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) --ignore-conflicts -o $(MERGED_SPEC_TARGET)
-
-$(SPEC_TARGET): $(SWAGGER) ## Generate API Swagger specification
-	SWAGGER_GENERATE_EXTENSION=false $(SWAGGER) generate spec -m -w pkg/server -o $(SPEC_TARGET) \
-	-x "github.com/grafana/grafana/pkg/services/ngalert/api/tooling/definitions" \
+$(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 pkg/api/swagger_tags.json
+	-i /grafana/pkg/api/docs/tags.json
 
 swagger-api-spec: gen-go $(SPEC_TARGET) $(MERGED_SPEC_TARGET) validate-api-spec
 
-validate-api-spec: $(MERGED_SPEC_TARGET) $(SWAGGER) ## Validate API spec
-	$(SWAGGER) validate $(<)
+$(NGALERT_SPEC_TARGET):
+	+$(MAKE) -C pkg/services/ngalert/api/tooling api.json
+
+$(MERGED_SPEC_TARGET): $(SPEC_TARGET) $(NGALERT_SPEC_TARGET) ## Merge generated and ngalert API specs
+	go run pkg/api/docs/merge/merge_specs.go -o=public/api-merged.json $(<) pkg/services/ngalert/api/tooling/api.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
+
+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) $(OAPI_SPEC_TARGET)
-
-##@ OpenAPI 3
-OAPI_SPEC_TARGET = public/openapi3.json
-
-openapi3-gen: swagger-api-spec ## Generates OpenApi 3 specs from the Swagger 2 already generated
-	$(GO) run scripts/openapi3/openapi3conv.go $(MERGED_SPEC_TARGET) $(OAPI_SPEC_TARGET)
+	rm $(SPEC_TARGET) $(MERGED_SPEC_TARGET)
 
 ##@ Building
-gen-cue: ## Do all CUE/Thema code generation
-	@echo "generate code from .cue files"
-	go generate ./pkg/framework/coremodel
-	go generate ./public/app/plugins
 
-gen-go: $(WIRE) gen-cue
+gen-go: $(WIRE)
 	@echo "generate go files"
 	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server ./pkg/cmd/grafana-cli/runner
 
@@ -76,10 +91,6 @@ build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build
 
-build-backend: ## Build Grafana backend.
-	@echo "build backend"
-	$(GO) run build.go $(GO_BUILD_FLAGS) build-backend
-
 build-server: ## Build Grafana server.
 	@echo "build server"
 	$(GO) run build.go $(GO_BUILD_FLAGS) build-server
@@ -95,38 +106,21 @@ build-js: ## Build frontend assets.
 
 build: build-go build-js ## Build backend and frontend.
 
-run: $(BRA) ## Build and run web server on filesystem changes.
-	$(BRA) run
+scripts/go/bin/bra: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/bra github.com/unknwon/bra
+
+run: scripts/go/bin/bra ## Build and run web server on filesystem changes.
+	@scripts/go/bin/bra run
 
 run-frontend: deps-js ## Fetch js dependencies and watch frontend for rebuild
 	yarn start
 
 ##@ Testing
 
-.PHONY: test-go
-test-go: test-go-unit test-go-integration
-
-.PHONY: test-go-unit
-test-go-unit: ## Run unit tests for backend with flags.
-	@echo "test backend unit tests"
-	$(GO) test -short -covermode=atomic -timeout=30m ./pkg/...
-
-.PHONY: test-go-integration
-test-go-integration: ## Run integration tests for backend with flags.
-	@echo "test backend integration tests"
-	$(GO) test -run Integration -covermode=atomic -timeout=30m ./pkg/...
-
-.PHONY: test-go-integration-postgres
-test-go-integration-postgres: devenv-postgres ## Run integration tests for postgres backend with flags.
-	@echo "test backend integration postgres tests"
-	$(GO) clean -testcache
-	$(GO) list './pkg/...' | xargs -I {} sh -c 'GRAFANA_TEST_DB=postgres go test -run Integration -covermode=atomic -timeout=30m {}'
-
-.PHONY: test-go-integration-mysql
-test-go-integration-mysql: devenv-mysql ## Run integration tests for mysql backend with flags.
-	@echo "test backend integration mysql tests"
-	$(GO) clean -testcache
-	$(GO) list './pkg/...' | xargs -I {} sh -c 'GRAFANA_TEST_DB=mysql go test -run Integration -covermode=atomic -timeout=30m {}'
+test-go: ## Run tests for backend.
+	@echo "test backend"
+	$(GO) test -v ./pkg/...
 
 test-js: ## Run tests for frontend.
 	@echo "test frontend"
@@ -135,10 +129,14 @@ test-js: ## Run tests for frontend.
 test: test-go test-js ## Run all tests.
 
 ##@ Linting
-golangci-lint: $(GOLANGCI_LINT)
+scripts/go/bin/golangci-lint: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
+
+golangci-lint: scripts/go/bin/golangci-lint
 	@echo "lint via golangci-lint"
-	$(GOLANGCI_LINT) run \
-		--config .golangci.toml \
+	@scripts/go/bin/golangci-lint run \
+		--config ./scripts/go/configs/.golangci.toml \
 		$(GO_FILES)
 
 lint-go: golangci-lint ## Run all code checks for backend. You can use GO_FILES to specify exact files to check
@@ -152,22 +150,17 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.
 
 build-docker-full: ## Build Docker image for development.
 	@echo "build docker container"
-	DOCKER_BUILDKIT=1 \
-	docker build \
-	--tag grafana/grafana:dev .
+	docker build --tag grafana/grafana:dev .
 
 build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
 	@echo "build docker container"
-	DOCKER_BUILDKIT=1 \
-	docker build \
-	--build-arg BASE_IMAGE=ubuntu:20.04 \
-	--build-arg GO_IMAGE=golang:1.20.4 \
-	--tag grafana/grafana:dev-ubuntu .
+	docker build --tag grafana/grafana:dev-ubuntu -f ./Dockerfile.ubuntu .
+
 
 ##@ Services
 
 # create docker-compose file with provided sources and start them
-# example: make devenv sources=postgres,auth/openldap
+# example: make devenv sources=postgres,openldap
 ifeq ($(sources),)
 devenv:
 	@printf 'You have to define sources for this command \nexample: make devenv sources=postgres,openldap\n'
@@ -188,14 +181,6 @@ devenv-down: ## Stop optional services.
 	test -f docker-compose.yaml && \
 	docker-compose down || exit 0;
 
-devenv-postgres:
-	@cd devenv; \
-	sources=postgres_tests
-
-devenv-mysql:
-	@cd devenv; \
-	sources=mysql_tests
-
 ##@ Helpers
 
 # We separate the protobuf generation because most development tasks on

api-extractor.json

@@ -0,0 +1,38 @@
+{
+  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
+  "mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
+  "bundledPackages": [],
+  "compiler": {},
+  "apiReport": {
+    "enabled": false
+  },
+  "docModel": {
+    "enabled": true,
+    "apiJsonFilePath": "<projectFolder>/../../reports/docs/<unscopedPackageName>.api.json"
+  },
+  "dtsRollup": {
+    "enabled": false
+  },
+  "tsdocMetadata": {},
+  "messages": {
+    "compilerMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    },
+    "extractorMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      },
+      "ae-internal-missing-underscore": {
+        "logLevel": "none",
+        "addToApiReportFile": false
+      }
+    },
+    "tsdocMessageReporting": {
+      "default": {
+        "logLevel": "warning"
+      }
+    }
+  }
+}

conf/defaults.ini

@@ -125,7 +125,7 @@ path = grafana.db
 # For "sqlite3" only. cache mode setting used for connecting to the database
 cache_mode = private
 
-# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+# 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 #############################
@@ -139,12 +139,6 @@ type = database
 # memcache: 127.0.0.1:11211
 connstr =
 
-# prefix prepended to all the keys in the remote cache
-prefix =
-
-# This enables encryption of values stored in the remote cache
-encryption =
-
 #################################### Data proxy ###########################
 [dataproxy]
 
@@ -218,9 +212,6 @@ check_for_plugin_updates = true
 # Google Analytics universal tracking code, only enabled if you specify an id here
 google_analytics_ua_id =
 
-# Google Analytics 4 tracking code, only enabled if you specify an id here
-google_analytics_4_id =
-
 # Google Tag Manager ID, only enabled if you specify an id here
 google_tag_manager_id =
 
@@ -256,9 +247,6 @@ admin_user = admin
 # default admin password, can be changed before first start of grafana, or in profile settings
 admin_password = admin
 
-# default admin email, created on startup
-admin_email = admin@localhost
-
 # used for signing
 secret_key = SW2YcwTIb9zpOOhoPsMm
 
@@ -388,9 +376,6 @@ password_hint = password
 # Default UI theme ("dark" or "light")
 default_theme = dark
 
-# Default locale (supported IETF language tag, such as en-US)
-default_locale = en-US
-
 # Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
 home_page =
 
@@ -452,9 +437,6 @@ sigv4_auth_enabled = false
 # Set to true to enable verbose logging of SigV4 request signing
 sigv4_verbose_logging = false
 
-# Set to true to enable Azure authentication option for HTTP-based datasources
-azure_auth_enabled = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -482,9 +464,6 @@ api_url = https://api.github.com/user
 allowed_domains =
 team_ids =
 allowed_organizations =
-role_attribute_path =
-role_attribute_strict = false
-allow_assign_grafana_admin = false
 
 #################################### GitLab Auth #########################
 [auth.gitlab]
@@ -500,7 +479,6 @@ allowed_domains =
 allowed_groups =
 role_attribute_path =
 role_attribute_strict = false
-allow_assign_grafana_admin = false
 
 #################################### Google Auth #########################
 [auth.google]
@@ -546,8 +524,6 @@ token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
 allowed_domains =
 allowed_groups =
 role_attribute_strict = false
-allow_assign_grafana_admin = false
-force_use_graph_api = false
 
 #################################### Okta OAuth #######################
 [auth.okta]
@@ -565,7 +541,6 @@ allowed_domains =
 allowed_groups =
 role_attribute_path =
 role_attribute_strict = false
-allow_assign_grafana_admin = false
 
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
@@ -598,8 +573,6 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 use_pkce = false
-auth_style =
-allow_assign_grafana_admin = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
@@ -620,7 +593,6 @@ enable_login_token = false
 #################################### Auth JWT ##########################
 [auth.jwt]
 enabled = false
-enable_login_token = false
 header_name =
 email_claim =
 username_claim =
@@ -629,18 +601,13 @@ jwk_set_file =
 cache_ttl = 60m
 expected_claims = {}
 key_file =
-role_attribute_path =
-role_attribute_strict = false
 auto_sign_up = false
-url_login = false
-allow_assign_grafana_admin = false
 
 #################################### Auth LDAP ###########################
 [auth.ldap]
 enabled = false
 config_file = /etc/grafana/ldap.toml
 allow_sign_up = true
-skip_org_role_sync = false
 
 # LDAP background sync (Enterprise only)
 # At 1 am every day
@@ -678,7 +645,8 @@ managed_identity_client_id =
 
 #################################### Role-based Access Control ###########
 [rbac]
-# If enabled, cache permissions in a in memory cache
+enabled = true
+# If enabled, cache permissions in a in memory cache (Enterprise only)
 permission_cache = true
 
 #################################### SMTP / Emailing #####################
@@ -762,16 +730,13 @@ tag =
 # Should Sentry javascript agent be initialized
 enabled = false
 
-# Defines which provider to use sentry or grafana
-provider = sentry
-
 # Sentry DSN if you want to send events to Sentry.
 sentry_dsn =
 
-# Custom HTTP endpoint to send events to. Default will log the events to stdout.
-custom_endpoint =
+# Custom HTTP endpoint to send events captured by the Sentry agent to. Default will log the events to stdout.
+custom_endpoint = /log
 
-# Rate of events to be reported to Sentry between 0 (none) and 1 (all), float
+# Rate of events to be reported between 0 (none) and 1 (all), float
 sample_rate = 1.0
 
 # Requests per second limit enforced per an extended period, for Grafana backend log ingestion endpoint (/log).
@@ -780,18 +745,6 @@ log_endpoint_requests_per_second_limit = 3
 # Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log)
 log_endpoint_burst_limit = 15
 
-# Should error instrumentation be enabled, only affects Grafana Javascript Agent
-instrumentations_errors_enabled = true
-
-# Should console instrumentation be enabled, only affects Grafana Javascript Agent
-instrumentations_console_enabled = false
-
-# Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
-instrumentations_webvitals_enabled = false
-
-# Api Key, only applies to Grafana Javascript Agent provider
-api_key =
-
 #################################### Usage Quotas ########################
 [quota]
 enabled = false
@@ -833,9 +786,6 @@ global_session = -1
 # global limit of alerts
 global_alert_rule = -1
 
-# global limit of files uploaded to the SQL DB
-global_file = 1000
-
 #################################### Unified Alerting ####################
 [unified_alerting]
 # Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed when switching. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -892,8 +842,8 @@ max_attempts = 3
 min_interval = 10s
 
 [unified_alerting.screenshots]
-# Enable screenshots in notifications. This option requires the Grafana Image Renderer plugin.
-# For more information on configuration options, refer to [rendering].
+# Enable screenshots in notifications. This option requires a remote HTTP image rendering service. Please
+# see [rendering] for further configuration options.
 capture = false
 
 # The maximum number of screenshots that can be taken at the same time. This option is different from
@@ -907,11 +857,6 @@ max_concurrent_screenshots = 5
 # screenshots will be persisted to disk for up to temp_data_lifetime.
 upload_external_image_storage = false
 
-[unified_alerting.reserved_labels]
-# Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
-# For example: `disabled_labels=grafana_folder`
-disabled_labels =
-
 #################################### Alerting ############################
 [alerting]
 # Enable the legacy alerting sub-system and interface. If Unified Alerting is already enabled and you try to go back to legacy alerting, all data that is part of Unified Alerting will be deleted. When this configuration section and flag are not defined, the state is defined at runtime. See the documentation for more details.
@@ -954,10 +899,6 @@ max_annotations_to_keep =
 # Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
 cleanupjob_batchsize = 100
 
-# Enforces the maximum allowed length of the tags for any newly introduced annotations. It can be between 500 and 4096 inclusive (which is the respective's column length). Default value is 500.
-# Setting it to a higher value would impact performance therefore is not recommended.
-tags_length = 500
-
 [annotations.dashboard]
 # Dashboard annotations means that annotations are associated with the dashboard they are created on.
 
@@ -1055,11 +996,6 @@ zipkin_propagation = false
 # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
 disable_shared_zipkin_spans = false
 
-[tracing.opentelemetry]
-
-# attributes that will always be included in when creating new spans. ex (key1:value1,key2:value2)
-custom_attributes =
-
 [tracing.opentelemetry.jaeger]
 # jaeger destination (ex http://localhost:14268/api/traces)
 address =
@@ -1116,8 +1052,6 @@ container_name =
 server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 callback_url =
-# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
-renderer_token = -
 # Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 # which this setting can help protect against by only allowing a certain amount of concurrent requests.
 concurrent_render_request_limit = 30
@@ -1244,7 +1178,7 @@ lokiQueryBuilder = true
 # Experimental Explore to Dashboard workflow
 explore2Dashboard = true
 
-# Command Palette
+# Experimental Command Palette
 commandPalette = true
 
 # Use dynamic labels in CloudWatch datasource
@@ -1302,26 +1236,3 @@ max_crawl_duration =
 # Minimum interval between two subsequent scheduler runs. Default is 12h.
 # This setting should be expressed as a duration. Examples: 10s (seconds), 1m (minutes).
 scheduler_interval =
-
-
-#################################### Storage ################################################
-
-[storage]
-# Allow uploading SVG files without sanitization.
-allow_unsanitized_svg_upload = false
-
-
-#################################### Search ################################################
-
-[search]
-# Defines the number of dashboards loaded at once in a batch during a full reindex.
-# This is a temporary settings that might be removed in the future.
-dashboard_loading_batch_size = 200
-
-# Defines the frequency of a full search reindex.
-# This is a temporary settings that might be removed in the future.
-full_reindex_interval = 5m
-
-# Defines the frequency of partial index updates based on recent changes such as dashboard updates.
-# This is a temporary settings that might be removed in the future.
-index_update_interval = 10s

conf/ldap.toml

@@ -25,9 +25,6 @@ bind_dn = "cn=admin,dc=grafana,dc=org"
 # If the password contains # or ; you have to wrap it with triple quotes. Ex """#password;"""
 bind_password = 'grafana'
 
-# Timeout in seconds (applies to each host specified in the 'host' entry (space separated))
-timeout = 10
-
 # User search filter, for example "(cn=%s)" or "(sAMAccountName=%s)" or "(uid=%s)"
 search_filter = "(cn=%s)"
 

conf/provisioning/access-control/sample.yaml

@@ -19,9 +19,9 @@
 #       # <string, required> action allowed.
 #       - action: 'users:read'
 #         #<string> scope it applies to.
-#         scope: 'global.users:*'
+#         scope: 'users:*'
 #       - action: 'users:write'
-#         scope: 'global.users:*'
+#         scope: 'users:*'
 #       - action: 'users:create'
 #   - name: 'custom:global:users:reader'
 #     # <bool> overwrite org id and creates a global role.
@@ -42,9 +42,9 @@
 #     # <list> list of the permissions to add/remove on top of the copied ones.
 #     permissions:
 #       - action: 'users:read'
-#         scope: 'global.users:*'
+#         scope: 'users:*'
 #       - action: 'users:write'
-#         scope: 'global.users:*'
+#         scope: 'users:*'
 #         # <string> state of the permission. Defaults to 'present'. If 'absent', the permission will be removed.
 #         state: absent
 

conf/provisioning/alerting/sample.yaml

@@ -1,187 +0,0 @@
-# # config file version
-apiVersion: 1
-
-# # List of rule groups to import or update
-# groups:
-#     # <int> organization ID, default = 1
-#   - orgId: 1
-#     # <string, required> name of the rule group
-#     name: my_rule_group
-#     # <string, required> name of the folder the rule group will be stored in
-#     folder: my_first_folder
-#     # <duration, required> interval of the rule group evaluation
-#     interval: 60s
-#     # <list, required> list of rules that are part of the rule group  
-#     rules:
-#       # <string, required> unique identifier for the rule
-#     - uid: my_id_1
-#       # <string, required> title of the rule, will be displayed in the UI
-#       title: my_first_rule
-#       # <string, required> query used for the condition
-#       condition: A
-#       # <list, required> list of query objects that should be executed on each
-#       #                  evaluation - should be obtained via the API
-#       data:
-#       - refId: A
-#         datasourceUid: "__expr__"
-#         model:
-#           conditions:
-#           - evaluator:
-#               params:
-#               - 3
-#               type: gt
-#             operator:
-#               type: and
-#             query:
-#               params:
-#               - A
-#             reducer:
-#               type: last
-#             type: query
-#           datasource:
-#             type: __expr__
-#             uid: "__expr__"
-#           expression: 1==0
-#           intervalMs: 1000
-#           maxDataPoints: 43200
-#           refId: A
-#           type: math
-#       # <string> UID of a dashboard that the alert rule should be linked to
-#       dashboardUid: my_dashboard
-#       # <int> ID of the panel that the alert rule should be linked to
-#       panelId: 123
-#       # <string> state of the alert rule when no data is returned
-#       #          possible values: "NoData", "Alerting", "OK", default = NoData
-#       noDataState: Alerting
-#       # <string> state of the alert rule when the query execution 
-#       #          fails - possible values: "Error", "Alerting", "OK"
-#       #          default = Alerting
-#       executionErrorState: Alerting
-#       # <duration, required> how long the alert condition should be breached before Firing. Before this time has elapsed, the alert is considered to be Pending
-#       for: 60s
-#       # <map<string, string>> map of strings to attach arbitrary custom data
-#       annotations:
-#         some_key: some_value
-#       # <map<string, string> map of strings to filter and 
-#       #                      route alerts
-#       labels:
-#         team: sre_team_1
-
-# # List of alert rule UIDs that should be deleted
-# deleteRules:
-#    # <int> organization ID, default = 1
-#  - orgId: 1
-#    # <string, required> unique identifier for the rule
-#    uid: my_id_1
-
-# # List of contact points to import or update
-# contactPoints:
-#     # <int> organization ID, default = 1
-#   - orgId: 1
-#     # <string, required> name of the contact point
-#     name: cp_1
-#     receivers:
-#       # <string, required> unique identifier for the receiver
-#     - uid: first_uid
-#       # <string, required> type of the receiver
-#       type: prometheus-alertmanager
-#       # <object, required> settings for the specific receiver type
-#       settings:
-#         url: http://test:9000
-
-# # List of receivers that should be deleted
-# deleteContactPoints:
-# - orgId: 1
-#   uid: first_uid
-
-# # List of notification policies to import or update
-# policies:
-#     # <int> organization ID, default = 1
-#   - orgId: 1
-#     # <string> name of the receiver that should be used for this route
-#     receiver: grafana-default-email
-#     # <list<string>> The labels by which incoming alerts are grouped together. For example,
-#     #        multiple alerts coming in for cluster=A and alertname=LatencyHigh would
-#     #        be batched into a single group.
-#     # 
-#     #        To aggregate by all possible labels, use the special value '...' as
-#     #        the sole label name, for example:
-#     #        group_by: ['...']
-#     #        This effectively disables aggregation entirely, passing through all
-#     #        alerts as-is. This is unlikely to be what you want, unless you have
-#     #        a very low alert volume or your upstream notification system performs
-#     #        its own grouping.
-#     group_by:
-#     - grafana_folder
-#     - alertname
-#     # <list> a list of matchers that an alert has to fulfill to match the node
-#     matchers:
-#     - alertname = Watchdog
-#     - severity =~ "warning|critical"
-#     # <list> Times when the route should be muted. These must match the name of a
-#     #        mute time interval.
-#     #        Additionally, the root node cannot have any mute times.
-#     #        When a route is muted it will not send any notifications, but
-#     #        otherwise acts normally (including ending the route-matching process
-#     #        if the `continue` option is not set)
-#     mute_time_intervals:
-#     - abc
-#     # <duration> How long to initially wait to send a notification for a group
-#     #            of alerts. Allows to collect more initial alerts for the same group. 
-#     #            (Usually ~0s to few minutes), default = 30s
-#     group_wait: 30s
-#     # <duration> How long to wait before sending a notification about new alerts that
-#     #            are added to a group of alerts for which an initial notification has
-#     #            already been sent. (Usually ~5m or more), default = 5m
-#     group_internval: 5m
-#     # <duration>  How long to wait before sending a notification again if it has already
-#     #             been sent successfully for an alert. (Usually ~3h or more), default = 4h
-#     repeat_interval: 4h
-#     # <list> Zero or more child routes
-#     routes: 
-#     ...
-
-# # List of orgIds that should be reset to the default policy
-# resetPolicies:
-# - 1
-
-# # List of templates to import or update
-# templates:
-#     # <int> organization ID, default = 1
-#   - orgID: 1
-#     # <string, required> name of the template, must be unique
-#     name: my_first_template
-#     # <string, required> content of the the template
-#     template: Alerting with a custome text template
-
-# # List of templates that should be deleted
-# deleteTemplates:
-#    # <int> organization ID, default = 1
-#  - orgId: 1
-#    # <string, required> name of the template, must be unique
-#    name: my_first_template
-
-
-# # List of mute time intervals to import or update
-# muteTimes:
-#   # <int> organization ID, default = 1
-# - orgId: 1
-#   # <string, required> name of the mute time interval, must be unique
-#   name: mti_1
-#   # <list> time intervals that should trigger the muting
-#            refer to https://prometheus.io/docs/alerting/latest/configuration/#time_interval-0
-#   time_intervals:
-#    - times:
-#      - start_time: '06:00'
-#        end_time: '23:59'
-#      weekdays: ['monday:wednesday','saturday', 'sunday']
-#      months: ['1:3', 'may:august', 'december']
-#      years: ['2020:2022', '2030']
-#      days_of_month: ['1:5', '-3:-1']
-
-# # List of mute time intervals that should be deleted
-# deleteMuteTimes:
-#   # <int> organization ID, default = 1
-# - orgId: 1
-#   # <string, required> name of the mute time interval, must be unique
-#   name: mti_1

conf/sample.ini

@@ -126,7 +126,7 @@
 # For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
 ;cache_mode = private
 
-# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+# 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 #########################
@@ -145,12 +145,6 @@
 # memcache: 127.0.0.1:11211
 ;connstr =
 
-# prefix prepended to all the keys in the remote cache
-; prefix =
-
-# This enables encryption of values stored in the remote cache
-;encryption =
-
 #################################### Data proxy ###########################
 [dataproxy]
 
@@ -224,9 +218,6 @@
 # Google Analytics universal tracking code, only enabled if you specify an id here
 ;google_analytics_ua_id =
 
-# Google Analytics 4 tracking code, only enabled if you specify an id here
-;google_analytics_4_id = 
-
 # Google Tag Manager ID, only enabled if you specify an id here
 ;google_tag_manager_id =
 
@@ -256,9 +247,6 @@
 # default admin password, can be changed before first start of grafana,  or in profile settings
 ;admin_password = admin
 
-# default admin email, created on startup
-;admin_email = admin@localhost
-
 # used for signing
 ;secret_key = SW2YcwTIb9zpOOhoPsMm
 
@@ -320,12 +308,6 @@
 # Controls if old angular plugins are supported or not. This will be disabled by default in future release
 ;angular_support_enabled = true
 
-# List of additional allowed URLs to pass by the CSRF check, separated by spaces. Suggested when authentication comes from an IdP.
-;csrf_trusted_origins = example.com
-
-# List of allowed headers to be set by the user, separated by spaces. Suggested to use for if authentication lives behind reverse proxies.
-;csrf_additional_headers =
-
 [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.
@@ -388,11 +370,8 @@
 # Default UI theme ("dark" or "light")
 ;default_theme = dark
 
-# Default locale (supported IETF language tag, such as en-US)
-;default_locale = en-US
-
 # Path to a custom home page. Users are only redirected to this if the default home dashboard is used. It should match a frontend route and contain a leading slash.
-;home_page =
+; home_page =
 
 # External user management, these options affect the organization users view
 ;external_manage_link_url =
@@ -452,9 +431,6 @@
 # Set to true to enable verbose logging of SigV4 request signing
 ;sigv4_verbose_logging = false
 
-# Set to true to enable Azure authentication option for HTTP-based datasources.
-;azure_auth_enabled = false
-
 #################################### Anonymous Auth ######################
 [auth.anonymous]
 # enable anonymous access
@@ -482,9 +458,6 @@
 ;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
-;role_attribute_path =
-;role_attribute_strict = false
-;allow_assign_grafana_admin = false
 
 #################################### GitLab Auth #########################
 [auth.gitlab]
@@ -498,9 +471,6 @@
 ;api_url = https://gitlab.com/api/v4
 ;allowed_domains =
 ;allowed_groups =
-;role_attribute_path =
-;role_attribute_strict = false
-;allow_assign_grafana_admin = false
 
 #################################### Google Auth ##########################
 [auth.google]
@@ -537,7 +507,6 @@
 ;allowed_domains =
 ;allowed_groups =
 ;role_attribute_strict = false
-;allow_assign_grafana_admin = false
 
 #################################### Okta OAuth #######################
 [auth.okta]
@@ -554,7 +523,6 @@
 ;allowed_groups =
 ;role_attribute_path =
 ;role_attribute_strict = false
-;allow_assign_grafana_admin = false
 
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
@@ -586,8 +554,6 @@
 ;tls_client_key =
 ;tls_client_ca =
 ;use_pkce = false
-;auth_style =
-;allow_assign_grafana_admin = false
 
 #################################### Basic Auth ##########################
 [auth.basic]
@@ -618,19 +584,13 @@
 ;cache_ttl = 60m
 ;expected_claims = {"aud": ["foo", "bar"]}
 ;key_file = /path/to/key/file
-;role_attribute_path =
-;role_attribute_strict = false
 ;auto_sign_up = false
-;url_login = false
-;allow_assign_grafana_admin = false
 
 #################################### Auth LDAP ##########################
 [auth.ldap]
 ;enabled = false
 ;config_file = /etc/grafana/ldap.toml
 ;allow_sign_up = true
-# prevent synchronizing ldap users organization roles
-;skip_org_role_sync = false
 
 # LDAP background sync (Enterprise only)
 # At 1 am every day
@@ -665,6 +625,8 @@
 
 #################################### Role-based Access Control ###########
 [rbac]
+;enabled = true
+# If enabled, cache permissions in a in memory cache (Enterprise only)
 ;permission_cache = true
 #################################### SMTP / Emailing ##########################
 [smtp]
@@ -749,9 +711,6 @@
 # Should Sentry javascript agent be initialized
 ;enabled = false
 
-# Defines which provider to use, default is Sentry
-;provider = sentry
-
 # Sentry DSN if you want to send events to Sentry.
 ;sentry_dsn =
 
@@ -767,18 +726,6 @@
 # Max requests accepted per short interval of time for Grafana backend log ingestion endpoint (/log).
 ;log_endpoint_burst_limit = 15
 
-# Should error instrumentation be enabled, only affects Grafana Javascript Agent
-;instrumentations_errors_enabled = true
-
-# Should console instrumentation be enabled, only affects Grafana Javascript Agent
-;instrumentations_console_enabled = false
-
-# Should webvitals instrumentation be enabled, only affects Grafana Javascript Agent
-;instrumentations_webvitals_enabled = false
-
-# Api Key, only applies to Grafana Javascript Agent provider
-;api_key = testApiKey
-
 #################################### Usage Quotas ########################
 [quota]
 ; enabled = false
@@ -875,11 +822,6 @@
 # The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
 ;min_interval = 10s
 
-[unified_alerting.reserved_labels]
-# Comma-separated list of reserved labels added by the Grafana Alerting engine that should be disabled.
-# For example: `disabled_labels=grafana_folder`
-;disabled_labels =
-
 #################################### Alerting ############################
 [alerting]
 # Disable legacy alerting engine & UI features
@@ -922,10 +864,6 @@
 # Configures the batch size for the annotation clean-up job. This setting is used for dashboard, API, and alert annotations.
 ;cleanupjob_batchsize = 100
 
-# Enforces the maximum allowed length of the tags for any newly introduced annotations. It can be between 500 and 4096 inclusive (which is the respective's column length). Default value is 500.
-# Setting it to a higher value would impact performance therefore is not recommended.
-;tags_length = 500
-
 [annotations.dashboard]
 # Dashboard annotations means that annotations are associated with the dashboard they are created on.
 
@@ -1023,10 +961,6 @@
 # Not disabling is the most common setting when using Zipkin elsewhere in your infrastructure.
 ;disable_shared_zipkin_spans = false
 
-[tracing.opentelemetry]
-# attributes that will always be included in when creating new spans. ex (key1:value1,key2:value2)
-;custom_attributes = key1:value1,key2:value2
-
 [tracing.opentelemetry.jaeger]
 # jaeger destination (ex http://localhost:14268/api/traces)
 ; address = http://localhost:14268/api/traces
@@ -1080,8 +1014,6 @@
 ;server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
-# An auth token that will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer side.
-;renderer_token = -
 # Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
 # which this setting can help protect against by only allowing a certain amount of concurrent requests.
 ;concurrent_render_request_limit = 30

contribute/architecture/backend/communication.md

@@ -2,95 +2,9 @@
 
 Grafana uses a _bus_ to pass messages between different parts of the application. All communication over the bus happens synchronously.
 
-## Commands and queries
+> **Deprecated:** The bus has officially been deprecated, however, we're still using the command/query objects paradigms.
 
-Grafana structures arguments to [services](services.md) using a command/query
-separation where commands are instructions for a mutation and queries retrieve
-records from a service.
-
-Services should define their methods as `func[T, U any](ctx context.Context, args T) (U, error)`.
-
-Each function should take two arguments. First, a `context.Context` that
-carries information about the tracing span, cancellation, and similar
-runtime information that might be relevant to the call. Secondly, `T` is
-a `struct` defined in the service's root package (see the instructions
-for [package hierarchy](package-hierarchy.md)) that contains zero or
-more arguments that can be passed to the method.
-
-The return values is more flexible, and may consist of none, one, or two
-values. If there are two values returned, the second value should be
-either an `bool` or `error` indicating the success or failure of the
-call. The first value `U` carries a value of any exported type that
-makes sense for the service.
-
-Following is an example of an interface providing method signatures for
-some calls adhering to these guidelines:
-
-```
-type Alphabetical interface {
-  // GetLetter returns either an error or letter.
-  GetLetter(context.Context, GetLetterQuery) (Letter, error)
-  // ListCachedLetters cannot fail, and doesn't return an error.
-  ListCachedLetters(context.Context, ListCachedLettersQuery) Letters
-  // DeleteLetter doesn't have any return values other than errors, so it
-  // returns only an error.
-  DeleteLetter(context.Contxt, DeleteLetterCommand) error
-}
-```
-
-> Because we request an operation to be performed, command are written in imperative mood, such as `CreateFolderCommand`, `GetDashboardQuery` and `DeletePlaylistCommand`.
-
-The use of complex types for arguments in Go means a few different
-things for us, it provides us with the equivalent of named parameters
-from other languages, and it reduces the headache of figuring out which
-argument is which that often occurs with three or more arguments.
-
-On the flip-side, it means that all input parameters are optional and
-that it is up to the programmer to make sure that the zero value is
-useful or at least safe for all fields and that while it's easy to add
-another field, if that field must be set for the correct function of the
-service that is not detectable at compile time.
-
-### Queries with Result fields
-
-Some queries have a Result field that is mutated and populated by the
-method being called. This is a remainder from when the _bus_ was used
-for sending commands and queries as well as for events.
-
-All bus commands and queries had to implement the Go type
-`func(ctx context.Context, msg interface{}) error`
-and mutation of the `msg` variable or returning structured information in
-`error` were the two most convenient ways to communicate with the caller.
-
-All `Result` fields should be refactored so that they are returned from
-the query method:
-
-```
-type GetQuery struct {
-  Something int
-
-  Result ResultType
-}
-
-func (s *Service) Get(ctx context.Context, cmd *GetQuery) error {
-  // ...do something
-  cmd.Result = result
-  return nil
-}
-```
-
-should become
-
-```
-type GetQuery struct {
-  Something int
-}
-
-func (s *Service) Get(ctx context.Context, cmd GetQuery) (ResultType, error) {
-  // ...do something
-  return result, nil
-}
-```
+There are three types of messages: _events_, _commands_, and _queries_.
 
 ## Events
 
@@ -130,3 +44,92 @@ if err := s.bus.Publish(event); err != nil {
     return err
 }
 ```
+
+## Commands
+
+A command is a request for an action to be taken. Unlike an event's fire-and-forget approach, a command can fail as it is handled. The handler will then return an error.
+
+> Because we request an operation to be performed, command are written in imperative mood, such as `CreateFolderCommand`, and `DeletePlaylistCommand`.
+
+### Dispatch a command
+
+To dispatch a command, pass the `context.Context` and object to the `DispatchCtx` method:
+
+```go
+// context.Context from caller
+ctx := req.Request.Context()
+cmd := &models.SendStickersCommand {
+    UserID: "taylor",
+    Count: 1,
+}
+if err := s.bus.DispatchCtx(ctx, cmd); err != nil {
+  if err == bus.ErrHandlerNotFound {
+    return nil
+  }
+  return err
+}
+```
+
+> **Note:** `DispatchCtx` will return an error if no handler is registered for that command.
+
+> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
+
+**Tip:** Browse the available commands in the `models` package.
+
+### Handle commands
+
+Let other parts of the application dispatch commands to a service, by registering a _command handler_:
+
+To handle a command, register a command handler in the `Init` function.
+
+```go
+func (s *MyService) Init() error {
+    s.bus.AddHandlerCtx(s.SendStickers)
+    return nil
+}
+
+func (s *MyService) SendStickers(ctx context.Context, cmd *models.SendStickersCommand) error {
+    // ...
+}
+```
+
+> **Note:** The handler method may return an error if unable to complete the command.
+
+> **Note:** `AddHandler` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
+
+## Queries
+
+A command handler can optionally populate the command sent to it. This pattern is commonly used to implement _queries_.
+
+### Making a query
+
+To make a query, dispatch the query instance just like you would a command. When the `DispatchCtx` method returns, the `Results` field contains the result of the query.
+
+```go
+// context.Context from caller
+ctx := req.Request.Context()
+query := &models.FindDashboardQuery{
+    ID: "foo",
+}
+if err := bus.Dispatch(ctx, query); err != nil {
+    return err
+}
+// The query now contains a result.
+for _, item := range query.Results {
+    // ...
+}
+```
+
+> **Note:** `Dispatch` currently exists and requires no `context.Context` to be provided, but it's strongly suggested to not use this since there's an ongoing refactoring to remove usage of non-context-aware functions/methods and use context.Context everywhere.
+
+### Return query results
+
+To return results for a query, set any of the fields on the query argument before returning:
+
+```go
+func (s *MyService) FindDashboard(ctx context.Context, query *models.FindDashboardQuery) error {
+    // ...
+    query.Result = dashboard
+    return nil
+}
+```

contribute/architecture/backend/errors.md

@@ -1,81 +0,0 @@
-# Errors
-
-Grafana introduced its own error type `github.com/grafana/grafana/pkg/util/errutil.Error`
-in June 2022. It's built on top of the Go `error` interface extended to
-contain all the information necessary by Grafana to handle errors in an
-informative and safe way.
-
-Previously, Grafana has passed around regular Go errors and have had to
-rely on bespoke solutions in API handlers to communicate informative
-messages to the end-user. With the new `errutil.Error`, the API handlers
-can be slimmed as information about public messaging, structured data
-related to the error, localization metadata, log level, HTTP status
-code, and so forth are carried by the error.
-
-## Basic use
-
-### Declaring errors
-
-For a service, declare the different categories of errors that may occur
-from your service (this corresponds to what you might want to have
-specific public error messages or their templates for) by globally
-constructing variables using the `errutil.NewBase(status, messageID, opts...)`
-function.
-
-The status code loosely corresponds to HTTP status codes and provides a
-default log level for errors to ensure that the request logging is
-properly informing administrators about various errors occurring in
-Grafana (e.g. `StatusBadRequest` is generally speaking not as relevant
-as `StatusInternal`). All available status codes live in the `errutil`
-package and have names starting with `Status`.
-
-The messageID is constructed as `<servicename>.<error-identifier>` where
-the `<servicename>` corresponds to the root service directory per
-[the package hierarchy](package-hierarchy.md) and `<error-identifier>`
-is a short identifier using dashes for word separation that identifies
-the specific category of errors within the service.
-
-To set a static message sent to the client when the error occurs, the
-`errutil.WithPublicMessage(message string)` option may be appended to
-the NewBase function call. For dynamic messages or more options, refer
-to the `errutil` package's GoDocs.
-
-Errors are then constructed using the `Base.Errorf` method, which
-functions like the [fmt.Errorf](https://pkg.go.dev/fmt#Errorf) method
-except that it creates an `errutil.Error`.
-
-```go
-package main
-
-import (
-  "errors"
-  "github.com/grafana/grafana/pkg/util/errutil"
-  "example.org/thing"
-)
-
-var ErrBaseNotFound = errutil.NewBase(errutil.StatusNotFound, "main.not-found", errutil.WithPublicMessage("Thing not found"))
-
-func Look(id int) (*Thing, error) {
-  t, err := thing.GetByID(id)
-  if errors.Is(err, thing.ErrNotFound) {
-    return nil, ErrBaseNotFound.Errorf("did not find thing with ID %d: %w", id, err)
-  }
-
-  return t, nil
-}
-```
-
-Check out [errutil's GoDocs](https://pkg.go.dev/github.com/grafana/grafana@v0.0.0-20220621133844-0f4fc1290421/pkg/util/errutil)
-for details on how to construct and use Grafana style errors.
-
-### Handling errors in the API
-
-API handlers use the `github.com/grafana/grafana/pkg/api/response.Err`
-function to create responses based on `errutil.Error`s.
-
-> **Note:** (@sakjur 2022-06) `response.Err` requires all errors to be
-> `errutil.Error` or it'll be considered an internal server error.
-> This is something that should be fixed in the near future to allow
-> fallback behavior to make it possible to correctly handle Grafana
-> style errors if they're present but allow fallback to a reasonable
-> default otherwise.

contribute/architecture/backend/package-hierarchy.md

@@ -1,217 +1,16 @@
 # Package hierarchy
 
-The Go packages in Grafana should be packaged by feature, keeping
-packages as small as reasonable while retaining a clear sole ownership
-of a single domain.
+The Go package hierarchy in Grafana should be organized logically (Ben Johnson's
+[article](https://medium.com/@benbjohnson/standard-package-layout-7cdbc8391fc1) served as inspiration), according to the
+following principles:
 
-[Ben Johnson's standard package layout](https://medium.com/@benbjohnson/standard-package-layout-7cdbc8391fc1) serves as
-inspiration for the way we organize packages.
-
-## Principles of how to structure a service in Grafana
-
-[](services.md)
-
-### Domain types and interfaces should be in local "root" packages
-
-Let's say you're creating a _tea pot_ service, place everything another
-service needs to interact with the tea pot service in
-_pkg/services/teapot_, choosing a name according to
-[Go's package naming conventions](https://go.dev/blog/package-names).
-
-Typically, you'd have one or more interfaces that your service provides
-in the root package along with any types, errors, and other constants
-that makes sense for another service interacting with this service to
-use.
-
-Avoid depending on other services when structuring the root package to
-reduce the risk of running into circular dependencies.
-
-### Sub-packages should depend on roots, not the other way around
-
-Small-to-medium sized packages should be able to have only a single
-sub-package containing the implementation of the service. By moving the
-implementation into a separate package we reduce the risk of triggering
-circular dependencies (in Go, circular dependencies are evaluated per
-package and this structure logically moves it to be per type or function
-declaration).
-
-Large packages may need utilize multiple sub-packages at the discretion
-of the implementor. Keep interfaces and domain types to the root
-package.
-
-### Try to name sub-packages for project wide uniqueness
-
-Prefix sub-packages with the service name or an abbreviation of the
-service name (whichever is more appropriate) to provide an ideally
-unique package name. This allows `teaimpl` to be distinguished from
-`coffeeimpl` without the need for package aliases, and encourages the
-use of the same name to reference your package throughout the codebase.
-
-### A well-behaving service provides test doubles for itself
-
-Other services may depend on your service, and it's good practice to
-provide means for those services to set up a test instance of the
-dependency as needed. Refer to
-[Google Testing's Testing on the Toilet: Know Your Test Doubles](https://testing.googleblog.com/2013/07/testing-on-toilet-know-your-test-doubles.html) for a brief
-explanation of how we semantically aim to differentiate fakes, mocks,
-and stubs within our codebase.
-
-Place test doubles in a sub-package to your root package named
-`<servicename>test` or `<service-abbreviation>test`, such that the `teapot` service may have the
-`teapottest` or `teatest`
-
-A stub or mock may be sufficient if the service is not a dependency of a
-lot of services or if it's called primarily for side effects so that a
-no-op default behavior makes sense.
-
-Services which serve many other services and where it's feasible should
-provide an in-memory backed test fake that can be used like the
-regular service without the need of complicated setup.
-
-### Separate store and logic
-
-When building a new service, data validation, manipulation, scheduled
-events and so forth should be collected in a service implementation that
-is built to be agnostic about its store.
-
-The storage should be an interface that is not directly called from
-outside the service and should be kept to a minimum complexity to
-provide the functionality necessary for the service.
-
-A litmus test to reduce the complexity of the storage interface is
-whether an in-memory implementation is a feasible test double to build
-to test the service.
-
-### Outside the service root
-
-Some parts of the service definition remains outside the
-service directory and reflects the legacy package hierarchy.
-As of June 2022, the parts that remain outside the service are:
-
-#### Migrations
-
-`pkg/services/sqlstore/migrations` contains all migrations for SQL
-databases, for all services (not including Grafana Enterprise).
-Migrations are written per the [database.md](database.md#migrations) document.
-
-#### API endpoints
-
-`pkg/api/api.go` contains the endpoint definitions for the most of
-Grafana HTTP API (not including Grafana Enterprise).
+- Domain types and interfaces should be in "root" packages (not necessarily at the very top, of the hierarchy, but
+  logical roots)
+- Sub-packages should depend on roots - sub-packages here typically contain implementations, for example of services
 
 ## Practical example
 
-The following is a simplified example of the package structure for a
-service that doesn't do anything in particular.
-
-None of the methods or functions are populated and in practice most
-packages will consist of multiple files. There isn't a Grafana-wide
-convention for which files should exist and contain what.
-
-`pkg/services/alphabetical`
-
-```
-package alphabetical
-
-type Alphabetical interface {
-  // GetLetter returns either an error or letter.
-  GetLetter(context.Context, GetLetterQuery) (Letter, error)
-  // ListCachedLetters cannot fail, and doesn't return an error.
-  ListCachedLetters(context.Context, ListCachedLettersQuery) Letters
-  // DeleteLetter doesn't have any return values other than errors, so it
-  // returns only an error.
-  DeleteLetter(context.Contxt, DeltaCommand) error
-}
-
-type Letter byte
-
-type Letters []Letter
-
-type GetLetterQuery struct {
-  ID int
-}
-
-// Create queries/commands for methods even if they are empty.
-type ListCachedLettersQuery struct {}
-
-type DeleteLetterCommand struct {
-  ID int
-}
-
-```
-
-`pkg/services/alphabetical/alphabeticalimpl`
-
-```
-package alphabeticalimpl
-
-// this name can be whatever, it's not supposed to be used from outside
-// the service except for in Wire.
-type Svc struct { … }
-
-func ProviceSvc(numbers numerical.Numerical, db db.DB) Svc { … }
-
-func (s *Svc) GetLetter(ctx context.Context, q root.GetLetterQuery) (root.Letter, error) { … }
-func (s *Svc) ListCachedLetters(ctx context.Context, q root.ListCachedLettersQuery) root.Letters { … }
-func (s *Svc) DeleteLetter(ctx context.Context, q root.DeleteLetterCommand) error { … }
-
-type letterStore interface {
-  Get(ctx.Context, id int) (root.Letter, error)
-  Delete(ctx.Context, root.DeleteLetterCommand) error
-}
-
-type sqlLetterStore struct {
-  db.DB
-}
-
-func (s *sqlStore) Get(ctx.Context, id int) (root.Letter, error) { … }
-func (s *sqlStore) Delete(ctx.Context, root.DeleteLetterCommand) error { … }
-```
-
-## Legacy package hierarchy
-
-> **Note:** A lot of services still adhere to the legacy model as outlined below. While it is ok to
-> extend existing services based on the legacy model, you are _strongly_ encouraged to structure any
-> new services or major refactorings using the new package layout.
-
-Grafana has long used a package-by-layer layout where domain types
-are placed in **pkg/models**, all SQL logic in **pkg/services/sqlstore**,
-and so forth.
-
-This is an example of how the _tea pot_ service could be structured
-throughout the codebase in the legacy model.
-
-- _pkg/_
-  - _api/_
-    - _api.go_ contains the endpoints for the
-    - _tea_pot.go_ contains methods on the _pkg/api.HTTPServer_ type
-      that interacts with the service based on queries coming in via the HTTP
-      API.
-    - _dtos/tea_pot.go_ extends the _pkg/models_ file with types
-      that are meant for translation to and from the API. It's not as commonly
-      present as _pkg/models_.
-  - _models/tea_pot.go_ contains the models for the service, this
-    includes the _command_ and _query_ structs that are used when calling
-    the service or SQL store methods related to the service and also any
-    models representing an abstraction provided by the service.
-  - _services/_
-    - _sqlstore_
-      - _tea_pot.go_ contains SQL queries for
-        interacting with stored objects related to the tea pot service.
-      - _migrations/tea_pot.go_ contains the migrations necessary to
-        build the
-    - _teapot/\*_ contains functions or a service for doing
-      logical operations beyond those done in _pkg/api_ or _pkg/services/sqlstore_
-      for the service.
-
-The implementation of legacy services varies widely from service to
-service, some or more of these files may be missing and there may be
-more files related to a service than those listed here.
-
-Some legacy services providing infrastructure will also take care of the
-integration with several domains. The cleanup service both
-provides the infrastructure to occasionally run cleanup scripts and
-defines the cleanup scripts. Ideally, this would be migrated
-to only handle the scheduling and synchronization of clean up jobs.
-The logic for the individual jobs would be placed with a service that is
-related to whatever is being cleaned up.
+The `pkg/plugins` package contains plugin domain types, for example `DataPlugin`, and also interfaces
+such as `RequestHandler`. Then you have the `pkg/plugins/managers` subpackage, which contains concrete implementations
+such as the service `PluginManager`. The subpackage `pkg/plugins/backendplugin/coreplugin` contains `plugins.DataPlugin`
+implementations.

contribute/architecture/backend/services.md

@@ -8,7 +8,7 @@ Even though the services in Grafana do different things, they share a number of
 
 Before a service can start communicating with the rest of Grafana, it needs to be registered with Wire, see `ProvideService` factory function/method in the service example below and how it's being referenced in the wire.go example below.
 
-When Wire is run, it inspects the parameters of `ProvideService` and makes sure that all its dependencies have been wired up and initialized properly.
+When Wire is run it will inspect the parameters of `ProvideService` and make sure that all it's dependencies has been wired up and initialized properly.
 
 **Service example:**
 
@@ -107,31 +107,31 @@ func InitializeForTest(cla setting.CommandLineArgs, opts Options, apiOpts api.Se
 
 ## Background services
 
-A background service runs in the background of the lifecycle between Grafana startup and shutdown. To run your service in the background, it must satisfy the `registry.BackgroundService` interface. Pass it through to the `NewBackgroundServiceRegistry` call in the [ProvideBackgroundServiceRegistry](/pkg/server/backgroundsvcs/background_services.go) function to register it.
+A background service is a service that runs in the background of the lifecycle between Grafana starts up and shutdown. If you want a service to be run in the background your Service should satisfy the `registry.BackgroundService` interface and add it as argument to the [ProvideBackgroundServiceRegistry](/pkg/server/backgroundsvcs/background_services.go) function and add it as argument to `NewBackgroundServiceRegistry` to register it as a background service.
 
 You can see an example implementation above of the Run method.
 
 ## Disabled services
 
-If you want to guarantee that a background service is not run by Grafana when certain criteria are met/service is disabled, your service must satisfy the `registry.CanBeDisabled` interface. When the `service.IsDisabled` method returns true, Grafana will not call the `service.Run` method.
+If you want to guarantee that a background service is not run by Grafana when certain criteria is met/service is disabled your service should satisfy the `registry.CanBeDisabled` interface. When the service.IsDisabled method return false Grafana would not call the service.Run method.
 
-If you want to run certain initialization code whether service is disabled or not, you need to handle this in the service factory method.
+If you want to run certain initialization code if service is disabled or not, you need to handle this in the service factory method.
 
-You can see an example implementation above of the `IsDisabled` method and custom initialization code when the service is disabled.
+You can see an example implementation above of the IsDisabled method and custom initialization code when service is disabled.
 
 ## Run Wire / generate code
 
-Running `make run` calls `make gen-go` on the first run. `gen-go` in turn calls the wire binary and generates the code in [wire_gen.go](/pkg/server/wire_gen.go) and [wire_gen.go](/pkg/cmd/grafana-cli/runner/wire_gen.go). The wire binary is installed using [bingo](https://github.com/bwplotka/bingo) which downloads and installs all the tools needed, including the Wire binary at the specified version.
+When running `make run` it will call `make gen-go` on the first run. `gen-go` in turn will call the wire binary and generate the code in [wire_gen.go](/pkg/server/wire_gen.go) and [wire_gen.go](/pkg/cmd/grafana-cli/runner/wire_gen.go). The wire binary is installed using [bingo](https://github.com/bwplotka/bingo) which will make sure to download and install all the tools needed, including the Wire binary at using a specific version.
 
 ## OSS vs Enterprise
 
-Grafana OSS and Grafana Enterprise share code and dependencies. Grafana Enterprise overrides or extends certain OSS services.
+Grafana OSS and Grafana Enterprise shares code and dependencies. Grafana Enterprise might need to override/extend certain OSS services.
 
 There's a [wireexts_oss.go](/pkg/server/wireexts_oss.go) that has the `wireinject` and `oss` build tags as requirements. Here services that might have other implementations, e.g. Grafana Enterprise, can be registered.
 
 Similarly, there's a wireexts_enterprise.go file in the Enterprise source code repository where other service implementations can be overridden/be registered.
 
-To extend an OSS background service, create a specific background interface for that type and inject that type to [ProvideBackgroundServiceRegistry](/pkg/server/backgroundsvcs/background_services.go) instead of the concrete type. Then add a wire binding for that interface in [wireexts_oss.go](/pkg/server/wireexts_oss.go) and in the enterprise wireexts file.
+To extend oss background service create a specific background interface for that type and inject that type to [ProvideBackgroundServiceRegistry](/pkg/server/backgroundsvcs/background_services.go) instead of the concrete type. Then add a wire binding for that interface in [wireexts_oss.go](/pkg/server/wireexts_oss.go) and in the enterprise wireexts file.
 
 ## Methods
 

contribute/architecture/frontend-data-requests.md

@@ -1,6 +1,6 @@
 # Data requests
 
-[BackendSrv](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts) handles all outgoing HTTP requests from Grafana. This document explains the high-level concepts used by `BackendSrv`.
+[BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv) handles all outgoing HTTP requests from Grafana. This document explains the high-level concepts used by `BackendSrv`.
 
 ## Canceling requests
 
@@ -10,11 +10,11 @@ A data request can take a long time to finish. During the time between when a re
 
 If we wait for canceled requests to complete, it might create unnecessary load on data sources.
 
-Grafana uses a concept called _request cancellation_ to cancel any ongoing request that Grafana doesn't need.
+Grafana uses a concept called _request cancelation_ to cancel any ongoing request that Grafana doesn't need.
 
 #### Before Grafana 7.2
 
-Before Grafana can cancel any data request, it has to identify that request. Grafana identifies a request using the property `requestId` [passed as options](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts#L47) when you use [BackendSrv](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts).
+Before Grafana can cancel any data request, it has to identify that request. Grafana identifies a request using the property `requestId` [passed as options](https://github.com/grafana/grafana/blob/main/docs/sources/packages_api/runtime/backendsrvrequest.md) when you use [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv).
 
 The cancellation logic is as follows:
 
@@ -23,15 +23,17 @@ The cancellation logic is as follows:
 
 #### After Grafana 7.2
 
-Grafana 7.2 introduced an additional way of canceling requests using [RxJs](https://github.com/ReactiveX/rxjs). To support the new cancellation functionality, the data source needs to use the new `fetch` function in [BackendSrv](https://github.com/grafana/grafana/blob/main/packages/grafana-runtime/src/services/backendSrv.ts).
+Grafana 7.2 introduced an additional way of canceling requests using [RxJs](https://github.com/ReactiveX/rxjs). To support the new cancellation functionality, the data source needs to use the new `fetch` function in [BackendSrv](https://grafana.com/docs/grafana/latest/packages_api/runtime/backendsrv).
 
 Migrating the core data sources to the new `fetch` function [is an ongoing process that you can read about in this issue.](https://github.com/grafana/grafana/issues/27222)
 
 ## Request queue
 
-If Grafana isn't configured to support HTTP/2, browsers connecting with HTTP 1.1 enforce a limit of 4 - 8 parallel requests (the specific limit varies). Because of this limit, if some requests take a long time, they will block later requests and make interacting with Grafana very slow.
+Depending on how the web browser implements the protocol for HTTP 1.1, it will limit the number of parallel requests, lets call this limit _max_parallel_browser_request_.
 
-[Enabling HTTP/2 support in Grafana](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol) allows far more parallel requests.
+Unless you have configured Grafana to use HTTP2, the browser limits parallel data requests according to the browser's implementation. For more information on how to enable HTTP2, refer to [Configuration](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol).
+
+Because there is a _max_parallel_browser_request_ limit, if some of the requests take a long time, they will block later requests and make interacting with Grafana very slow.
 
 #### Before Grafana 7.2
 
@@ -43,4 +45,4 @@ Grafana uses a _request queue_ to process all incoming data requests in order wh
 
 Since the first implementation of the request queue doesn't take into account what browser the user uses, the _request queue_ limit for parallel data source requests is hard-coded to 5.
 
-> **Note:** Grafana instances [configured with HTTP2](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol) will have a hard coded limit of 1000.
+> **Note:** Grafana instances [configured with HTTP2 ](https://grafana.com/docs/grafana/latest/administration/configuration/#protocol) will have a hard coded limit of 1000.

contribute/create-pull-request.md

@@ -26,7 +26,7 @@ If the pull request fixes a bug:
 - The pull request description must include `Closes #<issue number>` or `Fixes #<issue number>`.
 - To avoid regressions, the pull request should include tests that replicate the fixed bug.
 
-## Frontend-specific guidelines
+### Frontend-specific guidelines
 
 Pull requests for frontend contributions must:
 
@@ -55,22 +55,18 @@ Pull requests that create new UI components or modify existing ones must adhere
 - Use the [Grafana theme palette](/contribute/style-guides/themes.md) for styling. It contains colors with good contrast which aids accessibility.
 - Use [RTL](https://testing-library.com/docs/dom-testing-library/api-accessibility/) for writing unit tests. It helps to create accessible components.
 
-### Accessibility-specific guidelines
+Pull requests that introduce accessibility(a11y) errors:
 
-Pull requests that introduce accessibility(a11y) errors - please refer to the [accessibility guidelines](/contribute/style-guides/accessibility.md).
+We use [pa11y-ci](https://github.com/pa11y/pa11y-ci) to collect accessibility errors on [some URLs on the project](https://github.com/grafana/grafana/issues/36555), threshold errors are specified per URL.
 
-### Betterer
+If the contribution introduces new a11y errors, our continuous integration will fail, preventing you to merge on the main branch. In those cases there are two alternatives for moving forward:
 
-We make use of a tool called [**Betterer**](https://phenomnomnominal.github.io/betterer/) in order to drive long-running code quality improvements. The intention is for this to be as unintrusive as possible, however there are some things to be aware of:
+- Check the error log on the pipeline step `test-a11y-frontend-pr`, identify what was the error, and fix it.
+- Locally run the command `yarn test:accessibility-report` that generates an HTML accessibility report, then go to the URL that contains your change, identify the error, and fix it. Keep in mind, a local e2e Grafana instance is going to be running on `http://localhost:3001`.
 
-- **Betterer runs as a precommit hook**:
-  - You may see changes to the `.betterer.results` file automatically added to your commits.
-  - You may get an error when trying to commit something that decreases the overall code quality. You can either fix these errors or temporarily override the checks (e.g. to commit something that's a work in progress) by using `git commit --no-verify`. All errors will eventually have to be fixed before your code can be merged because...
-- **Betterer also runs as part of our CI**:
-  - You may see the following error message in the CI: `Unexpected changes detected in these tests while running in CI mode`. To resolve, merge with the target branch (usually `main`).
-  - You may see merge conflicts for the `.betterer.results` file. To resolve, merge with the target branch (usually `main`) then run `yarn betterer:merge` and commit.
+You can also prevent introducing a11y errors by installing an a11y plugin in your browser, for example, axe DevTools, Accessibility Insights for Web among others.
 
-## Backend-specific guidelines
+### Backend-specific guidelines
 
 Please refer to the [backend style guidelines](/contribute/style-guides/backend.md).
 

contribute/developer-guide.md

@@ -2,6 +2,8 @@
 
 This guide helps you get started developing Grafana.
 
+Before you begin, you might want to read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
+
 ## Dependencies
 
 Make sure you have the following dependencies installed before setting up your developer environment:
@@ -57,8 +59,6 @@ Before we can build the frontend assets, we need to install the dependencies:
 yarn install --immutable
 ```
 
-> Troubleshooting: if you get the error `The remote archive doesn't match the expected checksum` for a dependency pulled from a link (e.g. `"tether-drop": "https://github.com/torkelo/drop"`): this is a temporary mismatch. To work around it (while someone corrects the issue), you can prefix your `yarn install --immutable` command with [`YARN_CHECKSUM_BEHAVIOR=update`](https://yarnpkg.com/advanced/error-codes#yn0018---cache_checksum_mismatch)
-
 After the command has finished, we can start building our source code:
 
 ```
@@ -67,9 +67,7 @@ yarn start
 
 Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets every time you change the code.
 
-> Troubleshooting: if your first build works, but after pulling updates you see unexpected errors in the "Type-checking in progress..." stage, these can be caused by the [tsbuildinfo cache supporting incremental builds](https://www.typescriptlang.org/tsconfig#incremental). You can `rm tsconfig.tsbuildinfo` and re-try.
-
-Next, we'll build & run the web server that will serve the frontend assets we just built.
+Next, we'll build the web server that will serve the frontend assets we just built.
 
 ### Backend
 
@@ -97,7 +95,7 @@ You can build the back-end as follows:
 2. Generate code using Wire:
 
 ```
-# Default Wire tool install path: $GOPATH/bin/wire.exe
+# Normally Wire tool installed at $GOPATH/bin/wire.exe
 <Wire tool install path> gen -tags oss ./pkg/server ./pkg/cmd/grafana-cli/runner
 ```
 
@@ -140,13 +138,13 @@ go run build.go test
 
 ### Run SQLLite, PostgreSQL and MySQL integration tests
 
-By default grafana runs SQLite, to run test with SQLite
+By default, Grafana runs SQLite to run tests with SQLite.
 
 ```bash
 go test -covermode=atomic -tags=integration ./pkg/...
 ```
 
-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:
+To run PostgreSQL and MySQL integration tests locally, 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:
 
 ```bash
 GRAFANA_TEST_DB=mysql go test -covermode=atomic -tags=integration ./pkg/...
@@ -168,19 +166,19 @@ To run the tests:
 yarn e2e
 ```
 
-By default, the end-to-end tests start a Grafana instance listening on `localhost:3001`. To use a different URL, set the `BASE_URL` environment variable:
+By default, the end-to-end tests starts a Grafana instance listening on `localhost:3001`. To use a specific URL, set the `BASE_URL` environment variable:
 
 ```
 BASE_URL=http://localhost:3333 yarn e2e
 ```
 
-To follow all tests in the browser while they're running, use `yarn e2e:debug`
+To follow the tests in the browser while they're running, use the `yarn e2e:debug`.
 
 ```
 yarn e2e:debug
 ```
 
-To choose a single test to follow in the browser as it runs, use `yarn e2e:dev`
+If you want to pick a test first, use the `yarn e2e:dev`, to pick a test and follow the test in the browser while it runs.
 
 ```
 yarn e2e:dev
@@ -200,7 +198,7 @@ app_mode = development
 
 ### Add data sources
 
-By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you'll need to add at least one data source to verify the change.
+By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you need to add at least one data source to verify the change.
 
 To set up data sources for your development environment, go to the [devenv](/devenv) directory in the Grafana repository:
 
@@ -289,4 +287,5 @@ If that happens to you, chances are you've already set a lower limit and your sh
 
 - Read our [style guides](/contribute/style-guides).
 - Learn how to [Create a pull request](/contribute/create-pull-request.md).
+- Read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
 - Read about the [architecture](architecture).

contribute/engineering/backend/instrumentation.md

@@ -1,276 +0,0 @@
-# Instrumenting Grafana
-
-Guidance, conventions and best practices for instrumenting Grafana using logs, metrics and traces.
-
-## Logs
-
-Logs are files that record events, warnings and errors as they occur within a software environment. Most logs include contextual information, such as the time an event occurred and which user or endpoint was associated with it.
-
-### Usage
-
-Use the _pkg/infra/log_ package to create a named structured logger. Example:
-
-```go
-import (
-  "fmt"
-
-  "github.com/grafana/grafana/pkg/infra/log"
-)
-
-logger := log.New("my-logger")
-logger.Debug("Debug msg")
-logger.Info("Info msg")
-logger.Warning("Warning msg")
-logger.Error("Error msg", "error", fmt.Errorf("BOOM"))
-```
-
-### Naming conventions
-
-Name the logger using lowercase characters, e.g. `log.New("my-logger")` using snake_case or kebab-case styling.
-
-Prefix the logger name with an area name when using different loggers across a feature or related packages, e.g. `log.New("plugin.loader")` and `log.New("plugin.client")`.
-
-Start the log message with a capital letter, e.g. `logger.Info("Hello world")` instead of `logger.Info("hello world")`. The log message should be an identifier for the log entry, avoid parameterization in favor of key-value pairs for additional data.
-
-Prefer using camelCase style when naming log keys, e.g. _remoteAddr_, to be consistent with Go identifiers.
-
-Use the key _error_ when logging Go errors, e.g. `logger.Error("Something failed", "error", fmt.Errorf("BOOM"))`.
-
-### Validate and sanitize input coming from user input
-
-If log messages or key/value pairs originates from user input they **should** be validated and sanitized.
-
-Be **careful** to not expose any sensitive information in log messages e.g. secrets, credentials etc. It's especially easy to do by mistake when including a struct as value.
-
-### Log levels
-
-When to use which log level?
-
-- **Debug:** Informational messages of high frequency and/or less-important messages during normal operations.
-- **Info:** Informational messages of low frequency and/or important messages.
-- **Warning:** Should in normal cases not be used/needed. If used should be actionable.
-- **Error:** Error messages indicating some operation failed (with an error) and the program didn't have a way of handle the error.
-
-### Contextual logging
-
-Use a contextual logger to include additional key/value pairs attached to `context.Context`, e.g. `traceID`, to allow correlating logs with traces and/or correlate logs with a common identifier.
-
-Example:
-
-```go
-import (
-  "context"
-  "fmt"
-
-  "github.com/grafana/grafana/pkg/infra/log"
-)
-
-var logger = log.New("my-logger")
-
-func doSomething(ctx context.Context) {
-  ctxLogger := logger.FromContext(ctx)
-  ctxLogger.Debug("Debug msg")
-  ctxLogger.Info("Info msg")
-  ctxLogger.Warning("Warning msg")
-  ctxLogger.Error("Error msg", "error", fmt.Errorf("BOOM"))
-}
-```
-
-### Enable certain log levels for certain loggers
-
-During development it's convenient to enable certain log level, e.g. debug, for certain loggers to minimize the generated log output and make it easier to find things. See [[log.filters]](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#filters) for information how to configure this.
-
-It's also possible to configure multiple loggers:
-
-```ini
-[log]
-filters = rendering:debug \
-          ; alerting.notifier:debug \
-          oauth.generic_oauth:debug \
-          ; oauth.okta:debug \
-          ; tsdb.postgres:debug \
-          ; tsdb.mssql:debug \
-          ; provisioning.plugins:debug \
-          ; provisioning:debug \
-          ; provisioning.dashboard:debug \
-          ; provisioning.datasources:debug \
-          datasources:debug \
-          data-proxy-log:debug
-```
-
-## Metrics
-
-Metrics are quantifiable measurements that reflect the health and performance of applications or infrastructure.
-
-Consider using metrics to provide real-time insight into the state of resources. If you want to know how responsive your application is or identify anomalies that could be early signs of a performance issue, metrics are a key source of visibility.
-
-### Metric types
-
-See [Prometheus metric types](https://prometheus.io/docs/concepts/metric_types/) for a list and description of the different metric types you can use and when to use them.
-
-There are many possible types of metrics that can be tracked. One popular method for defining metrics is the [RED method](https://grafana.com/blog/2018/08/02/the-red-method-how-to-instrument-your-services/).
-
-### Naming conventions
-
-Use the namespace _grafana_ as that would prefix any defined metric names with `grafana_`. This will make it clear for operators that any metric named `grafana_*` belongs to Grafana.
-
-Use snake*case style when naming metrics, e.g. \_http_request_duration_seconds* instead of _httpRequestDurationSeconds_.
-
-Use snake*case style when naming labels, e.g. \_status_code* instead of _statusCode_.
-
-If metric type is a _counter_, name it with a `_total` suffix, e.g. _http_requests_total_.
-
-If metric type is a _histogram_ and you're measuring duration, name it with a `_<unit>` suffix, e.g. _http_request_duration_seconds_.
-
-If metric type is a _gauge_, name it to denote it's a value that can increase and decrease , e.g. _http_request_in_flight_.
-
-### Label values and high cardinality
-
-Be careful with what label values you add/accept. Using/allowing too many label values could result in [high cardinality problems](https://grafana.com/blog/2022/02/15/what-are-cardinality-spikes-and-why-do-they-matter/).
-
-If label values originates from user input they **should** be validated. Use `metricutil.SanitizeLabelName(<label value>`) from _pkg/infra/metrics/metricutil_ package to sanitize label names. Very **important** to only allow a pre-defined set of labels to minimize the risk of high cardinality problems.
-
-Be **careful** to not expose any sensitive information in label values, e.g. secrets, credentials etc.
-
-### Guarantee the existence of metrics
-
-If you want to guarantee the existence of metrics before any observations has happened there's a couple of helper methods available in the _pkg/infra/metrics/metricutil_ package.
-
-### How to collect and visualize metrics locally
-
-1. Start Prometheus
-
-   ```bash
-   make devenv sources=prometheus
-   ```
-
-2. Use Grafana Explore or dashboards to query any exported Grafana metrics
-
-## Traces
-
-A distributed trace is data that tracks an application request as it flows through the various parts of an application. The trace records how long it takes each application component to process the request and pass the result to the next component. Traces can also identify which parts of the application trigger an error.
-
-### Usage
-
-Grafana currently supports two tracing implementations, [OpenTelemetry](https://opentelemetry.io/) and [OpenTracing](https://opentracing.io/). OpenTracing is deprecated, but still supported until we remove it. The two different implementations implements the `Tracer` and `Span` interfaces, defined in the _pkg/infra/tracing_ package, which you can use to create traces and spans. To get a hold of a `Tracer` you would need to get it injected as dependency into your service, see [Services](../../architecture/backend/services.md) for more details.
-
-Example:
-
-```go
-import (
-   "fmt"
-
-   "github.com/grafana/grafana/pkg/infra/tracing"
-   "go.opentelemetry.io/otel/attribute"
-)
-
-type MyService struct {
-   tracer tracing.Tracer
-}
-
-func ProvideService(tracer tracing.Tracer) *MyService {
-   return &MyService{
-      tracer: tracer,
-   }
-}
-
-func (s *MyService) Hello(ctx context.Context, name string) (string, error) {
-   ctx, span := s.tracer.Start(ctx, "MyService.Hello")
-   // this make sure the span is marked as finished when this
-   // method ends to allow the span to be flushed and sent to
-   // storage backend.
-   defer span.End()
-
-   // Add some event to show Events usage
-   span.AddEvents(
-      []string{"message"},
-      []tracing.EventValue{
-         {Str: "checking name..."},
-      })
-
-   if name == "" {
-      err := fmt.Errorf("name cannot be empty")
-
-      // record err as an exception span event for this span
-      span.RecordError(err)
-      return "", err
-   }
-
-   // Add some other event to show Events usage
-   span.AddEvents(
-      []string{"message"},
-      []tracing.EventValue{
-         {Str: "name checked"},
-      })
-
-   // Add attribute to show Attributes usage
-   span.SetAttributes("my_service.name", name, attribute.Key("my_service.name").String(name))
-
-   return fmt.Sprintf("Hello %s", name), nil
-}
-
-```
-
-### Naming conventions
-
-Span names should follow the [guidelines from OpenTelemetry](https://opentelemetry.io/docs/reference/specification/trace/api/#span).
-
-| Span Name               | Guidance                                                 |
-| ----------------------- | -------------------------------------------------------- |
-| get                     | Too general                                              |
-| get_account/42          | Too specific                                             |
-| get_account             | Good, and account_id=42 would make a nice Span attribute |
-| get_account/{accountId} | Also good (using the “HTTP route”)                       |
-
-Span attribute and span event attributes should follow the [Attribute naming specification from OpenTelemetry](https://opentelemetry.io/docs/reference/specification/common/attribute-naming/). Good attribute key examples:
-
-- service.version
-- http.status_code
-
-See [Trace semantic conventions from OpenTelemetry](https://opentelemetry.io/docs/reference/specification/trace/semantic_conventions/) for additional conventions regarding well-known protocols and operations.
-
-### Span names and high cardinality
-
-Be careful with what span names you add/accept. Using/allowing too many span names could result in high cardinality problems.
-
-### Validate and sanitize input coming from user input
-
-If span names, attribute or event values originates from user input they **should** be validated and sanitized. It's very **important** to only allow a pre-defined set of span names to minimize the risk of high cardinality problems.
-
-Be **careful** to not expose any sensitive information in span names, attribute or event values, e.g. secrets, credentials etc.
-
-### How to collect, visualize and query traces (and correlate logs with traces) locally
-
-1. Start Jaeger
-
-   ```bash
-   make devenv sources=jaeger
-   ```
-
-2. Enable tracing in Grafana
-
-   opentelemetry tracing (recommended):
-
-   ```ini
-   [tracing.opentelemetry.jaeger]
-   address = http://localhost:14268/api/traces
-   ```
-
-   opentracing tracing (deprecated/not recommended):
-
-   ```ini
-   [tracing.jaeger]
-   address = localhost:6831
-   ```
-
-3. Search/browse collected logs and traces in Grafana Explore
-
-   You need provisioned gdev-jaeger and gdev-loki datasources, see [developer dashboard and data sources](https://github.com/grafana/grafana/tree/main/devenv#developer-dashboards-and-data-sources) for setup instructions.
-
-   Open Grafana explore and select gdev-loki datasource and use the query `{filename="/var/log/grafana/grafana.log"} | logfmt`.
-
-   You can then inspect any log message that includes a `traceID` and from there click on `gdev-jaeger` to split view and inspect the trace in question.
-
-4. Search/browse collected traces in Jaeger UI
-
-   You can open http://localhost:16686 to use the Jaeger UI for browsing and searching traces.

contribute/internationalization.md

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

contribute/localisation.md

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

contribute/style-guides/accessibility.md

@@ -1,77 +0,0 @@
-# Accessibility at Grafana
-
-At Grafana we pay special attention to accessibility and that's why it's important that all components are written with it in
-mind.
-
-The goal of this document is to list best practices and recommendations when it comes to writing accessible components.
-
-### grafana/ui components
-
-Some grafana/ui components have specific mechanisms built-in that make it easier to write accessible components.
-
-#### Form elements
-
-One of the important accessibility considerations when working with form elements is to make sure form controls are
-properly labelled. For that a `label` element has to be associated with the respective form control. One way to
-do that is to provide `for` attribute to the label that matches the `id` attribute of the form control.
-
-The form components from grafana/ui provide an easier way to achieve that. The form elements, used inside `Field`
-components, will get the `label` properly associated with them given that the element has `id` (in case of `Select` the prop is `inputId`) specified.
-
-As an example, this code
-
-```tsx
-<Field label="Name">
-  <Input id="name" placeholder="Enter a name" />
-</Field>
-```
-
-will be rendered as (simplified)
-
-```html
-<div>
-  <label for="name"> Name </label>
-  <input name="name" type="text" id="name" placeholder="Enter a name" value="" />
-</div>
-```
-
-As long as the form element has a unique `id` attribute specified, it will be automatically accessible when rendered.
-
-### Writing tests with accessibility in mind
-
-We use [React Testing Library](https://testing-library.com/docs/react-testing-library/intro) (RTL) for writing unit tests.
-The library is built with accessibility in mind and makes it easier to ensure the written code is accessible to all users.
-When querying DOM elements with RTL prefer using `*ByRole` queries as they resemble closely how the users interact
-with the page - both using mouse/visual display and assistive technologies.
-As a rule of thumb, if code is written with the accessibility concerns in
-mind, `*ByRole` queries will be sufficient in most of the cases. There are certainly exceptions here, as not all the elements have defined [ARIA role](https://www.w3.org/TR/html-aria/#docconformance).
-
-As an example, for this code
-
-```tsx
-<Field label="Username">
-  <Input id="username" placeholder="Enter a name" value={'Test'} />
-</Field>
-```
-
-the test could case be as follows
-
-```tsx
-it('has username set', () => {
-  expect(screen.getByRole('textbox', { name: 'Username' })).toHaveValue('Test');
-});
-```
-
-Input with type `text` (default type value) has a role of `textbox` and the `name` option is not the name attribute
-given to the input elements but their [accessible name](https://www.tpgi.com/what-is-an-accessible-name/), which in this case is the text content of the associated with input label.
-
-### Pull requests that introduce accessibility(a11y) errors:
-
-We use [pa11y-ci](https://github.com/pa11y/pa11y-ci) to collect accessibility errors on [some URLs in the project](https://github.com/grafana/grafana/issues/36555), threshold errors are specified per URL.
-
-If the contribution introduces new a11y errors, our continuous integration will fail, preventing you to merge to the main branch. In those cases there are two alternatives for moving forward:
-
-- Check the error log on the pipeline step `test-a11y-frontend-pr`, identify what was the error, and fix it.
-- Locally run the command `yarn test:accessibility-report` that generates an HTML accessibility report, then go to the URL that contains your change, identify the error, and fix it. Keep in mind, a local e2e Grafana instance is going to be running on `http://localhost:3001`.
-
-You can also prevent introducing a11y errors by installing an a11y plugin in your browser, for example, axe DevTools, Accessibility Insights for Web among others.

contribute/style-guides/e2e.md

@@ -26,10 +26,10 @@ Let's start with a simple [JSX](https://reactjs.org/docs/introducing-jsx.html) e
 <input className="gf-form-input login-form-input" type="text" />
 ```
 
-We _could_ target the field with a CSS selector like `.gf-form-input.login-form-input` but that would be brittle as style changes occur frequently. Furthermore there is nothing that signals to future developers that this input is part of an E2E test. At Grafana, we use `data-testid` attributes as our preferred way of defining selectors. See [Aria-Labels vs data-testid](#aria-labels-vs-data-testid) for more details.
+We _could_ target the field with a CSS selector like `.gf-form-input.login-form-input` but that would be brittle as style changes occur frequently. Furthermore there is nothing that signals to future developers that this input is part of an E2E test. At Grafana, we use `aria-label` attributes as our preferred way of defining selectors instead of [`data-*`](https://mdn.io/docs/Web/HTML/Global_attributes/data-*) as they also aid in [accessibility](https://mdn.io/docs/Learn/Accessibility/What_is_accessibility):
 
 ```jsx
-<input data-testid="Username input field" className="gf-form-input login-form-input" type="text" />
+<input aria-label="Username input field" className="gf-form-input login-form-input" type="text" />
 ```
 
 The next step is to create a `Page` representation in our E2E framework to glue the test with the real implementation using the `pageFactory` function. For that function we can supply a `url` and `selectors` like in the example below:
@@ -39,12 +39,10 @@ export const Login = {
   // Called via `Login.visit()`
   url: '/login',
   // Called via `Login.username()`
-  username: 'data-testid Username input field',
+  username: 'Username input field',
 };
 ```
 
-Note that the selector is prefixed with `data-testid` - this is a signal to the framework to look for the selector in the `data-testid` attribute.
-
 The next step is to add the `Login` page to the `Pages` export within [_\<repo-root>/packages/grafana-e2e-selectors/src/selectors/pages.ts_](../../packages/grafana-e2e-selectors/src/selectors/pages.ts) so that it appears when we type `e2e.pages` in our IDE.
 
 ```typescript
@@ -61,7 +59,7 @@ Now that we have a `Page` called `Login` in our `Pages` const we can use that to
 ```jsx
 import { selectors } from '@grafana/e2e-selectors';
 
-<input data-testid={selectors.pages.Login.username} className="gf-form-input login-form-input" type="text" />;
+<input aria-label={selectors.pages.Login.username} className="gf-form-input login-form-input" type="text" />;
 ```
 
 The last step in our example is to use our `Login` page as part of a test.
@@ -102,7 +100,7 @@ Just as before in the basic example we'll start by creating a page abstraction u
 ```typescript
 export const DataSources = {
   url: '/datasources',
-  dataSources: (dataSourceName: string) => `data-testid Data source list item ${dataSourceName}`,
+  dataSources: (dataSourceName: string) => `Data source list item ${dataSourceName}`,
 };
 ```
 
@@ -117,7 +115,7 @@ The next step is to use the `dataSources` selector function as in our example be
   {dataSources.map(({ id, name }) => (
     <li className="card-item-wrapper" key={id}>
       <a className="card-item" href={`datasources/edit/${id}`}>
-        <div className="card-item-name" data-testid={selectors.pages.DataSources.dataSources(name)}>
+        <div className="card-item-name" aria-label={selectors.pages.DataSources.dataSources(name)}>
           {name}
         </div>
       </a>
@@ -129,9 +127,9 @@ The next step is to use the `dataSources` selector function as in our example be
 When this list is rendered with the data sources with names `A`, `B` and `C` ,the resulting HTML would look like:
 
 ```html
-<div class="card-item-name" data-testid="data-testid Data source list item A">A</div>
-<div class="card-item-name" data-testid="data-testid Data source list item B">B</div>
-<div class="card-item-name" data-testid="data-testid Data source list item C">C</div>
+<div class="card-item-name" aria-label="Data source list item A">A</div>
+<div class="card-item-name" aria-label="Data source list item B">B</div>
+<div class="card-item-name" aria-label="Data source list item C">C</div>
 ```
 
 Now we can write our test. The one thing that differs from the [basic example](#basic-example) above is that we pass in which data source we want to click on as an argument to the selector function:

contribute/style-guides/frontend.md

@@ -166,22 +166,17 @@ interface ModalState {
 ##### Emotion class names
 
 ```typescript
-const getStyles = (theme: GrafanaTheme2) => ({
+const getStyles  = = () => ({
   // bad
   ElementWrapper: css`...`,
   // bad
-  ['element-wrapper']: css`...`,
+  ["element-wrapper"]: css`...`,
 
   // good
-  elementWrapper: css({
-    padding: theme.spacing(1, 2),
-    background: theme.colors.background.secondary,
-  }),
+  elementWrapper: css`...`,
 });
 ```
 
-Use hook useStyles2(getStyles) to memoize the styles generation and try to avoid passing props to the the getStyles function and instead compose classes using emotion cx function.
-
 #### Use `ALL_CAPS` for constants.
 
 ```typescript
@@ -356,7 +351,7 @@ static defaultProps: Partial<Props> = { ... }
 We recommend using named regular functions when creating a new react functional component.
 
 ```typescript
-export function Component(props: Props) { ... }
+export function Component(props: Props): ReactElement { ... }
 ```
 
 ## State management

contribute/style-guides/styling.md

@@ -4,9 +4,26 @@
 
 ## Usage
 
+### Basic styling
+
 For styling components, use [Emotion's `css` function](https://emotion.sh/docs/emotion#css).
 
-### Basic styling
+```tsx
+import React from 'react';
+import { css } from '@emotion/css';
+
+const ComponentA = () => (
+  <div
+    className={css`
+      background: red;
+    `}
+  >
+    As red as you can get
+  </div>
+);
+```
+
+### Styling with theme
 
 To access the theme in your styles, use the `useStyles` hook. It provides basic memoization and access to the theme object.
 
@@ -14,35 +31,33 @@ To access the theme in your styles, use the `useStyles` hook. It provides basic
 
 ```tsx
 import React, { FC } from 'react';
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { GrafanaTheme } from '@grafana/data';
+import { useStyles } from '@grafana/ui';
 import { css } from '@emotion/css';
 
 const Foo: FC<FooProps> = () => {
-  const styles = useStyles2(getStyles);
+  const styles = useStyles(getStyles);
 
   // Use styles with classNames
   return <div className={styles}>...</div>;
 };
 
-const getStyles = (theme: GrafanaTheme2) =>
-  css({
-    padding: theme.spacing(1, 2), // will result in 8px 16px padding
-  });
+const getStyles = (theme: GrafanaTheme) => css`
+  padding: ${theme.spacing.md};
+`;
 ```
 
 ### Styling complex components
 
-In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state you
-can have your getStyles function return an object with many class names and use [Emotion's `cx` function](https://emotion.sh/docs/emotion#cx) to compose them.
+In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state, you should create a helper function that returns an object of styles. This function should also be wrapped in the `stylesFactory` helper function, which will provide basic memoization.
 
 Let's say you need to style a component that has a different background depending on the `isActive` property :
 
 ```tsx
 import React from 'react';
-import { css, cx } from '@emotion/css';
-import { GrafanaTheme2 } from '@grafana/data';
-import { useStyles2 } from '@grafana/ui';
+import { css } from '@emotion/css';
+import { GrafanaTheme } from '@grafana/data';
+import { selectThemeVariant, stylesFactory, useTheme } from '@grafana/ui';
 
 interface ComponentAProps {
   isActive: boolean;
@@ -50,10 +65,10 @@ interface ComponentAProps {
 
 const ComponentA: React.FC<ComponentAProps> = ({ isActive }) => {
   const theme = useTheme();
-  const styles = useStyles2(theme);
+  const styles = getStyles(theme, isActive);
 
   return (
-    <div className={cx(styles.wrapper, isActive && styles.active)}>
+    <div className={styles.wrapper}>
       As red as you can get
       <i className={styles.icon} />
     </div>
@@ -61,20 +76,42 @@ const ComponentA: React.FC<ComponentAProps> = ({ isActive }) => {
 };
 
 // Mind, that you can pass multiple arguments, theme included
-const getStyles = (theme: GrafanaTheme2) => {
+const getStyles = stylesFactory((theme: GrafanaTheme, isActive: boolean) => {
+  const backgroundColor = isActive ? theme.colors.red : theme.colors.blue;
+
   return {
-    wrapper: css({
-      background: theme.colors.background.secondary;
-    }),
-    active: css({
-      background: theme.colors.primary.main,
-      text: theme.colors.primary.contrastText,
-    },
-    icon: css({
-      fontSize: theme.typography.bodySmall.fontSize;
-    })
+    wrapper: css`
+      background: ${backgroundColor};
+    `,
+    icon: css`
+      font-size: ${theme.typography.size.sm};
+    `,
   };
-};
+});
 ```
 
 For more information about themes at Grafana please see the [themes guide](./themes.md).
+
+### Composing class names
+
+For class composition, use [Emotion's `cx` function](https://emotion.sh/docs/emotion#cx).
+
+```tsx
+import React from 'react';
+import { css, cx } from '@emotion/css';
+
+interface Props {
+  className?: string;
+}
+
+const ComponentA: React.FC<Props> = ({ className }) => {
+  const finalClassName = cx(
+    className,
+    css`
+      background: red;
+    `
+  );
+
+  return <div className={finalClassName}>As red as you can ge</div>;
+};
+```

crowdin.yml

@@ -1,10 +0,0 @@
-files:
-  - source: /public/locales/en-US/messages.po
-    translation: /public/locales/%locale%/%original_file_name%
-    export_only_approved: true
-
-pull_request_title: 'I18n: Crowdin sync'
-pull_request_labels:
-  - area/internationalization
-  - no-changelog
-  - no-backport

cue/scuemata/panel-plugin.cue

@@ -0,0 +1,27 @@
+package scuemata
+
+// Definition of the shape of a panel plugin's schema declarations in its
+// schema.cue file.
+//
+// Note that these keys do not appear directly in any real JSON artifact;
+// rather, they are composed into panel structures as they are defined within
+// the larger Dashboard schema.
+#PanelSchema: {
+    // Defines plugin specific options for a panel
+    PanelOptions: {...} @cuetsy(kind="interface")
+
+    // Define the custom properties that exist within standard field config
+    PanelFieldConfig?: {...} @cuetsy(kind="interface")
+
+    // Panels may define their own types
+    ...
+}
+
+// A lineage of panel schema
+#PanelLineage: [#PanelSchema, ...#PanelSchema]
+
+// Panel plugin-specific Family
+#PanelFamily: {
+    lineages: [#PanelLineage, ...#PanelLineage]
+    migrations: [...#Migration]
+}

cue/scuemata/scuemata.cue

@@ -0,0 +1,61 @@
+package scuemata
+
+// A family is a collection of schemas that specify a single kind of object,
+// allowing evolution of the canonical schema for that kind of object over time.
+//
+// The schemas are organized into a list of Lineages, which are themselves ordered
+// lists of schemas where each schema with its predecessor in the lineage.
+//
+// If it is desired to define a schema with a breaking schema relative to its
+// predecessors, a new Lineage must be created, as well as a Migration that defines
+// a mapping to the new schema from the latest schema in prior Lineage.
+//
+// The version number of a schema is not controlled by the schema itself, but by
+// its position in the list of lineages - e.g., 0.0 corresponds to the first
+// schema in the first lineage.
+#Family: {
+	compose?: {...}
+	lineages: [#Lineage, ...#Lineage]
+	migrations: [...#Migration]
+	let lseq = lineages[len(lineages)-1]
+	latest: #LastSchema & {_p: lseq}
+}
+
+// A Lineage is a non-empty list containing an ordered series of schemas that
+// all describe a single kind of object, where each schema is backwards
+// compatible with its predecessor.
+#Lineage: [{...}, ...{...}]
+
+#LastSchema: {
+	_p: #Lineage
+	_p[len(_p)-1]
+}
+
+// A Migration defines a relation between two schemas, "_from" and "_to". The
+// relation expresses any complex mappings that must be performed to
+// transform an input artifact valid with respect to the _from schema, into
+// an artifact valid with respect to the _to schema. This is accomplished
+// in two stages:
+//   1. A Migration is initially defined by passing in schemas for _from and _to,
+//      and mappings that translate _from to _to are defined in _rel. 
+//   2. A concrete object may then be unified with _to, resulting in its values
+//      being mapped onto "result" by way of _rel.
+//
+// This is the absolute simplest possible definition of a Migration. It's
+// incumbent on the implementor to manually ensure the correctness and
+// completeness of the mapping. The primary value in defining such a generic
+// structure is to allow comparably generic logic for migrating concrete
+// artifacts through schema changes.
+//
+// If _to isn't backwards compatible (accretion-only) with _from, then _rel must
+// explicitly enumerate every field in _from and map it to a field in _to, even
+// if they're identical. This is laborious for anything outside trivially tiny
+// schema. We'll want to eventually add helpers for whitelisting or blacklisting
+// of paths in _from, so that migrations of larger schema can focus narrowly on
+// the points of actual change.
+#Migration: {
+	from: {...}
+	to: {...}
+	rel: {...}
+	result: to & rel
+}