"Release: Updated versions in package to 8.2.0-beta.2" (#39831)

* Add search to time picker

* implement fiscal datemath

Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
(cherry picked from commit 738d5e499e)

Co-authored-by: Oscar Kilhed <oscar.kilhed@grafana.com>

.bingo/.gitignore

@@ -0,0 +1,12 @@
+
+# Ignore everything
+*
+
+# But not these files:
+!.gitignore
+!*.mod
+!README.md
+!Variables.mk
+!variables.env
+
+*tmp.mod

.bingo/README.md

@@ -0,0 +1,14 @@
+# Project Development Dependencies.
+
+This is directory which stores Go modules with pinned buildable package that is used within this repository, managed by https://github.com/bwplotka/bingo.
+
+- Run `bingo get` to install all tools having each own module file in this directory.
+- Run `bingo get <tool>` to install <tool> that have own module file in this directory.
+- For Makefile: Make sure to put `include .bingo/Variables.mk` in your Makefile, then use $(<upper case tool name>) variable where <tool> is the .bingo/<tool>.mod.
+- For shell: Run `source .bingo/variables.env` to source all environment variable for each tool.
+- For go: Import `.bingo/variables.go` to for variable names.
+- See https://github.com/bwplotka/bingo or -h on how to add, remove or change binaries dependencies.
+
+## Requirements
+
+- Go 1.14+

.bingo/Variables.mk

@@ -0,0 +1,25 @@
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.3. DO NOT EDIT.
+# All tools are designed to be build inside $GOBIN.
+BINGO_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+GOPATH ?= $(shell go env GOPATH)
+GOBIN  ?= $(firstword $(subst :, ,${GOPATH}))/bin
+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 wire variable:
+#
+# In your main Makefile (for non array binaries):
+#
+#include .bingo/Variables.mk # Assuming -dir was set to .bingo .
+#
+#command: $(WIRE)
+#	@echo "Running wire"
+#	@$(WIRE) <flags/args..>
+#
+WIRE := $(GOBIN)/wire-v0.5.0
+$(WIRE): $(BINGO_DIR)/wire.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)/wire-v0.5.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=wire.mod -o=$(GOBIN)/wire-v0.5.0 "github.com/google/wire/cmd/wire"
+

.bingo/go.mod

@@ -0,0 +1 @@
+module _ // Fake go.mod auto-created by 'bingo' for go -moddir compatibility with non-Go projects. Commit this file, together with other .mod files.

.bingo/variables.env

@@ -0,0 +1,12 @@
+# Auto generated binary variables helper managed by https://github.com/bwplotka/bingo v0.4.3. 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)}
+
+if [ -z "$GOBIN" ]; then
+	GOBIN="$(go env GOPATH)/bin"
+fi
+
+
+WIRE="${GOBIN}/wire-v0.5.0"
+

.bingo/wire.mod

@@ -0,0 +1,5 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.16
+
+require github.com/google/wire v0.5.0 // cmd/wire

.bra.toml

@@ -1,5 +1,6 @@
 [run]
 init_cmds = [
+  ["make", "gen-go"],
   ["go", "run", "build.go", "-dev", "build-cli"],
   ["go", "run", "build.go", "-dev", "build-server"],
   ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]

.drone.star

@@ -4,12 +4,12 @@
 # 3. Run `make drone`
 # More information about this process here: https://github.com/grafana/deployment_tools/blob/master/docs/infrastructure/drone/signing.md
 
-load('scripts/pr.star', 'pr_pipelines')
-load('scripts/main.star', 'main_pipelines')
-load('scripts/release.star', 'release_pipelines', 'test_release_pipelines')
-load('scripts/version.star', 'version_branch_pipelines')
-load('scripts/job.star', 'cronjobs')
-load('scripts/vault.star', 'secrets')
+load('scripts/drone/pipelines/pr.star', 'pr_pipelines')
+load('scripts/drone/pipelines/main.star', 'main_pipelines')
+load('scripts/drone/pipelines/release.star', 'release_pipelines', 'test_release_pipelines')
+load('scripts/drone/version.star', 'version_branch_pipelines')
+load('scripts/drone/pipelines/cron.star', 'cronjobs')
+load('scripts/drone/vault.star', 'secrets')
 
 def main(ctx):
     edition = 'oss'

.github/CODEOWNERS

@@ -22,6 +22,10 @@
 go.mod @grafana/backend-platform
 go.sum @grafana/backend-platform
 
+# Continuous Integration
+.drone.yml @malcolmholmes @dsotirakis @zserge
+/scripts/drone/ @malcolmholmes @dsotirakis @zserge
+
 # Cloud Datasources backend code
 /pkg/tsdb/cloudwatch @grafana/cloud-datasources @grafana/observability-squad
 /pkg/tsdb/azuremonitor @grafana/cloud-datasources

.github/pr-commands.json

@@ -66,9 +66,6 @@
       "packaging/**/*",
       "scripts/build/**/*",
       "scripts/*.sh",
-      "scripts/*.star",
-      ".drone.star",
-      ".drone.yml",
       "Makefile",
       "Dockerfile",
       "Dockerfile.ubuntu"
@@ -76,6 +73,16 @@
     "action": "updateLabel",
     "addLabel": "type/build-packaging"
   },
+  {
+    "type": "changedfiles",
+    "matches": [
+      "scripts/*.star",
+      ".drone.star",
+      ".drone.yml"
+    ],
+    "action": "updateLabel",
+    "addLabel": "type/ci"
+  },
   {
     "type": "changedfiles",
     "matches": [ "public/app/plugins/datasource/grafana-azure-monitor-datasource/**/*", "pkg/tsdb/azuremonitor/**/*"],

.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: publish_docs
 on:
   push:
     branches:
-    - v8.1.x
+    - main
     paths:
     - 'docs/sources/**'
     - 'packages/grafana-*/**'
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - run: git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.GH_BOT_ACCESS_TOKEN }}@github.com/grafana/website-sync ./.github/actions/website-sync
-    - uses: actions/cache@v2.1.5
+    - uses: actions/cache@v2.1.6
       with:
         path: '**/node_modules'
         key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
@@ -36,7 +36,7 @@ jobs:
         host: github.com
         github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
         source_folder: docs/sources
-        target_folder: content/docs/grafana/latest
+        target_folder: content/docs/grafana/next
         allow_no_changes: 'true'
     - shell: bash
       run: |

.gitignore

@@ -75,6 +75,7 @@ profile.cov
 /pkg/cmd/grafana-server/grafana-server
 /pkg/cmd/grafana-server/debug
 /pkg/extensions/*
+/pkg/server/wireexts_enterprise.go
 !/pkg/extensions/main.go
 /public/app/extensions
 debug.test
@@ -122,8 +123,15 @@ compilation-stats.json
 !/e2e/**/screenshots/expected/*
 /e2e/**/videos/*
 
+# a11y tests
+/pa11y-ci-results.json
+/pa11y-ci-report
+
 # report dumping the whole system env
 /report.*.json
 
 # auto generated frontend docs
 /docs/sources/packages_api
+
+# auto generated Go files
+*_gen.go

.pa11yci-pr.conf.js

@@ -0,0 +1,96 @@
+var config = {
+  defaults: {
+    concurrency: 1,
+    runners: ['axe'],
+    chromeLaunchConfig: {
+      args: ['--no-sandbox'],
+    },
+  },
+
+  urls: [
+    {
+      url: '${HOST}/login',
+      actions: [
+        "set field input[name='user'] to admin",
+        "set field input[name='password'] to admin",
+        "click element button[aria-label='Login button']",
+        "wait for element [aria-label='Skip change password button'] to be visible",
+      ],
+      threshold: 3,
+    },
+    {
+      url: '${HOST}/?orgId=1',
+      threshold: 7,
+    },
+    {
+      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
+      hideElements: '.sidemenu',
+      threshold: 2,
+    },
+    {
+      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
+      rootElement: '.dashboard-settings',
+      threshold: 10,
+    },
+    {
+      url: '${HOST}/?orgId=1&search=open',
+      rootElement: '.main-view',
+      threshold: 15,
+    },
+    {
+      url: '${HOST}/alerting/list',
+      rootElement: '.main-view',
+      threshold: 7,
+    },
+    {
+      url: '${HOST}/datasources',
+      rootElement: '.main-view',
+      threshold: 36,
+    },
+    {
+      url: '${HOST}/org/users',
+      rootElement: '.main-view',
+      threshold: 4,
+    },
+    {
+      url: '${HOST}/org/teams',
+      rootElement: '.main-view',
+      threshold: 1,
+    },
+    {
+      url: '${HOST}/plugins',
+      rootElement: '.main-view',
+      threshold: 41,
+    },
+    {
+      url: '${HOST}/org',
+      rootElement: '.main-view',
+      threshold: 2,
+    },
+    {
+      url: '${HOST}/org/apikeys',
+      rootElement: '.main-view',
+      threshold: 5,
+    },
+    {
+      url: '${HOST}/dashboards',
+      rootElement: '.main-view',
+      threshold: 8,
+    },
+  ],
+};
+
+function myPa11yCiConfiguration(urls, defaults) {
+  const HOST_SERVER = process.env.HOST || 'localhost';
+  const PORT_SERVER = process.env.PORT || '3000';
+  for (var idx = 0; idx < urls.length; idx++) {
+    urls[idx] = { ...urls[idx], url: urls[idx].url.replace('${HOST}', `${HOST_SERVER}:${PORT_SERVER}`) };
+  }
+
+  return {
+    defaults: defaults,
+    urls: urls,
+  };
+}
+
+module.exports = myPa11yCiConfiguration(config.urls, config.defaults);

.pa11yci.conf.js

@@ -0,0 +1,83 @@
+var config = {
+  defaults: {
+    concurrency: 1,
+    runners: ['axe'],
+    chromeLaunchConfig: {
+      args: ['--no-sandbox'],
+    },
+  },
+
+  urls: [
+    {
+      url: '${HOST}/login',
+      actions: [
+        "set field input[name='user'] to admin",
+        "set field input[name='password'] to admin",
+        "click element button[aria-label='Login button']",
+        "wait for element [aria-label='Skip change password button'] to be visible",
+      ],
+    },
+    {
+      url: '${HOST}/?orgId=1',
+    },
+    {
+      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge',
+      hideElements: '.sidemenu',
+    },
+    {
+      url: '${HOST}/d/O6f11TZWk/panel-tests-bar-gauge?orgId=1&editview=settings',
+      rootElement: '.dashboard-settings',
+    },
+    {
+      url: '${HOST}/?orgId=1&search=open',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/alerting/list',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/datasources',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/org/users',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/org/teams',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/plugins',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/org',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/org/apikeys',
+      rootElement: '.main-view',
+    },
+    {
+      url: '${HOST}/dashboards',
+      rootElement: '.main-view',
+    },
+  ],
+};
+
+function myPa11yCiConfiguration(urls, defaults) {
+  const HOST_SERVER = process.env.HOST || 'localhost';
+  const PORT_SERVER = process.env.PORT || '3000';
+  for (var idx = 0; idx < urls.length; idx++) {
+    urls[idx] = { ...urls[idx], url: urls[idx].url.replace('${HOST}', `${HOST_SERVER}:${PORT_SERVER}`) };
+  }
+
+  return {
+    defaults: defaults,
+    urls: urls,
+  };
+}
+
+module.exports = myPa11yCiConfiguration(config.urls, config.defaults);

.prettierignore

@@ -5,8 +5,9 @@ pkg/
 node_modules
 public/vendor/
 vendor/
-data/
+/data/
 e2e/tmp
 public/build/
 public/sass/*.generated.scss
 devenv/
+public/lib/monaco

CHANGELOG.md

@@ -1,3 +1,161 @@
+<!-- 8.2.0-beta1 START -->
+
+# 8.2.0-beta1 (2021-09-16)
+
+### Features and enhancements
+
+- **AccessControl:** Introduce new permissions to restrict access for reloading provisioning configuration. [#38906](https://github.com/grafana/grafana/pull/38906), [@vtorosyan](https://github.com/vtorosyan)
+- **Alerting:** Add UI to edit Cortex/Loki namespace, group names, and group evaluation interval. [#38543](https://github.com/grafana/grafana/pull/38543), [@domasx2](https://github.com/domasx2)
+- **Alerting:** Add a Test button to test contact point. [#37475](https://github.com/grafana/grafana/pull/37475), [@domasx2](https://github.com/domasx2)
+- **Alerting:** Allow creating/editing recording rules for Loki and Cortex. [#38064](https://github.com/grafana/grafana/pull/38064), [@domasx2](https://github.com/domasx2)
+- **Alerting:** Sort notification channels by name to make them easier to locate. [#37426](https://github.com/grafana/grafana/pull/37426), [@jstangroome](https://github.com/jstangroome)
+- **AzureMonitor:** Add data links to deep link to Azure Portal Azure Resource Graph. [#35591](https://github.com/grafana/grafana/pull/35591), [@shuotli](https://github.com/shuotli)
+- **AzureMonitor:** Add support for annotations from Azure Monitor Metrics and Azure Resource Graph services. [#37633](https://github.com/grafana/grafana/pull/37633), [@joshhunt](https://github.com/joshhunt)
+- **AzureMonitor:** Show error message when subscriptions request fails in ConfigEditor. [#37837](https://github.com/grafana/grafana/pull/37837), [@joshhunt](https://github.com/joshhunt)
+- **Chore:** Update to Golang 1.16.7. [#38604](https://github.com/grafana/grafana/pull/38604), [@dsotirakis](https://github.com/dsotirakis)
+- **CloudWatch Logs:** Add link to X-Ray data source for trace IDs in logs. [#39135](https://github.com/grafana/grafana/pull/39135), [@aocenas](https://github.com/aocenas)
+- **CloudWatch Logs:** Disable query path using websockets (Live) feature. [#39231](https://github.com/grafana/grafana/pull/39231), [@aocenas](https://github.com/aocenas)
+- **CloudWatch/Logs:** Don't group dataframes for non time series queries. [#37998](https://github.com/grafana/grafana/pull/37998), [@aocenas](https://github.com/aocenas)
+- **Cloudwatch:** Migrate queries that use multiple stats to one query per stat. [#36925](https://github.com/grafana/grafana/pull/36925), [@sunker](https://github.com/sunker)
+- **Dashboard:** Keep live timeseries moving left (v2). [#37769](https://github.com/grafana/grafana/pull/37769), [@ryantxu](https://github.com/ryantxu)
+- **Datasources:** Introduce `response_limit` for datasource responses. [#38962](https://github.com/grafana/grafana/pull/38962), [@dsotirakis](https://github.com/dsotirakis)
+- **Explore:** Add filter by trace or span ID to `trace to logs` feature. [#38943](https://github.com/grafana/grafana/pull/38943), [@connorlindsey](https://github.com/connorlindsey)
+- **Explore:** Download traces as JSON in Explore Inspector. [#38614](https://github.com/grafana/grafana/pull/38614), [@connorlindsey](https://github.com/connorlindsey)
+- **Explore:** Reuse Dashboard's QueryRows component. [#38942](https://github.com/grafana/grafana/pull/38942), [@Elfo404](https://github.com/Elfo404)
+- **Explore:** Support custom display label for derived fields buttons for Loki datasource. [#37273](https://github.com/grafana/grafana/pull/37273), [@connorlindsey](https://github.com/connorlindsey)
+- **Grafana UI:** Update monaco-related dependencies. [#39027](https://github.com/grafana/grafana/pull/39027), [@gabor](https://github.com/gabor)
+- **Graphite:** Deprecate browser access mode. [#38783](https://github.com/grafana/grafana/pull/38783), [@ifrost](https://github.com/ifrost)
+- **InfluxDB:** Improve handling of intervals in alerting. [#37588](https://github.com/grafana/grafana/pull/37588), [@gabor](https://github.com/gabor)
+- **InfluxDB:** InfluxQL query editor: Handle unusual characters in tag values better. [#39170](https://github.com/grafana/grafana/pull/39170), [@gabor](https://github.com/gabor)
+- **Jaeger:** Add ability to upload JSON file for trace data. [#37205](https://github.com/grafana/grafana/pull/37205), [@zoltanbedi](https://github.com/zoltanbedi)
+- **LibraryElements:** Enable specifying UID for new and existing library elements. [#39019](https://github.com/grafana/grafana/pull/39019), [@hugohaggmark](https://github.com/hugohaggmark)
+- **LibraryPanels:** Remove library panel icon from the panel header so you can no longer tell that a panel is a library panel from the dashboard view. [#38749](https://github.com/grafana/grafana/pull/38749), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Logs panel:** Scroll to the bottom on page refresh when sorting in ascending order. [#37634](https://github.com/grafana/grafana/pull/37634), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Loki:** Add fuzzy search to label browser. [#36864](https://github.com/grafana/grafana/pull/36864), [@connorlindsey](https://github.com/connorlindsey)
+- **Navigation:** Implement active state for items in the Sidemenu. [#39030](https://github.com/grafana/grafana/pull/39030), [@ashharrison90](https://github.com/ashharrison90)
+- **Packaging:** Add stricter systemd unit options. [#38109](https://github.com/grafana/grafana/pull/38109), [@erdnaxe](https://github.com/erdnaxe)
+- **Packaging:** Update PID file location from `/var/run` to `/run`. [#35739](https://github.com/grafana/grafana/pull/35739), [@MichaIng](https://github.com/MichaIng)
+- **Plugins:** Add Hide OAuth Forward config option. [#36306](https://github.com/grafana/grafana/pull/36306), [@wbrowne](https://github.com/wbrowne)
+- **Postgres/MySQL/MSSQL:** Add setting to limit the maximum number of rows processed. [#38986](https://github.com/grafana/grafana/pull/38986), [@marefr](https://github.com/marefr)
+- **Prometheus:** Add browser access mode deprecation warning. [#37578](https://github.com/grafana/grafana/pull/37578), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Prometheus:** Add interpolation for built-in-time variables to backend. [#39051](https://github.com/grafana/grafana/pull/39051), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Tempo:** Add ability to upload trace data in JSON format. [#37407](https://github.com/grafana/grafana/pull/37407), [@zoltanbedi](https://github.com/zoltanbedi)
+- **TimeSeries/XYChart:** Allow grid lines visibility control in XYChart and TimeSeries panels. [#38502](https://github.com/grafana/grafana/pull/38502), [@dprokop](https://github.com/dprokop)
+- **Transformations:** Convert field types to time string number or boolean. [#38517](https://github.com/grafana/grafana/pull/38517), [@nikki-kiga](https://github.com/nikki-kiga)
+- **Value mappings:** Add regular-expression based value mapping. [#38931](https://github.com/grafana/grafana/pull/38931), [@mcdee](https://github.com/mcdee)
+- **Zipkin:** Add ability to upload trace JSON. [#37483](https://github.com/grafana/grafana/pull/37483), [@zoltanbedi](https://github.com/zoltanbedi)
+
+### Bug fixes
+
+- **Admin:** Prevent user from deleting user's current/active organization. [#38056](https://github.com/grafana/grafana/pull/38056), [@idafurjes](https://github.com/idafurjes)
+- **LibraryPanels:** Fix library panel getting saved in the dashboard's folder. [#38978](https://github.com/grafana/grafana/pull/38978), [@hugohaggmark](https://github.com/hugohaggmark)
+- **OAuth:** Make generic teams URL and JMES path configurable. [#37233](https://github.com/grafana/grafana/pull/37233), [@djairhogeuens](https://github.com/djairhogeuens)
+- **QueryEditor:** Fix broken copy-paste for mouse middle-click (#39117). [#39117](https://github.com/grafana/grafana/pull/39117), [@glintik](https://github.com/glintik)
+- **Thresholds:** Fix undefined color in "Add threshold". [#39113](https://github.com/grafana/grafana/pull/39113), [@glintik](https://github.com/glintik)
+- **Timeseries:** Add wide-to-long, and fix multi-frame output. [#38670](https://github.com/grafana/grafana/pull/38670), [@ryantxu](https://github.com/ryantxu)
+- **TooltipPlugin:** Fix behavior of Shared Crosshair when Tooltip is set to All. [#37285](https://github.com/grafana/grafana/pull/37285), [@nikki-kiga](https://github.com/nikki-kiga)
+
+### Breaking changes
+
+The `monaco-editor` dependency in `grafana-ui` has been updated to a newer version (`0.27.0`), which is not completely backward compatible with the old version (`0.21.2`). The backward incompatible changes are fairly small, but they do exist, so if your code accesses the raw monaco-objects through the `grafana-ui` package, please check the [monaco-editor changelog](https://github.com/microsoft/monaco-editor/blob/main/CHANGELOG.md) and apply any necessary changes. Issue [#39027](https://github.com/grafana/grafana/issues/39027)
+
+The mandatory `css` prop in `grafana/ui` components has been removed.
+
+Previous versions of `grafana/ui` components were typed incorrectly due to a dependency mismatch between emotion 10 and 11 causing a `css` prop to be added to components that extended react types.
+Issue [#38078](https://github.com/grafana/grafana/issues/38078)
+
+Panel queries and/or annotation queries that used more than one statistic will be converted into one query/annotation per statistic. In case an alerting rule was based on a query row that had more than one statistic, it would now be based only on the first statistic for that query row. New alerting rules will not be created for migrated queries. Please note that in most cases it would not make sense to have an alerting rule that is based on multiple statistics anyway. Issue [#36925](https://github.com/grafana/grafana/issues/36925)
+
+### Deprecations
+
+`getHighlighterExpressions` in datasource APIs ( used to highlight logs while editing queries) has been deprecated and will be removed in a future release.
+
+# Deprecation notice
+
+`ExploreQueryFieldProps` interface for query editors has been deprecated and will be removed in a future release. Use `QueryEditorProps` instead. Issue [#38942](https://github.com/grafana/grafana/issues/38942)
+
+### Plugin development fixes & changes
+
+- **Grafana UI:** Fix TS error property `css` is missing in type. [#38078](https://github.com/grafana/grafana/pull/38078), [@jackw](https://github.com/jackw)
+
+<!-- 8.2.0-beta1 END -->
+<!-- 8.1.4 START -->
+
+# 8.1.4 (2021-09-16)
+
+### Features and enhancements
+
+- **Explore:** Ensure logs volume bar colors match legend colors. [#39072](https://github.com/grafana/grafana/pull/39072), [@ifrost](https://github.com/ifrost)
+- **LDAP:** Search all DNs for users. [#38891](https://github.com/grafana/grafana/pull/38891), [@sakjur](https://github.com/sakjur)
+
+### Bug fixes
+
+- **Alerting:** Fix notification channel migration. [#38983](https://github.com/grafana/grafana/pull/38983), [@papagian](https://github.com/papagian)
+- **Annotations:** Fix blank panels for queries with unknown data sources. [#39017](https://github.com/grafana/grafana/pull/39017), [@hugohaggmark](https://github.com/hugohaggmark)
+- **BarChart:** Fix stale values and x axis labels. [#39188](https://github.com/grafana/grafana/pull/39188), [@leeoniya](https://github.com/leeoniya)
+- **Graph:** Make old graph panel thresholds work even if ngalert is enabled. [#38918](https://github.com/grafana/grafana/pull/38918), [@domasx2](https://github.com/domasx2)
+- **InfluxDB:** Fix regex to identify `/` as separator. [#39185](https://github.com/grafana/grafana/pull/39185), [@dsotirakis](https://github.com/dsotirakis)
+- **LibraryPanels:** Fix update issues related to library panels in rows. [#38963](https://github.com/grafana/grafana/pull/38963), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Variables:** Fix variables not updating inside a Panel when the preceding Row uses "Repeat For". [#38935](https://github.com/grafana/grafana/pull/38935), [@axelavargas](https://github.com/axelavargas)
+
+<!-- 8.1.4 END -->
+<!-- 8.1.3 START -->
+
+# 8.1.3 (2021-09-08)
+
+### Bug fixes
+
+- **Alerting:** Fix alert flapping in the internal alertmanager. [#38648](https://github.com/grafana/grafana/pull/38648), [@gotjosh](https://github.com/gotjosh)
+- **Alerting:** Fix request handler failed to convert dataframe "results" to plugins.DataTimeSeriesSlice: input frame is not recognized as a time series. [#38587](https://github.com/grafana/grafana/pull/38587), [@idafurjes](https://github.com/idafurjes)
+- **Dashboard:** Fix UIDs are not preserved when importing/creating dashboards thru importing .json file. [#38659](https://github.com/grafana/grafana/pull/38659), [@axelavargas](https://github.com/axelavargas)
+- **Dashboard:** Forces panel re-render when exiting panel edit. [#38913](https://github.com/grafana/grafana/pull/38913), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Dashboard:** Prevent folder from changing when navigating to general settings. [#38103](https://github.com/grafana/grafana/pull/38103), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Docker:** Force use of libcrypto1.1 and libssl1.1 versions to fix CVE-2021-3711. [#38585](https://github.com/grafana/grafana/pull/38585), [@dsotirakis](https://github.com/dsotirakis)
+- **Elasticsearch:** Fix metric names for alert queries. [#38546](https://github.com/grafana/grafana/pull/38546), [@dsotirakis](https://github.com/dsotirakis)
+- **Elasticsearch:** Limit Histogram field parameter to numeric values. [#38631](https://github.com/grafana/grafana/pull/38631), [@Elfo404](https://github.com/Elfo404)
+- **Elasticsearch:** Prevent pipeline aggregations to show up in terms order by options. [#38448](https://github.com/grafana/grafana/pull/38448), [@Elfo404](https://github.com/Elfo404)
+- **LibraryPanels:** Prevent duplicate repeated panels from being created. [#38804](https://github.com/grafana/grafana/pull/38804), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Loki:** Fix ad-hoc filter in dashboard when used with parser. [#38542](https://github.com/grafana/grafana/pull/38542), [@ivanahuckova](https://github.com/ivanahuckova)
+- **Plugins:** Track signed files + add warn log for plugin assets which are not signed. [#38938](https://github.com/grafana/grafana/pull/38938), [@wbrowne](https://github.com/wbrowne)
+- **Postgres/MySQL/MSSQL:** Fix region annotations not displayed correctly. [#38936](https://github.com/grafana/grafana/pull/38936), [@marefr](https://github.com/marefr)
+- **Prometheus:** Fix validate selector in metrics browser. [#38921](https://github.com/grafana/grafana/pull/38921), [@ivanahuckova](https://github.com/ivanahuckova)
+
+<!-- 8.1.3 END -->
+<!-- 8.1.2 START -->
+
+# 8.1.2 (2021-08-19)
+
+### Features and enhancements
+
+- **AzureMonitor:** Add support for PostgreSQL and MySQL Flexible Servers. [#38075](https://github.com/grafana/grafana/pull/38075), [@joshhunt](https://github.com/joshhunt)
+- **Datasource:** Change HTTP status code for failed datasource health check to 400. [#37895](https://github.com/grafana/grafana/pull/37895), [@stephaniehingtgen](https://github.com/stephaniehingtgen)
+- **Explore:** Add span duration to left panel in trace viewer. [#37806](https://github.com/grafana/grafana/pull/37806), [@connorlindsey](https://github.com/connorlindsey)
+- **Plugins:** Use file extension allowlist when serving plugin assets instead of checking for UNIX executable. [#37688](https://github.com/grafana/grafana/pull/37688), [@wbrowne](https://github.com/wbrowne)
+- **Profiling:** Add support for binding pprof server to custom network interfaces. [#36580](https://github.com/grafana/grafana/pull/36580), [@cinaglia](https://github.com/cinaglia)
+- **Search:** Make search icon keyboard navigable. [#37865](https://github.com/grafana/grafana/pull/37865), [@tskarhed](https://github.com/tskarhed)
+- **Template variables:** Keyboard navigation improvements. [#38001](https://github.com/grafana/grafana/pull/38001), [@tskarhed](https://github.com/tskarhed)
+- **Tooltip:** Display ms within minute time range. [#37569](https://github.com/grafana/grafana/pull/37569), [@nikki-kiga](https://github.com/nikki-kiga)
+
+### Bug fixes
+
+- **Alerting:** Fix saving LINE contact point. [#37744](https://github.com/grafana/grafana/pull/37744), [@xy-man](https://github.com/xy-man)
+- **Alerting:** Fix saving LINE contact point. [#37718](https://github.com/grafana/grafana/pull/37718), [@xy-man](https://github.com/xy-man)
+- **Annotations:** Fix alerting annotation coloring. [#37412](https://github.com/grafana/grafana/pull/37412), [@kylebrandt](https://github.com/kylebrandt)
+- **Annotations:** Alert annotations are now visible in the correct Panel. [#37959](https://github.com/grafana/grafana/pull/37959), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Auth:** Hide SigV4 config UI and disable middleware when its config flag is disabled. [#37293](https://github.com/grafana/grafana/pull/37293), [@wbrowne](https://github.com/wbrowne)
+- **Dashboard:** Prevent incorrect panel layout by comparing window width against theme breakpoints. [#37868](https://github.com/grafana/grafana/pull/37868), [@ashharrison90](https://github.com/ashharrison90)
+- **Elasticsearch:** Fix metric names for alert queries. [#37871](https://github.com/grafana/grafana/pull/37871), [@dsotirakis](https://github.com/dsotirakis)
+- **Explore:** Fix showing of full log context. [#37442](https://github.com/grafana/grafana/pull/37442), [@ivanahuckova](https://github.com/ivanahuckova)
+- **PanelEdit:** Fix 'Actual' size by passing the correct panel size to Das…. [#37885](https://github.com/grafana/grafana/pull/37885), [@ashharrison90](https://github.com/ashharrison90)
+- **Plugins:** Fix TLS datasource settings. [#37797](https://github.com/grafana/grafana/pull/37797), [@wbrowne](https://github.com/wbrowne)
+- **Variables:** Fix issue with empty drop downs on navigation. [#37776](https://github.com/grafana/grafana/pull/37776), [@hugohaggmark](https://github.com/hugohaggmark)
+- **Variables:** Fix URL util converting `false` into `true`. [#37402](https://github.com/grafana/grafana/pull/37402), [@simPod](https://github.com/simPod)
+
+### Plugin development fixes & changes
+
+- **Toolkit:** Fix matchMedia not found error. [#37643](https://github.com/grafana/grafana/pull/37643), [@zoltanbedi](https://github.com/zoltanbedi)
+
+<!-- 8.1.2 END -->
 <!-- 8.1.1 START -->
 
 # 8.1.1 (2021-08-09)
@@ -8,7 +166,6 @@
 - **Reporting:** Fix timezone parsing for scheduler (enterprise)
 
 <!-- 8.1.1 END -->
-
 <!-- 8.1.0 START -->
 
 # 8.1.0 (2021-08-05)
@@ -1309,7 +1466,7 @@ This option to group query variable values into groups by tags has been an exper
 - **CloudWatch**: Adding support for additional Amazon CloudFront metrics. [#28069](https://github.com/grafana/grafana/pull/28069), [@darrylsepeda](https://github.com/darrylsepeda)
 - **CloudWatch**: Re-implement authentication. [#25548](https://github.com/grafana/grafana/pull/25548), [@aknuds1](https://github.com/aknuds1),[@patstrom](https://github.com/patstrom)
 - **Dashboard**: Allow shortlink generation. [#27409](https://github.com/grafana/grafana/pull/27409), [@MisterSquishy](https://github.com/MisterSquishy)
-- **Docker**: OpenShift compatability. [#27813](https://github.com/grafana/grafana/pull/27813), [@xlson](https://github.com/xlson)
+- **Docker**: OpenShift compatibility. [#27813](https://github.com/grafana/grafana/pull/27813), [@xlson](https://github.com/xlson)
 - **Elasticsearch**: Support multiple pipeline aggregations for a query. [#27945](https://github.com/grafana/grafana/pull/27945), [@simianhacker](https://github.com/simianhacker)
 - **Explore**: Allow shortlink generation. [#28222](https://github.com/grafana/grafana/pull/28222), [@ivanahuckova](https://github.com/ivanahuckova)
 - **Explore**: Remove collapsing of visualisations. [#27026](https://github.com/grafana/grafana/pull/27026), [@ivanahuckova](https://github.com/ivanahuckova)
@@ -1812,7 +1969,7 @@ This option to group query variable values into groups by tags has been an exper
 - **Datasource/CloudWatch**: Makes CloudWatch Logs query history more readable. [#24795](https://github.com/grafana/grafana/pull/24795), [@kaydelaney](https://github.com/kaydelaney)
 - **Download CSV**: Add date and time formatting. [#24992](https://github.com/grafana/grafana/pull/24992), [@ryantxu](https://github.com/ryantxu)
 - **Table**: Make last cell value visible when right aligned. [#24921](https://github.com/grafana/grafana/pull/24921), [@peterholmberg](https://github.com/peterholmberg)
-- **TablePanel**: Adding sort order persistance. [#24705](https://github.com/grafana/grafana/pull/24705), [@torkelo](https://github.com/torkelo)
+- **TablePanel**: Adding sort order persistence. [#24705](https://github.com/grafana/grafana/pull/24705), [@torkelo](https://github.com/torkelo)
 - **Transformations**: Display correct field name when using reduce transformation. [#25068](https://github.com/grafana/grafana/pull/25068), [@peterholmberg](https://github.com/peterholmberg)
 - **Transformations**: Allow custom number input for binary operations. [#24752](https://github.com/grafana/grafana/pull/24752), [@ryantxu](https://github.com/ryantxu)
 

CONTRIBUTING.md

@@ -26,10 +26,12 @@ Report a bug by submitting a [bug report](https://github.com/grafana/grafana/iss
 Follow the issue template and add additional information that will help us replicate the problem.
 
 For data visualization issues:
+
 - Query results from the inspect drawer (data tab & query inspector)
 - Panel settings can be extracted in the panel inspect drawer JSON tab
 
 For a dashboard related issues:
+
 - Dashboard JSON can be found in the dashboard settings JSON model view
 
 For authentication and alerting Grafana server logs are useful.
@@ -40,7 +42,7 @@ If you believe you've found a security vulnerability, please read our [security
 
 ### Suggest enhancements
 
-If you have an idea of how to improve Grafana, submit an [enhancement request](https://github.com/grafana/grafana/issues/new?labels=type%3A+feature+request&template=2-feature_request.md).
+If you have an idea of how to improve Grafana, submit an [enhancement request](https://github.com/grafana/grafana/discussions/new).
 
 We want to make Grafana accessible to even more people. Submit an [accessibility issue](https://github.com/grafana/grafana/issues/new?labels=type%3A+accessibility&template=3-accessibility.md) to help us understand what we can improve.
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.16.0-alpine3.13 as js-builder
+FROM node:16-alpine3.14 as js-builder
 
 WORKDIR /usr/src/app/
 
@@ -17,7 +17,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.16.1-alpine3.13 as go-builder
+FROM golang:1.17.0-alpine3.14 as go-builder
 
 RUN apk add --no-cache gcc g++
 
@@ -25,6 +25,8 @@ WORKDIR $GOPATH/src/github.com/grafana/grafana
 
 COPY go.mod go.sum embed.go ./
 COPY cue cue
+COPY cue.mod cue.mod
+COPY packages/grafana-schema packages/grafana-schema
 COPY public/app/plugins public/app/plugins
 COPY pkg pkg
 COPY build.go package.json ./
@@ -33,7 +35,7 @@ RUN go mod verify
 RUN go run build.go build
 
 # Final stage
-FROM alpine:3.13
+FROM alpine:3.14.2
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 

Dockerfile.ubuntu

@@ -17,7 +17,7 @@ COPY emails emails
 ENV NODE_ENV production
 RUN yarn build
 
-FROM golang:1.16 AS go-builder
+FROM golang:1.17.0 AS go-builder
 
 WORKDIR /src/grafana
 
@@ -25,6 +25,8 @@ COPY go.mod go.sum embed.go ./
 COPY build.go package.json ./
 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/
 
 RUN go mod verify

Makefile

@@ -2,7 +2,10 @@
 ##
 ## For more information, refer to https://suva.sh/posts/well-documented-makefiles/
 
+WIRE_TAGS = "oss"
+
 -include local/Makefile
+include .bingo/Variables.mk
 
 .PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go golangci-lint test-go test-js test run run-frontend clean devenv devenv-down protobuf drone help
 
@@ -27,7 +30,11 @@ node_modules: package.json yarn.lock ## Install node modules.
 
 ##@ Building
 
-build-go: ## Build all Go binaries.
+gen-go: $(WIRE)
+	@echo "generate go files"
+	$(WIRE) gen -tags $(WIRE_TAGS) ./pkg/server
+
+build-go: gen-go ## Build all Go binaries.
 	@echo "build go files"
 	$(GO) run build.go build
 

build.go

@@ -3,476 +3,14 @@
 package main
 
 import (
-	"bytes"
-	"crypto/md5"
-	"crypto/sha256"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"go/build"
-	"io"
-	"io/ioutil"
 	"log"
 	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-)
 
-const (
-	windows = "windows"
-	linux   = "linux"
-)
-
-var (
-	//versionRe = regexp.MustCompile(`-[0-9]{1,3}-g[0-9a-f]{5,10}`)
-	goarch    string
-	goos      string
-	gocc      string
-	cgo       bool
-	libc      string
-	pkgArch   string
-	version   string = "v1"
-	buildTags []string
-	// deb & rpm does not support semver so have to handle their version a little differently
-	linuxPackageVersion   string = "v1"
-	linuxPackageIteration string = ""
-	race                  bool
-	workingDir            string
-	includeBuildId        bool     = true
-	buildId               string   = "0"
-	serverBinary          string   = "grafana-server"
-	cliBinary             string   = "grafana-cli"
-	binaries              []string = []string{serverBinary, cliBinary}
-	isDev                 bool     = false
-	enterprise            bool     = false
-	skipRpmGen            bool     = false
-	skipDebGen            bool     = false
-	printGenVersion       bool     = false
+	"github.com/grafana/grafana/pkg/build"
 )
 
 func main() {
 	log.SetOutput(os.Stdout)
 	log.SetFlags(0)
-
-	var buildIdRaw string
-	var buildTagsRaw string
-
-	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
-	flag.StringVar(&goos, "goos", runtime.GOOS, "GOOS")
-	flag.StringVar(&gocc, "cc", "", "CC")
-	flag.StringVar(&libc, "libc", "", "LIBC")
-	flag.StringVar(&buildTagsRaw, "build-tags", "", "Sets custom build tags")
-	flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
-	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
-	flag.BoolVar(&race, "race", race, "Use race detector")
-	flag.BoolVar(&includeBuildId, "includeBuildId", includeBuildId, "IncludeBuildId in package name")
-	flag.BoolVar(&enterprise, "enterprise", enterprise, "Build enterprise version of Grafana")
-	flag.StringVar(&buildIdRaw, "buildId", "0", "Build ID from CI system")
-	flag.BoolVar(&isDev, "dev", isDev, "optimal for development, skips certain steps")
-	flag.BoolVar(&skipRpmGen, "skipRpm", skipRpmGen, "skip rpm package generation (default: false)")
-	flag.BoolVar(&skipDebGen, "skipDeb", skipDebGen, "skip deb package generation (default: false)")
-	flag.BoolVar(&printGenVersion, "gen-version", printGenVersion, "generate Grafana version and output (default: false)")
-	flag.Parse()
-
-	buildId = shortenBuildId(buildIdRaw)
-
-	readVersionFromPackageJson()
-
-	if pkgArch == "" {
-		pkgArch = goarch
-	}
-
-	if printGenVersion {
-		printGeneratedVersion()
-		return
-	}
-
-	if len(buildTagsRaw) > 0 {
-		buildTags = strings.Split(buildTagsRaw, ",")
-	}
-
-	log.Printf("Version: %s, Linux Version: %s, Package Iteration: %s\n", version, linuxPackageVersion, linuxPackageIteration)
-
-	if flag.NArg() == 0 {
-		log.Println("Usage: go run build.go build")
-		return
-	}
-
-	workingDir, _ = os.Getwd()
-
-	for _, cmd := range flag.Args() {
-		switch cmd {
-		case "setup":
-			setup()
-
-		case "build-srv", "build-server":
-			clean()
-			doBuild("grafana-server", "./pkg/cmd/grafana-server", buildTags)
-
-		case "build-cli":
-			clean()
-			doBuild("grafana-cli", "./pkg/cmd/grafana-cli", buildTags)
-
-		case "build":
-			//clean()
-			for _, binary := range binaries {
-				doBuild(binary, "./pkg/cmd/"+binary, buildTags)
-			}
-
-		case "build-frontend":
-			yarn("build")
-
-		case "sha-dist":
-			shaFilesInDist()
-
-		case "latest":
-			makeLatestDistCopies()
-
-		case "clean":
-			clean()
-
-		default:
-			log.Fatalf("Unknown command %q", cmd)
-		}
-	}
-}
-
-func makeLatestDistCopies() {
-	files, err := ioutil.ReadDir("dist")
-	if err != nil {
-		log.Fatalf("failed to create latest copies. Cannot read from /dist")
-	}
-
-	latestMapping := map[string]string{
-		"_amd64.deb":               "dist/grafana_latest_amd64.deb",
-		".x86_64.rpm":              "dist/grafana-latest-1.x86_64.rpm",
-		".linux-amd64.tar.gz":      "dist/grafana-latest.linux-x64.tar.gz",
-		".linux-amd64-musl.tar.gz": "dist/grafana-latest.linux-x64-musl.tar.gz",
-		".linux-armv7.tar.gz":      "dist/grafana-latest.linux-armv7.tar.gz",
-		".linux-armv7-musl.tar.gz": "dist/grafana-latest.linux-armv7-musl.tar.gz",
-		".linux-armv6.tar.gz":      "dist/grafana-latest.linux-armv6.tar.gz",
-		".linux-arm64.tar.gz":      "dist/grafana-latest.linux-arm64.tar.gz",
-		".linux-arm64-musl.tar.gz": "dist/grafana-latest.linux-arm64-musl.tar.gz",
-	}
-
-	for _, file := range files {
-		for extension, fullName := range latestMapping {
-			if strings.HasSuffix(file.Name(), extension) {
-				runError("cp", path.Join("dist", file.Name()), fullName)
-			}
-		}
-	}
-}
-
-func readVersionFromPackageJson() {
-	reader, err := os.Open("package.json")
-	if err != nil {
-		log.Fatal("Failed to open package.json")
-		return
-	}
-	defer reader.Close()
-
-	jsonObj := map[string]interface{}{}
-	jsonParser := json.NewDecoder(reader)
-
-	if err := jsonParser.Decode(&jsonObj); err != nil {
-		log.Fatal("Failed to decode package.json")
-	}
-
-	version = jsonObj["version"].(string)
-	linuxPackageVersion = version
-	linuxPackageIteration = ""
-
-	// handle pre version stuff (deb / rpm does not support semver)
-	parts := strings.Split(version, "-")
-
-	if len(parts) > 1 {
-		linuxPackageVersion = parts[0]
-		linuxPackageIteration = parts[1]
-	}
-
-	// add timestamp to iteration
-	if includeBuildId {
-		if buildId != "0" {
-			linuxPackageIteration = fmt.Sprintf("%s%s", buildId, linuxPackageIteration)
-		} else {
-			linuxPackageIteration = fmt.Sprintf("%d%s", time.Now().Unix(), linuxPackageIteration)
-		}
-	}
-}
-
-func yarn(params ...string) {
-	runPrint(`yarn run`, params...)
-}
-
-func genPackageVersion() string {
-	if includeBuildId {
-		return fmt.Sprintf("%v-%v", linuxPackageVersion, linuxPackageIteration)
-	} else {
-		return version
-	}
-}
-
-func setup() {
-	args := []string{"install", "-v"}
-	if goos == windows {
-		args = append(args, "-buildmode=exe")
-	}
-	args = append(args, "./pkg/cmd/grafana-server")
-	runPrint("go", args...)
-}
-
-func printGeneratedVersion() {
-	fmt.Print(genPackageVersion())
-}
-
-func test(pkg string) {
-	setBuildEnv()
-	args := []string{"test", "-short", "-timeout", "60s"}
-	if goos == windows {
-		args = append(args, "-buildmode=exe")
-	}
-	args = append(args, pkg)
-	runPrint("go", args...)
-}
-
-func doBuild(binaryName, pkg string, tags []string) {
-	libcPart := ""
-	if libc != "" {
-		libcPart = fmt.Sprintf("-%s", libc)
-	}
-	binary := fmt.Sprintf("./bin/%s-%s%s/%s", goos, goarch, libcPart, binaryName)
-	if isDev {
-		//don't include os/arch/libc in output path in dev environment
-		binary = fmt.Sprintf("./bin/%s", binaryName)
-	}
-
-	if goos == windows {
-		binary += ".exe"
-	}
-
-	if !isDev {
-		rmr(binary, binary+".md5")
-	}
-	args := []string{"build", "-ldflags", ldflags()}
-	if goos == windows {
-		// Work around a linking error on Windows: "export ordinal too large"
-		args = append(args, "-buildmode=exe")
-	}
-	if len(tags) > 0 {
-		args = append(args, "-tags", strings.Join(tags, ","))
-	}
-	if race {
-		args = append(args, "-race")
-	}
-
-	args = append(args, "-o", binary)
-	args = append(args, pkg)
-
-	if !isDev {
-		setBuildEnv()
-		runPrint("go", "version")
-		libcPart := ""
-		if libc != "" {
-			libcPart = fmt.Sprintf("/%s", libc)
-		}
-		fmt.Printf("Targeting %s/%s%s\n", goos, goarch, libcPart)
-	}
-
-	runPrint("go", args...)
-
-	if !isDev {
-		// Create an md5 checksum of the binary, to be included in the archive for
-		// automatic upgrades.
-		err := md5File(binary)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func ldflags() string {
-	var b bytes.Buffer
-	b.WriteString("-w")
-	b.WriteString(fmt.Sprintf(" -X main.version=%s", version))
-	b.WriteString(fmt.Sprintf(" -X main.commit=%s", getGitSha()))
-	b.WriteString(fmt.Sprintf(" -X main.buildstamp=%d", buildStamp()))
-	b.WriteString(fmt.Sprintf(" -X main.buildBranch=%s", getGitBranch()))
-	if v := os.Getenv("LDFLAGS"); v != "" {
-		b.WriteString(fmt.Sprintf(" -extldflags \"%s\"", v))
-	}
-	return b.String()
-}
-
-func rmr(paths ...string) {
-	for _, path := range paths {
-		log.Println("rm -r", path)
-		os.RemoveAll(path)
-	}
-}
-
-func clean() {
-	if isDev {
-		return
-	}
-
-	rmr("dist")
-	rmr("tmp")
-	rmr(filepath.Join(build.Default.GOPATH, fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch)))
-}
-
-func setBuildEnv() {
-	os.Setenv("GOOS", goos)
-	if goos == windows {
-		// require windows >=7
-		os.Setenv("CGO_CFLAGS", "-D_WIN32_WINNT=0x0601")
-	}
-	if goarch != "amd64" || goos != linux {
-		// needed for all other archs
-		cgo = true
-	}
-	if strings.HasPrefix(goarch, "armv") {
-		os.Setenv("GOARCH", "arm")
-		os.Setenv("GOARM", goarch[4:])
-	} else {
-		os.Setenv("GOARCH", goarch)
-	}
-	if cgo {
-		os.Setenv("CGO_ENABLED", "1")
-	}
-	if gocc != "" {
-		os.Setenv("CC", gocc)
-	}
-}
-
-func getGitBranch() string {
-	v, err := runError("git", "rev-parse", "--abbrev-ref", "HEAD")
-	if err != nil {
-		return "main"
-	}
-	return string(v)
-}
-
-func getGitSha() string {
-	v, err := runError("git", "rev-parse", "--short", "HEAD")
-	if err != nil {
-		return "unknown-dev"
-	}
-	return string(v)
-}
-
-func buildStamp() int64 {
-	// use SOURCE_DATE_EPOCH if set.
-	if s, _ := strconv.ParseInt(os.Getenv("SOURCE_DATE_EPOCH"), 10, 64); s > 0 {
-		return s
-	}
-
-	bs, err := runError("git", "show", "-s", "--format=%ct")
-	if err != nil {
-		return time.Now().Unix()
-	}
-	s, _ := strconv.ParseInt(string(bs), 10, 64)
-	return s
-}
-
-func runError(cmd string, args ...string) ([]byte, error) {
-	ecmd := exec.Command(cmd, args...)
-	bs, err := ecmd.CombinedOutput()
-	if err != nil {
-		return nil, err
-	}
-
-	return bytes.TrimSpace(bs), nil
-}
-
-func runPrint(cmd string, args ...string) {
-	log.Println(cmd, strings.Join(args, " "))
-	ecmd := exec.Command(cmd, args...)
-	ecmd.Stdout = os.Stdout
-	ecmd.Stderr = os.Stderr
-	err := ecmd.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func md5File(file string) error {
-	fd, err := os.Open(file)
-	if err != nil {
-		return err
-	}
-	defer fd.Close()
-
-	h := md5.New()
-	_, err = io.Copy(h, fd)
-	if err != nil {
-		return err
-	}
-
-	out, err := os.Create(file + ".md5")
-	if err != nil {
-		return err
-	}
-
-	_, err = fmt.Fprintf(out, "%x\n", h.Sum(nil))
-	if err != nil {
-		return err
-	}
-
-	return out.Close()
-}
-
-func shaFilesInDist() {
-	filepath.Walk("./dist", func(path string, f os.FileInfo, err error) error {
-		if path == "./dist" {
-			return nil
-		}
-
-		if !strings.Contains(path, ".sha256") {
-			err := shaFile(path)
-			if err != nil {
-				log.Printf("Failed to create sha file. error: %v\n", err)
-			}
-		}
-		return nil
-	})
-}
-
-func shaFile(file string) error {
-	fd, err := os.Open(file)
-	if err != nil {
-		return err
-	}
-	defer fd.Close()
-
-	h := sha256.New()
-	_, err = io.Copy(h, fd)
-	if err != nil {
-		return err
-	}
-
-	out, err := os.Create(file + ".sha256")
-	if err != nil {
-		return err
-	}
-
-	_, err = fmt.Fprintf(out, "%x\n", h.Sum(nil))
-	if err != nil {
-		return err
-	}
-
-	return out.Close()
-}
-
-func shortenBuildId(buildId string) string {
-	buildId = strings.Replace(buildId, "-", "", -1)
-	if len(buildId) < 9 {
-		return buildId
-	}
-	return buildId[0:8]
+	os.Exit(build.RunCmd())
 }

conf/defaults.ini

@@ -172,6 +172,12 @@ idle_conn_timeout_seconds = 90
 # If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request.
 send_user_header = false
 
+# Limit the amount of bytes that will be read/accepted from responses of outgoing HTTP requests.
+response_limit = 0
+
+# Limits the number of rows that Grafana will process from SQL data sources.
+row_limit = 1000000
+
 #################################### Analytics ###########################
 [analytics]
 # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -202,6 +208,12 @@ rudderstack_write_key =
 # Rudderstack data plane url, enabled only if rudderstack_write_key is also set
 rudderstack_data_plane_url =
 
+# Application Insights connection string. Specify an URL string to enable this feature.
+application_insights_connection_string =
+
+# Optional. Specifies an Application Insights endpoint URL where the endpoint string is wrapped in backticks ``.
+application_insights_endpoint_url =
+
 #################################### Security ############################
 [security]
 # disable creation of admin user on first start of grafana
@@ -498,9 +510,11 @@ role_attribute_path =
 role_attribute_strict = false
 groups_attribute_path =
 id_token_attribute_name =
+team_ids_attribute_path =
 auth_url =
 token_url =
 api_url =
+teams_url =
 allowed_domains =
 team_ids =
 allowed_organizations =
@@ -715,11 +729,67 @@ global_session = -1
 # global limit of alerts
 global_alert_rule = -1
 
+#################################### Unified Alerting ####################
+[unified_alerting]
+# Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.
+enabled = false
+
+# Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
+disabled_orgs = 
+
+# Specify the frequency of polling for admin config changes.
+# 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.
+admin_config_poll_interval = 60s
+
+# Specify the frequency of polling for Alertmanager config changes.
+# 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.
+alertmanager_config_poll_interval = 60s
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port.
+ha_listen_address = "0.0.0.0:9094"
+
+# Explicit address/hostname and port to advertise other Grafana instances. The port is used for both TCP and UDP.
+ha_advertise_address = ""
+
+# Comma-separated list of initial instances (in a format of host:port) that will form the HA cluster. Configuring this setting will enable High Availability mode for alerting.
+ha_peers = ""
+
+# Time to wait for an instance to send a notification via the Alertmanager. In HA, each Grafana instance will
+# be assigned a position (e.g. 0, 1). We then multiply this position with the timeout to indicate how long should
+# each instance wait before sending the notification to take into account replication lag.
+# 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.
+ha_peer_timeout = 15s
+
+# The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
+# across cluster more quickly at the expense of increased bandwidth usage.
+# 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.
+ha_gossip_interval = 200ms
+
+# The interval between gossip full state syncs. Setting this interval lower (more frequent) will increase convergence speeds
+# across larger clusters at the expense of increased bandwidth usage.
+# 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.
+ha_push_pull_interval = 60s
+
+# Enable or disable alerting rule execution. The alerting UI remains visible. This option has a legacy version in the `[alerting]` section that takes precedence.
+execute_alerts = true
+
+# Alert evaluation timeout when fetching data from the datasource. This option has a legacy version in the `[alerting]` section that takes precedence.
+# The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+evaluation_timeout = 30s
+
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+max_attempts = 3
+
+# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
+# 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
+
 #################################### Alerting ############################
 [alerting]
-# Disable alerting engine & UI features
+# Disable legacy alerting engine & UI features
 enabled = true
-# Makes it possible to turn off alert rule execution but alerting UI is visible
+
+# Makes it possible to turn off alert execution but alerting UI is visible
 execute_alerts = true
 
 # Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
@@ -895,7 +965,7 @@ app_tls_skip_verify_insecure = false
 # Enter a comma-separated list of plugin identifiers to identify plugins to load even if they are unsigned. Plugins with modified signatures are never loaded.
 allow_loading_unsigned_plugins =
 # Enable or disable installing plugins directly from within Grafana.
-plugin_admin_enabled = false
+plugin_admin_enabled = true
 plugin_admin_external_manage_enabled = false
 plugin_catalog_url = https://grafana.com/grafana/plugins/
 

conf/sample.ini

@@ -178,6 +178,12 @@
 # If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
 ;send_user_header = false
 
+# Limit the amount of bytes that will be read/accepted from responses of outgoing HTTP requests.
+;response_limit = 0
+
+# Limits the number of rows that Grafana will process from SQL data sources.
+;row_limit = 1000000
+
 #################################### Analytics ####################################
 [analytics]
 # Server reporting, sends usage counters to stats.grafana.org every 24 hours.
@@ -483,12 +489,14 @@
 ;auth_url = https://foo.bar/login/oauth/authorize
 ;token_url = https://foo.bar/login/oauth/access_token
 ;api_url = https://foo.bar/user
+;teams_url =
 ;allowed_domains =
 ;team_ids =
 ;allowed_organizations =
 ;role_attribute_path =
 ;role_attribute_strict = false
 ;groups_attribute_path =
+;team_ids_attribute_path =
 ;tls_skip_verify_insecure = false
 ;tls_client_cert =
 ;tls_client_key =
@@ -698,11 +706,67 @@
 # global limit of alerts
 ;global_alert_rule = -1
 
+#################################### Unified Alerting ####################
+[unified_alerting]
+#Enable the Unified Alerting sub-system and interface. When enabled we'll migrate all of your alert rules and notification channels to the new system. New alert rules will be created and your notification channels will be converted into an Alertmanager configuration. Previous data is preserved to enable backwards compatibility but new data is removed.```
+;enabled = false
+
+# Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
+;disabled_orgs = 
+
+# Specify the frequency of polling for admin config changes.
+# 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.
+;admin_config_poll_interval = 60s
+
+# Specify the frequency of polling for Alertmanager config changes.
+# 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.
+;alertmanager_config_poll_interval = 60s
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+;ha_listen_address = "0.0.0.0:9094"
+
+# Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+;ha_advertise_address = ""
+
+# Comma-separated list of initial instances (in a format of host:port) that will form the HA cluster. Configuring this setting will enable High Availability mode for alerting.
+;ha_peers = ""
+
+# Time to wait for an instance to send a notification via the Alertmanager. In HA, each Grafana instance will
+# be assigned a position (e.g. 0, 1). We then multiply this position with the timeout to indicate how long should
+# each instance wait before sending the notification to take into account replication lag.
+# 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.
+;ha_peer_timeout = "15s"
+
+# The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
+# across cluster more quickly at the expense of increased bandwidth usage.
+# 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.
+;ha_gossip_interval = "200ms"
+
+# The interval between gossip full state syncs. Setting this interval lower (more frequent) will increase convergence speeds
+# across larger clusters at the expense of increased bandwidth usage.
+# 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.
+;ha_push_pull_interval = "60s"
+
+# Enable or disable alerting rule execution. The alerting UI remains visible. This option has a legacy version in the `[alerting]` section that takes precedence.
+;execute_alerts = true
+
+# Alert evaluation timeout when fetching data from the datasource. This option has a legacy version in the `[alerting]` section that takes precedence.
+# The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+;evaluation_timeout = 30s
+
+# Number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. This option has a legacy version in the `[alerting]` section that takes precedence.
+;max_attempts = 3
+
+# Minimum interval to enforce between rule evaluations. Rules will be adjusted if they are less than this value  or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has a legacy version in the `[alerting]` section that takes precedence.
+# 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
+
 #################################### Alerting ############################
 [alerting]
-# Disable alerting engine & UI features
+# Disable legacy alerting engine & UI features
 ;enabled = true
-# Makes it possible to turn off alert rule execution but alerting UI is visible
+
+# Makes it possible to turn off alert execution but alerting UI is visible
 ;execute_alerts = true
 
 # Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
@@ -715,7 +779,6 @@
 # This limit will protect the server from render overloading and make sure notifications are sent out quickly
 ;concurrent_render_limit = 5
 
-
 # Default setting for alert calculation timeout. Default value is 30
 ;evaluation_timeout_seconds = 30
 

contribute/README.md

@@ -6,6 +6,7 @@ This directory contains guides for contributors to the Grafana project.
 - [Contributing documentation](documentation.md)
 - [Developer guide](developer-guide.md)
 - [Triage issues](triage-issues.md)
+- [Merge a pull request](merge-pull-request.md)
 
 The `style-guides` directory contains style guides for the Grafana software project and documentation.
 

contribute/architecture/backend/services.md

@@ -2,71 +2,136 @@
 
 A Grafana _service_ encapsulates and exposes application logic to the rest of the application, through a set of related operations.
 
-Before a service can start communicating with the rest of Grafana, it needs to be registered in the _service registry_.
-
-The service registry keeps track of all available services during runtime. On start-up, Grafana uses the registry to build a dependency graph of services, a _service graph_.
+Grafana uses [Wire](https://github.com/google/wire), which is a code generation tool that automates connecting components using [dependency injection](https://en.wikipedia.org/wiki/Dependency_injection). Dependencies between components are represented in Wire as function parameters, encouraging explicit initialization instead of global variables.
 
 Even though the services in Grafana do different things, they share a number of patterns. To better understand how a service works, let's build one from scratch!
 
-## Create a service
+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.
 
-To start building a service:
+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.
 
-- Create a new Go package `mysvc` in the [pkg/services](/pkg/services) directory.
-- Create a `service.go` file inside your new directory.
-
-All services need to implement the [Service](https://godoc.org/github.com/grafana/grafana/pkg/registry#Service) interface:
+**Service example:**
 
 ```go
-type MyService struct {
+package example
+
+// Service service is the service responsible for X, Y and Z.
+type Service struct {
+    logger   log.Logger
+    cfg      *setting.Cfg
+    sqlStore *sqlstore.SQLStore
 }
 
-func (s *MyService) Init() error {
+// ProvideService provides Service as dependency for other services.
+func ProvideService(cfg *setting.Cfg, sqlStore *sqlstore.SQLStore) (*Service, error) {
+    s := &Service{
+        logger:     log.New("service"),
+        cfg:        cfg,
+        sqlStore:   sqlStore,
+    }
+
+    if s.IsDisabled() {
+        // skip certain initialization logic
+        return s, nil
+    }
+
+    if err := s.init(); err != nil {
+        return nil, err
+    }
+
+    return s, nil
+}
+
+func (s *Service) init() error {
+    // additional initialization logic...
     return nil
 }
-```
 
-The `Init` method is used to initialize and configure the service to make it ready to use. Services that return an error halt Grafana's startup process and cause the error to be logged as it exits.
+// IsDisabled returns true if the service is disabled.
+//
+// Satisfies the registry.CanBeDisabled interface which will guarantee
+// that Run() is not called if the service is disabled.
+func (s *Service) IsDisabled() bool {
+	return !s.cfg.IsServiceEnabled()
+}
 
-## Register a service
-
-Every service needs to be registered with the application for it to be included in the service graph.
-
-To register a service, call the `registry.RegisterService` function in an `init` function within your package.
-
-```go
-func init() {
-    registry.RegisterService(&MyService{})
+// Run runs the service in the background.
+//
+// Satisfies the registry.BackgroundService interface which will
+// guarantee that the service can be registered as a background service.
+func (s *Service) Run(ctx context.Context) error {
+    // background service logic...
+    <-ctx.Done()
+    return ctx.Err()
 }
 ```
 
-`init` functions are only run whenever a package is imported, so we also need to import the package in the application. In the `server.go` file under `pkg/server`, import the package we just created:
+[wire.go](/pkg/server/wire.go)
 
 ```go
-import _ "github.com/grafana/grafana/pkg/services/mysvc"
-```
+// +build wireinject
 
-## Dependencies
+package server
 
-Grafana uses the [inject](https://github.com/facebookgo/inject) package to inject dependencies during runtime.
+import (
+	"github.com/google/wire"
+	"github.com/grafana/grafana/pkg/example"
+    "github.com/grafana/grafana/pkg/services/sqlstore"
+)
 
-For example, to access the [bus](communication.md), add it to the `MyService` struct:
+var wireBasicSet = wire.NewSet(
+	example.ProvideService,
 
-```go
-type MyService struct {
-    Bus bus.Bus `inject:""`
+)
+
+var wireSet = wire.NewSet(
+	wireBasicSet,
+	sqlstore.ProvideService,
+)
+
+var wireTestSet = wire.NewSet(
+	wireBasicSet,
+)
+
+func Initialize(cla setting.CommandLineArgs, opts Options, apiOpts api.ServerOptions) (*Server, error) {
+	wire.Build(wireExtsSet)
+	return &Server{}, nil
 }
-```
 
-You can also inject other services in the same way:
-
-```go
-type MyService struct {
-    Service other.Service `inject:""`
+func InitializeForTest(cla setting.CommandLineArgs, opts Options, apiOpts api.ServerOptions, sqlStore *sqlstore.SQLStore) (*Server, error) {
+	wire.Build(wireExtsTestSet)
+	return &Server{}, nil
 }
+
 ```
 
-> **Note:** Any injected dependency needs to be an exported field. Any unexported fields result in a runtime error.
+## Background services
+
+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 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 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 service is disabled.
+
+## Run Wire / generate code
+
+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). 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 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 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/create-pull-request.md

@@ -55,6 +55,17 @@ 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.
 
+Pull requests that introduce accessibility(a11y) errors:
+
+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.
+
+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:
+
+- 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 Grafana instance needs to be running on `http://localhost:3000`.
+
+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
 
 Please refer to the [backend style guidelines](/contribute/style-guides/backend.md).
@@ -102,6 +113,8 @@ For changes to panels, the area should be the name of the panel, suffixed with P
 - `GraphPanel: Fix legend sorting issues`
 - `Docs: Changed url to URL in all documentation files`
 
+If you're unsure, please have a look at the existing [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) for inspiration/guidance.
+
 ### Pull request titles
 
 The Grafana team _squashes_ all commits into one when we accept a pull request. The title of the pull request becomes the subject line of the squashed commit message. We still encourage contributors to write informative commit messages, as they becomes a part of the Git commit body.

contribute/merge-pull-request.md

@@ -0,0 +1,118 @@
+# Merge a pull request
+
+When a pull request has been reviewed and approved by at least one person and all checks have passed it's time to merge the pull request.
+
+## Who is expected to merge a pull request?
+
+Maintainers are responsible for merging all pull requests. If a maintainer has opened a pull request the general rule is that the same maintainer merges the pull request. If a non-maintainer has opened a pull request it's suggested that one of the maintainers reviewing the pull request merges the pull request.
+
+## Checklist/summary
+
+The following checklist/summary should give you a quick overview of what to ask/consider before merging a pull request.
+
+- Reviewed and approved?
+- All checks passed?
+- Proper pull request title?
+- Milestone assigned?
+- Add to changelog/release notes?
+- Needs backporting?
+
+## Before merge
+
+Before actually merging a pull request there's a couple of things to take into consideration.
+
+### Format the pull request title
+
+Make sure that the pull request title is properly formatted according to `<Area>: <Summary>` and try to make the summary short and understandable for the community as a whole.
+
+All commits in a pull request are squashed when merged and the pull request title will be the default subject line of the squashed commit message. It's also used for [changelog/release notes](#include-in-changelog-and-release-notes).
+
+See [formatting guidelines](create-pull-request.md#formatting-guidelines) for more information.
+
+### Assign a milestone
+
+It's recommended to add a milestone to every pull request. This makes it easier to track what changes did go into a certain release. Without this you're basically left with going through git commits which could be a lot harder.
+
+There's also various tooling built that in some cases requires a pull request to be assigned a milestone, for example [generating changelog/release notes](#include-in-changelog-and-release-notes).
+
+### Include in changelog and release notes?
+
+At Grafana we generate the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md) and [release notes](https://grafana.com/docs/grafana/latest/release-notes/) based on merged pull requests. Including changes in the changelog/release notes is very important to provide a somewhat complete picture of what changes a Grafana release actually includes.
+
+Exactly what changes should be added to the changelog is hard to answer but some general guidance would be any change that you think would be interesting for the community as a whole. Use your best judgement and/or ask other maintainers for advice.
+
+There's a GitHub action available in the repository named [Update changelog](https://github.com/grafana/grafana/blob/main/.github/workflows/update-changelog.yml) that can manually be triggered to re-generate the changelog and release notes for any release.
+
+To include a pull request in the changelog/release notes the general rule of thumb is that a milestone should be assigned and labeled with `add to changelog`.
+
+The changelog/release notes are divided into sections and here's a description of how you make a pull request show up in a certain section.
+
+**Features and enhancements:**
+
+Milestone assigned and labeled with `add to changelog` and any of the other section rules don't apply.
+
+**Bug fixes:**
+
+Milestone assigned and labeled with `add to changelog` and either labeled with `type/bug` or the pull request title contains `fix` or `fixes`.
+
+**Plugin development fixes & changes:**
+
+Milestone assigned and labeled with `area/grafana/toolkit`, `area/grafana/ui` or `area/grafana/runtime`.
+
+**Deprecations:**
+
+In case the pull request introduces a deprecation you should document this. Label the pull request with `add to changelog` and use the following template at the end of the pull request description describing the deprecation change.
+
+```md
+# Deprecation notice
+
+<Deprecation description>
+```
+
+**Breaking changes:**
+
+In case the pull request introduces a breaking change you should document this. Label the pull request with `add to changelog` and `breaking change` and use the following template at the end of the pull request description describing the breaking change.
+
+```md
+# Release notice breaking change
+
+<Breaking change description>
+```
+
+### Should the pull request be backported?
+
+If your pull request has changes that need to go into one or several existing release branches you need to backport the changes. Please refer to [Backport PR](.github/bot.md#backport-pr) for detailed instructions.
+
+Some examples when backport is required:
+
+- The change needs to be released in the next upcoming patch release, e.g. v8.1.3, so you have to backport it, e.g. into the v8.1.x release branch.
+- You have a change to be released in the next major/minor release, e.g. v8.0.0, and there's already a release branch, e.g. v8.0.x, you have to backport it, e.g. into the v8.0.x release branch.
+- The change includes documentation changes that needs to be updated for one or multiple older versions, then you have to backport it to each release branch.
+
+Some examples when backport is not required:
+
+- The change is supposed to be released in the next major/minor release, e.g. v8.0.0, but the release branch, e.g. v8.0.x, has not yet been created.
+
+> **Note:** You can still backport a pull request after it's been merged.
+
+## Doing the actual merge
+
+Time to actually merge the pull request changes. All commits in a pull request are squashed, hence the GitHub `Squash and merge` button is used to initialize the merge.
+
+This will present you with options allowing you to optionally change the commit message before merging. Please remember that developers might use the commit information when reviewing changes of files, doing git blame and resolving merge conflicts etc., trying to quickly figure out what the actual change was. But there's not really any best practices around this, the following is an attempt to bring some guidance.
+
+Do:
+
+- Make sure the pull request title is formatted properly before merging, this will automatically give you a good and short summary of the commit/change.
+- Leave `Co-authored-by:` lines as is so that co-authors will be accounted for the contribution.
+- Remove any commit information that doesn't bring any context to the change.
+
+Consider:
+
+- Add any references to issues that the pull request fixes/closes/references to ease giving quick context to things. Doing this allows cross-reference between the commit and referenced issue(s).
+
+Finalize the merge by clicking on the `Confirm squash and merge` button.
+
+## After the merge
+
+Make sure to close any referenced/related issues. It's recommended to assign the same milestone on the issues that the pull request fixes/closes, but not required.

contribute/style-guides/documentation-style-guide.md

@@ -4,13 +4,13 @@ This style guide applies to all documentation created for Grafana products.
 
 For information about how to write technical documentation, refer to the following resources:
 
-* [Google Technical Writing courses](https://developers.google.com/tech-writing)
-* [Divio documentation system](https://documentation.divio.com/)
-* [Vue writing principles](https://v3.vuejs.org/guide/contributing/writing-guide.html#principles)
+- [Google Technical Writing courses](https://developers.google.com/tech-writing)
+- [Divio documentation system](https://documentation.divio.com/)
+- [Vue writing principles](https://v3.vuejs.org/guide/contributing/writing-guide.html#principles)
 
 ## Contributing
 
-The *Documentation style guide* is a living document. Add to it whenever a style decision is made or a question is answered regarding style, grammar, or word choice.
+The _Documentation style guide_ is a living document. Add to it whenever a style decision is made or a question is answered regarding style, grammar, or word choice.
 
 ## Published guides
 
@@ -46,10 +46,14 @@ Avoid _master_ or _slave_.
 
 ## Grafana-specific style
 
-The following guidelines are specific to Grafana documentation. For the most part, these are *guidelines* are not rigid rules. If you have questions, then please ask in the #docs channel of Grafana Slack.
+The following guidelines are specific to Grafana documentation. For the most part, these are _guidelines_ are not rigid rules. If you have questions, then please ask in the #docs channel of Grafana Slack.
 
 ### General
 
+Per the [Voice and tone](https://developers.google.com/style/tone) section of the Google developer documentation style guide:
+
+> In your documents, aim for a voice and tone that's conversational, friendly, and respectful without being overly colloquial or frivolous; a voice that's casual and natural and approachable, not pedantic or pushy. Try to sound like a knowledgeable friend who understands what the developer wants to do.
+
 - Use active voice:
   - Active: Grafana displays the heatmap visualization.
   - Passive: The heatmap visualization is displayed.
@@ -104,6 +108,7 @@ However, sometimes we need to use headings as numbered steps. This is mostly in
 If that is the case, then use the following format for headings:
 
 ##### Step 1. Install the software
+
 ##### Step 2. Run the software
 
 ### Images
@@ -149,6 +154,7 @@ In general, "integration" is not capitalized. Only capitalize it if it is capita
 The first letter of the name of an integration is always capitalized, even if the original named source is lowercase.
 
 **Examples:**
+
 - MySQL Integration
 - CockroachDB Integration
 - Etcd Integration
@@ -212,16 +218,20 @@ Warnings tell the user not to do something. For example:
 - Do not assume everyone is using Linux. Make sure instructions include enough information for Windows and Mac users to successfully complete procedures.
 
 - Do not add `$` before commands. Make it easy for users to copy and paste commands.
+
   - **Right:** `sudo yum install grafana`
   - **Wrong:** `$ sudo yum install grafana`
 
 - Include `sudo` before commands that require `sudo` to work.
 
 For terminal examples and Grafana configuration, use a `bash` code block:
+
 ```bash
 sudo yum install grafana
 ```
+
 For HTTP request/response, use an `http` code block:
+
 ```http
 GET /api/dashboards/id/1/permissions HTTP/1.1
 Accept: application/json
@@ -259,6 +269,7 @@ Two words if used as a verb, one word if used as a noun.
 Two words, not one.
 
 **Exceptions:**
+
 - "datasource" used as an identifier
 - "datasource" in a URL
 - Use "data source" instead of "datasource" unless used as an identifier, in code, or as part of a URL.
@@ -267,7 +278,8 @@ Two words, not one.
 
 #### display (verb)
 
-*Display* is a transitive verb, which means it always needs a direct object.
+_Display_ is a transitive verb, which means it always needs a direct object.
+
 - Correct, active voice: Grafana displays your list of active alarms.
 - Correct, but passive voice: Your list of active alarms is displayed.
 - Incorrect: The list of active alarms displays.
@@ -327,6 +339,7 @@ Two words, not one.
 **Incorrect:** webserver
 
 ### MS SQL Server
+
 Always use "MS SQL" when referring to MS SQL Server application.
 
 Incorrect UI spellings will be corrected in a later version of Grafana.

contribute/style-guides/e2e.md

@@ -23,20 +23,13 @@ Inspired by https://martinfowler.com/bliki/PageObject.html
 Let's start with a simple [JSX](https://reactjs.org/docs/introducing-jsx.html) example containing a single input field that we want to populate during our E2E test:
 
 ```jsx
-<input
-  className="gf-form-input login-form-input"
-  type="text"
-/>
+<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 `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
-  aria-label="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:
@@ -45,7 +38,6 @@ The next step is to create a `Page` representation in our E2E framework to glue
 export const Login = {
   // Called via `Login.visit()`
   url: '/login',
-  
   // Called via `Login.username()`
   username: 'Username input field',
 };
@@ -67,11 +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
-  aria-label={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.
@@ -86,9 +74,7 @@ describe('Login test', () => {
     e2e.pages.Login.visit();
     // To prevent flaky tests, always do a `.should` on any selector that you expect to be in the DOM.
     // Read more here: https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions
-    e2e.pages.Login.username()
-      .should('be.visible')
-      .type('admin');
+    e2e.pages.Login.username().should('be.visible').type('admin');
   });
 });
 ```
@@ -154,25 +140,28 @@ describe('List test', () => {
     e2e.pages.DataSources.visit();
     // To prevent flaky tests, always do a .should on any selector that you expect to be in the DOM.
     // Read more here: https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions
-    e2e.pages.DataSources.dataSources('B')
-      .should('be.visible')
-      .click();
+    e2e.pages.DataSources.dataSources('B').should('be.visible').click();
   });
 });
 ```
 
 ## Aria-Labels vs data-testid
-Our selectors are set up to work with both aria-labels and data-testid attributes. Aria-labels help assistive technologies such as screenreaders identify interactive elements of a page for our users. 
+
+Our selectors are set up to work with both aria-labels and data-testid attributes. Aria-labels help assistive technologies such as screenreaders identify interactive elements of a page for our users.
 
 A good example of a time to use an aria-label might be if you have a button with an X to close:
+
 ```
 <button aria-label="close">X<button>
 ```
+
 It might be clear visually that the X closes the modal, but audibly it would not be clear for example.
+
 ```
 <button aria-label="close">Close<button>
 ```
-The above example for example might read aloud to a user "Close, Close" or something similar. 
+
+The example might read aloud to a user as "Close, Close" or something similar.
 
 However adding aria-labels to elements that are already clearly labeled or not interactive can be confusing and redundant for users with assistive technologies.
 
@@ -185,16 +174,18 @@ In such cases rather than adding unnecessary aria-labels to components so as to
 We have added support for this in our selectors, to use:
 
 Prefix your selector string with "data-testid":
+
 ```typescript
 export const Components = {
   Login: {
-    openButton: "data-testid-open", // this would look for a data-testid
-    closeButton: "close-button" // this would look for an aria-label
+    openButton: 'open-button', // this would look for an aria-label
+    closeButton: 'data-testid modal-close-button', // this would look for a data-testid
   },
 };
 ```
 
 and in your component, import the selectors and add the data test id:
+
+```
+<button data-testid={Selectors.Components.Login.closeButton}>
 ```
-<button data-testid={Selectors.Components.Login.openButton}>
-```

contribute/style-guides/frontend.md

@@ -5,6 +5,7 @@ Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/jav
 ## Table of Contents
 
 - [Frontend Style Guide](#frontend-style-guide)
+
   - [Table of Contents](#table-of-contents)
   - [Basic rules](#basic-rules)
     - [Naming conventions](#naming-conventions)
@@ -28,12 +29,12 @@ Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/jav
     - [Linting](#linting)
   - [React](#react)
     - [Props](#props)
-        - [Name callback props and handlers with an "on" prefix.](#name-callback-props-and-handlers-with-an-on-prefix)
-        - [React Component definitions](#react-component-definitions)
-        - [React Component constructor](#react-component-constructor)
-        - [React Component defaultProps](#react-component-defaultprops)
+      - [Name callback props and handlers with an "on" prefix.](#name-callback-props-and-handlers-with-an-on-prefix)
+      - [React Component definitions](#react-component-definitions)
+      - [React Component constructor](#react-component-constructor)
+      - [React Component defaultProps](#react-component-defaultprops)
   - [State management](#state-management)
-  
+
   - [Proposal for removing or replacing Angular dependencies](https://github.com/grafana/grafana/pull/23048)
 
 ## Basic rules
@@ -194,12 +195,12 @@ _SASS styles are deprecated. Please migrate to Emotion whenever you need to modi
 
 ### Typing
 
-In general, you should let Typescript infer the types so that there's no need to explicitly define type for each variable. 
+In general, you should let Typescript infer the types so that there's no need to explicitly define type for each variable.
 
 There are some exceptions to this:
 
 ```typescript
-// Typescript needs to know type of arrays or objects otherwise it would infer it as array of any 
+// Typescript needs to know type of arrays or objects otherwise it would infer it as array of any
 
 // bad
 const stringArray = [];
@@ -208,7 +209,7 @@ const stringArray = [];
 const stringArray: string[] = [];
 ```
 
-Specify function return types explicitly in new code. This improves readability by being able to tell what a function returns just by looking at the signature. It also prevents errors when a function's return type is broader than expected by the author. 
+Specify function return types explicitly in new code. This improves readability by being able to tell what a function returns just by looking at the signature. It also prevents errors when a function's return type is broader than expected by the author.
 
 > **Note:** We don't have linting for this enabled because of lots of old code that needs to be fixed first.
 
@@ -216,18 +217,18 @@ Specify function return types explicitly in new code. This improves readability
 // bad
 function transform(value?: string) {
   if (!value) {
-    return undefined
+    return undefined;
   }
-  return applyTransform(value)
-};
+  return applyTransform(value);
+}
 
 // good
 function transform(value?: string): TransformedValue | undefined {
   if (!value) {
-    return undefined
+    return undefined;
   }
-  return applyTransform(value)
-};
+  return applyTransform(value);
+}
 ```
 
 ### File and directory naming conventions
@@ -244,6 +245,8 @@ For files exporting multiple utility functions, use the name that describes the
 - Use `reducers.ts` Redux reducers.
 - Use `*.test.ts(x)` for test files.
 
+- Use kebab case for directory names: lowercase, words delimited by hyphen ( `-` ). For example, `features/new-important-feature/utils.ts`.
+
 ### Code organization
 
 Organize your code in a directory that encloses feature code:

contribute/style-guides/themes.md

@@ -120,7 +120,7 @@ Example use cases:
 
 ### Typography
 
-For font family, font sizes and line heights use the variables under `theme.typography`. 
+For font family, font sizes and line heights use the variables under `theme.typography`.
 
 #### Using `ThemeContext` directly
 

cue/data/gen.cue

@@ -1,212 +0,0 @@
-package grafanaschema
-
-import "github.com/grafana/grafana/cue/scuemata"
-
-Family: scuemata.#Family & {
-	lineages: [
-		[ 
-			{ // 0.0
-                // Unique numeric identifier for the dashboard.
-                // TODO must isolate or remove identifiers local to a Grafana instance...?
-                id?: number
-                // Unique dashboard identifier that can be generated by anyone. string (8-40)
-                uid?: string
-                // Title of dashboard.
-                title?: string
-                // Description of dashboard.
-                description?: string
-
-                gnetId?: string
-                // Tags associated with dashboard.
-                tags?: [...string]
-                // Theme of dashboard.
-                style: *"light" | "dark"
-                // Timezone of dashboard,
-                timezone?: *"browser" | "utc"
-                // Whether a dashboard is editable or not.
-                editable: bool | *true
-                // 0 for no shared crosshair or tooltip (default).
-                // 1 for shared crosshair.
-                // 2 for shared crosshair AND shared tooltip.
-                graphTooltip: >=0 & <=2 | *0
-                // Time range for dashboard, e.g. last 6 hours, last 7 days, etc
-                time?: {
-                    from: string | *"now-6h"
-                    to:   string | *"now"
-                }
-                // Timepicker metadata.
-                timepicker?: {
-                    // Whether timepicker is collapsed or not.
-                    collapse: bool | *false
-                    // Whether timepicker is enabled or not.
-                    enable: bool | *true
-                    // Whether timepicker is visible or not.
-                    hidden: bool | *false
-                    // Selectable intervals for auto-refresh.
-                    refresh_intervals: [...string] | *["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-                }
-                // Templating.
-                templating?: list: [...{...}]
-                // Annotations.
-                annotations?: list: [...{
-                    builtIn: number | *0
-                    // Datasource to use for annotation.
-                    datasource: string
-                    // Whether annotation is enabled.
-                    enable?: bool | *true
-                    // Whether to hide annotation.
-                    hide?: bool | *false
-                    // Annotation icon color.
-                    iconColor?: string
-                    // Name of annotation.
-                    name?: string
-                    type: string | *"dashboard"
-                    // Query for annotation data.
-                    rawQuery?: string
-                    showIn:   number | *0
-                }]
-                // Auto-refresh interval.
-                refresh?: string
-                // Version of the JSON schema, incremented each time a Grafana update brings
-                // changes to said schema.
-                schemaVersion: number | *25
-                // Version of the dashboard, incremented each time the dashboard is updated.
-                version?: number
-                panels?: [...#Panel]
-
-                // Dashboard panels. Panels are canonically defined inline
-                // because they share a version timeline with the dashboard
-                // schema; they do not vary independently. We create a separate,
-                // synthetic Family to represent them in Go, for ease of generating
-                // e.g. JSON Schema.
-                #Panel: {
-                    // The panel plugin type id. 
-                    type: !=""
-
-                    // Internal - the exact major and minor versions of the panel plugin
-                    // schema. Hidden and therefore not a part of the data model, but
-                    // expected to be filled with panel plugin schema versions so that it's
-                    // possible to figure out which schema version matched on a successful
-                    // unification.
-                    // _pv: { maj: int, min: int }
-                    // The major and minor versions of the panel plugin for this schema.
-                    // TODO 2-tuple list instead of struct?
-                    panelSchema?: { maj: number, min: number }
-
-                    // Panel title.
-                    title?: string
-                    // Description.
-                    description?: string
-                    // Whether to display the panel without a background.
-                    transparent: bool | *false
-                    // Name of default datasource.
-                    datasource?: string
-                    // Grid position.
-                    gridPos?: {
-                        // Panel
-                        h: number & >0 | *9
-                        // Panel
-                        w: number & >0 & <=24 | *12
-                        // Panel x
-                        x: number & >=0 & <24 | *0
-                        // Panel y
-                        y: number & >=0 | *0
-                        // true if fixed
-                        static?: bool
-                    }
-                    // Panel links.
-                    // links?: [..._panelLink]
-                    // Name of template variable to repeat for.
-                    repeat?: string
-                    // Direction to repeat in if 'repeat' is set.
-                    // "h" for horizontal, "v" for vertical.
-                    repeatDirection: *"h" | "v"
-                    // Schema for panel targets is specified by datasource
-                    // plugins. We use a placeholder definition, which the Go
-                    // schema loader either left open/as-is with the Base
-                    // variant of the Dashboard and Panel families, or filled
-                    // with types derived from plugins in the Instance variant.
-                    // When working directly from CUE, importers can extend this
-                    // type directly to achieve the same effect.
-                    targets?: [...{...}]
-
-                    // The values depend on panel type
-                    options: {...}
-                    fieldConfig: {
-                        defaults: {
-                            // The display value for this field.  This supports template variables blank is auto
-                            displayName?: string
-
-                            // This can be used by data sources that return and explicit naming structure for values and labels
-                            // When this property is configured, this value is used rather than the default naming strategy.
-                            displayNameFromDS?: string
-
-                            // Human readable field metadata
-                            description?: string
-
-                            // An explict path to the field in the datasource.  When the frame meta includes a path,
-                            // This will default to `${frame.meta.path}/${field.name}
-                            //
-                            // When defined, this value can be used as an identifier within the datasource scope, and
-                            // may be used to update the results
-                            path?: string
-
-                            // True if data source can write a value to the path.  Auth/authz are supported separately
-                            writeable?: bool
-
-                            // True if data source field supports ad-hoc filters
-                            filterable?: bool
-
-                            // Numeric Options
-                            unit?: string
-
-                            // Significant digits (for display)
-                            decimals?: number
-
-                            min?: number
-                            max?: number
-
-                            //   // Convert input values into a display string
-                            //   mappings?: ValueMapping[];
-
-                            //   // Map numeric values to states
-                            //   thresholds?: ThresholdsConfig;
-
-                            //   // Map values to a display color
-                            //   color?: FieldColor;
-
-                            //   // Used when reducing field values
-                            //   nullValueMode?: NullValueMode;
-
-                            //   // The behavior when clicking on a result
-                            links?: [...]
-
-                            // Alternative to empty string
-                            noValue?: string
-
-                            // Can always exist. Valid fields within this are
-                            // defined by the panel plugin - that's the
-                            // PanelFieldConfig that comes from the plugin.
-                            custom?: {}
-                        }
-                        overrides: [...{
-                            matcher: {
-                                id: string | *""
-                                options?: _
-                            }
-                            properties: [...{
-                                id: string | *""
-                                value?: _
-                            }]
-                        }]
-                    }
-                }
-            }
-		]
-	]
-}
-
-#Latest: {
-    #Dashboard: Family.latest
-    #Panel: Family.latest._Panel
-}

cue/scuemata/panel-plugin.cue

@@ -8,10 +8,10 @@ package scuemata
 // the larger Dashboard schema.
 #PanelSchema: {
     // Defines plugin specific options for a panel
-    PanelOptions: {...}
+    PanelOptions: {...} @cuetsy(kind="interface")
 
     // Define the custom properties that exist within standard field config
-    PanelFieldConfig?: {...}
+    PanelFieldConfig?: {...} @cuetsy(kind="interface")
 
     // Panels may define their own types
     ...

cue/scuemata/scuemata.cue

@@ -14,6 +14,7 @@ package scuemata
 // 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]

cue/ui/gen.cue

@@ -1,93 +0,0 @@
-package grafanaschema
-
-TableCellDisplayMode: {
-  Auto: "auto",
-  ColorText: "color-text",
-  ColorBackground: "color-background",
-  GradientGauge: "gradient-gauge",
-  LcdGauge: "lcd-gauge",
-  JSONView: "json-view",
-  BasicGauge: "basic",
-  Image: "image",
-} @cuetsy(targetType="enum")
-
-TableFieldOptions: {
-  width?: number
-  align: FieldTextAlignment | *"auto"
-  displayMode: TableCellDisplayMode | *"auto"
-  hidden?: bool  // ?? default is missing or false ??
-} @cuetsy(targetType="interface")
-
-TableSortByFieldState: {
-  displayName: string
-  desc?: bool
-} @cuetsy(targetType="interface")
-
-TooltipDisplayMode:          "single" | "multi" | "none"          @cuetsy(targetType="enum")
-FieldTextAlignment:   "auto" | "left" | "right" | "center" @cuetsy(targetType="type")
-AxisPlacement:        "auto" | "top" | "right" | "bottom" | "left" | "hidden" @cuetsy(targetType="enum")
-PointVisibility:      "auto" | "never" | "always"                             @cuetsy(targetType="enum")
-DrawStyle:            "line" | "bars" | "points"                              @cuetsy(targetType="enum")
-LineInterpolation:    "linear" | "smooth" | "stepBefore" | "stepAfter"        @cuetsy(targetType="enum")
-ScaleDistribution:    "linear" | "log"                                        @cuetsy(targetType="enum")
-GraphGradientMode:    "none" | "opacity" | "hue" | "scheme"                   @cuetsy(targetType="enum")
-LineStyle: {
-	fill?: "solid" | "dash" | "dot" | "square"
-	dash?: [number]
-} @cuetsy(targetType="interface")
-LineConfig: {
-	lineColor?:         string
-	lineWidth?:         number
-	lineInterpolation?: LineInterpolation
-	lineStyle?:         LineStyle
-	spanNulls?:         bool
-} @cuetsy(targetType="interface")
-FillConfig: {
-	fillColor?:   string
-	fillOpacity?: number
-	fillBelowTo?: string
-} @cuetsy(targetType="interface")
-PointsConfig: {
-	showPoints?:  PointVisibility
-	pointSize?:   number
-	pointColor?:  string
-	pointSymbol?: string
-} @cuetsy(targetType="interface")
-ScaleDistributionConfig: {
-	type: ScaleDistribution
-	log?: number
-} @cuetsy(targetType="interface")
-AxisConfig: {
-	axisPlacement?:     AxisPlacement
-	axisLabel?:         string
-	axisWidth?:         number
-	axisSoftMin?:       number
-	axisSoftMax?:       number
-	scaleDistribution?: ScaleDistributionConfig
-} @cuetsy(targetType="interface")
-HideSeriesConfig: {
-	tooltip: bool
-	legend:  bool
-	graph:   bool
-} @cuetsy(targetType="interface")
-LegendPlacement:   "bottom" | "right"          @cuetsy(targetType="type")
-LegendDisplayMode: "list" | "table" | "hidden" @cuetsy(targetType="enum")
-TableFieldOptions: {
-	width?:      number
-	align:       FieldTextAlignment | *"auto"
-	displayMode: TableCellDisplayMode | *"auto"
-	hidden?:     bool
-} @cuetsy(targetType="interface")
-GraphFieldConfig: LineConfig & FillConfig & PointsConfig & AxisConfig & {
-	drawStyle?:    DrawStyle
-	gradientMode?: GraphGradientMode
-	hideFrom?:     HideSeriesConfig
-} @cuetsy(targetType="interface")
-VizLegendOptions: {
-	displayMode: LegendDisplayMode
-	placement:   LegendPlacement
-	calcs: [string]
-} @cuetsy(targetType="interface")
-VizTooltipOptions: {
-	mode: TooltipDisplayMode
-} @cuetsy(targetType="interface")

devenv/README.md

@@ -55,6 +55,9 @@ Jaeger block runs both Jaeger and Loki container. Loki container sends traces to
 | 1.0     | graphite1   | 8280              | 2203           | 2203        |
 | 0.9     | graphite09  | 8380              | 2303           | 2303        |
 
+## Debugging setup in VS Code
+An example of launch.json is provided in `devenv/vscode/launch.json`. It basically does what Makefile and .bra.toml do. The 'program' field is set to the folder name so VS Code loads all *.go files in it instead of just main.go.
+
 ## Troubleshooting
 
 ### Containers that read from log files fail to start (Mac OS)

devenv/dev-dashboards/datasource-opentsdb/opentsdb_v2.3.json

@@ -13,7 +13,6 @@
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "id": 3151,
   "links": [],
@@ -90,9 +89,7 @@
         }
       ],
       "thresholds": [],
-      "timeFrom": null,
       "timeRegions": [],
-      "timeShift": null,
       "title": "CPU per host",
       "tooltip": {
         "shared": true,
@@ -101,33 +98,24 @@
       },
       "type": "graph",
       "xaxis": {
-        "buckets": null,
         "mode": "time",
-        "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "format": "short",
-          "label": null,
           "logBase": 1,
-          "max": null,
-          "min": null,
           "show": true
         },
         {
           "format": "short",
-          "label": null,
           "logBase": 1,
-          "max": null,
-          "min": null,
           "show": true
         }
       ],
       "yaxis": {
-        "align": false,
-        "alignLevel": null
+        "align": false
       }
     },
     {
@@ -199,9 +187,7 @@
         }
       ],
       "thresholds": [],
-      "timeFrom": null,
       "timeRegions": [],
-      "timeShift": null,
       "title": "Login Count per host",
       "tooltip": {
         "shared": true,
@@ -210,33 +196,24 @@
       },
       "type": "graph",
       "xaxis": {
-        "buckets": null,
         "mode": "time",
-        "name": null,
         "show": true,
         "values": []
       },
       "yaxes": [
         {
           "format": "short",
-          "label": null,
           "logBase": 1,
-          "max": null,
-          "min": null,
           "show": true
         },
         {
           "format": "short",
-          "label": null,
           "logBase": 1,
-          "max": null,
-          "min": null,
           "show": true
         }
       ],
       "yaxis": {
-        "align": false,
-        "alignLevel": null
+        "align": false
       }
     }
   ],
@@ -255,4 +232,4 @@
   "title": "Datasource tests - OpenTSDB v2.3",
   "uid": "rZRUGik7k",
   "version": 3
-}
+}

devenv/dev-dashboards/datasource-testdata/new_features_in_v74.json

@@ -511,7 +511,6 @@
       },
       "id": 41,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -613,7 +612,6 @@
       },
       "id": 42,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -716,7 +714,6 @@
       },
       "id": 32,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -819,7 +816,6 @@
       },
       "id": 44,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -2070,7 +2066,6 @@
       "id": 29,
       "maxDataPoints": 500,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [
             "last"

devenv/dev-dashboards/datasource-testdata/new_features_in_v8.json

@@ -13,13 +13,11 @@
       ]
     },
     "editable": true,
-    "gnetId": null,
     "graphTooltip": 0,
     "id": 625,
     "links": [],
     "panels": [
       {
-        "datasource": null,
         "gridPos": {
           "h": 4,
           "w": 24,
@@ -38,13 +36,10 @@
             "target": ""
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "transparent": true,
         "type": "text"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 8,
@@ -107,8 +102,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -166,7 +160,6 @@
         "type": "state-timeline"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 15,
@@ -207,8 +200,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "blue",
-                  "value": null
+                  "color": "blue"
                 },
                 {
                   "color": "green",
@@ -267,10 +259,9 @@
               "fillOpacity": 0,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
-                "tooltip": false,
-                "viz": false
+                "tooltip": false
               },
               "lineInterpolation": "linear",
               "lineWidth": 1,
@@ -293,8 +284,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "blue",
-                  "value": null
+                  "color": "blue"
                 },
                 {
                   "color": "green",
@@ -343,7 +333,6 @@
         "type": "timeseries"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 13,
@@ -386,8 +375,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "blue",
-                  "value": null
+                  "color": "blue"
                 },
                 {
                   "color": "#EAB839",
@@ -473,8 +461,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "blue",
-                  "value": null
+                  "color": "blue"
                 },
                 {
                   "color": "#EAB839",
@@ -522,7 +509,6 @@
         "type": "status-history"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 3,
@@ -562,7 +548,7 @@
               "fillOpacity": 74,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -573,8 +559,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -679,7 +664,7 @@
               "fillOpacity": 80,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -713,8 +698,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "blue",
-                  "value": null
+                  "color": "blue"
                 }
               ]
             },
@@ -757,7 +741,6 @@
         "type": "barchart"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 3,
@@ -783,7 +766,6 @@
         "type": "text"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 6,
@@ -823,7 +805,7 @@
               "fillOpacity": 50,
               "gradientMode": "hue",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -848,8 +830,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -924,8 +905,6 @@
             "stringInput": ""
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "title": "Interpolation mode: smooth",
         "type": "timeseries"
       },
@@ -944,7 +923,7 @@
               "fillOpacity": 40,
               "gradientMode": "hue",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -969,8 +948,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -1045,8 +1023,6 @@
             "stringInput": "1,20,90,30,5,0"
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "title": "Interpolation mode: Step before",
         "type": "timeseries"
       },
@@ -1065,7 +1041,7 @@
               "fillOpacity": 40,
               "gradientMode": "hue",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -1090,8 +1066,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -1166,13 +1141,10 @@
             "stringInput": "1,20,90,30,5,0"
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "title": "Interpolation mode: Step after",
         "type": "timeseries"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 8,
@@ -1210,12 +1182,9 @@
               "barAlignment": 0,
               "drawStyle": "line",
               "fillOpacity": 10,
-              "gradientMode": {
-                "label": "None",
-                "value": "none"
-              },
+              "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -1240,8 +1209,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -1261,7 +1229,6 @@
         },
         "id": 41,
         "options": {
-          "graph": {},
           "legend": {
             "calcs": [],
             "displayMode": "list",
@@ -1300,8 +1267,6 @@
             "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,10,10,11,12,13,11,10,9,10,11,12,13,14,10,10"
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "title": "Auto min max",
         "type": "timeseries"
       },
@@ -1319,12 +1284,9 @@
               "barAlignment": 0,
               "drawStyle": "line",
               "fillOpacity": 10,
-              "gradientMode": {
-                "label": "None",
-                "value": "none"
-              },
+              "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -1351,8 +1313,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -1372,7 +1333,6 @@
         },
         "id": 32,
         "options": {
-          "graph": {},
           "legend": {
             "calcs": [],
             "displayMode": "list",
@@ -1411,8 +1371,6 @@
             "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,200,10,11,12,13,11,10,9,10,11,12,13,14,10,10"
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "title": "Hard min 0, max 30",
         "type": "timeseries"
       },
@@ -1432,12 +1390,9 @@
               "barAlignment": 0,
               "drawStyle": "line",
               "fillOpacity": 10,
-              "gradientMode": {
-                "label": "None",
-                "value": "none"
-              },
+              "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -1462,8 +1417,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -1483,7 +1437,6 @@
         },
         "id": 44,
         "options": {
-          "graph": {},
           "legend": {
             "calcs": [],
             "displayMode": "list",
@@ -1522,13 +1475,10 @@
             "stringInput": "10,11,12,11,10,11,12,12,11,10,9,10,11,12,200,10,11,12,13,11,10,9,10,11,12,13,14,10,10"
           }
         ],
-        "timeFrom": null,
-        "timeShift": null,
         "title": "Soft min 0, soft max 30",
         "type": "timeseries"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 5,
@@ -1570,7 +1520,7 @@
               "fillOpacity": 0,
               "gradientMode": "opacity",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -1595,8 +1545,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -1769,7 +1718,6 @@
         "type": "timeseries"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 5,
@@ -1807,12 +1755,9 @@
               "barAlignment": 0,
               "drawStyle": "line",
               "fillOpacity": 0,
-              "gradientMode": {
-                "label": "None",
-                "value": "none"
-              },
+              "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -1844,8 +1789,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -2133,12 +2077,9 @@
               "barAlignment": 0,
               "drawStyle": "line",
               "fillOpacity": 0,
-              "gradientMode": {
-                "label": "None",
-                "value": "none"
-              },
+              "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -2170,8 +2111,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -2461,7 +2401,7 @@
               "fillOpacity": 82,
               "gradientMode": "hue",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -2493,8 +2433,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -2573,7 +2512,6 @@
         "type": "timeseries"
       },
       {
-        "cacheTimeout": null,
         "datasource": "gdev-testdata",
         "gridPos": {
           "h": 3,
@@ -2609,7 +2547,7 @@
               "fillOpacity": 80,
               "gradientMode": "hue",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -2620,8 +2558,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -2655,7 +2592,6 @@
           "y": 83
         },
         "id": 49,
-        "maxDataPoints": null,
         "options": {
           "bucketOffset": 0,
           "bucketSize": 10,
@@ -2719,8 +2655,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -2754,7 +2689,6 @@
           "y": 83
         },
         "id": 77,
-        "maxDataPoints": null,
         "options": {
           "showHeader": true
         },
@@ -2838,4 +2772,4 @@
     "title": "New Features in v8.0",
     "uid": "8mux8PqGz",
     "version": 17
-  }
+  }

devenv/dev-dashboards/home.json

@@ -19,12 +19,10 @@
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "links": [],
   "panels": [
     {
-      "datasource": null,
       "gridPos": {
         "h": 26,
         "w": 6,
@@ -34,7 +32,6 @@
       "id": 7,
       "links": [],
       "options": {
-        "folderId": null,
         "maxItems": 100,
         "query": "",
         "showHeadings": true,
@@ -45,13 +42,10 @@
       },
       "pluginVersion": "8.1.0-pre",
       "tags": [],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Starred",
       "type": "dashlist"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 13,
         "w": 6,
@@ -75,13 +69,10 @@
       "tags": [
         "panel-tests"
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "tag: panel-tests",
       "type": "dashlist"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 13,
         "w": 6,
@@ -91,7 +82,6 @@
       "id": 3,
       "links": [],
       "options": {
-        "folderId": null,
         "maxItems": 1000,
         "query": "",
         "showHeadings": false,
@@ -108,13 +98,10 @@
         "gdev",
         "demo"
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "tag: dashboard-demo",
       "type": "dashlist"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 26,
         "w": 6,
@@ -124,7 +111,6 @@
       "id": 5,
       "links": [],
       "options": {
-        "folderId": null,
         "maxItems": 1000,
         "query": "",
         "showHeadings": false,
@@ -141,13 +127,10 @@
         "gdev",
         "datasource-test"
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Data source tests",
       "type": "dashlist"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 13,
         "w": 6,
@@ -173,13 +156,10 @@
         "templating",
         "gdev"
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "tag: templating ",
       "type": "dashlist"
     },
     {
-      "datasource": null,
       "gridPos": {
         "h": 13,
         "w": 6,
@@ -205,8 +185,6 @@
         "gdev",
         "demo"
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "tag: transforms",
       "type": "dashlist"
     }
@@ -250,4 +228,4 @@
   "title": "Grafana Dev Overview & Home",
   "uid": "j6T00KRZz",
   "version": 2
-}
+}

devenv/dev-dashboards/panel-barchart/barchart-autosizing.json

@@ -19,12 +19,10 @@
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "links": [],
   "panels": [
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -37,7 +35,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -49,8 +46,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -80,6 +76,7 @@
         },
         "orientation": "auto",
         "showValue": "auto",
+        "stacking": "none",
         "text": {},
         "tooltip": {
           "mode": "single"
@@ -87,7 +84,7 @@
       },
       "targets": [
         {
-          "csvContent": "Name,Stat1,Stat2\nStockholm, 10, 15\nNew York, 19, 5\nLondon, 10, 1\nNegative, 15, -5\nLong value, 15,10",
+          "csvContent": "Time,Name,Stat1,Stat2\n2020-01-01T00:00:00Z,Stockholm, 10, 15\n2020-01-01T00:00:00Z,New York, 19, 5\n2020-01-01T00:00:00Z,London, 10, 1\n2020-01-01T00:00:00Z,Negative, 15, -5\n2020-01-01T00:00:00Z,Long value, 15,10",
           "refId": "A",
           "scenarioId": "csv_content"
         }
@@ -96,7 +93,6 @@
       "type": "barchart"
     },
     {
-      "datasource": null,
       "description": "Should be smaller given the longer value",
       "fieldConfig": {
         "defaults": {
@@ -110,7 +106,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -123,8 +118,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -154,6 +148,7 @@
         },
         "orientation": "auto",
         "showValue": "auto",
+        "stacking": "none",
         "text": {},
         "tooltip": {
           "mode": "single"
@@ -170,7 +165,6 @@
       "type": "barchart"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -183,7 +177,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -195,8 +188,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -226,6 +218,7 @@
         },
         "orientation": "auto",
         "showValue": "auto",
+        "stacking": "none",
         "text": {},
         "tooltip": {
           "mode": "single"
@@ -242,7 +235,6 @@
       "type": "barchart"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -255,7 +247,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -267,8 +258,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -298,6 +288,7 @@
         },
         "orientation": "auto",
         "showValue": "always",
+        "stacking": "none",
         "text": {},
         "tooltip": {
           "mode": "single"
@@ -327,7 +318,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -339,8 +329,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -368,8 +357,9 @@
         },
         "orientation": "auto",
         "showValue": "auto",
+        "stacking": "none",
         "text": {
-          "size": 10,
+          "titleSize": 10,
           "valueSize": 25
         },
         "tooltip": {
@@ -386,7 +376,6 @@
       "type": "barchart"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -399,7 +388,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -412,8 +400,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -443,6 +430,7 @@
         },
         "orientation": "horizontal",
         "showValue": "auto",
+        "stacking": "none",
         "text": {},
         "tooltip": {
           "mode": "single"
@@ -459,7 +447,6 @@
       "type": "barchart"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -473,7 +460,6 @@
             "fillOpacity": 80,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -485,8 +471,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -516,6 +501,7 @@
         },
         "orientation": "horizontal",
         "showValue": "auto",
+        "stacking": "none",
         "text": {},
         "tooltip": {
           "mode": "single"
@@ -552,4 +538,4 @@
   "title": "BarChart - Panel Tests - Value sizing",
   "uid": "WFlOM-jM1",
   "version": 9
-}
+}

devenv/dev-dashboards/panel-geomap/panel-geomap.json

@@ -0,0 +1,395 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "graphTooltip": 0,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-GrYlRd"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 9,
+        "x": 0,
+        "y": 0
+      },
+      "id": 62,
+      "options": {
+        "basemap": {
+          "config": {},
+          "type": "default"
+        },
+        "controls": {
+          "mouseWheelZoom": true,
+          "showAttribution": true,
+          "showDebug": false,
+          "showScale": false,
+          "showZoom": true
+        },
+        "layers": [
+          {
+            "config": {
+              "color": {
+                "field": "Price",
+                "fixed": "dark-green"
+              },
+              "fillOpacity": 0.4,
+              "shape": "circle",
+              "showLegend": true,
+              "size": {
+                "field": "Count",
+                "fixed": 5,
+                "max": 15,
+                "min": 2
+              }
+            },
+            "location": {
+              "gazetteer": "public/gazetteer/usa-states.json",
+              "lookup": "State",
+              "mode": "auto"
+            },
+            "type": "markers"
+          }
+        ],
+        "view": {
+          "id": "coords",
+          "lat": 38.297683,
+          "lon": -99.228359,
+          "shared": true,
+          "zoom": 3.98
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "flight_info_by_state.csv",
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "Size, color mapped to different fields + share view",
+      "type": "geomap"
+    },
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              },
+              {
+                "color": "#EAB839",
+                "value": 90
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 9,
+        "x": 9,
+        "y": 0
+      },
+      "id": 66,
+      "options": {
+        "basemap": {
+          "config": {},
+          "type": "default"
+        },
+        "controls": {
+          "mouseWheelZoom": true,
+          "showAttribution": true,
+          "showDebug": false,
+          "showScale": false,
+          "showZoom": true
+        },
+        "layers": [
+          {
+            "config": {
+              "color": {
+                "field": "Price",
+                "fixed": "dark-green"
+              },
+              "fillOpacity": 0.4,
+              "shape": "circle",
+              "showLegend": true,
+              "size": {
+                "field": "Count",
+                "fixed": 5,
+                "max": 15,
+                "min": 2
+              }
+            },
+            "location": {
+              "gazetteer": "public/gazetteer/usa-states.json",
+              "lookup": "State",
+              "mode": "auto"
+            },
+            "type": "markers"
+          }
+        ],
+        "view": {
+          "id": "coords",
+          "lat": 38.297683,
+          "lon": -99.228359,
+          "shared": true,
+          "zoom": 3.98
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "flight_info_by_state.csv",
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "Thresholds legend",
+      "type": "geomap"
+    },
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-BlYlRd"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 9,
+        "x": 0,
+        "y": 11
+      },
+      "id": 63,
+      "options": {
+        "basemap": {
+          "config": {},
+          "type": "default"
+        },
+        "controls": {
+          "mouseWheelZoom": true,
+          "showAttribution": true,
+          "showDebug": false,
+          "showScale": false,
+          "showZoom": true
+        },
+        "layers": [
+          {
+            "config": {
+              "blur": 27,
+              "radius": 25,
+              "weight": {
+                "field": "Count",
+                "fixed": 1,
+                "max": 1,
+                "min": 0
+              }
+            },
+            "location": {
+              "gazetteer": "public/gazetteer/usa-states.json",
+              "lookup": "State",
+              "mode": "auto"
+            },
+            "type": "heatmap"
+          }
+        ],
+        "view": {
+          "id": "coords",
+          "lat": 38.251497,
+          "lon": -100.932144,
+          "shared": false,
+          "zoom": 4.15
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "flight_info_by_state.csv",
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "Heatmap data layer",
+      "transformations": [],
+      "type": "geomap"
+    },
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "continuous-GrYlRd"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 9,
+        "x": 9,
+        "y": 11
+      },
+      "id": 65,
+      "options": {
+        "basemap": {
+          "config": {
+            "server": "world-imagery"
+          },
+          "type": "esri-xyz"
+        },
+        "controls": {
+          "mouseWheelZoom": true,
+          "showAttribution": true,
+          "showDebug": false,
+          "showScale": false,
+          "showZoom": true
+        },
+        "layers": [
+          {
+            "config": {
+              "color": {
+                "fixed": "#ff001e"
+              },
+              "fillOpacity": 0.4,
+              "shape": "star",
+              "showLegend": true,
+              "size": {
+                "field": "Count",
+                "fixed": 5,
+                "max": 15,
+                "min": 2
+              }
+            },
+            "location": {
+              "gazetteer": "public/gazetteer/usa-states.json",
+              "lookup": "State",
+              "mode": "auto"
+            },
+            "type": "markers"
+          }
+        ],
+        "view": {
+          "id": "coords",
+          "lat": 40.159084,
+          "lon": -96.508021,
+          "shared": true,
+          "zoom": 3.83
+        }
+      },
+      "targets": [
+        {
+          "csvFileName": "flight_info_by_state.csv",
+          "refId": "A",
+          "scenarioId": "csv_file"
+        }
+      ],
+      "title": "Base layer ArcGIS wold imagery + star shape + share view",
+      "type": "geomap"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 30,
+  "style": "dark",
+  "tags": [
+    "gdev",
+    "panel-tests"
+  ],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ]
+  },
+  "timezone": "",
+  "title": "Panel Tests - Geomap",
+  "uid": "2xuwrgV7z",
+  "version": 5
+}

devenv/dev-dashboards/panel-graph/graph-ng-by-value-color-schemes.json

@@ -19,12 +19,10 @@
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "links": [],
   "panels": [
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -66,8 +64,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "orange",
@@ -112,7 +109,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "description": "",
       "fieldConfig": {
         "defaults": {
@@ -154,8 +150,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "orange",
@@ -200,7 +195,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -241,8 +235,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "orange",
@@ -328,8 +321,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "orange",
@@ -373,7 +365,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -414,8 +405,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "orange",
@@ -461,7 +451,6 @@
           "startValue": 1
         }
       ],
-      "timeFrom": null,
       "title": "Color bars by discrete thresholds",
       "type": "timeseries"
     },
@@ -507,8 +496,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "blue",
-                "value": null
+                "color": "blue"
               },
               {
                 "color": "green",
@@ -597,8 +585,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "blue",
-                "value": null
+                "color": "blue"
               },
               {
                 "color": "green",
@@ -687,8 +674,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "blue",
-                "value": null
+                "color": "blue"
               },
               {
                 "color": "green",
@@ -736,7 +722,6 @@
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -777,8 +762,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "blue",
-                "value": null
+                "color": "blue"
               },
               {
                 "color": "green",
@@ -859,4 +843,4 @@
   "title": "Panel Tests - Graph NG - By value color schemes",
   "uid": "aBXrJ0R7z",
   "version": 11
-}
+}

devenv/dev-dashboards/panel-graph/graph-ng-gradient-area.json

@@ -92,7 +92,6 @@
       "interval": "1m",
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"
@@ -181,7 +180,6 @@
       "links": [],
       "maxDataPoints": 10,
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"
@@ -270,7 +268,6 @@
       "links": [],
       "maxDataPoints": 20,
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"
@@ -358,7 +355,6 @@
       "interval": "1m",
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"
@@ -447,7 +443,6 @@
       "links": [],
       "maxDataPoints": 80,
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"
@@ -536,7 +531,6 @@
       "links": [],
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"

devenv/dev-dashboards/panel-graph/graph-ng-hue-gradients.json

@@ -99,7 +99,6 @@
       "links": [],
       "maxDataPoints": 9,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -194,7 +193,6 @@
       "links": [],
       "maxDataPoints": 9,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -289,7 +287,6 @@
       "links": [],
       "maxDataPoints": 9,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -384,7 +381,6 @@
       "links": [],
       "maxDataPoints": 9,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -479,7 +475,6 @@
       "links": [],
       "maxDataPoints": 9,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -574,7 +569,6 @@
       "links": [],
       "maxDataPoints": 9,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -669,7 +663,6 @@
       "links": [],
       "maxDataPoints": 100,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -764,7 +757,6 @@
       "links": [],
       "maxDataPoints": 100,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -859,7 +851,6 @@
       "links": [],
       "maxDataPoints": 100,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",

devenv/dev-dashboards/panel-graph/graph-ng-nulls.json

@@ -8,12 +8,17 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "links": [
     {
@@ -43,7 +48,6 @@
             "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -69,8 +73,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -91,7 +94,6 @@
       "id": 3,
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -132,8 +134,6 @@
           "target": ""
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Show gaps",
       "type": "timeseries"
     },
@@ -153,7 +153,6 @@
             "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -180,8 +179,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -202,7 +200,6 @@
       "id": 2,
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -251,8 +248,6 @@
           "target": ""
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Gaps & null between every point for series B",
       "type": "timeseries"
     },
@@ -272,7 +267,6 @@
             "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -299,8 +293,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -321,7 +314,6 @@
       "id": 6,
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -390,8 +382,6 @@
           "target": ""
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "No nulls but unaligned series",
       "type": "timeseries"
     },
@@ -410,7 +400,6 @@
             "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -436,8 +425,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -458,7 +446,6 @@
       "id": 4,
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -499,8 +486,6 @@
           "target": ""
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Connected",
       "type": "timeseries"
     },
@@ -520,7 +505,6 @@
             "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -547,8 +531,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -569,7 +552,6 @@
       "id": 5,
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -618,8 +600,6 @@
           "target": ""
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Same as above but connected",
       "type": "timeseries"
     },
@@ -639,7 +619,6 @@
             "fillOpacity": 0,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -666,8 +645,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -688,7 +666,6 @@
       "id": 7,
       "links": [],
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -757,8 +734,6 @@
           "target": ""
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Same as above but connected",
       "type": "timeseries"
     },
@@ -777,7 +752,6 @@
             "fillOpacity": 10,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -803,8 +777,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -855,9 +828,6 @@
       },
       "id": 11,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "calcs": [],
@@ -903,8 +873,6 @@
           "stringInput": "1,20,90,30,5,0"
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Null values in first series & show gaps ",
       "transformations": [],
       "type": "timeseries"
@@ -924,7 +892,6 @@
             "fillOpacity": 10,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -950,8 +917,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1002,9 +968,6 @@
       },
       "id": 9,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "calcs": [],
@@ -1050,14 +1013,11 @@
           "stringInput": "10,25,null,null,50,10"
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Null values in second series show gaps (bugged)",
       "transformations": [],
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1071,7 +1031,6 @@
             "fillOpacity": 10,
             "gradientMode": "none",
             "hideFrom": {
-              "graph": false,
               "legend": false,
               "tooltip": false,
               "viz": false
@@ -1097,8 +1056,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1118,7 +1076,6 @@
       },
       "id": 13,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "list",
@@ -1157,13 +1114,10 @@
           "stringInput": "1,20,90,null,30,5,0"
         }
       ],
-      "timeFrom": null,
-      "timeShift": null,
       "title": "Span nulls below 1hr",
       "type": "timeseries"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -1205,8 +1159,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1263,5 +1216,5 @@
   "timezone": "",
   "title": "Panel Tests - Graph NG - Gaps and Connected",
   "uid": "8mmCAF1Mz",
-  "version": 12
-}
+  "version": 2
+}

devenv/dev-dashboards/panel-graph/graph-ng-time.json

@@ -80,7 +80,6 @@
       "id": 2,
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -151,7 +150,6 @@
       "id": 3,
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -222,7 +220,6 @@
       "id": 4,
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -293,7 +290,6 @@
       "id": 5,
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -364,7 +360,6 @@
       "id": 6,
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",
@@ -435,7 +430,6 @@
       "id": 7,
       "maxDataPoints": 50,
       "options": {
-        "graph": {},
         "legend": {
           "calcs": [],
           "displayMode": "hidden",

devenv/dev-dashboards/panel-graph/graph-ng.json

@@ -113,9 +113,6 @@
       "id": 47,
       "maxDataPoints": 500,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -237,9 +234,6 @@
       "id": 48,
       "maxDataPoints": 20,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -361,9 +355,6 @@
       "id": 55,
       "maxDataPoints": 20,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -485,9 +476,6 @@
       "id": 56,
       "maxDataPoints": 90,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -609,9 +597,6 @@
       "id": 52,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -733,9 +718,6 @@
       "id": 53,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -857,9 +839,6 @@
       "id": 54,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -981,9 +960,6 @@
       "id": 57,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -1184,9 +1160,6 @@
       },
       "id": 60,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -1468,7 +1441,6 @@
       "interval": null,
       "maxDataPoints": 100,
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "list",
           "placement": "right"
@@ -1599,9 +1571,6 @@
       "id": 63,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -1737,9 +1706,6 @@
       "id": 64,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -1875,9 +1841,6 @@
       "id": 65,
       "maxDataPoints": 10,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -2013,9 +1976,6 @@
       "id": 66,
       "maxDataPoints": 100,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -2179,9 +2139,6 @@
       "id": 32,
       "maxDataPoints": 100,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "list",
@@ -2319,9 +2276,6 @@
       "id": 35,
       "maxDataPoints": 100,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "list",
@@ -2473,9 +2427,6 @@
       "id": 31,
       "maxDataPoints": 200,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": true,
           "displayMode": "table",
@@ -2626,9 +2577,6 @@
       "id": 51,
       "maxDataPoints": 200,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": true,
           "displayMode": "table",
@@ -2768,9 +2716,6 @@
       },
       "id": 19,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -2876,9 +2821,6 @@
       },
       "id": 20,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -2983,9 +2925,6 @@
       },
       "id": 21,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -3091,9 +3030,6 @@
       },
       "id": 9,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "hidden",
@@ -3215,9 +3151,6 @@
       },
       "id": 46,
       "options": {
-        "graph": {
-          "realTimeUpdates": false
-        },
         "legend": {
           "asTable": false,
           "displayMode": "list",
@@ -3358,7 +3291,6 @@
       },
       "id": 68,
       "options": {
-        "graph": {},
         "legend": {
           "displayMode": "hidden",
           "placement": "bottom"

devenv/dev-dashboards/panel-histogram/histogram_tests.json

@@ -13,13 +13,11 @@
       ]
     },
     "editable": true,
-    "gnetId": null,
     "graphTooltip": 0,
     "id": 632,
     "links": [],
     "panels": [
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -29,7 +27,7 @@
               "fillOpacity": 80,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -40,8 +38,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -89,7 +86,7 @@
               "fillOpacity": 80,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -100,8 +97,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -139,7 +135,6 @@
         "type": "histogram"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -149,7 +144,7 @@
               "fillOpacity": 80,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -160,8 +155,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -212,7 +206,6 @@
         "type": "histogram"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -222,7 +215,7 @@
               "fillOpacity": 80,
               "gradientMode": "none",
               "hideFrom": {
-                "graph": false,
+                "viz": false,
                 "legend": false,
                 "tooltip": false
               },
@@ -233,8 +226,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -285,7 +277,6 @@
         "type": "histogram"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -300,8 +291,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -353,7 +343,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -368,8 +357,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -439,4 +427,4 @@
     "title": "Panel Tests - Histogram",
     "uid": "UTv--wqMk",
     "version": 4
-  }
+  }

devenv/dev-dashboards/panel-timeline/timeline-demo.json

@@ -8,17 +8,21 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "links": [],
   "panels": [
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -55,8 +59,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -82,9 +85,12 @@
           "displayMode": "list",
           "placement": "bottom"
         },
-        "mode": "changes",
+        "mergeValues": true,
         "rowHeight": 0.98,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "pluginVersion": "7.5.0-pre",
       "targets": [
@@ -113,7 +119,6 @@
       "type": "state-timeline"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -151,8 +156,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -173,9 +177,17 @@
       "options": {
         "alignValue": "center",
         "colWidth": 1,
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "mergeValues": true,
         "mode": "changes",
         "rowHeight": 0.98,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "targets": [
         {
@@ -207,7 +219,6 @@
       "type": "state-timeline"
     },
     {
-      "datasource": null,
       "description": "Should show gaps",
       "fieldConfig": {
         "defaults": {
@@ -246,8 +257,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -268,9 +278,17 @@
       "options": {
         "alignValue": "center",
         "colWidth": 1,
+        "legend": {
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "mergeValues": true,
         "mode": "changes",
         "rowHeight": 0.98,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "targets": [
         {
@@ -301,7 +319,6 @@
       "type": "state-timeline"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -319,8 +336,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -339,7 +355,6 @@
         "y": 19
       },
       "id": 4,
-      "interval": null,
       "maxDataPoints": 20,
       "options": {
         "alignValue": "center",
@@ -349,9 +364,11 @@
           "displayMode": "list",
           "placement": "bottom"
         },
-        "mode": "samples",
         "rowHeight": 0.98,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "pluginVersion": "7.5.0-pre",
       "targets": [
@@ -410,5 +427,5 @@
   "timezone": "utc",
   "title": "Timeline Demo",
   "uid": "mIJjFy8Kz",
-  "version": 13
-}
+  "version": 3
+}

devenv/dev-dashboards/panel-timeline/timeline-modes.json

@@ -8,18 +8,22 @@
         "hide": true,
         "iconColor": "rgba(0, 211, 255, 1)",
         "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
         "type": "dashboard"
       }
     ]
   },
   "editable": true,
-  "gnetId": null,
   "graphTooltip": 0,
   "id": 329,
   "links": [],
   "panels": [
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -34,8 +38,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -63,7 +66,10 @@
         },
         "mergeValues": true,
         "rowHeight": 0.9,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "pluginVersion": "7.5.0-pre",
       "targets": [
@@ -165,7 +171,6 @@
               1616557148000
             ],
             [
-              null,
               1616558756000
             ],
             [
@@ -173,7 +178,6 @@
               1616561658000
             ],
             [
-              null,
               1616562446000
             ],
             [
@@ -181,7 +185,6 @@
               1616564104000
             ],
             [
-              null,
               1616564548000
             ],
             [
@@ -197,7 +200,6 @@
       "type": "state-timeline"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -212,8 +214,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -241,7 +242,10 @@
         },
         "mergeValues": true,
         "rowHeight": 0.9,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "pluginVersion": "7.5.0-pre",
       "targets": [
@@ -267,7 +271,6 @@
       "type": "state-timeline"
     },
     {
-      "datasource": null,
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -282,8 +285,7 @@
             "mode": "percentage",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "#EAB839",
@@ -306,7 +308,6 @@
         "y": 21
       },
       "id": 4,
-      "interval": null,
       "maxDataPoints": 20,
       "options": {
         "colWidth": 0.9,
@@ -316,7 +317,10 @@
           "placement": "bottom"
         },
         "rowHeight": 0.9,
-        "showValue": "always"
+        "showValue": "always",
+        "tooltip": {
+          "mode": "single"
+        }
       },
       "pluginVersion": "7.5.0-pre",
       "targets": [
@@ -371,5 +375,5 @@
   "timezone": "utc",
   "title": "Timeline Modes",
   "uid": "mIJjFy8Gz",
-  "version": 12
+  "version": 13
 }

devenv/dev-dashboards/transforms/config-from-query.json

@@ -20,12 +20,10 @@
     },
     "description": "",
     "editable": true,
-    "gnetId": null,
     "graphTooltip": 0,
     "links": [],
     "panels": [
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -51,10 +49,6 @@
               },
               "showPoints": "auto",
               "spanNulls": false,
-              "stacking": {
-                "group": "A",
-                "mode": "none"
-              },
               "thresholdsStyle": {
                 "mode": "line"
               }
@@ -64,8 +58,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -122,7 +115,6 @@
         "type": "timeseries"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -137,8 +129,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -209,7 +200,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -224,8 +214,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -291,7 +280,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -306,8 +294,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -377,7 +364,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -392,8 +378,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -446,7 +431,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -470,8 +454,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -565,4 +548,4 @@
     "title": "Transforms - Config from query",
     "uid": "Juj4_7ink",
     "version": 1
-  }
+  }

devenv/dev-dashboards/transforms/rows-to-fields.json

@@ -19,7 +19,6 @@
       ]
     },
     "editable": true,
-    "gnetId": null,
     "graphTooltip": 0,
     "links": [],
     "panels": [
@@ -39,8 +38,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -87,8 +85,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -146,7 +143,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -157,8 +153,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -209,7 +204,6 @@
         "type": "stat"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -221,8 +215,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -286,8 +279,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -334,8 +326,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -393,7 +384,6 @@
         "type": "table"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -404,8 +394,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -454,7 +443,6 @@
         "type": "bargauge"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -466,8 +454,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 }
               ]
             }
@@ -530,7 +517,6 @@
         "type": "gauge"
       },
       {
-        "datasource": null,
         "fieldConfig": {
           "defaults": {
             "color": {
@@ -541,8 +527,7 @@
               "mode": "absolute",
               "steps": [
                 {
-                  "color": "green",
-                  "value": null
+                  "color": "green"
                 },
                 {
                   "color": "red",
@@ -612,4 +597,4 @@
     "title": "Transforms - Rows to fields",
     "uid": "PMtIInink",
     "version": 1
-  }
+  }

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

@@ -24,12 +24,12 @@
       - influxdb
 
   telegraf:
-    image: telegraf:1.19.1
+    image: telegraf:latest
     links:
       - influxdb
     depends_on:
       - influxdb_cli
     volumes:
       - ./docker/blocks/influxdb/telegraf.conf:/etc/telegraf/telegraf.conf:ro
-      - /var/log:/var/log
+      - /var/log:/var/log/host
       - ../data/log:/var/log/grafana

devenv/docker/blocks/influxdb/telegraf.conf

@@ -44,7 +44,7 @@
 
 [[inputs.logparser]]
   files = [
-    "/var/log/*.log",
+    "/var/log/host/*.log",
     "/var/log/grafana/*.log"
   ]
   [inputs.logparser.grok]

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

@@ -1,5 +1,5 @@
   influxdb1:
-    image: influxdb:1.8.6
+    image: influxdb:1.8
     container_name: influxdb1
     ports:
       - '2004:2004'
@@ -22,11 +22,11 @@
       FD_PORT: 8086
 
   telegraf-influxdb1:
-    image: telegraf:1.19.1
+    image: telegraf:latest
     links:
       - influxdb1
     volumes:
       - ./docker/blocks/influxdb1/telegraf.conf:/etc/telegraf/telegraf.conf:ro
-      - /var/log:/var/log
+      - /var/log:/var/log/host
       - ../data/log:/var/log/grafana
 

devenv/docker/blocks/influxdb1/telegraf.conf

@@ -52,7 +52,7 @@
 
 [[inputs.logparser]]
   files = [
-    "/var/log/*.log",
+    "/var/log/host/*.log",
     "/var/log/grafana/*.log"
   ]
   [inputs.logparser.grok]

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

@@ -1,11 +1,11 @@
   # datasource URL: http://localhost:3100/
   loki:
-    image: grafana/loki:master
+    image: grafana/loki:latest
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
   promtail:
-    image: grafana/promtail:master
+    image: grafana/promtail:latest
     volumes:
       - ./docker/blocks/loki/config.yaml:/etc/promtail/docker-config.yaml
       - /var/log:/var/log

devenv/docker/blocks/prometheus_random_data/Dockerfile

@@ -1,18 +1,13 @@
 # This Dockerfile builds an image for a client_golang example.
 
 # Builder image, where we build the example.
-FROM golang:1.15.1 AS builder
+FROM golang:1.17 AS builder
 # Download prometheus/client_golang/examples/random first
-RUN go get github.com/prometheus/client_golang/examples/random
-WORKDIR /go/src/github.com/prometheus/client_golang
-WORKDIR /go/src/github.com/prometheus/client_golang/prometheus
-RUN go get -d
-WORKDIR /go/src/github.com/prometheus/client_golang/examples/random
-RUN CGO_ENABLED=0 GOOS=linux go build -a -tags netgo -ldflags '-w'
+RUN CGO_ENABLED=0 GOOS=linux go install -tags netgo -ldflags '-w' github.com/prometheus/client_golang/examples/random@latest
 
 # Final image.
 FROM scratch
 LABEL maintainer "The Prometheus Authors <prometheus-developers@googlegroups.com>"
-COPY --from=builder /go/src/github.com/prometheus/client_golang/examples/random .
+COPY --from=builder /go/bin/random .
 EXPOSE 8080
 ENTRYPOINT ["/random"]

devenv/docker/ha-test-unified-alerting/.gitignore

@@ -0,0 +1 @@
+grafana/provisioning/dashboards/alerts/alert-*

devenv/docker/ha-test-unified-alerting/README.md

@@ -0,0 +1,66 @@
+# Grafana Unified Alerting High Availability (HA) test setup
+
+A set of docker compose services which together creates a Grafana HA test setup for unified alerting.
+
+Included services
+
+- Grafana
+- Mysql - Grafana configuration database, exporter for metrics and session storage
+- Prometheus - Monitoring of Grafana and used as data source
+- Nginx - Reverse proxy for Grafana and Prometheus. Enables browsing Grafana/Prometheus UI using a hostname
+
+## Prerequisites
+
+### Build grafana docker container
+
+Build a Grafana docker container from current branch and commit and tag it as grafana/grafana:dev.
+
+```bash
+$ cd <grafana repo>
+$ make build-docker-full
+```
+
+### Virtual host names
+
+#### Alternative 1 - Use dnsmasq
+
+```bash
+$ sudo apt-get install dnsmasq
+$ echo 'address=/loc/127.0.0.1' | sudo tee /etc/dnsmasq.d/dnsmasq-loc.conf > /dev/null
+$ sudo /etc/init.d/dnsmasq restart
+$ ping whatever.loc
+PING whatever.loc (127.0.0.1) 56(84) bytes of data.
+64 bytes from localhost (127.0.0.1): icmp_seq=1 ttl=64 time=0.076 ms
+--- whatever.loc ping statistics ---
+1 packet transmitted, 1 received, 0% packet loss, time 1998ms
+```
+
+#### Alternative 2 - Manually update /etc/hosts
+
+Update your `/etc/hosts` to be able to access Grafana and/or Prometheus UI using a hostname.
+
+```bash
+$ cat /etc/hosts
+127.0.0.1       grafana.loc
+127.0.0.1       prometheus.loc
+```
+
+## Start services
+
+```bash
+$ docker-compose up -d
+```
+
+Browse
+- http://grafana.loc/
+- http://prometheus.loc/
+
+
+## Test alerting
+
+### Create contact points
+TBD
+### Create alerts
+TBD
+### Create silences
+TBD

devenv/docker/ha-test-unified-alerting/docker-compose.yaml

@@ -0,0 +1,90 @@
+version: "2.1"
+
+services:
+  db:
+    image: mysql:5.6
+    platform: linux/x86_64
+    environment:
+      MYSQL_ROOT_PASSWORD: rootpass
+      MYSQL_DATABASE: grafana
+      MYSQL_USER: grafana
+      MYSQL_PASSWORD: password
+    command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all, --max-connections=1001]
+    ports:
+      - 3306
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      timeout: 10s
+      retries: 10
+  mysqld-exporter:
+    image: prom/mysqld-exporter
+    environment:
+      - DATA_SOURCE_NAME=root:rootpass@(db:3306)/
+    ports:
+      - 9104
+    depends_on:
+      db:
+        condition: service_healthy
+  prometheus:
+    image: prom/prometheus:v2.4.2
+    volumes:
+      - ./prometheus/:/etc/prometheus/
+    environment:
+      - VIRTUAL_HOST=prometheus.loc
+    ports:
+      - 909
+  nginx-proxy:
+    image: jwilder/nginx-proxy
+    ports:
+      - "80:80"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    depends_on:
+      db:
+        condition: service_healthy
+  grafana1:
+    image: grafana/grafana:dev
+    volumes:
+      - ./grafana/provisioning/:/etc/grafana/provisioning/
+    environment:
+      - VIRTUAL_HOST=grafana.loc
+      - GF_FEATURE_TOGGLES_ENABLE=ngalert
+      - GF_UNIFIED_ALERTING_HA_PEERS=ha-test-unified-alerting_grafana2_1:9094,ha-test-unified-alerting_grafana1_1:9094
+      - GF_SERVER_ROOT_URL=http://grafana.loc
+      - GF_DATABASE_NAME=grafana
+      - GF_DATABASE_USER=grafana
+      - GF_DATABASE_PASSWORD=password
+      - GF_DATABASE_TYPE=mysql
+      - GF_DATABASE_HOST=db:3306
+      - GF_DATABASE_MAX_OPEN_CONN=300
+      - GF_SESSION_PROVIDER=mysql
+      - GF_SESSION_PROVIDER_CONFIG=grafana:password@tcp(db:3306)/grafana?allowNativePasswords=true
+    ports:
+      - 3010:3000
+    depends_on:
+      db:
+        condition: service_healthy
+
+  grafana2:
+    image: grafana/grafana:dev
+    volumes:
+      - ./grafana/provisioning/:/etc/grafana/provisioning/
+    environment:
+      - VIRTUAL_HOST=grafana.loc
+      - GF_FEATURE_TOGGLES_ENABLE=ngalert
+      - GF_UNIFIED_ALERTING_HA_PEERS=ha-test-unified-alerting_grafana2_1:9094,ha-test-unified-alerting_grafana1_1:9094
+      - GF_SERVER_ROOT_URL=http://grafana.loc
+      - GF_DATABASE_NAME=grafana
+      - GF_DATABASE_USER=grafana
+      - GF_DATABASE_PASSWORD=password
+      - GF_DATABASE_TYPE=mysql
+      - GF_DATABASE_HOST=db:3306
+      - GF_DATABASE_MAX_OPEN_CONN=300
+      - GF_SESSION_PROVIDER=mysql
+      - GF_SESSION_PROVIDER_CONFIG=grafana:password@tcp(db:3306)/grafana?allowNativePasswords=true
+    ports:
+      - 3020:3000
+    depends_on:
+      db:
+        condition: service_healthy
+

devenv/docker/ha-test-unified-alerting/grafana/provisioning/alerts.jsonnet

@@ -0,0 +1,203 @@
+local numAlerts = std.extVar('alerts');
+local condition = std.extVar('condition');
+local arr = std.range(1, numAlerts);
+
+local alertDashboardTemplate = {
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "id": null,
+  "links": [],
+  "panels": [
+    {
+      "alert": {
+        "conditions": [
+          {
+            "evaluator": {
+              "params": [
+                65
+              ],
+              "type": "gt"
+            },
+            "operator": {
+              "type": "and"
+            },
+            "query": {
+              "params": [
+                "A",
+                "5m",
+                "now"
+              ]
+            },
+            "reducer": {
+              "params": [],
+              "type": "avg"
+            },
+            "type": "query"
+          }
+        ],
+        "executionErrorState": "alerting",
+        "frequency": "10s",
+        "handler": 1,
+        "for": "1m",
+        "name": "bulk alerting",
+        "noDataState": "no_data",
+        "notifications": [
+          {
+            "id": 2
+          }
+        ]
+      },
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "$$hashKey": "object:117",
+          "expr": "go_goroutines",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "refId": "A"
+        }
+      ],
+      "thresholds": [
+        {
+          "colorMode": "critical",
+          "fill": true,
+          "line": true,
+          "op": "gt",
+          "value": 50
+        }
+      ],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Panel Title",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ]
+    }
+  ],
+  "schemaVersion": 16,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "",
+  "title": "New dashboard",
+  "uid": null,
+  "version": 0
+};
+
+
+{
+  ['alert-' + std.toString(x) + '.json']:
+    alertDashboardTemplate + {
+      panels: [
+        alertDashboardTemplate.panels[0] +
+        {
+          alert+: {
+            name: 'Alert rule ' + x,
+            conditions: [
+              alertDashboardTemplate.panels[0].alert.conditions[0] +
+              {
+                evaluator+: {
+                  params: [condition]
+                }
+              },
+            ],
+          },
+        },
+      ],
+      uid: 'alert-' + x,
+      title: 'Alert ' + x
+    },
+      for x in arr
+}

devenv/docker/ha-test-unified-alerting/grafana/provisioning/dashboards/alerts/overview.json

@@ -0,0 +1,172 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "links": [],
+  "panels": [
+    {
+      "aliasColors": {
+        "Active alerts": "#bf1b00"
+      },
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "Prometheus",
+      "fill": 1,
+      "gridPos": {
+        "h": 12,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 2,
+      "interval": "",
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": true,
+        "max": false,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 2,
+      "links": [],
+      "nullPointMode": "null",
+      "percentage": false,
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [
+        {
+          "alias": "Active grafana instances",
+          "dashes": true,
+          "fill": 0
+        }
+      ],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(increase(grafana_alerting_notification_sent_total[1m])) by(job)",
+          "format": "time_series",
+          "instant": false,
+          "interval": "1m",
+          "intervalFactor": 1,
+          "legendFormat": "Notifications sent",
+          "refId": "A"
+        },
+        {
+          "expr": "min(grafana_alerting_active_alerts) without(instance)",
+          "format": "time_series",
+          "interval": "1m",
+          "intervalFactor": 1,
+          "legendFormat": "Active alerts",
+          "refId": "B"
+        },
+        {
+          "expr": "count(up{job=\"grafana\"})",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Active grafana instances",
+          "refId": "C"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeShift": null,
+      "title": "Notifications sent vs active alerts",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": 3
+      }
+    }
+  ],
+  "schemaVersion": 16,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-1h",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "",
+  "title": "Overview",
+  "uid": "xHy7-hAik",
+  "version": 6
+}

devenv/docker/ha-test-unified-alerting/grafana/provisioning/dashboards/dashboards.yaml

@@ -0,0 +1,14 @@
+apiVersion: 1
+
+providers:
+ - name: 'Alerts'
+   folder: 'Alerts'
+   type: file
+   options:
+     path: /etc/grafana/provisioning/dashboards/alerts
+
+ - name: 'MySQL'
+   folder: 'MySQL'
+   type: file
+   options:
+     path: /etc/grafana/provisioning/dashboards/mysql

devenv/docker/ha-test-unified-alerting/grafana/provisioning/datasources/datasources.yaml

@@ -0,0 +1,16 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    access: proxy
+    url: http://prometheus:9090
+    jsonData:
+      timeInterval: 10s
+      queryTimeout: 30s
+      httpMethod: POST
+
+  - name: Loki
+    type: loki
+    access: proxy
+    url: http://loki:3100

devenv/docker/ha-test-unified-alerting/prometheus/prometheus.yml

@@ -0,0 +1,47 @@
+# my global config
+global:
+  scrape_interval:     10s # By default, scrape targets every 15 seconds.
+  evaluation_interval: 10s # By default, scrape targets every 15 seconds.
+  # scrape_timeout is set to the global default (10s).
+
+# Load and evaluate rules in this file every 'evaluation_interval' seconds.
+#rule_files:
+# - "alert.rules"
+# - "first.rules"
+# - "second.rules"
+
+# alerting:
+#   alertmanagers:
+#   - scheme: http
+#     static_configs:
+#     - targets:
+#       - "127.0.0.1:9093"
+
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['localhost:9090']
+
+  - job_name: 'grafana'
+    dns_sd_configs:
+      - names:
+        - 'grafana'
+        type: 'A'
+        port: 3000
+        refresh_interval: 10s
+
+  - job_name: 'mysql'
+    dns_sd_configs:
+      - names:
+        - 'mysqld-exporter'
+        type: 'A'
+        port: 9104
+        refresh_interval: 10s
+
+  - job_name: 'loki'
+    dns_sd_configs:
+      - names:
+        - 'loki'
+        type: 'A'
+        port: 3100
+        refresh_interval: 10s

devenv/vscode/launch.json

@@ -0,0 +1,21 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "grafana-server",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/pkg/cmd/grafana-server",
+      "env": {},
+      "args": [
+          "--homepath=${workspaceFolder}",
+          "--packaging=dev",
+          "cfg:app_mode=development",
+      ]
+  }
+  ]
+}

docs/README.md

@@ -25,17 +25,29 @@ Edit content in the `sources` directory.
 Use the Hugo shortcode [relref](https://gohugo.io/content-management/cross-references/#use-ref-and-relref) any time you are linking to other internal docs pages.
 
 Syntax is:
+
 ```
 {{< relref "example.md" >}}
 ```
 
-You might need to add more context for the link (containing folders and so on, `folder/example.md`) if Hugo says the relref is ambiguous. 
+You might need to add more context for the link (containing folders and so on, `folder/example.md`) if Hugo says the relref is ambiguous.
 
+### Managing redirects
+
+When moving content around or removing pages it's important that users following old links are properly redirected to the new location. We do this using the [aliases](https://gohugo.io/content-management/urls/#aliases) feature in Hugo.
+
+If you are moving a page, add an `aliases` entry in the front matter referencing the old location of the page which will redirect the old url to the new location.
+
+If you are removing a page, add an `aliases` entry in the front matter of the most-applicable page referencing the location of the page being removed.
+
+If you are copying an existing page as the basis for a new one, be sure to remove any `aliases` entries in the front matter in your copy to avoid conflicting redirects.
 
 ### Edit the side menu
 
 The side menu is automatically build from the file structure. Use the [weight](https://gohugo.io/templates/lists/#by-weight) front matter parameter to order pages.
 
+To specify different menu text from the page title, use the front matter parameter `menuTitle`.
+
 ### Add images
 
 Images are currently hosted in the grafana/website repo.
@@ -44,6 +56,9 @@ Images are currently hosted in the grafana/website repo.
 
 ## Deploy changes to grafana.com
 
-When a PR is merged to main with changes in the `docs/sources` directory, those changes are automatically synced to the grafana/website repo and published to the staging site.
+When a PR is merged with changes in the `docs/sources` directory, those changes are automatically synced by a GitHub action (`.github/workflows/publish.yml`) to the grafana/website repo.
 
-Generally, someone from marketing will publish to production each day: so as long as the sync is successful your docs edits will be published. Alternatively, you can refer to [publishing to production](https://github.com/grafana/website#publishing-to-production-grafanacom) if you'd like to do it yourself.
+- A PR that targets the `main` branch syncs to the `content/docs/grafana/next` directory in the `website` repository, and publishes to `https://grafana.com/docs/grafana/next/`.
+- A PR targeting the `latest/current` release branch syncs to the `content/docs/grafana/latest` directory in the `website` repository, and publishes to `https://grafana.com/docs/grafana/latest/`.
+
+Once the sync is complete, the website will automatically publish to production - no further action is needed.

docs/sources/_index.md

@@ -94,7 +94,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
       <img src="/static/img/docs/logos/icon_cloudmonitoring.svg">
       <h5>Google Cloud Monitoring</h5>
     </a>
-    <a href="{{< relref "datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
+    <a href="{{< relref "datasources/aws-cloudwatch/_index.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/static/img/docs/logos/icon_cloudwatch.svg">
       <h5>AWS CloudWatch</h5>
     </a>

docs/sources/administration/configuration.md

@@ -16,6 +16,8 @@ To see all settings currently applied to the Grafana server, refer to [View serv
 
 ## Config file locations
 
+The default settings for a Grafana instance are stored in the `$WORKING_DIR/conf/defaults.ini` file. _Do not_ change the location in this file.
+
 _Do not_ change `defaults.ini`! Grafana defaults are stored in this file. Depending on your OS, make all configuration changes in either `custom.ini` or `grafana.ini`.
 
 - Default configuration from `$WORKING_DIR/conf/defaults.ini`
@@ -435,6 +437,14 @@ The length of time that Grafana maintains idle connections before closing them.
 
 If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request. Default is `false`.
 
+### response_limit
+
+Limits the amount of bytes that will be read/accepted from responses of outgoing HTTP requests. Default is `0` which means disabled.
+
+### row_limit
+
+Limits the number of rows that Grafana will process from SQL (relational) data sources. Default is `1000000`.
+
 <hr />
 
 ## [analytics]
@@ -460,6 +470,14 @@ Analytics ID here. By default this feature is disabled.
 
 Google Tag Manager ID, only enabled if you enter an ID here.
 
+### application_insights_connection_string
+
+If you want to track Grafana usage via Azure Application Insights, then specify _your_ Application Insights connection string. Since the connection string contains semicolons, you need to wrap it in backticks (`). By default, tracking usage is disabled.
+
+### application_insights_endpoint_url
+
+    	Optionally, use this option to override the default endpoint address for Application Insights data collecting. For details, refer to the [Azure documentation](https://docs.microsoft.com/en-us/azure/azure-monitor/app/custom-endpoints?tabs=js).
+
 <hr />
 
 ## [security]
@@ -1099,13 +1117,97 @@ Sets a global limit on number of alert rules that can be created. Default is -1
 
 <hr>
 
+## [unified_alerting]
+
+For more information about the Grafana 8 alerts, refer to [Unified Alerting]({{< relref "../alerting/unified-alerting/_index.md" >}}).
+
+### enabled
+
+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. The default value is `false`.
+
+Alerting Rules migrated from dashboards and panels will include a link back via the `annotations`.
+
+### disabled_orgs
+
+Comma-separated list of organization IDs for which to disable Grafana 8 Unified Alerting.
+
+### admin_config_poll_interval
+
+Specify the frequency of polling for admin config changes. The default value is `60s`.
+
+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.
+
+### alertmanager_config_poll_interval
+
+Specify the frequency of polling for Alertmanager config changes. The default value is `60s`.
+
+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.
+
+### ha_listen_address
+
+Listen address/hostname and port to receive unified alerting messages for other Grafana instances. The port is used for both TCP and UDP. It is assumed other Grafana instances are also running on the same port. The default value is `0.0.0.0:9094`.
+
+### ha_advertise_address
+
+Explicit address/hostname and port to advertise other Grafana instances. The port is used for both TCP and UDP.
+
+### ha_peers
+
+Comma-separated list of initial instances (in a format of host:port) that will form the HA cluster. Configuring this setting will enable High Availability mode for alerting.
+
+### ha_peer_timeout
+
+Time to wait for an instance to send a notification via the Alertmanager. In HA, each Grafana instance will
+be assigned a position (e.g. 0, 1). We then multiply this position with the timeout to indicate how long should
+each instance wait before sending the notification to take into account replication lag. The default value is `15s`.
+
+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.
+
+### ha_gossip_interval
+
+The interval between sending gossip messages. By lowering this value (more frequent) gossip messages are propagated
+across cluster more quickly at the expense of increased bandwidth usage. The default value is `200ms`.
+
+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.
+
+### ha_push_pull_interval
+
+The interval between gossip full state syncs. Setting this interval lower (more frequent) will increase convergence speeds
+across larger clusters at the expense of increased bandwidth usage. The default value is `60s`.
+
+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.
+
+### execute_alerts
+
+Enable or disable alerting rule execution. The default value is `true`. The alerting UI remains visible. This option has a [legacy version in the alerting section]({{< relref "#execute_alerts-1">}}) that takes precedence.
+
+### evaluation_timeout
+
+Sets the alert evaluation timeout when fetching data from the datasource. The default value is `30s`. This option has a [legacy version in the alerting section]({{< relref "#evaluation_timeout_seconds">}}) that takes precedence.
+
+The timeout string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. 30s or 1m.
+
+### max_attempts
+
+Sets a maximum number of times we'll attempt to evaluate an alert rule before giving up on that evaluation. The default value is `3`. This option has a [legacy version in the alerting section]({{< relref "#max_attempts-1">}}) that takes precedence.
+
+### min_interval
+
+Sets the minimum interval to enforce between rule evaluations. The default value is `10s` which equals the scheduler interval. Rules will be adjusted if they are less than this value or if they are not multiple of the scheduler interval (10s). Higher values can help with resource management as we'll schedule fewer evaluations over time. This option has [a legacy version in the alerting section]({{< relref "#min_interval_seconds">}}) that takes precedence.
+
+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.
+
+> **Note.** This setting has precedence over each individual rule frequency. If a rule frequency is lower than this value, then this value is enforced.
+
+<hr>
+
 ## [alerting]
 
 For more information about the Alerting feature in Grafana, refer to [Alerts overview]({{< relref "../alerting/_index.md" >}}).
 
 ### enabled
 
-Set to `false` to disable alerting engine and hide Alerting in the Grafana UI. Default is `true`.
+Set to `false` to [enable Grafana 8 alerting]({{<relref "#unified_alerting">}}) and to disable legacy alerting engine. Default is `true`.
 
 ### execute_alerts
 
@@ -1416,7 +1518,7 @@ Optional extra path inside bucket.
 
 ### enable_signed_urls
 
-If set to true, Grafana creates a [signed URL](https://cloud.google.com/storage/docs/access-control/signed-urls] for
+If set to true, Grafana creates a [signed URL](https://cloud.google.com/storage/docs/access-control/signed-urls) for
 the image uploaded to Google Cloud Storage.
 
 ### signed_url_expiration
@@ -1651,7 +1753,7 @@ For more information about Grafana Enterprise, refer to [Grafana Enterprise]({{<
 
 ### enable
 
-Keys of alpha features to enable, separated by space. Available alpha features are: `ngalert`
+Keys of alpha features to enable, separated by space.
 
 ## [date_formats]
 

docs/sources/administration/provisioning.md

@@ -154,6 +154,7 @@ Since not all datasources have the same configuration settings we only have the
 | maxSeries               | number  | Influxdb                                                         | Max number of series/tables that Grafana processes                                                                                                |
 | httpMethod              | string  | Prometheus                                                       | HTTP Method. 'GET', 'POST', defaults to POST                                                                                                      |
 | customQueryParameters   | string  | Prometheus                                                       | Query parameters to add, as a URL-encoded string.                                                                                                 |
+| manageAlerts            | boolean | Prometheus and Loki                                              | Manage alerts via Alerting UI                                                                                                                     |
 | esVersion               | string  | Elasticsearch                                                    | Elasticsearch version (E.g. `7.0.0`, `7.6.1`)                                                                                                     |
 | timeField               | string  | Elasticsearch                                                    | Which field that should be used as timestamp                                                                                                      |
 | interval                | string  | Elasticsearch                                                    | Index date time format. nil(No Pattern), 'Hourly', 'Daily', 'Weekly', 'Monthly' or 'Yearly'                                                       |
@@ -448,7 +449,7 @@ The following sections detail the supported settings and secure settings for eac
 | ---------- | -------------- |
 | url        | yes            |
 | avatar_url |                |
-| message    |                |
+| content    |                |
 
 #### Alert notification `slack`
 

docs/sources/administration/security.md

@@ -16,6 +16,12 @@ To prevent this type of exploitation from happening, we recommend that you apply
 
 You can configure Grafana to only allow certain IP addresses or hostnames to be used as data source URLs and proxied through the Grafana data source proxy. Refer to [data_source_proxy_whitelist]({{< relref "../administration/configuration/#data-source-proxy-whitelist" >}}) for usage instructions.
 
+## Request security
+
+The request security configuration option allows users to limit requests from the Grafana server. It targets requests that are generated by users. For more information, refer to [Request security]({{< relref "../enterprise/request-security.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).
+
+> **Note:** Request security is available in Grafana Enterprise v7.4 and later versions.
+
 ## Firewall rules
 
 Configure a firewall to restrict Grafana from making network requests to sensitive internal web services.

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

@@ -9,14 +9,14 @@ weight = 400
 
 > Refer to [Fine-grained access control]({{< relref "../../enterprise/access-control/_index.md" >}}) in Grafana Enterprise to understand how you can control access with fine-grained permissions.
 
-If you are a Grafana server admin, then you can view useful statistics about your Grafana server in the Stats tab.
+If you are a Grafana server admin, then you can view useful statistics about your Grafana server in the Stats & Licensing tab.
 
 > **Note:** Only Grafana server administrators can access the **Server Admin** menu. For more information about about administrative permissions, refer to [Grafana server admin]({{< relref "../../permissions/_index.md" >}}).
 
 ## View server stats
 
 1. Log in to your Grafana server with an account that has the Grafana Admin flag set.
-1. Hover your cursor over the **Server Admin** (shield) icon in the side menu and then click the **Stats** tab.
+1. Hover your cursor over the **Server Admin** (shield) icon in the side menu and then click the **Stats & Licensing** tab.
 
 ## Available stats
 

docs/sources/alerting/_index.md

@@ -7,7 +7,9 @@ weight = 110
 
 Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services.
 
-Grafana 8.0 has new and improved alerts. The new alerting system are an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible data sources in one UI and API.
+Grafana 8.0 has new and improved alerts that centralizes alerting information for Grafana managed alerts as well as alerts from Prometheus-compatible data sources into one user interface and API.
+
+> **Note:** Grafana 8 alerts is an [opt-in]({{< relref "./unified-alerting/opt-in.md" >}}) feature. Out of the box, Grafana still supports old [legacy dashboard alerts]({{< relref "./old-alerting/_index.md" >}}). We encourage you to create issues in the Grafana GitHub repository for bugs found while testing Grafana 8 alerts.
 
 Alerts have four main components:
 

docs/sources/alerting/difference-old-new.md

@@ -1,13 +1,13 @@
 +++
-title = "What's New with Grafana 8 Alerts"
+title = "What's New with Grafana 8 alerts"
 description = "What's New with Grafana 8 Alerts"
 keywords = ["grafana", "alerting", "guide"]
 weight = 112
 +++
 
-# What's New with Grafana 8 Alerts
+# What's New with Grafana 8 alerts
 
-The Alerts released with Grafana 8.0 are an opt-in feature that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible datasources in one UI and API. You are able to create and edit alerting rules for Grafana managed alerts, Cortex alerts, and Loki alerts as well as see alerting information from prometheus-compatible datasources in a single, searchable view.
+The alerts released with Grafana 8.0 centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible datasources in one UI and API. You can create and edit alerting rules for Grafana managed alerts, Cortex alerts, and Loki alerts as well as see alerting information from prometheus-compatible datasources in a single, searchable view.
 
 ## Multi-dimensional alerting
 

docs/sources/alerting/old-alerting/notifications.md

@@ -51,7 +51,7 @@ These examples show how often and when reminders are sent for a triggered alert.
 ## List of supported notifiers
 
 | Name                                          | Type                      | Supports images    | Support alert rule tags |
-| --------------------------------------------- | ------------------------- | ------------------ | ----------------------- |
+| --------------------------------------------- | ------------------------- | ------------------ | ----------------------- | --- |
 | [DingDing](#dingdingdingtalk)                 | `dingding`                | yes, external only | no                      |
 | [Discord](#discord)                           | `discord`                 | yes                | no                      |
 | [Email](#email)                               | `email`                   | yes                | no                      |
@@ -70,8 +70,7 @@ These examples show how often and when reminders are sent for a triggered alert.
 | Telegram                                      | `telegram`                | yes                | no                      |
 | Threema                                       | `threema`                 | yes, external only | no                      |
 | VictorOps                                     | `victorops`               | yes, external only | yes                     |
-| [Webhook](#webhook)                           | `webhook`                 | yes, external only | yes                     |
-| [Zenduty](#zenduty)                           | `webhook`                 | yes, external only | yes                     |
+| [Webhook](#webhook)                           | `webhook`                 | yes, external only | yes                     |     |
 
 ### Email
 
@@ -257,13 +256,9 @@ Alertmanager handles alerts sent by client applications such as Prometheus serve
 
 > **Caution:** In case of a high-availability setup, do not load balance traffic between Grafana and Alertmanagers to keep coherence between all your Alertmanager instances. Instead, point Grafana to a list of all Alertmanagers, by listing their URLs comma-separated in the notification channel configuration.
 
-### Zenduty
-
-[Zenduty](https://www.zenduty.com) is an incident alerting and response orchestration platform that not alerts the right teams via SMS, Phone(Voice), Email, Slack, Microsoft Teams and Push notifications(Android/iOS) whenever a Grafana alert is triggered, but also helps you rapidly triage and remediate critical, user impacting incidents. Grafana alert are sent to Zenduty through Grafana's native webhook dispatcher. Refer the Zenduty-Grafana [integration documentation](https://docs.zenduty.com/docs/grafana) for configuring the integration.
-
 ### Sensu Go
 
-[Sensu](https://sensu.io) is a complete solution for monitoring and observability at scale. Sensu Go is designed to give you visibility into everything you care about: traditional server closets, containers, applications, the cloud, and more. Grafana notifications can be sent to Sensu Go as events via the API. This operation requires an API Key. Refer to the [Sensu Go documentation](https://docs.sensu.io/sensu-go/latest/operations/control-access/use-apikeys/#api-key-authentication) for information on creating this key.
+Grafana alert notifications can be sent to [Sensu](<(https://sensu.io)>) Go as events via the API. This operation requires an API key. For information on creating this key, refer to [Sensu Go documentation](https://docs.sensu.io/sensu-go/latest/operations/control-access/use-apikeys/#api-key-authentication).
 
 ## Enable images in notifications {#external-image-store}
 

docs/sources/alerting/unified-alerting/_index.md

@@ -6,11 +6,11 @@ weight = 113
 
 # Overview of Grafana 8 alerts
 
-Alerts allow you to know about problems in your systems moments after they occur. Robust and actionable alerts help you identify and resolve issues quickly, minimizing disruption to your services.
+Grafana 8.0 has a new and improved alerting sub-system that centralizes alerting information for Grafana managed alerts and alerts from Prometheus-compatible data sources into one user interface and API.
 
-> **Note:** This information is for the new, Grafana 8 Alerts. This is an [opt-in]({{< relref"./opt-in.md" >}}) feature released in Grafana 8.0. Grafana still supports [legacy dashboard alerts]({{< relref "../old-alerting/_index.md" >}}) out of the box
+> **Note:** Grafana 8 alerts is an [opt-in]({{< relref "../unified-alerting/opt-in.md" >}}) feature. Out of the box, Grafana still supports old [legacy dashboard alerts]({{< relref "./old-alerting/_index.md" >}}). We encourage you to create issues in the Grafana GitHub repository for bugs found while testing Grafana 8 alerts.
 
-Alerts have four main components:
+Grafana 8 alerts have four main components:
 
 - Alerting rule - One or more query and/or expression, a condition, the frequency of evaluation, and the (optional) duration that a condition must be met before creating an alert.
 - Contact point - A channel for sending notifications when the conditions of an alerting rule are met.
@@ -45,16 +45,18 @@ Alerting rules can only query backend data sources with alerting enabled:
 
 ## Metrics from the alerting engine
 
-The alerting engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../../administration/view-server/internal-metrics.md" >}}).
+The alerting engine publishes some internal metrics about itself. You can read more about how Grafana publishes [internal metrics]({{< relref "../../administration/view-server/internal-metrics.md" >}}). See also, [View alert rules and their current state]({{< relref "alerting-rules/rule-list.md" >}}).
 
-| Metric Name                                 | Type      | Description                                                                              |
-| ------------------------------------------- | --------- | ---------------------------------------------------------------------------------------- |
-| `alerting.alerts`                           | gauge     | How many alerts by state                                                                 |
-| `alerting.request_duration_seconds`         | histogram | Histogram of requests to the Alerting API                                                |
-| `alerting.active_configurations`            | gauge     | The number of active, non default Alertmanager configurations for grafana managed alerts |
-| `alerting.rule_evaluations_total`           | counter   | The total number of rule evaluations                                                     |
-| `alerting.rule_evaluation_failures_total`   | counter   | The total number of rule evaluation failures                                             |
-| `alerting.rule_evaluation_duration_seconds` | summary   | The duration for a rule to execute                                                       |
-| `alerting.rule_group_rules`                 | gauge     | The number of rules                                                                      |
+| Metric Name                                       | Type      | Description                                                                              |
+| ------------------------------------------------- | --------- | ---------------------------------------------------------------------------------------- |
+| `grafana_alerting_alerts`                         | gauge     | How many alerts by state                                                                 |
+| `grafana_alerting_request_duration`               | histogram | Histogram of requests to the Alerting API                                                |
+| `grafana_alerting_active_configurations`          | gauge     | The number of active, non default Alertmanager configurations for grafana managed alerts |
+| `grafana_alerting_rule_evaluations_total`         | counter   | The total number of rule evaluations                                                     |
+| `grafana_alerting_rule_evaluation_failures_total` | counter   | The total number of rule evaluation failures                                             |
+| `grafana_alerting_rule_evaluation_duration`       | summary   | The duration for a rule to execute                                                       |
+| `grafana_alerting_rule_group_rules`               | gauge     | The number of rules                                                                      |
 
-- [View alert rules and their current state]({{< relref "alerting-rules/rule-list.md" >}})
+## Limitation
+
+Grafana 8 alerting system can retrieve rules from all available Prometheus, Loki, and Alertmanager data sources. It might not be able to fetch rules from all other supported data sources at this time.

docs/sources/alerting/unified-alerting/alerting-rules/_index.md

@@ -4,11 +4,13 @@ aliases = ["/docs/grafana/latest/alerting/rules/"]
 weight = 130
 +++
 
-# Create and manage alerting Rules
+# Create and manage alerting rules
 
 One or more queries and/or expressions, a condition, the frequency of evaluation, and the (optional) duration that a condition must be met before creating an alert. Alerting rules are how you express the criteria for creating an alert. Queries and expressions select and can operate on the data you wish to alert on. A condition sets the threshold that an alert must meet or exceed to create an alert. The interval specifies how frequently the rule should be evaluated. The duration, when configured, sets a period that a condition must be met or exceeded before an alert is created. Alerting rules also can contain settings for what to do when your query does not return any data, or there is an error attempting to execute the query.
 
 - [Create Cortex or Loki managed alert rule]({{< relref "./create-cortex-loki-managed-rule.md" >}})
+- [Create Cortex or Loki managed recording rule]({{< relref "./create-cortex-loki-managed-recording-rule.md" >}})
+- [Edit Cortex or Loki rule groups and namespaces]({{< relref "./edit-cortex-loki-namespace-group.md" >}})
 - [Create Grafana managed alert rule]({{< relref "./create-grafana-managed-rule.md" >}})
 - [State and Health of alerting rules]({{< relref "./state-and-health.md" >}})
 - [View existing alert rules and their current state]({{< relref "./rule-list.md" >}})

docs/sources/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule.md

@@ -0,0 +1,55 @@
++++
+title = "Create Cortex or Loki managed recording rule"
+description = "Create Cortex or Loki managed recording rule"
+keywords = ["grafana", "alerting", "guide", "rules", "recording rules", "create"]
+weight = 400
++++
+
+# Create a Cortex or Loki managed recording rule
+
+You can create and manage recording rules for an external Cortex or Loki instance. Recording rules calculate frequently needed expressions or computationally expensive expressions in advance and save the result as a new set of time series. Querying this new time series is faster, especially for dashboards since they query the same expression every time the dashboards refresh.
+
+For both Cortex and Loki data sources to work with Grafana 8.0 alerting, enable the ruler API by configuring their respective services. The `local` rule storage type (default for Loki data source), only supports viewing of rules. If you want to edit rules, then configure one of the other rule storage types.
+
+When configuring a Grafana Prometheus data source to point to Cortex, use the legacy /api/prom prefix, not /prometheus. Only single-binary mode is currently supported, provide a separate URL for the ruler API.
+
+## Add a Cortex or Loki managed recording rule
+
+1. Hover your cursor over the Alerting (bell) icon.
+1. Click **New alert rule**.
+1. Click on the **Alert type** drop down and select **Cortex / Loki managed recording rule**.
+1. Enter the recording rule details using instructions in the [Recording rule fields](#recording-rule-fields) section.
+1. Click **Save** in the upper right corner to save the rule.
+
+## Edit a Cortex or Loki managed recording rule
+
+1. Hover your cursor over the Alerting (bell) icon in the side menu.
+1. Expand an existing recording rule in the **Cortex / Loki** section and click **Edit**.
+1. Update the recording rule details using instructions in the [Recording rule fields](#recording-rule-fields) section.
+1. Click **Save and exit** to save and exit rule editing.
+
+## Recording rule fields
+
+This section describes the fields you fill out to create a recording rule.
+
+### Rule type
+
+- **Rule name -** Enter a descriptive name. The name will get displayed in the alert rule list. It will also get added as an `alertname` label to every alert instance that is created from this rule. Recording rules names must be valid [metric names](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels).
+- **Rule type -** Select **Cortex / Loki managed recording rule**.
+- **Data source -** Select a Prometheus or Loki data source. Only data sources that support Cortex ruler API are available.
+- **Namespace -** Select an existing rule namespace or click **Add new** and enter a name to create a new one. Namespaces can contain one or more rule groups and have only organizational purpose.
+- **Group -** Select an existing group within the selected namespace or click **Add new** to create a new group. Newly created rules are added to the end of this group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
+
+![Rule type section screenshot](/static/img/docs/alerting/unified/rule-edit-cortex-recording-rule-8-2.png 'Rule type section screenshot')
+
+### Query
+
+Enter a PromQL or LogQL expression. The result of this expression will get recorded as the value for the new metric.
+
+![Query section](/static/img/docs/alerting/unified/rule-edit-cortex-recording-rule-query-8-2.png 'Query section screenshot')
+
+### Details
+
+You can optionally define labels in the details section.
+
+![Details section](/static/img/docs/alerting/unified/rule-recording-rule-labels-8-2.png 'Details section screenshot')

docs/sources/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-rule.md

@@ -15,21 +15,21 @@ In order for both Cortex and Loki data sources to work with Grafana 8.0 alerting
 
 1. In the Grafana menu hover your cursor over the Alerting (bell) icon.
 1. To create a new alert rule, click **New alert rule**. To edit an existing rule, expand one of the rules in the **Cortex / Loki** section and click **Edit**.
-1. Click on the **Alert type** drop down and select **Cortex / Loki managed alert**.
+1. Click on the **Rule type** drop down and select **Cortex / Loki managed alert**.
 1. Fill out the rest of the fields. Descriptions are listed below in [Alert rule fields](#alert-rule-fields).
-1. When you have finished writing your rule, click **Save** in the upper right corner to save the rule,, or **Save and exit** to save and exit rule editing.
+1. When you have finished writing your rule, click **Save** in the upper right corner to save the rule, or **Save and exit** to save and exit rule editing.
 
 ## Alert rule fields
 
 This section describes the fields you fill out to create an alert.
 
-### Alert type
+### Rule type
 
-- **Alert name -** Enter a descriptive name. The name will be displayed in the alert rule list, as well as added as `alertname` label to every alert instance that is created from this rule.
-- **Alert type -** Select **Cortex / Loki managed alert**.
+- **Rule name -** Enter a descriptive name. The name will be displayed in the alert rule list, as well as added as `alertname` label to every alert instance that is created from this rule.
+- **Rule type -** Select **Cortex / Loki managed alert**.
 - **Data source -** Select a Prometheus or Loki data source. Only Prometheus data sources that support Cortex ruler API will be available.
-- **Namespace -** Select an existing rule namespace or click **Add new** to create a new one.
-- **Group -** Select an existing group within the selected namespace or click **Add new** to create a new one. Newly created rules will be added to the end of the rule group.
+- **Namespace -** Select an existing rule namespace or click **Add new** and enter a name to create a new one. Namespaces can contain one or more rule groups and have only organizational purpose.
+- **Group -** Select an existing group within the selected namespace or click **Add new** and enter a name to create a new one. Newly created rules will be added to the end of the rule group. Rules within a group are run sequentially at a regular interval, with the same evaluation time.
 
 ![Alert type section screenshot](/static/img/docs/alerting/unified/rule-edit-cortex-alert-type-8-0.png 'Alert type section screenshot')
 

docs/sources/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule.md

@@ -75,11 +75,11 @@ See or [expressions documentation]({{< relref "../../../panels/expressions.md" >
 
 Toggle **Configure no data and error handling** switch to configure how the rule should handle cases where evaluation results in error or returns no data.
 
-| No Data Option | Description                                            |
-| -------------- | ------------------------------------------------------ |
-| No Data        | Set alert state to `NoData` and rule state to `Normal` |
-| Alerting       | Set alert rule state to `Alerting`                     |
-| Ok             | Set alert rule state to `Normal`                       |
+| No Data Option | Description                                                                                           |
+| -------------- | ----------------------------------------------------------------------------------------------------- |
+| No Data        | Set alert state to `NoData` and rule state to `Normal` (notifications are not sent on NoData states). |
+| Alerting       | Set alert rule state to `Alerting`.                                                                   |
+| Ok             | Set alert rule state to `Normal`.                                                                     |
 
 | Error or timeout option | Description                        |
 | ----------------------- | ---------------------------------- |

docs/sources/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group.md

@@ -0,0 +1,34 @@
++++
+title = "Edit Cortex or Loki rule groups and namespaces"
+description = "Edit Cortex or Loki rule groups and namespaces"
+keywords = ["grafana", "alerting", "guide", "group", "namespace", "cortex", "loki"]
+weight = 400
++++
+
+# Edit Cortex or Loki rule groups and namespaces
+
+You can rename Cortex or Loki rule namespaces and groups and edit group evaluation intervals.
+
+## Rename a namespace
+
+A namespace contains one or more groups. To rename a namespace, find a group that belongs to the namespace, then update the namespace.
+
+1. Hover your cursor over the Alerting (bell) icon in the side menu.
+1. Locate a group that belongs to the namespace you want to edit and click the edit (pen) icon.
+1. Enter a new name in the **Namespace** field, then click **Save changes**.
+
+A new namespace is created and all groups are copied into this namespace from the old one. The old namespace is deleted.
+
+## Rename rule group or change rule group evaluation interval
+
+The rules within a group are run sequentially at a regular interval, the default interval is one (1) minute. You can modify this interval using the following instructions.
+
+1. Hover your cursor over the Alerting (bell) icon in the side menu.
+1. Find the group you want to edit and click the edit (pen) icon.
+1. Modify the **Rule group** and **Rule group evaluation interval** information as necessary.
+1. Click **Save changes**.
+
+If you remaned the group, a new group is created that has all the rules from the old group, and the old group deleted.
+
+![Group list](/static/img/docs/alerting/unified/rule-list-edit-cortex-loki-icon-8-2.png 'Rule group list screenshot')
+![Group edit modal](/static/img/docs/alerting/unified/rule-list-cortex-loki-edit-ns-group-8-2.png 'Rule group edit modal screenshot')

docs/sources/alerting/unified-alerting/message-templating/_index.md

@@ -8,7 +8,7 @@ weight = 400
 
 # Message templating
 
-Notifications sent via [contact points]({{< relref "../contact-points.md" >}}) are built using templates. Grafana comes with default templates which you can customize. Grafana's notification templates are based on the [Go templating system](https://golang.org/pkg/text/template) where some fields are evaluated as text, while others are evaluated as HTML which can affect escaping. Since most of the contact point fields can be templated, you can create reusable templates and them in multiple contact points. See [template data reference]({{< relref "./template-data.md" >}}) to check what variables are available in the templates.
+Notifications sent via [contact points]({{< relref "../contact-points.md" >}}) are built using templates. Grafana comes with default templates which you can customize. Grafana's notification templates are based on the [Go templating system](https://golang.org/pkg/text/template) where some fields are evaluated as text, while others are evaluated as HTML which can affect escaping. Since most of the contact point fields can be templated, you can create reusable templates and them in multiple contact points. See [template data reference]({{< relref "./template-data.md" >}}) to check what variables are available in the templates. The default template is defined in [default_template.go](https://github.com/grafana/grafana/blob/main/pkg/services/ngalert/notifier/channels/default_template.go) which can serve as a useful reference or starting point for custom templates.
 
 ## Using templating in contact point fields
 

docs/sources/alerting/unified-alerting/notification-policies.md

@@ -35,7 +35,7 @@ To edit a specific policy, find it in the specific routing table and click **Edi
 ### Root policy fields
 
 - **Default contact point -** The [contact point]({{< relref "./contact-points.md" >}}) to send notifications to that did not match any specific policy.
-- **Group by -** Labels to group alerts by. If multiple alerts are matched for this policy, they will be grouped based on these labels and a notification will be sent per group. Mandatory for root policy, optional for nested specific policies. If a specific policy does not specify own grouping, root policy grouping will be used.
+- **Group by -** Labels to group alerts by. If multiple alerts are matched for this policy, they will be grouped based on these labels and a notification will be sent per group. If the field is empty (default), then all notifications are sent in a single group. Use a special label `...` to group alerts by all labels, which effectively disables grouping.
 
 Group timing options
 
@@ -43,7 +43,7 @@ Group timing options
 - **Group interval -** - How long to wait before sending an notification when an alert has been added to a group for which there has already been a notification. Default is 5 minutes.
 - **Repeat interval -** - How long to wait before re-sending a notification after one has already been sent and no new alerts were added to the group. Default is 4 hours.
 
-### Specific policy fields
+### Specific routing policy fields
 
 - **Contact point -** The [contact point]({{< relref "./contact-points.md" >}}) to send notification to if alert matched this specific policy but did not match any of it's nested policies, or there were no nested specific policies.
 - **Matching labels -** Rules for matching alert labels. See ["How label matching works"](#how-label-matching-works) below for details.

docs/sources/alerting/unified-alerting/opt-in.md

@@ -4,31 +4,53 @@ description = "Enable Grafana 8 Alerts"
 weight = 128
 +++
 
-# Enable Grafana 8 Alerts
+# Opt-in to Grafana 8 alerts
 
-Setting the `ngalert` feature toggle enables the new Grafana 8 alerting system.
+This topic describes how to enable Grafana 8 alerts as well as the rules and restrictions that govern the migration of existing dashboard alerts to this new alerting system. You can also [disable Grafana 8 alerts]({{< relref "./opt-in.md#disable-grafana-8-alerts" >}}) if needed.
 
-> **Note:** We recommend that you backup Grafana's database before enabling this feature. If you are using PostgreSQL as the backend data source, then the minimum required version is 9.5.
+Before you begin, we recommend that you backup Grafana's database. If you are using PostgreSQL as the backend data source, then the minimum required version is 9.5.
 
-At startup, when [the feature toggle is enabled]({{< relref "../../administration/configuration.md">}}#feature_toggles), the legacy Grafana dashboard alerting is disabled and existing dashboard alerts are migrated into a format that is compatible with the Grafana 8 alerting system. You can view these migrated rules, alongside any new alerts you create after the migration, from the Alerting page of your Grafana instance.
+## Enable Grafana 8 alerts
 
-> **Note:** Since the new system stores the notification log and silences on disk, we require the use of persistent disks for using Grafana 8 alerts. Otherwise, the silences and notification log will get lost on a restart, and you might get unwanted or duplicate notifications.
+To enable Grafana 8 alerts:
 
-Read and write access to dashboard alerts in Grafana versions 7 and earlier were governed by the dashboard and folder permissions under which the alerts were stored. In Grafana 8, alerts are stored in folders and inherit the permissions of those folders. During the migration, dashboard alert permissions are matched to the new rules permissions as follows:
+1. Go to your custom configuration file located in $WORKING_DIR/conf/custom.ini.
+1. In the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section, set the `enabled` property to `true`.
+1. Next, in the [alerting]({{< relref "../../administration/configuration.md#alerting" >}}) section of the configuration file, update the configuration for the legacy dashboard alerts by setting the `enabled` property to `false`.
+1. Restart Grafana for the configuration changes to take effect.
+
+> **Note:** Before Grafana v8.2, to enable or disable Grafana 8 alerts, users configured the `ngalert` feature toggle. This toggle option is no longer available.
+
+Moreover, before v8.2, notification logs and silences were stored on a disk. If you did not use persistent disks, any configured silences and logs would get lost on a restart, resulting in unwanted or duplicate notifications.
+
+As of Grafana 8.2, we no longer require the use of a persistent disk. Instead, the notification logs and silences are stored regularly (every 15 minutes), and a clean shutdown to the database. If you used the file-based approach, Grafana will read the existing file and persisting it eventually.
+
+## Migrating legacy alerts to Grafana 8 alerting system
+
+When Grafana 8 alerting is enabled, existing legacy dashboard alerts migrate in a format compatible with the Grafana 8 alerting system. In the Alerting page of your Grafana instance, you can view the migrated alerts alongside new alerts.
+
+Read and write access to legacy dashboard alerts was governed by the dashboard and folder permissions storing them. In Grafana 8, alerts inherit the permissions of the folders they are stored in. During migration, legacy dashboard alert permissions are matched to the new rules permissions as follows:
 
 - If alert's dashboard has permissions, it will create a folder named like `Migrated {"dashboardUid": "UID", "panelId": 1, "alertId": 1}` to match permissions of the dashboard (including the inherited permissions from the folder).
 - If there are no dashboard permissions and the dashboard is under a folder, then the rule is linked to this folder and inherits its permissions.
-- If there are no dashboard permissions and the dashboard is under the General folder, then the rule is linked to the `General Alerting` folder and the rule inherits the default permissions.
+- If there are no dashboard permissions and the dashboard is under the General folder, then the rule is linked to the `General Alerting` folder, and the rule inherits the default permissions.
 
-During beta, Grafana 8 alerting system can retrieve rules from all available Prometheus, Loki, and Alertmanager data sources. It might not be able to fetch rules from all other supported data sources at this time.
+Notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
 
-Also notification channels are migrated to an Alertmanager configuration with the appropriate routes and receivers. Default notification channels are added as contact points to the default route. Notification channels not associated with any Dashboard alert go to the `autogen-unlinked-channel-recv` route.
+Since `Hipchat` and `Sensu` notification channels are no longer supported, legacy alerts associated with these channels are not automatically migrated to Grafana 8 alerting. Assign the legacy alerts to a supported notification channel so that you continue to receive notifications for those alerts.
+Silences (expiring after one year) are created for all paused dashboard alerts.
 
-Since `Hipchat` and `Sensu` are discontinued, they are not migrated to the new alerting. If you have dashboard alerts associated with those types of channels and you want to migrate to the new alerting, make sure you assign another supported notification channel, so that you continue to receive notifications for those alerts.
-Finally, silences (expiring after one year) are created for all paused dashboard alerts.
+### Limitation
 
-## Disabling Grafana 8 Alerting after migration
+Grafana 8 alerting system can retrieve rules from all available Prometheus, Loki, and Alertmanager data sources. It might not be able to fetch rules from all other supported data sources at this time.
 
-To disable Grafana 8 Alerting, remove or disable the `ngalert` feature toggle. Dashboard alerts will be re-enabled and any alerts created during or after the migration are deleted.
+## Disable Grafana 8 alerts
 
-> **Note:** Any alerting rules created in the Grafana 8 Alerting system will be lost when migrating back to dashboard alerts
+To disable Grafana 8 alerts and enable legacy dashboard alerts:
+
+1. Go to your custom configuration file located in $WORKING_DIR/conf/custom.ini.
+1. In the [unified alerts]({{< relref "../../administration/configuration.md#unified_alerting" >}}) section, set the `enabled` property to `false`.
+1. Next, in the [alerting]({{< relref "../../administration/configuration.md#alerting" >}}) section of the configuration file, update the configuration for the legacy dashboard alerts by setting the `enabled` property to `true`.
+1. Restart Grafana for the configuration changes to take effect.
+
+> **Note:** If you choose to migrate from Grafana 8 alerts to legacy dashboard alerts, you will lose any new alerts that you created in the Grafana 8 alerting system.

docs/sources/alerting/unified-alerting/silences.md

@@ -50,7 +50,7 @@ Grafana alerting UI supports managing external Alertmanager silences. Once you a
 
 ## Create a URL to silence form with defaults filled in
 
-When linking to silence form, you can provide default matching labels and comment via `matchers` and `comment` query parameters. `matchers` expects one more matching labels of type `[label][operator][value]` joined by a comma. `operator` can be one of `=` (equals, not regex), `!=` (not equals, not regex), `=~` (equals, regex), `!~` (not equals, not regex).
+When linking to a silence form, provide the default matching labels and comment via `matchers` and `comment` query parameters. The `matchers` parameter requires one more matching labels of the type `[label][operator][value]` joined by a comma while the `operator` parameter can be one of the following: `=` (equals, not regex), `!=` (not equals, not regex), `=~` (equals, regex), `!~` (not equals, regex).
 
 For example, to link to silence form with matching labels `severity=critical` & `cluster!~europe-.*` and comment `Silence critical EU alerts`, create a URL `https://mygrafana/aleting/silence/new?matchers=severity%3Dcritical%2Ccluster!~europe-*&comment=Silence%20critical%20EU%20alert`.
 

docs/sources/auth/azuread.md

@@ -108,6 +108,13 @@ allowed_domains =
 allowed_groups =
 ```
 
+You can also use these environment variables to configure **client_id** and **client_secret**:
+
+```
+GF_AUTH_AZUREAD_CLIENT_ID
+GF_AUTH_AZUREAD_CLIENT_SECRET
+```
+
 **Note:** Ensure that the [root_url]({{< relref "../administration/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (**App** -> **Settings** -> **Reply URLs**)
 
 ### Configure allowed groups

docs/sources/auth/generic-oauth.md

@@ -55,24 +55,30 @@ You can also specify the SSL/TLS configuration used by the client.
 
 Set `empty_scopes` to true to use an empty scope during authentication. By default, Grafana uses `user:email` as scope.
 
-Grafana will attempt to determine the user's e-mail address by querying the OAuth provider as described below in the following order until an e-mail address is found:
+### Email address
+
+Grafana determines a user's email address by querying the OAuth provider until it finds an e-mail address:
 
 1. Check for the presence of an e-mail address via the `email` field encoded in the OAuth `id_token` parameter.
 1. Check for the presence of an e-mail address using the [JMESPath](http://jmespath.org/examples.html) specified via the `email_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option.
    **Note**: Only available in Grafana v6.4+.
 1. Check for the presence of an e-mail address in the `attributes` map encoded in the OAuth `id_token` parameter. By default Grafana will perform a lookup into the attributes map using the `email:primary` key, however, this is configurable and can be adjusted by using the `email_attribute_name` configuration option.
-1. Query the `/emails` endpoint of the OAuth provider's API (configured with `api_url`) and check for the presence of an e-mail address marked as a primary address.
-1. If no e-mail address is found in steps (1-4), then the e-mail address of the user is set to the empty string.
+1. Query the `/emails` endpoint of the OAuth provider's API (configured with `api_url`), then check for the presence of an email address marked as a primary address.
+1. If no email address is found in steps (1-4), then the email address of the user is set to an empty string.
 
-Grafana will also attempt to do role mapping through OAuth as described below.
+### Roles
 
-Check for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. The result after evaluating the `role_attribute_path` JMESPath expression needs to be a valid Grafana role, i.e. `Viewer`, `Editor` or `Admin`.
+Grafana checks for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option. The JMESPath is applied to the `id_token` first. If there is no match, then the UserInfo endpoint specified via the `api_url` configuration option is tried next. The result after evaluation of the `role_attribute_path` JMESPath expression should be a valid Grafana role, for example, `Viewer`, `Editor` or `Admin`.
 
-Grafana also attempts to map teams through OAuth as described below.
+For more information, refer to the [JMESPath examples](#jmespath-examples).
 
-Check for the presence of groups using the [JMESPath](http://jmespath.org/examples.html) specified via the `groups_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the UserInfo endpoint specified via the `api_url` configuration option. After evaluating the `groups_attribute_path` JMESPath expression, the result should be a string array of groups.
+### Groups / Teams
 
-See [JMESPath examples](#jmespath-examples) for more information.
+Similarly, group mappings are made using [JMESPath](http://jmespath.org/examples.html) with the `groups_attribute_path` configuration option. The `id_token` is attempted first, followed by the UserInfo from the `api_url`. The result of the JMESPath expression should be a string array of groups.
+
+Furthermore, Grafana will check for the presence of at least one of the teams specified via the `team_ids` configuration option using the [JMESPath](http://jmespath.org/examples.html) specified via the `team_ids_attribute_path` configuration option. The JSON used for the path lookup is the HTTP response obtained from querying the Teams endpoint specified via the `teams_url` configuration option (using `/teams` as a fallback endpoint). The result should be a string array of Grafana Team IDs. Using this setting ensures that only certain teams is allowed to authenticate to Grafana using your OAuth provider.
+
+### Login
 
 Customize user login using `login_attribute_path` configuration option. Order of operations is as follows:
 
@@ -126,6 +132,8 @@ scopes = account email
 auth_url = https://bitbucket.org/site/oauth2/authorize
 token_url = https://bitbucket.org/site/oauth2/access_token
 api_url = https://api.bitbucket.org/2.0/user
+teams_url = https://api.bitbucket.org/2.0/user/permissions/workspaces
+team_ids_attribute_path = values[*].workspace.slug
 team_ids =
 allowed_organizations =
 ```

docs/sources/auth/gitlab.md

@@ -26,10 +26,10 @@ instance, if you access Grafana at `http://203.0.113.31:3000`, you should use
 http://203.0.113.31:3000/login/gitlab
 ```
 
-Finally, select _read_api_ as the _Scope_ and submit the form. Note that if you're
+Finally, select _read_api_as the_Scope_and submit the form. Note that if you're
 not going to use GitLab groups for authorization (i.e. not setting
-`allowed_groups`, see below), you can select _read_user_ instead of _read_api_ as
-the _Scope_, thus giving a more restricted access to your GitLab API.
+`allowed_groups`, see below), you can select_read_user_ instead of _read_api_as
+the_Scope_, thus giving a more restricted access to your GitLab API.
 
 You'll get an _Application Id_ and a _Secret_ in return; we'll call them
 `GITLAB_APPLICATION_ID` and `GITLAB_SECRET` respectively for the rest of this
@@ -94,8 +94,8 @@ display name, especially if the display name contains spaces or special
 characters. Make sure you always use the group or subgroup name as it appears
 in the URL of the group or subgroup.
 
-Here's a complete example with `allow_sign_up` enabled, and access limited to
-the `example` and `foo/bar` groups:
+Here's a complete example with `allow_sign_up` enabled, with access limited to
+the `example` and `foo/bar` groups. The example also promotes all GitLab Admins to Grafana Admins:
 
 ```ini
 [auth.gitlab]
@@ -103,13 +103,28 @@ enabled = true
 allow_sign_up = true
 client_id = GITLAB_APPLICATION_ID
 client_secret = GITLAB_SECRET
-scopes = api
+scopes = read_api
 auth_url = https://gitlab.com/oauth/authorize
 token_url = https://gitlab.com/oauth/token
 api_url = https://gitlab.com/api/v4
 allowed_groups = example, foo/bar
+role_attribute_path = is_admin && 'Admin' || 'Viewer'
 ```
 
+### Map roles
+
+You can use GitLab OAuth to map roles. During mapping, Grafana checks for the presence of a role using the [JMESPath](http://jmespath.org/examples.html) specified via the `role_attribute_path` configuration option.
+
+For the path lookup, Grafana uses JSON obtained from querying GitLab's API [`/api/v4/user`](https://docs.gitlab.com/ee/api/users.html#list-current-user-for-normal-users) endpoint. The result of evaluating the `role_attribute_path` JMESPath expression must be a valid Grafana role, for example, `Viewer`, `Editor` or `Admin`. For more information about roles and permissions in Grafana, refer to [Organization roles]({{< relref "../permissions/organization_roles.md" >}}).
+
+An example Query could look like the following:
+
+```bash
+role_attribute_path = is_admin && 'Admin' || 'Viewer'
+```
+
+This allows every GitLab Admin to be an Admin in Grafana.
+
 ### Team Sync (Enterprise only)
 
 > Only available in Grafana Enterprise v6.4+

docs/sources/auth/overview.md

@@ -121,6 +121,11 @@ Defaults to `false`.
 oauth_auto_login = true
 ```
 
+### Avoid automatic OAuth login
+
+To sign in with a username and password and avoid automatic OAuth login, add the `disableAutoLogin` parameter to your login URL.
+For example: `grafana.example.com/login?disableAutoLogin` or `grafana.example.com/login?disableAutoLogin=true`
+
 ### Hide sign-out menu
 
 Set the option detailed below to true to hide sign-out menu link. Useful if you use an auth proxy or JWT authentication.

docs/sources/basics/intro-histograms.md

@@ -25,7 +25,7 @@ Here is an example showing height distribution of people.
 
 {{< figure src="/static/img/docs/histogram-panel/histogram-example-v8-0.png" max-width="625px" caption="Bar chart example" >}}
 
-For more information about histogram visualization options, refer to [Histogram]({{< relref "../panels/visualizations/histogram.md" >}}).
+For more information about histogram visualization options, refer to [Histogram]({{< relref "../visualizations/histogram.md" >}}).
 
 Histograms only look at _value distributions_ over a specific time range. The problem with histograms is you cannot see any trends or changes in the distribution over time. This is where heatmaps become useful.
 
@@ -37,7 +37,7 @@ In this example, you can clearly see what values are more common and how they tr
 
 ![](/static/img/docs/v43/heatmap_histogram_over_time.png)
 
-For more information about heatmap visualization options, refer to [Heatmap]({{< relref "../panels/visualizations/heatmap.md" >}}).
+For more information about heatmap visualization options, refer to [Heatmap]({{< relref "../visualizations/heatmap.md" >}}).
 
 ## Pre-bucketed data
 

docs/sources/best-practices/best-practices-for-creating-dashboards.md

@@ -48,7 +48,7 @@ Once you have a strategy or design guidelines, write them down to help maintain
 - Avoid unnecessary dashboard refreshing to reduce the load on the network or backend. For example, if your data changes every hour, then you don't need to set the dashboard refresh rate to 30 seconds.
 - Use the left and right Y-axes when displaying time series with different units or ranges.
 - Add documentation to dashboards and panels.
-  - To add documentation to a dashboard, add a [Text panel visualization]({{< relref "../panels/visualizations/text-panel.md" >}}) to the dashboard. Record things like the purpose of the dashboard, useful resource links, and any instructions users might need to interact with the dashboard. Check out this [Wikimedia example](https://grafana.wikimedia.org/d/000000066/resourceloader?orgId=1).
+  - To add documentation to a dashboard, add a [Text panel visualization]({{< relref "../visualizations/text-panel.md" >}}) to the dashboard. Record things like the purpose of the dashboard, useful resource links, and any instructions users might need to interact with the dashboard. Check out this [Wikimedia example](https://grafana.wikimedia.org/d/000000066/resourceloader?orgId=1).
   - To add documentation to a panel, [edit the panel settings]({{< relref "../panels/add-a-panel.md#edit-panel-settings" >}}) and add a description. Any text you add will appear if you hover your cursor over the small `i` in the top left corner of the panel.
 - Reuse your dashboards and enforce consistency by using [templates and variables]({{< relref "../variables/_index.md" >}}).
 - Be careful with stacking graph data. The visualizations can be misleading, and hide important data. We recommend turning it off in most cases.

docs/sources/best-practices/best-practices-for-managing-dashboards.md

@@ -33,5 +33,5 @@ What is your dashboard maturity level? Analyze your current dashboard setup and
 - When you must copy a dashboard, clearly rename it and _do not_ copy the dashboard tags. Tags are important metadata for dashboards that are used during search. Copying tags can result in false matches.
 - Maintain a dashboard of dashboards or cross-reference dashboards. This can be done in several ways:
   - Create dashboard links, panel, or data links. Links can go to other dashboards or to external systems. For more information, refer to [Linking]({{< relref "../linking/_index.md" >}}).
-  - Add a [Dashboard list panel]({{< relref "../panels/visualizations/dashboard-list-panel.md" >}}). You can then customize what you see by doing tag or folder searches.
-  - Add a [Text panel]({{< relref "../panels/visualizations/text-panel.md" >}}) and use markdown to customize the display.
+  - Add a [Dashboard list panel]({{< relref "../visualizations/dashboard-list-panel.md" >}}). You can then customize what you see by doing tag or folder searches.
+  - Add a [Text panel]({{< relref "../visualizations/text-panel.md" >}}) and use markdown to customize the display.

docs/sources/datasources/_index.md

@@ -17,7 +17,7 @@ Each data source has a specific Query Editor that is customized for the features
 The following data sources are officially supported:
 
 - [Alertmanager]({{< relref "alertmanager.md" >}})
-- [AWS CloudWatch]({{< relref "cloudwatch.md" >}})
+- [AWS CloudWatch]({{< relref "aws-cloudwatch/_index.md" >}})
 - [Azure Monitor]({{< relref "azuremonitor/_index.md" >}})
 - [Elasticsearch]({{< relref "elasticsearch.md" >}})
 - [Google Cloud Monitoring]({{< relref "google-cloud-monitoring/_index.md" >}})

docs/sources/datasources/alertmanager.md

@@ -10,7 +10,7 @@ weight = 150
 
 Grafana includes built-in support for Prometheus Alertmanager. It is presently in alpha and not accessible unless [alpha plugins are enabled in Grafana settings](https://grafana.com/docs/grafana/latest/administration/configuration/#enable_alpha). Once you add it as a data source, you can use the [Grafana alerting UI](https://grafana.com/docs/grafana/latest/alerting/) to manage silences, contact points as well as notification policies. A drop down option in these pages allows you to switch between Grafana and any configured Alertmanager data sources .
 
-> **Note:** Currently, the [Cortex implementation of Prometheus Alertmanager](https://cortexmetrics.io/docs/proposals/scalable-alertmanager/) is required to edit rules. 
+> **Note:** Currently, the [Cortex implementation of Prometheus Alertmanager](https://cortexmetrics.io/docs/proposals/scalable-alertmanager/) is required to edit rules.
 
 ## Provision the Alertmanager data source
 

docs/sources/datasources/aws-cloudwatch/_index.md

@@ -10,9 +10,9 @@ weight = 200
 
 Grafana ships with built-in support for CloudWatch. Add it as a data source, then you are ready to build dashboards or use Explore with CloudWatch metrics and CloudWatch Logs.
 
-This topic explains options, variables, querying, and other options specific to this data source. Refer to [Add a data source]({{< relref "add-a-data-source.md" >}}) for instructions on how to add a data source to Grafana. Only users with the organization admin role can add data sources.
+This topic describes queries, templates, variables, and other configuration specific to the CloudWatch data source. For instructions on how to add a data source to Grafana, refer to [Add a data source]({{< relref "../add-a-data-source.md" >}}). Only users with the organization admin role can add data sources.
 
-> **Note:** If you have issues with getting this data source to work and Grafana is giving you undescriptive errors, then check your log file (try looking in /var/log/grafana/grafana.log).
+> **Note:** If you are having issues setting up the data source and Grafana is returning undescriptive errors, then check the log file located in /var/log/grafana/grafana.log).
 
 ## Cloudwatch settings
 
@@ -31,21 +31,9 @@ To access data source settings, hover your mouse over the **Configuration** (gea
 
 ## Authentication
 
-### AWS credentials
+For authentication options and configuration details, see [AWS authentication]({{< relref "aws-authentication.md" >}}) topic.
 
-There are three different authentication methods available. `AWS SDK Default` performs no custom configuration at all and instead uses the [default provider](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html) as specified by the AWS SDK for Go. This requires you to configure your AWS credentials separately, such as if you've [configured the CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html), if you're [running on an EC2 instance](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html), [in an ECS task](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html) or for a [Service Account in a Kubernetes cluster](https://docs.aws.amazon.com/eks/latest/userguide/iam-roles-for-service-accounts.html).
-
-`Credentials file` corresponds directly to the [SharedCredentialsProvider](https://docs.aws.amazon.com/sdk-for-go/api/aws/credentials/#SharedCredentialsProvider) provider in the Go SDK. In short, it will read the AWS shared credentials file and find the given profile. While `AWS SDK Default` will also find the shared credentials file, this option allows you to specify which profile to use without using environment variables. It doesn't have any implicit fallbacks to other credential providers, and will fail if using credentials from the credentials file doesn't work.
-
-`Access & secret key` corresponds to the [StaticProvider](https://docs.aws.amazon.com/sdk-for-go/api/aws/credentials/#StaticProvider) and uses the given access key ID and secret key to authenticate. This method doesn't have any fallbacks, and will fail if the provided key pair doesn't work.
-
-### IAM roles
-
-Currently all access to CloudWatch is done server side by the Grafana backend using the official AWS SDK. Providing you have chosen the _AWS SDK Default_ authentication method, and your Grafana server is running on AWS, you can use IAM Roles to handle authentication automatically.
-
-See the AWS documentation on [IAM Roles](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html)
-
-### IAM policies
+## IAM policies
 
 Grafana needs permissions granted via IAM to be able to read CloudWatch metrics
 and EC2 tags/instances/regions. You can attach these permissions to IAM roles and
@@ -99,40 +87,6 @@ Here is a minimal policy example:
 }
 ```
 
-### Assuming a role
-
-The `Assume Role ARN` field allows you to specify which IAM role to assume, if any. When left blank, the provided credentials are used directly and the associated role or user should have the required permissions. If this field is non-blank, on the other hand, the provided credentials are used to perform an [sts:AssumeRole](https://docs.aws.amazon.com/STS/latest/APIReference/API_AssumeRole.html) call.
-
-### Endpoint
-
-The `Endpoint` field allows you to specify a custom endpoint URL that overrides the default generated endpoint for the CloudWatch API. Leave this field blank if you want to use the default generated endpoint. For more information on why and how to use Service endpoints, refer to the [AWS service endpoints documentation](https://docs.aws.amazon.com/general/latest/gr/rande.html).
-
-### EKS IAM roles for service accounts
-
-The Grafana process in the container runs as user 472 (called "grafana"). When Kubernetes mounts your projected credentials, they will by default only be available to the root user. In order to allow user 472 to access the credentials (and avoid it falling back to the IAM role attached to the EC2 instance), you will need to provide a [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/) for your pod.
-
-```yaml
-securityContext:
-  fsGroup: 472
-  runAsUser: 472
-  runAsGroup: 472
-```
-
-### AWS credentials file
-
-Create a file at `~/.aws/credentials`. That is the `HOME` path for user running grafana-server.
-
-> **Note:** If you think you have the credentials file in the right place and it is still not working, you might try moving your .aws file to '/usr/share/grafana/' and make sure your credentials file has at most 0644 permissions.
-
-Example content:
-
-```bash
-[default]
-aws_access_key_id = asdsadasdasdasd
-aws_secret_access_key = dasdasdsadasdasdasdsa
-region = us-west-2
-```
-
 ## Using the Query Editor
 
 The CloudWatch data source can query data from both CloudWatch metrics and CloudWatch Logs APIs, each with its own specialized query editor. You select which API you want to query with using the query mode switch on top of the editor.
@@ -146,22 +100,18 @@ To create a valid query, you need to specify the namespace, metric name and at l
 
 ### Dynamic queries using dimension wildcards
 
-> Only available in Grafana v6.5+.
-
-In Grafana 6.5 or higher, you’re able to monitor a dynamic list of metrics by using the asterisk (\*) wildcard for one or more dimension values.
+You can monitor a dynamic list of metrics by using the asterisk (\*) wildcard for one or more dimension values.
 
 {{< figure src="/static/img/docs/v65/cloudwatch-dimension-wildcard.png" max-width="800px" class="docs-image--right" caption="CloudWatch dimension wildcard" >}}
 
-In the example, all metrics in the namespace `AWS/EC2` with a metric name of `CPUUtilization` and ANY value for the `InstanceId` dimension are queried. This can help you monitor metrics for AWS resources, like EC2 instances or containers. For example, when new instances get created as part of an auto scaling event, they will automatically appear in the graph without you having to track the new instance IDs. This capability is currently limited to retrieving up to 100 metrics. You can click on `Show Query Preview` to see the search expression that is automatically built to support wildcards. To learn more about search expressions, visit the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/search-expression-syntax.html).
+In this example, the query returns all metrics in the namespace `AWS/EC2` with a metric name of `CPUUtilization` and ANY value for the `InstanceId` dimension are queried. This can help you monitor metrics for AWS resources, like EC2 instances or containers. For example, when new instances are created as part of an auto scaling event, they will automatically appear in the graph without needing to track the new instance IDs. This capability is currently limited to retrieving up to 100 metrics.
 
-By default, the search expression is defined in such a way that the queried metrics must match the defined dimension names exactly. This means that in the example only metrics with exactly one dimension with name ‘InstanceId’ will be returned.
+Click on `Show Query Preview` to see the search expression that is automatically built to support wildcards. To learn more about search expressions, visit the [CloudWatch documentation](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/search-expression-syntax.html). By default, the search expression is defined in such a way that the queried metrics must match the defined dimension names exactly. This means that in the example only metrics with exactly one dimension with name ‘InstanceId’ will be returned.
 
 You can untoggle `Match Exact` to include metrics that have other dimensions defined. Disabling `Match Exact` also creates a search expression even if you don’t use wildcards. We simply search for any metric that matches at least the namespace, metric name, and all defined dimensions.
 
 ### Multi-value template variables
 
-> Only available in Grafana v6.5+.
-
 When defining dimension values based on multi-valued template variables, a search expression is used to query for the matching metrics. This enables the use of multiple template variables in one query and also allows you to use template variables for queries that have the `Match Exact` option disabled.
 
 Search expressions are currently limited to 1024 characters, so your query may fail if you have a long list of values. We recommend using the asterisk (`*`) wildcard instead of the `All` option if you want to query all metrics that have any value for a certain dimension name.
@@ -180,7 +130,7 @@ Please note that in the case you use the expression field to reference another q
 
 A period is the length of time associated with a specific Amazon CloudWatch statistic. Periods are defined in numbers of seconds, and valid values for period are 1, 5, 10, 30, or any multiple of 60.
 
-If the period field is left blank or set to `auto`, then it calculates automatically based on the time range. The formula used is `time range in seconds / 2000`, and then it snaps to the next higher value in an array of predefined periods `[60, 300, 900, 3600, 21600, 86400]`. By clicking `Show Query Preview` in the query editor, you can see what period Grafana used.
+If the period field is left blank or set to `auto`, then it calculates automatically based on the time range and [cloudwatch's retention policy](https://aws.amazon.com/about-aws/whats-new/2016/11/cloudwatch-extends-metrics-retention-and-new-user-interface/). The formula used is `time range in seconds / 2000`, and then it snaps to the next higher value in an array of predefined periods `[60, 300, 900, 3600, 21600, 86400]` after removing periods based on retention. By clicking `Show Query Preview` in the query editor, you can see what period Grafana used.
 
 ### Deep linking from Grafana panels to the CloudWatch console
 
@@ -192,8 +142,6 @@ This feature is not available for metrics that are based on metric math expressi
 
 ## Using the Logs Query Editor
 
-> **Note:** Available in Grafana v7.0+.
-
 To query CloudWatch Logs, select the region and up to 20 log groups which you want to query. Use the main input area to write your query in [CloudWatch Logs Query Language](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_QuerySyntax.html)
 
 You can also write queries returning time series data by using the [`stats` command](https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/CWL_Insights-Visualizing-Log-Data.html). When making `stats` queries in Explore, you have to make sure you are in Metrics Explore mode.
@@ -206,8 +154,8 @@ To the right of the query input field is a CloudWatch Logs Insights link that op
 
 ### Using template variables
 
-As with several other data sources, the CloudWatch data source supports the use of template variables in queries.
-See the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+The CloudWatch data source supports use of template variables in queries.
+For an introduction to templating and template variables, refer to the [Templating]({{< relref "../../variables/_index.md" >}}) documentation.
 
 ### Deep linking from Grafana panels to the CloudWatch console
 
@@ -218,7 +166,7 @@ If you're not currently logged in to the CloudWatch console, the link will forwa
 ### Alerting
 
 Since CloudWatch Logs queries can return numeric data, for example through the use of the `stats` command, alerts are supported.
-See the [Alerting]({{< relref "../alerting/_index.md" >}}) documentation for more on Grafana alerts.
+For more information on Grafana alerts, refer to [Alerting]({{< relref "../../alerting/_index.md" >}}) documentation.
 
 ## Curated dashboards
 
@@ -236,9 +184,9 @@ To import the pre-configured dashboards, go to the configuration page of your Cl
 
 ## Templated queries
 
-Instead of hard-coding things like server, application and sensor name in your metric queries you can use variables in their place. Variables are shown as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the data being displayed in your dashboard.
+Instead of hard-coding server, application, and sensor names in your metric queries, you can use variables. The variables are listed as dropdown select boxes at the top of the dashboard. These dropdowns make it easy to change the display of data in your dashboard.
 
-See the [Templating]({{< relref "../variables/_index.md" >}}) documentation for an introduction to the templating feature and the different types of template variables.
+For an introduction to templating and template variables, refer to the [Templating]({{< relref "../../variables/_index.md" >}}) documentation.
 
 ### Query variable
 
@@ -371,7 +319,7 @@ Please see the AWS documentation for [Service Quotas](https://docs.aws.amazon.co
 
 ## Configure the data source with grafana.ini
 
-In the Grafana [configuration]({{< relref "../administration/configuration.md#aws" >}}) file, there's an `AWS` section that allows you to customize the data source.
+The Grafana [configuration]({{< relref "../../administration/configuration.md#aws" >}}) file includes an `AWS` section where you can customize the data source.
 
 ### allowed_auth_providers
 
@@ -387,7 +335,7 @@ When a custom namespace is specified in the query editor, the [List Metrics API]
 
 ## Configure the data source with provisioning
 
-It's now possible to configure data sources using config files with Grafana's provisioning system. You can read more about how it works and all the settings you can set for data sources on the [provisioning docs page]({{< relref "../administration/provisioning/#datasources" >}})
+You can configure the CloudWatch data source by customizing configuration files in Grafana's provisioning system. To know more about provisioning and learn about available configuration options, refer to the [Provisioning Grafana]({{< relref "../../administration/provisioning/#datasources" >}}) topic.
 
 Here are some provisioning examples for this data source.