Fix linting issues

Downgrade Ubuntu Docker images to 18.04 LTS since 18.10 has reached EOL.

.bra.toml

@@ -1,19 +1,19 @@
 [run]
 init_cmds = [
-  ["go", "run", "build.go", "-dev", "build-cli"],
-  ["go", "run", "build.go", "-dev", "build-server"],
-  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-cli"],
+	["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
+	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]
 watch_all = true
 follow_symlinks = true
 watch_dirs = [
-  "$WORKDIR/pkg",
-  "$WORKDIR/public/views",
-  "$WORKDIR/conf",
+	"$WORKDIR/pkg",
+	"$WORKDIR/public/views",
+	"$WORKDIR/conf",
 ]
 watch_exts = [".go", ".ini", ".toml", ".template.html"]
 build_delay = 1500
 cmds = [
-  ["go", "run", "build.go", "-dev", "build-server"],
-  ["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
+  ["go", "run", "-mod=vendor", "build.go", "-dev", "build-server"],
+	["./bin/grafana-server", "-packaging=dev", "cfg:app_mode=development"]
 ]

.editorconfig

@@ -16,9 +16,6 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,ts,tsx,scss}]
-quote_type = single
-
 [*.md]
 trim_trailing_whitespace = false
 

.eslintrc

@@ -1,4 +0,0 @@
-{
-  "extends": ["@grafana/eslint-config"],
-  "root": true
-}

.github/CODEOWNERS

@@ -13,48 +13,4 @@
 
 # Documentation owner: Diana Payton
 /docs/ @oddlittlebird
-/contribute/ @oddlittlebird  @marcusolsson
-
-
-# Backend code
-*.go @grafana/backend-platform
-go.mod @grafana/backend-platform
-go.sum @grafana/backend-platform
-
-/e2e @grafana/grafana-frontend-platform
-/packages @grafana/grafana-frontend-platform
-/plugins-bundled @grafana/grafana-frontend-platform
-/public @grafana/grafana-frontend-platform
-/scripts/build/release-packages.sh @grafana/grafana-frontend-platform
-/scripts/circle-release-next-packages.sh @grafana/grafana-frontend-platform
-/scripts/ci-frontend-metrics.sh @grafana/grafana-frontend-platform
-/scripts/grunt @grafana/grafana-frontend-platform
-/scripts/webpack @grafana/grafana-frontend-platform
-package.json @grafana/grafana-frontend-platform
-tsconfig.json @grafana/grafana-frontend-platform
-lerna.json @grafana/grafana-frontend-platform
-.babelrc @grafana/grafana-frontend-platform
-.prettierrc.js @grafana/grafana-frontend-platform
-.eslintrc @grafana/grafana-frontend-platform
-
-# @grafana/ui component documentation
-*.mdx @marcusolsson @jessover9000 @grafana/grafana-frontend-platform
-
-/public/app/features/explore/ @grafana/observability-squad
-/packages/jaeger-ui-components/ @grafana/observability-squad
-
-# Core datasources
-/public/app/plugins/datasource/cloudwatch @grafana/backend-platform @grafana/observability-squad
-/public/app/plugins/datasource/elasticsearch @grafana/observability-squad
-/public/app/plugins/datasource/grafana-azure-monitor-datasource @grafana/backend-platform
-/public/app/plugins/datasource/graphite @grafana/observability-squad
-/public/app/plugins/datasource/influxdb @grafana/observability-squad
-/public/app/plugins/datasource/jaeger @grafana/observability-squad
-/public/app/plugins/datasource/loki @grafana/observability-squad
-/public/app/plugins/datasource/mssql @grafana/backend-platform
-/public/app/plugins/datasource/mysql @grafana/backend-platform
-/public/app/plugins/datasource/opentsdb @grafana/backend-platform
-/public/app/plugins/datasource/postgres @grafana/backend-platform
-/public/app/plugins/datasource/prometheus @grafana/observability-squad
-/public/app/plugins/datasource/cloud-monitoring @grafana/backend-platform
-/public/app/plugins/datasource/zipkin @grafana/observability-squad
+/contribute/ @oddlittlebird  @marcusolsson

.github/ISSUE_TEMPLATE/1-bug_report.md

@@ -5,13 +5,9 @@ labels: 'type: bug'
 ---
 
 <!--
-Please use this template to create your bug report. By providing as much info as possible you help us understand the issue, reproduce it and resolve it for you quicker. Therefor take a couple of extra minutes to make sure you have provided all info needed.
-
-PROTIP: record your screen and attach it as a gif to showcase the issue.
-
-* Questions should be posted to: https://community.grafana.com
-* Use query inspector to troubleshoot issues: https://bit.ly/2XNF6YS
-* How to record and attach gif: https://bit.ly/2Mi8T6K
+Please use this template while reporting a bug and provide as much info as possible.
+Questions should be posted to https://community.grafana.com
+Use query inspector to troubleshoot issues: https://community.grafana.com/t/using-grafanas-query-inspector-to-troubleshoot-issues/2630
 -->
 
 **What happened**:

.github/ISSUE_TEMPLATE/4-grafana_ui_component.md

@@ -1,39 +0,0 @@
----
-name: '@grafana/ui component request'
-about: Suggest a component for the @grafana/ui package
-labels: 'area/grafana/ui'
----
-
-<!-- 
-By using this template you will make it easier for us to make sure that documentation and implementation stays up to date for every component in @grafana/ui
-
-Thank you!
--->
-
-**Why is this component needed**:
-<!-- Explain your use case -->
-___
- - [ ] Is/could it be used in more than one place in Grafana?
-
-**Where is/could it be used?**:
-
-___
-- [ ] Post screenshots possible.
-- [ ] It has a single use case.
-- [ ] It is/could be used in multiple places.
-
-**Implementation** (Checklist meant for the person implementing the component)
-
-- [ ] Component has a story in Storybook.
-- [ ] Props and naming follows [our style guide](https://github.com/grafana/grafana/blob/master/contribute/style-guides/frontend.md).
-- [ ] It is extendable (rest props are spread, styles with className work, and so on).
-- [ ] Uses [theme for spacing, colors, and so on](https://github.com/grafana/grafana/blob/master/contribute/style-guides/themes.md).
-- [ ] Works with both light and dark theme.
-
-**Documentation**
-
-- [ ] Properties are documented.
-- [ ] Use cases are described.
-- [ ] Code examples for the different use cases.
-- [ ] Dos and don'ts.
-- [ ] Styling guidelines, specific color usage (if applicable).

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
       id: publish
       with:
         repository: grafana/website
-        branch: master
+        branch: docs-grafana
         host: github.com
         github_pat: '${{ secrets.GH_BOT_ACCESS_TOKEN }}'
         source_folder: docs/sources

.gitignore

@@ -11,19 +11,11 @@ awsconfig
 /public/views/error.html
 /emails/dist
 /reports
-/e2e/tmp
-.yarnrc
-.yarn/
-vendor/
-.eslintcache
 
 # Enterprise emails
 /emails/templates/enterprise_*
 /public/emails/enterprise_*
 
-# Enterprise devenv
-/devenv/docker/blocks/grafana-enterprise
-
 /tmp
 tools/phantomjs/phantomjs
 tools/phantomjs/phantomjs.exe
@@ -47,7 +39,6 @@ public/css/*.min.css
 .DS_Store
 .vscode/
 .vs/
-.eslintcache
 
 /data/*
 /bin/*
@@ -90,8 +81,6 @@ debug.test
 
 /devenv/bulk-dashboards/*.json
 /devenv/bulk_alerting_dashboards/*.json
-/devenv/datasources_bulk.yaml
-/devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml
 
 /scripts/build/release_publisher/release_publisher
 *.patch
@@ -100,7 +89,6 @@ debug.test
 /packages/**/dist
 /packages/**/compiled
 /packages/**/.rpt2_cache
-/packages/**/tsdoc-metadata.json
 
 # Ignore go local build dependencies
 /scripts/go/bin/**
@@ -112,10 +100,6 @@ compilation-stats.json
 /packages/grafana-e2e/cypress/screenshots
 /packages/grafana-e2e/cypress/videos
 /packages/grafana-e2e/cypress/logs
-/e2e/server.log
-/e2e/**/screenshots
-!/e2e/**/screenshots/expected/*
-/e2e/**/videos/*
-
-# report dumping the whole system env
-/report.*.json
+/public/e2e-test/screenShots/theOutput
+/public/e2e-tests/screenShots/theOutput/*.png
+/public/e2e-tests/videos

.prettierrc.js

@@ -1,3 +0,0 @@
-module.exports = {
-  ...require('@grafana/toolkit/src/config/prettier.plugin.config.json'),
-};

CONTRIBUTING.md

@@ -58,10 +58,10 @@ When you're ready to contribute, it's time to [Create a pull request](/contribut
 
 #### Contributor License Agreement (CLA)
 
-Before we can accept your pull request, you need to [sign our CLA](https://grafana.com/docs/grafana/latest/developers/cla/). If you haven't, our CLA assistant prompts you to when you create your pull request.
+Before we can accept your pull request, you need to [sign our CLA](https://grafana.com/docs/contribute/cla/). If you haven't, our CLA assistant prompts you to when you create your pull request.
 
 ## Where do I go from here?
 
 - Set up your [development environment](contribute/developer-guide.md).
 - Learn how to [contribute documentation](contribute/documentation.md).
-- Get started [developing plugins](https://grafana.com/docs/grafana/latest/developers/plugins/) for Grafana.
+- Get started [developing plugins](https://grafana.com/docs/plugins/developing/development/) for Grafana.

Dockerfile

@@ -1,28 +1,12 @@
-FROM node:12.18.1-alpine3.12 as js-builder
-
-WORKDIR /usr/src/app/
-
-COPY package.json yarn.lock ./
-COPY packages packages
-
-RUN yarn install --pure-lockfile --no-progress
-
-COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
-COPY public public
-COPY tools tools
-COPY scripts scripts
-COPY emails emails
-
-ENV NODE_ENV production
-RUN ./node_modules/.bin/grunt build
-
-FROM golang:1.14.4-alpine3.12 as go-builder
+# Golang build container
+FROM golang:1.13.4-alpine
 
 RUN apk add --no-cache gcc g++
 
 WORKDIR $GOPATH/src/github.com/grafana/grafana
 
 COPY go.mod go.sum ./
+COPY vendor vendor
 
 RUN go mod verify
 
@@ -31,8 +15,36 @@ COPY build.go package.json ./
 
 RUN go run build.go build
 
-# Final stage
-FROM alpine:3.12
+# Node build container
+FROM node:12.13.0-alpine
+
+# PhantomJS
+RUN apk add --no-cache curl &&\
+    cd /tmp && curl -Ls https://github.com/dustinblackman/phantomized/releases/download/2.1.1/dockerized-phantomjs.tar.gz | tar xz &&\
+    cp -R lib lib64 / &&\
+    cp -R usr/lib/x86_64-linux-gnu /usr/lib &&\
+    cp -R usr/share /usr/share &&\
+    cp -R etc/fonts /etc &&\
+    curl -k -Ls https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -jxf - &&\
+    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
+
+WORKDIR /usr/src/app/
+
+COPY package.json yarn.lock ./
+COPY packages packages
+
+RUN yarn install --pure-lockfile --no-progress
+
+COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
+COPY public public
+COPY scripts scripts
+COPY emails emails
+
+ENV NODE_ENV production
+RUN ./node_modules/.bin/grunt build
+
+# Final container
+FROM alpine:3.10
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 
@@ -50,7 +62,7 @@ ENV PATH="/usr/share/grafana/bin:$PATH" \
 WORKDIR $GF_PATHS_HOME
 
 RUN apk add --no-cache ca-certificates bash tzdata && \
-    apk add --no-cache --upgrade openssl musl-utils
+    apk add --no-cache --upgrade --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main openssl musl-utils
 
 COPY conf ./conf
 
@@ -68,9 +80,18 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
-COPY --from=go-builder /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
-COPY --from=js-builder /usr/src/app/public ./public
-COPY --from=js-builder /usr/src/app/tools ./tools
+# PhantomJS
+COPY --from=1 /tmp/lib /lib
+COPY --from=1 /tmp/lib64 /lib64
+COPY --from=1 /tmp/usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
+COPY --from=1 /tmp/usr/share /usr/share
+COPY --from=1 /tmp/etc/fonts /etc/fonts
+COPY --from=1 /usr/local/bin/phantomjs /usr/local/bin
+
+COPY --from=0 /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-server /go/src/github.com/grafana/grafana/bin/linux-amd64/grafana-cli ./bin/
+COPY --from=1 /usr/src/app/public ./public
+COPY --from=1 /usr/src/app/tools ./tools
+COPY tools/phantomjs/render.js ./tools/phantomjs/render.js
 
 EXPOSE 3000
 

Dockerfile.ubuntu

@@ -1,26 +1,9 @@
-FROM node:12.16.3-slim AS js-builder
-
-WORKDIR /usr/src/app/
-
-COPY package.json yarn.lock ./
-COPY packages packages
-
-RUN yarn install --pure-lockfile
-
-COPY Gruntfile.js tsconfig.json .eslintrc .editorconfig .browserslistrc .prettierrc.js ./
-COPY public public
-COPY tools tools
-COPY scripts scripts
-COPY emails emails
-
-ENV NODE_ENV production
-RUN ./node_modules/.bin/grunt build
-
-FROM golang:1.14.2 AS go-builder
+FROM golang:1.13.4 AS go-builder
 
 WORKDIR /src/grafana
 
 COPY go.mod go.sum ./
+COPY vendor vendor/
 
 RUN go mod verify
 
@@ -29,7 +12,29 @@ COPY pkg pkg/
 
 RUN go run build.go build
 
-FROM ubuntu:20.04
+FROM node:12.13 AS js-builder
+
+# PhantomJS
+RUN apt-get update && apt-get install -y curl &&\
+    curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar xj &&\
+    cp phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin/phantomjs
+
+WORKDIR /usr/src/app/
+
+COPY package.json yarn.lock ./
+COPY packages packages
+
+RUN yarn install --pure-lockfile
+
+COPY Gruntfile.js tsconfig.json tslint.json .browserslistrc ./
+COPY public public
+COPY scripts scripts
+COPY emails emails
+
+ENV NODE_ENV production
+RUN ./node_modules/.bin/grunt build
+
+FROM ubuntu:18.04
 
 LABEL maintainer="Grafana team <hello@grafana.com>"
 EXPOSE 3000
@@ -49,8 +54,8 @@ WORKDIR $GF_PATHS_HOME
 
 COPY conf conf
 
-# curl should be part of the image
-RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl
+# We need font libs for phantomjs, and curl should be part of the image
+RUN apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates libfontconfig1 curl
 
 RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
   addgroup --system --gid $GF_GID grafana && \
@@ -66,11 +71,14 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \
     chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \
     chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING"
 
+# PhantomJS
+COPY --from=js-builder /usr/local/bin/phantomjs /usr/local/bin/
 
 COPY --from=go-builder /src/grafana/bin/linux-amd64/grafana-server /src/grafana/bin/linux-amd64/grafana-cli bin/
 COPY --from=js-builder /usr/src/app/public public
 COPY --from=js-builder /usr/src/app/tools tools
 
+COPY tools/phantomjs/render.js tools/phantomjs/
 COPY packaging/docker/run.sh /
 
 USER grafana

GOVERNANCE.md

@@ -1,203 +0,0 @@
-# Governance
-
-This document describes the rules and governance of the project. It is meant to be followed by all the developers of the project and the Grafana community. Common terminology used in this governance document are listed below:
-
-- **Team members**: Any members of the private [grafana-team][team] Google group.
-
-- **Maintainers**: Maintainers lead an individual project or parts thereof ([`MAINTAINERS.md`][maintainers]).
-
-- **Projects**: A single repository in the Grafana GitHub organization and listed below is referred to as a project:
-
-  - clock-panel
-  - devtools
-  - gel-app
-  - grafana
-  - grafana-github-datasource
-  - grafana-image-renderer
-  - grafana-kiosk
-  - grafana-plugin-sdk-go
-  - grafana-polystat-panel
-  - grafonnet-lib
-  - kairosdb-datasource
-  - piechart-panel
-  - simple-angular-panel
-  - simple-app-plugin
-  - simple-datasource
-  - simple-datasource-backend
-  - simple-json-backend-datasource
-  - simple-json-datasource
-  - simple-react-panel
-  - strava-datasource
-  - tutorials
-  - worldmap-panel
-
-- **The Grafana project**: The sum of all activities performed under this governance, concerning one or more repositories or the community.
-
-## Values
-
-The Grafana developers and community are expected to follow the values defined in the Grafana Code of Conduct. Furthermore, the Grafana community strives for kindness, giving feedback effectively, and building a welcoming environment. The Grafana developers generally decide by consensus and only resort to conflict resolution by a majority vote if consensus cannot be reached.
-
-## Projects
-
-Each project must have a [`MAINTAINERS.md`][maintainers] file with at least one maintainer. Where a project has a release process, access and documentation should be such that more than one person can perform a release. Releases should be announced on the Grafana Labs blog. Any new projects should be first proposed on the [team mailing list][team] following the voting procedures listed below.
-
-## Decision making
-
-### Team members
-
-Team member status may be given to those who have made ongoing contributions to the Grafana project for at least 3 months. This is usually in the form of code improvements and/or notable work on documentation, but organizing events or user support could also be taken into account.
-
-New members may be proposed by any existing member by email to [grafana-team][team]. It is highly desirable to reach consensus about acceptance of a new member. However, the proposal is ultimately voted on by a formal [supermajority vote](#supermajority-vote).
-
-If the new member proposal is accepted, the proposed team member should be contacted privately via email to confirm or deny their acceptance of team membership. This email will also be CC'd to [grafana-team][team] for record-keeping purposes.
-
-If they choose to accept, the [onboarding](#onboarding) procedure is followed.
-
-Team members may retire at any time by emailing [the team][team].
-
-Team members can be removed by [supermajority vote](#supermajority-vote) on [the team mailing list][team].
-For this vote, the member in question is not eligible to vote and does not count towards the quorum.
-Any removal vote can cover only one single person.
-
-Upon death of a member, they leave the team automatically.
-
-In case a member leaves, the [offboarding](#offboarding) procedure is applied.
-
-The current team members are:
-
-- Alexander Zobnin ([Grafana Labs](https://grafana.com/))
-- Andrej Ocenas ([Grafana Labs](https://grafana.com/))
-- Arve Knudsen ([Grafana Labs](https://grafana.com/))
-- Brian Gann ([Grafana Labs](https://grafana.com/))
-- Carl Bergquist ([Grafana Labs](https://grafana.com/))
-- Chris Trott ([Grafana Labs](https://grafana.com/))
-- Daniel Lee ([Grafana Labs](https://grafana.com/))
-- David Kaltschmidt ([Grafana Labs](https://grafana.com/))
-- Diana Payton ([Grafana Labs](https://grafana.com/))
-- Diana Sarlinska ([Grafana Labs](https://grafana.com/))
-- Dominik Prokop ([Grafana Labs](https://grafana.com/))
-- Emil Tullstedt ([Grafana Labs](https://grafana.com/))
-- Hugo Häggmark ([Grafana Labs](https://grafana.com/))
-- Ivana Huckova ([Grafana Labs](https://grafana.com/))
-- Jeroen Op 't Eynde ([Grafana Labs](https://grafana.com/))
-- Jessica Müller ([Grafana Labs](https://grafana.com/))
-- Julien Pivotto ([Inuits](https://inuits.eu/))
-- Kay Delaney ([Grafana Labs](https://grafana.com/))
-- Kyle Brandt ([Grafana Labs](https://grafana.com/))
-- Leonard Gram ([Grafana Labs](https://grafana.com/))
-- Lukas Siatka ([Grafana Labs](https://grafana.com/))
-- Malcolm Holmes ([Grafana Labs](https://grafana.com/))
-- Marcus Andersson ([Grafana Labs](https://grafana.com/))
-- Marcus Efraimsson ([Grafana Labs](https://grafana.com/))
-- Marcus Olsson ([Grafana Labs](https://grafana.com/))
-- Mitsuhiro Tanda ([GREE](https://corp.gree.net/jp/en/))
-- Patrick O’Carroll ([Grafana Labs](https://grafana.com/))
-- Peter Holmberg ([Grafana Labs](https://grafana.com/))
-- Richard Hartmann ([Grafana Labs](https://grafana.com/))
-- Ryan McKinley ([Grafana Labs](https://grafana.com/))
-- Sofia Papagiannaki ([Grafana Labs](https://grafana.com/))
-- Stephanie Closson ([Grafana Labs](https://grafana.com/))
-- Tobias Skarhed ([Grafana Labs](https://grafana.com/))
-- Torkel Ödegaard ([Grafana Labs](https://grafana.com/))
-- Utkarsh Bhatnagar ([Tinder](https://www.tinder.com/))
-
-### Maintainers
-
-Maintainers lead one or more project(s) or parts thereof and serve as a point of conflict resolution amongst the contributors to this project. Ideally, maintainers are also team members, but exceptions are possible for suitable maintainers that, for whatever reason, are not yet team members.
-
-Changes in maintainership have to be announced on the [developers mailing list][devs]. They are decided by [rough consensus](#consensus) and formalized by changing the [`MAINTAINERS.md`][maintainers] file of the respective repository.
-
-Maintainers are granted commit rights to all projects covered by this governance.
-
-A maintainer or committer may resign by notifying the [team mailing list][team]. A maintainer with no project activity for a year is considered to have resigned. Maintainers that wish to resign are encouraged to propose another team member to take over the project.
-
-A project may have multiple maintainers, as long as the responsibilities are clearly agreed upon between them. This includes coordinating who handles which issues and pull requests.
-
-### Technical decisions
-
-Technical decisions that only affect a single project are made informally by the maintainer of this project, and [rough consensus](#consensus) is assumed. Technical decisions that span multiple parts of the Grafana project should be discussed and made on the [Grafana developer mailing list][devs].
-
-Decisions are usually made by [rough consensus](#consensus). If no consensus can be reached, the matter may be resolved by [majority vote](#majority-vote).
-
-### Governance changes
-
-Changes to this document are made by Grafana Labs.
-
-### Other matters
-
-Any matter that needs a decision may be called to a vote by any member if they deem it necessary. For private or personnel matters, discussion and voting takes place on the [team mailing list][team], otherwise on the [developer mailing list][devs].
-
-## Voting
-
-The Grafana project usually runs by informal consensus, however sometimes a formal decision must be made.
-
-Depending on the subject matter, as laid out [above](#decision-making), different methods of voting are used.
-
-For all votes, voting must be open for at least one week. The end date should be clearly stated in the call to vote. A vote may be called and closed early if enough votes have come in one way so that further votes cannot change the final decision.
-
-In all cases, all and only [team members](#team-members) are eligible to vote, with the sole exception of the forced removal of a team member, in which said member is not eligible to vote.
-
-Discussion and votes on personnel matters (including but not limited to team membership and maintainership) are held in private on the [team mailing list][team]. All other discussion and votes are held in public on the [developer mailing list][devs].
-
-For public discussions, anyone interested is encouraged to participate. Formal power to object or vote is limited to [team members](#team-members).
-
-### Consensus
-
-The default decision making mechanism for the Grafana project is [rough][rough] consensus. This means that any decision on technical issues is considered supported by the [team][team] as long as nobody objects or the objection has been considered but not necessarily accommodated.
-
-Silence on any consensus decision is implicit agreement and equivalent to explicit agreement. Explicit agreement may be stated at will. Decisions may, but do not need to be called out and put up for decision on the [developers mailing list][devs] at any time and by anyone.
-
-Consensus decisions can never override or go against the spirit of an earlier explicit vote.
-
-If any [team member](#team-members) raises objections, the team members work together towards a solution that all involved can accept. This solution is again subject to rough consensus.
-
-In case no consensus can be found, but a decision one way or the other must be made, any [team member](#team-members) may call a formal [majority vote](#majority-vote).
-
-### Majority vote
-
-Majority votes must be called explicitly in a separate thread on the appropriate mailing list. The subject must be prefixed with `[VOTE]`. In the body, the call to vote must state the proposal being voted on. It should reference any discussion leading up to this point.
-
-Votes may take the form of a single proposal, with the option to vote yes or no, or the form of multiple alternatives.
-
-A vote on a single proposal is considered successful if more vote in favor than against.
-
-If there are multiple alternatives, members may vote for one or more alternatives, or vote “no” to object to all alternatives. It is not possible to cast an “abstain” vote. A vote on multiple alternatives is considered decided in favor of one alternative if it has received the most votes in favor, and a vote from more than half of those voting. Should no alternative reach this quorum, another vote on a reduced number of options may be called separately.
-
-### Supermajority vote
-
-Supermajority votes must be called explicitly in a separate thread on the appropriate mailing list. The subject must be prefixed with `[VOTE]`. In the body, the call to vote must state the proposal being voted on. It should reference any discussion leading up to this point.
-
-Votes may take the form of a single proposal, with the option to vote yes or no, or the form of multiple alternatives.
-
-A vote on a single proposal is considered successful if at least two thirds of those eligible to vote vote in favor.
-
-If there are multiple alternatives, members may vote for one or more alternatives, or vote “no” to object to all alternatives. A vote on multiple alternatives is considered decided in favor of one alternative if it has received the most votes in favor, and a vote from at least two thirds of those eligible to vote. Should no alternative reach this quorum, another vote on a reduced number of options may be called separately.
-
-## On- / Offboarding
-
-### Onboarding
-
-The new member is
-
-- added to the list of [team members](#team-members). Ideally by sending a PR of their own, at least approving said PR.
-- announced on the [developers mailing list][devs] by an existing team member. Ideally, the new member replies in this thread, acknowledging team membership.
-- added to the projects with commit rights.
-- added to the [team mailing list][team].
-
-### Offboarding
-
-The ex-member is
-
-- removed from the list of [team members](#team-members). Ideally by sending a PR of their own, at least approving said PR. In case of forced removal, no approval is needed.
-- removed from the projects. Optionally, they can retain maintainership of one or more repositories if the [team](#team-members) agrees.
-- removed from the team mailing list and demoted to a normal member of the other mailing lists.
-- not allowed to call themselves an active team member any more, nor allowed to imply this to be the case.
-- added to a list of previous members if they so choose.
-
-If needed, we reserve the right to publicly announce removal.
-
-[coc]: https://github.com/grafana/grafana/blob/master/CODE_OF_CONDUCT.md
-[devs]: https://groups.google.com/forum/#!forum/grafana-developers
-[maintainers]: https://github.com/grafana/grafana/blob/master/MAINTAINERS.md
-[rough]: https://tools.ietf.org/html/rfc7282
-[team]: https://groups.google.com/forum/#!forum/grafana-team

Gruntfile.js

@@ -35,6 +35,7 @@ module.exports = function (grunt) {
     config.libc = grunt.option('libc');
   }
 
+  config.phjs = grunt.option('phjsToRelease');
   config.pkg.version = grunt.option('pkgVer') || config.pkg.version;
 
   console.log('Version', config.pkg.version);

ISSUE_TRIAGE.md

@@ -143,7 +143,7 @@ Label | Description
 `type/feature-request` | Request for a new feature or enhancement.
 `type/docs` | Documentation problem or enhancement.
 `type/accessibility` | Accessibility problem or enhancement.
-`type/question` | Issue is a question or is perceived as such.
+`type/question` | Issue is or perceived as a question.
 `type/duplicate` | An existing issue of the same subject/request have already been reported.
 `type/works-as-intended` | A reported bug works as intended/by design.
 `type/build-packaging` | Build or packaging problem or enhancement.
@@ -152,7 +152,7 @@ Label | Description
 
 ### Duplicate issue?
 
-Make sure it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there is an existing issue, but can't find it, please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue:
+Make sure that it's not a duplicate by searching existing issues using related terms from the issue title and description. If you think you know there are an existing issue, but can't find it please reach out to one of the maintainers and ask for help. If you identify that the issue is a duplicate of an existing issue:
 
 1. Add a comment `Duplicate of #<issue number>`. GitHub will recognize this and add some additional context to the issue activity.
 2. Close the issue and label it with `type/duplicate`.
@@ -188,8 +188,8 @@ If it's not perfectly clear that it's an actual bug, quickly try to reproduce it
 First, evaluate if the documentation makes sense to be included in the Grafana project:
 
 - Is this something we want/can maintain as a project?
-- Is this referring to usage of some specific integration/tool and in that case is that a popular use case in combination with Grafana?
-- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users want/need this.
+- Is this referring to usage of some specific integration/tool and in that case are those a popular use case in combination with Grafana?
+- If unsure, kindly and politely add a comment explaining that we would need [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) to identify that lots of other users wants/needs this.
 
 Second, label the issue `type/docs` and at least one `area/*` or `datasource/*` label.
 
@@ -219,9 +219,9 @@ In general bugs and enhancement issues should be labeled with a priority.
 
 This is the most difficult thing with triaging issues since it requires a lot of knowledge, context and experience before being able to think of and start feel comfortable adding a certain priority label.
 
-The key here is asking for help and discuss issues to understand how more experienced project members think and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
+The key here is asking for help and discuss issues to understand how more experienced project members thinks and reason. By doing that you learn more and eventually be more and more comfortable with prioritizing issues.
 
-In case there is an uncertainty around the prioritization of an issue, please ask the maintainers for help.
+In any case there are uncertainty around the priorization of an issue, please ask the maintainers for help.
 
 Label | Description
 ------- | --------
@@ -235,7 +235,7 @@ Label | Description
 
 **Critical bug?**
 
-1. If a bug has been categorized and any of the following criteria apply, the bug should be labeled as critical and must be actively worked on as someone's top priority right now.
+1. If a bug have been categorized and any of the following problems applies the bug should be labeled as critical and must be actively worked on as someone's top priority right now.
 
    - Results in any data loss
    - Critical security or performance issues
@@ -273,9 +273,9 @@ Label | Description
 
 ## 5. Requesting help from the community
 
-Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement. In general, requesting help from the community means that a contribution has a good chance of getting accepted and merged.
+Depending on the issue and/or priority, it's always a good idea to consider signalling to the community that help from community is appreciated and needed in case an issue is not prioritized to be worked on by maintainers. Use your best judgement. In general, when requesting help from the community it means a contribution has a good chance of getting accepted and merged.
 
-In many cases the issue author or community as a whole is more suitable to contribute changes since they're experts in their domain. It's also quite common that someone has tried to get something to work using the documentation without success and made an effort to get it to work and/or reached out to the [community site](https://community.grafana.com/) to get the missing information. Particularly in these areas it's more likely that there exist experts in their own domain and it is usually a good idea to request help from contributors:
+In many cases the issue author or community as a whole is more suitable to contribute changes since they're experts in their domain. It's also quite common that someone has tried to get something to work using the documentation without success and made an effort to get it to work and/or reached out to the [community site](https://community.grafana.com/) to get the missing information. In especially these areas it's more likely that there exists experts in their own domain and usually a good idea to request help from contributors:
 
 - Database setups
 - Authentication like OAuth providers and LDAP setups
@@ -292,11 +292,11 @@ In many cases the issue author or community as a whole is more suitable to contr
 
 ## Investigation of issues
 
-When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending on the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or put on hold until someone else (maintainer or contributor) picks it up and eventually starts investigating it.
+When an issue has all basic information provided, but the triage responsible haven't been able to reproduce the reported problem at a first glance, the issue is labeled [Needs investigation](https://github.com/grafana/grafana/labels/needs%20investigation). Depending of the perceived severity and/or number of [upvotes](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments), the investigation will either be delegated to another maintainer for further investigation or either put on hold until someone else (maintainer or contributor) picks it up and eventually start investigating it.
 
-Investigating issues can be a very time consuming task, especially for the maintainers, given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services, etc that are being used with Grafana. There is a certain number of combinations that are more common than others, and these are in general easier for maintainers to investigate.
+Investigating issues can be a very time consuming task, especially for the maintainers given the huge number of combinations of plugins, data sources, platforms, databases, browsers, tools, hardware, integrations, versions and cloud services etc that are being used with Grafana. There are a certain amount of combinations that are more common than others and these are in general easier for maintainers to investigate.
 
-For some other combinations it may not be possible at all for a maintainer to setup a proper test environment to investigate the issue. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
+For some other combinations there may not be possible at all for a maintainer to setup a proper test environment for being able to investigate. In these cases we really appreciate any help we can get from the community. Otherwise the issue is highly likely to be closed.
 
 Even if you don't have the time or knowledge to investigate an issue we highly recommend that you [upvote](https://help.github.com/en/articles/about-conversations-on-github#reacting-to-ideas-in-comments) the issue if you happen to have the same problem. If you have further details that may help investigating the issue please provide as much information as possible.
 
@@ -306,14 +306,14 @@ Part of issue triage should also be triaging of external PRs. Main goal should b
 
 1. Check new external PRs which do not have a reviewer.
 1. Check if there is a link to an existing issue.
-1. If not and you know which issue it is solving, add the link yourself, otherwise ask the author to link the issue or create one.
+1. If not and you know which issue it is solving add the link yourself, otherwise ask the author to link the issue or create one.
 1. Assign a reviewer based on who was handling the linked issue or what code or feature does the PR touches (look at who was the last to make changes there if all else fails).
 
 ## Appendix
 
 ### Setting up Gmail filters
 
-If you're using Gmail it's highly recommended that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
+If you're using Gmail it's highly recommened that you setup filters to automatically remove email from the inbox and label them accordingly to make it easy for you to understand when you need to act upon a notification or process all incoming issues that haven't been triaged.
 
 This may be setup by personal preference, but here's a working configuration for reference.
 1. Follow instructions in [gist](https://gist.github.com/marefr/9167c2e31466f6316c1cba118874e74f)
@@ -335,6 +335,6 @@ This will give you a structure of labels in the sidebar similar to the following
   - Grafana
 ```
 
-* All notifications you’ll need to read/take action on show up as unread in Github (mine) and its sub-labels.
-* All other notifications you don’t need to take action on show up as unread in Github (other) and its sub-labels
+* All notifications you’ll need to read/take action on shows up as unread in Github (mine) and its sub-labels.
+* All other notifications you don’t need to take action on shows up as unread in Github (other) and its sub-labels
   * This is convenient for issue triage and to follow the activity in the Grafana project.

MAINTAINERS.md

@@ -1,8 +0,0 @@
-@torkelo is the main/default maintainer, some parts of the codebase have other maintainers:
-
-* Backend:
-  * @bergquist
-* Plugins:
-  * @ryantxu
-* UX/UI:
-  * @davkal

Makefile

@@ -4,7 +4,7 @@
 
 -include local/Makefile
 
-.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go revive golangci-lint test-go test-js test run run-frontend clean devenv devenv-down revive-strict protobuf help
+.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-dev build-docker-full lint-go gosec revive golangci-lint go-vet test-go test-js test run run-frontend clean devenv devenv-down revive-alerting help
 
 GO = GO111MODULE=on go
 GO_FILES ?= ./pkg/...
@@ -42,7 +42,6 @@ build-cli: ## Build Grafana CLI application.
 build-js: ## Build frontend assets.
 	@echo "build frontend"
 	yarn run build
-	yarn run plugins:build-bundled
 
 build: build-go build-js ## Build backend and frontend.
 
@@ -81,18 +80,11 @@ revive: scripts/go/bin/revive
 		-config ./scripts/go/configs/revive.toml \
 		$(GO_FILES)
 
-revive-strict: scripts/go/bin/revive
-	@echo "lint via revive (strict)"
+revive-alerting: scripts/go/bin/revive
+	@echo "lint alerting via revive"
 	@scripts/go/bin/revive \
 		-formatter stylish \
-		-config ./scripts/go/configs/revive-strict.toml \
-		-exclude ./pkg/plugins/backendplugin/pluginextensionv2/... \
-		./pkg/services/alerting/... \
-		./pkg/services/provisioning/datasources/... \
-		./pkg/services/provisioning/dashboards/... \
-		./pkg/services/provisioning/notifiers/... \
-		./pkg/services/provisioning/values/... \
-		./pkg/plugins/backendplugin/...
+		./pkg/services/alerting/...
 
 scripts/go/bin/golangci-lint: scripts/go/go.mod
 	@cd scripts/go; \
@@ -101,10 +93,26 @@ scripts/go/bin/golangci-lint: scripts/go/go.mod
 golangci-lint: scripts/go/bin/golangci-lint
 	@echo "lint via golangci-lint"
 	@scripts/go/bin/golangci-lint run \
-		--config ./scripts/go/configs/.golangci.toml \
+		--config ./scripts/go/configs/.golangci.yml \
 		$(GO_FILES)
 
-lint-go: golangci-lint revive revive-strict # Run all code checks for backend.
+scripts/go/bin/gosec: scripts/go/go.mod
+	@cd scripts/go; \
+	$(GO) build -o ./bin/gosec github.com/securego/gosec/cmd/gosec
+
+# TODO recheck the rules and leave only necessary exclusions
+gosec: scripts/go/bin/gosec
+	@echo "lint via gosec"
+	@scripts/go/bin/gosec -quiet \
+		-exclude=G104,G107,G108,G201,G202,G204,G301,G304,G401,G402,G501 \
+		-conf=./scripts/go/configs/gosec.json \
+		$(GO_FILES)
+
+go-vet:
+	@echo "lint via go vet"
+	@$(GO) vet $(GO_FILES)
+
+lint-go: go-vet golangci-lint revive revive-alerting gosec ## Run all code checks for backend.
 
 # with disabled SC1071 we are ignored some TCL,Expect `/usr/bin/env expect` scripts
 shellcheck: $(SH_FILES) ## Run checks for shell scripts.
@@ -150,16 +158,6 @@ devenv-down: ## Stop optional services.
 
 ##@ Helpers
 
-# We separate the protobuf generation because most development tasks on
-# Grafana do not involve changing protobuf files and protoc is not a
-# go-gettable dependency and so getting it installed can be inconvenient.
-#
-# If you are working on changes to protobuf interfaces you may either use
-# this target or run the individual scripts below directly.
-protobuf: ## Compile protobuf definitions
-	bash scripts/protobuf-check.sh
-	bash pkg/plugins/backendplugin/pluginextensionv2/generate.sh
-
 clean: ## Clean up intermediate build artifacts.
 	@echo "cleaning"
 	rm -rf node_modules

SECURITY.md

@@ -6,7 +6,7 @@ Please encrypt your message to us; please use our PGP key. The key fingerprint i
 
 F988 7BEA 027A 049F AE8E  5CAA D125 8932 BE24 C5CA
 
-The key is available from [keyserver.ubuntu.com](https://keyserver.ubuntu.com/pks/lookup?search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA&fingerprint=on&op=index).
+The key is available from [pgp.mit.edu](https://pgp.mit.edu/pks/lookup?op=get&search=0xF9887BEA027A049FAE8E5CAAD1258932BE24C5CA) by searching for [grafana](https://pgp.mit.edu/pks/lookup?search=grafana&op=index).
 
 Grafana Labs will send you a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
 

UPGRADING_DEPENDENCIES.md

@@ -20,6 +20,8 @@ Upgrading Go or Node.js requires making changes in many different files. See bel
 
 The Grafana project uses [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. This requires a working Go environment with version 1.11 or greater installed.
 
+All dependencies are vendored in the `vendor/` directory.
+
 _Note:_ Since most developers of Grafana still use the `GOPATH` we need to specify `GO111MODULE=on` to make `go mod` and `got get` work as intended. If you have setup Grafana outside of the `GOPATH` on your machine you can skip `GO111MODULE=on` when running the commands below.
 
 To add or update a new dependency, use the `go get` command:
@@ -33,14 +35,16 @@ GO111MODULE=on go get example.com/some/module/pkg
 GO111MODULE=on go get example.com/some/module/pkg@vX.Y.Z
 ```
 
-Tidy up the `go.mod` and `go.sum` files:
+Tidy up the `go.mod` and `go.sum` files and copy the new/updated dependency to the `vendor/` directory:
 
 ```bash
 # The GO111MODULE variable can be omitted when the code isn't located in GOPATH.
 GO111MODULE=on go mod tidy
+
+GO111MODULE=on go mod vendor
 ```
 
-You have to commit the changes to `go.mod` and `go.sum` before submitting the pull request.
+You have to commit the changes to `go.mod`, `go.sum` and the `vendor/` directory before submitting the pull request.
 
 ## Node.js dependencies
 

WORKFLOW.md

@@ -1,73 +0,0 @@
-# Grafana workflow
-
-This document is based on [GOVERNANCE.md](GOVERNANCE.md). We assume good faith and intend to keep all processes as lightweight as possible but as specific as required. In case of disagreements about anything in this document, GOVERNANCE.md applies.
-
-The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be interpreted as described in [RFC2119](http://tools.ietf.org/html/rfc2119).
-
-Git and [GitHub terminology](https://help.github.com/en/github/getting-started-with-github/github-glossary) are used throughout this document.
-
-Team members and their access to repositories is maintained through [GitHub teams](https://help.github.com/en/github/setting-up-and-managing-organizations-and-teams/about-teams). Team maintainers add and remove team members as outlined in GOVERNANCE.md.
-
-# Code changes
-
-## Proposing changes
-
-Examples of proposed changes are overarching architecture, component design, and specific code or graphical elements. Proposed changes SHOULD cover the big picture and intention, but individual parts SHOULD be split into the smallest possible changes. Changes SHOULD be based on and target the master branch. Depending on size of the proposed change, each change SHOULD be discussed, in increasing order of change size and complexity:
-* Directly in a RR (Pull Request) - this MAY be done, but SHOULD not be the common case.
-* Issue
-* Developer mailing list
-* Design document, shared via Google Docs, accessible to at least all team members.
-
-Significant changes MUST be discussed and agreed upon with the relevant subsystem maintainers.
-
-## Merging PRs (Pull Requests)
-
-Depending on the size and complexity of a PR, different requirements MUST be applied. Any team member contributing substantially to a PR MUST NOT count against review requirements.
-Commits MUST be merged into master using PRs. They MUST NOT be merged into master directly.
-* Every merge MUST be approved by at least one team member.
-* Non-trivial changes MUST be approved by at least
-  * two team members, or
-  * one subsystem maintainer.
-* Significant changes MUST be approved by at least
-  * two team members, AND
-  * the relevant subsystem maintainer.
-
-PRs MUST be [reviewed](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/reviewing-changes-in-pull-requests) and [approved](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/approving-a-pull-request-with-required-reviews) via GitHub’s review system.
-* Reviewers MAY write comments if approving
-* Reviewers MUST write comments if rejecting a PR or if requesting changes.
-
-Once a PR is approved as per above, any team member MAY merge the PR.
-
-# Release workflow
-
-## Branch structure
-
-Grafana uses trunk-based development.
-
-In particular, we found that the following principles match how we work:
-* Master and release branches MUST always build without failure.
-* Branches SHOULD be merged often. Larger changes SHOULD be activated with feature flags until they are ready. Long-lived development branches SHOULD be avoided.
-* Changes MAY be enabled by default once they are in a complete state
-* Changes which span multiple PRs MUST be described in an overarching issue or Google Doc.
-
-## Releases
-
-Releases MUST follow [Semantic Versioning](https://semver.org/) in naming and SHOULD follow Semantic Versioning as closely as reasonably possible for non-library software.
-
-Release branches MUST be split from the following branches.
-* MAJOR release branches MUST be based on master.
-* MINOR release branches MUST be based on master.
-* PATCH release branches MUST be split from the relevant MINOR release branch’s most current PATCH
-
-Security releases follow the same process but MUST be prepared in secret. Security releases MUST NOT include changes which are not related to the security fix. Normal release processes MUST accommodate the security release process. SECURITY.md MUST be followed.
-
-PRs intended for inclusion in the next PATCH release MUST be labeled with `cherry-pick-needed` so they can be picked up by automated release tooling.
-
-Releases follow the following cadence
-* MAJOR: Yearly
-* MINOR: Every 4-6 weeks
-* PATCH: As needed
-
-Releases SHOULD NOT be delayed by pending changes.
-
-Releases MUST be coordinated with the relevant subsystem maintainers.

api-extractor.json

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

build.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"go/build"
 	"io"
 	"io/ioutil"
 	"log"
@@ -41,6 +40,7 @@ var (
 	linuxPackageVersion   string = "v1"
 	linuxPackageIteration string = ""
 	race                  bool
+	phjsToRelease         string
 	workingDir            string
 	includeBuildId        bool     = true
 	buildId               string   = "0"
@@ -52,12 +52,15 @@ var (
 	skipRpmGen            bool     = false
 	skipDebGen            bool     = false
 	printGenVersion       bool     = false
+	modVendor             bool     = true
 )
 
 func main() {
 	log.SetOutput(os.Stdout)
 	log.SetFlags(0)
 
+	ensureGoPath()
+
 	var buildIdRaw string
 
 	flag.StringVar(&goarch, "goarch", runtime.GOARCH, "GOARCH")
@@ -66,7 +69,9 @@ func main() {
 	flag.StringVar(&libc, "libc", "", "LIBC")
 	flag.BoolVar(&cgo, "cgo-enabled", cgo, "Enable cgo")
 	flag.StringVar(&pkgArch, "pkg-arch", "", "PKG ARCH")
+	flag.StringVar(&phjsToRelease, "phjs", "", "PhantomJS binary")
 	flag.BoolVar(&race, "race", race, "Use race detector")
+	flag.BoolVar(&modVendor, "modVendor", modVendor, "Go modules use vendor folder")
 	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")
@@ -105,16 +110,16 @@ func main() {
 
 		case "build-srv", "build-server":
 			clean()
-			doBuild("grafana-server", "./pkg/cmd/grafana-server", []string{})
+			build("grafana-server", "./pkg/cmd/grafana-server", []string{})
 
 		case "build-cli":
 			clean()
-			doBuild("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
+			build("grafana-cli", "./pkg/cmd/grafana-cli", []string{})
 
 		case "build":
 			//clean()
 			for _, binary := range binaries {
-				doBuild(binary, "./pkg/cmd/"+binary, []string{})
+				build(binary, "./pkg/cmd/"+binary, []string{})
 			}
 
 		case "build-frontend":
@@ -384,6 +389,7 @@ func createPackage(options linuxPackageOptions) {
 	if enterprise {
 		description += " Enterprise"
 	}
+	args = append(args, "--vendor", description)
 
 	if !enterprise {
 		args = append(args, "--license", "\"Apache 2.0\"")
@@ -416,6 +422,18 @@ func createPackage(options linuxPackageOptions) {
 	runPrint("fpm", append([]string{"-t", options.packageType}, args...)...)
 }
 
+func ensureGoPath() {
+	if os.Getenv("GOPATH") == "" {
+		cwd, err := os.Getwd()
+		if err != nil {
+			log.Fatal(err)
+		}
+		gopath := filepath.Clean(filepath.Join(cwd, "../../../../"))
+		log.Println("GOPATH is", gopath)
+		os.Setenv("GOPATH", gopath)
+	}
+}
+
 func grunt(params ...string) {
 	if runtime.GOOS == windows {
 		runPrint(`.\node_modules\.bin\grunt`, params...)
@@ -441,6 +459,9 @@ func gruntBuildArg(task string) []string {
 	if libc != "" {
 		args = append(args, fmt.Sprintf("--libc=%s", libc))
 	}
+	if phjsToRelease != "" {
+		args = append(args, fmt.Sprintf("--phjsToRelease=%v", phjsToRelease))
+	}
 	if enterprise {
 		args = append(args, "--enterprise")
 	}
@@ -463,7 +484,7 @@ func test(pkg string) {
 	runPrint("go", "test", "-short", "-timeout", "60s", pkg)
 }
 
-func doBuild(binaryName, pkg string, tags []string) {
+func build(binaryName, pkg string, tags []string) {
 	libcPart := ""
 	if libc != "" {
 		libcPart = fmt.Sprintf("-%s", libc)
@@ -488,6 +509,9 @@ func doBuild(binaryName, pkg string, tags []string) {
 	if race {
 		args = append(args, "-race")
 	}
+	if modVendor {
+		args = append(args, "-mod=vendor")
+	}
 
 	args = append(args, "-o", binary)
 	args = append(args, pkg)
@@ -541,7 +565,7 @@ func clean() {
 
 	rmr("dist")
 	rmr("tmp")
-	rmr(filepath.Join(build.Default.GOPATH, fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch)))
+	rmr(filepath.Join(os.Getenv("GOPATH"), fmt.Sprintf("pkg/%s_%s/github.com/grafana", goos, goarch)))
 }
 
 func setBuildEnv() {

conf/defaults.ini

@@ -126,8 +126,7 @@ connstr =
 # This enables data proxy logging, default is false
 logging = false
 
-# How long the data proxy waits before timing out, default is 30 seconds.
-# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+# How long the data proxy should wait before timing out default is 30 (seconds)
 timeout = 30
 
 # If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
@@ -189,6 +188,7 @@ allow_embedding = false
 # Set to true if you want to enable http strict transport security (HSTS) response header.
 # This is only sent when HTTPS is enabled in this configuration.
 # HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default will change to true in the next minor release, 6.3.
 strict_transport_security = false
 
 # Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
@@ -202,12 +202,12 @@ strict_transport_security_subdomains = false
 
 # Set to true to enable the X-Content-Type-Options response header.
 # The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed.
-x_content_type_options = true
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+x_content_type_options = false
 
 # Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks.
-x_xss_protection = true
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+x_xss_protection = false
 
 
 #################################### Snapshots ###########################
@@ -230,13 +230,6 @@ snapshot_remove_expired = true
 # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 versions_to_keep = 20
 
-# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
-# 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_refresh_interval = 5s
-
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-default_home_dashboard_path =
-
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -301,9 +294,6 @@ signout_redirect_url =
 # This setting is ignored if multiple OAuth providers are configured.
 oauth_auto_login = false
 
-# OAuth state max age cookie duration. Defaults to 60 seconds.
-oauth_state_cookie_max_age = 60
-
 # limit of api_key seconds to live before expiration
 api_key_max_seconds_to_live = -1
 
@@ -318,9 +308,6 @@ org_name = Main Org.
 # specify role for unauthenticated users
 org_role = Viewer
 
-# mask the Grafana version number for unauthenticated users
-hide_version = false
-
 #################################### Github Auth #########################
 [auth.github]
 enabled = false
@@ -379,34 +366,6 @@ client_secret = some_secret
 scopes = user:email
 allowed_organizations =
 
-#################################### Azure AD OAuth #######################
-[auth.azuread]
-name = Azure AD
-enabled = false
-allow_sign_up = true
-client_id = some_client_id
-client_secret = some_client_secret
-scopes = openid email profile
-auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
-token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
-allowed_domains =
-allowed_groups =
-
-#################################### Okta OAuth #######################
-[auth.okta]
-name = Okta
-enabled = false
-allow_sign_up = true
-client_id = some_id
-client_secret = some_secret
-scopes = openid profile email groups
-auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
-token_url = https://<tenant-id>.okta.com/oauth2/v1/token
-api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
-allowed_domains =
-allowed_groups =
-role_attribute_path =
-
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
 name = OAuth
@@ -429,6 +388,47 @@ tls_client_cert =
 tls_client_key =
 tls_client_ca =
 
+#################################### SAML Auth ###########################
+[auth.saml] # Enterprise only
+# Defaults to false. If true, the feature is enabled
+enabled = false
+
+# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
+certificate =
+
+# Path to the public X.509 certificate. Used to sign requests to the IdP
+certificate_path =
+
+# Base64-encoded private key. Used to decrypt assertions from the IdP
+private_key =
+
+# Path to the private key. Used to decrypt assertions from the IdP
+private_key_path =
+
+# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata =
+
+# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
+idp_metadata_path =
+
+# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
+idp_metadata_url =
+
+# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds
+max_issue_delay = 90s
+
+# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours
+metadata_valid_duration = 48h
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's name
+assertion_attribute_name = displayName
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
+assertion_attribute_login = mail
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's email
+assertion_attribute_email = mail
+
 #################################### Basic Auth ##########################
 [auth.basic]
 enabled = true
@@ -470,7 +470,6 @@ skip_verify = false
 from_address = admin@grafana.localhost
 from_name = Grafana
 ehlo_identity =
-startTLS_policy =
 
 [emails]
 welcome_email_on_sign_up = false
@@ -690,9 +689,6 @@ container_name =
 server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 callback_url =
-# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
-# which this setting can help protect against by only allowing a certain amount of concurrent requests.
-concurrent_render_request_limit = 30
 
 [panels]
 # here for to support old env variables, can remove after a few months
@@ -702,68 +698,6 @@ disable_sanitize_html = false
 [plugins]
 enable_alpha = false
 app_tls_skip_verify_insecure = false
-# Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
-allow_loading_unsigned_plugins =
-
-#################################### Grafana Image Renderer Plugin ##########################
-[plugin.grafana-image-renderer]
-# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
-# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
-# timezone IDs. Fallbacks to TZ environment variable if not set.
-rendering_timezone =
-
-# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
-# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
-rendering_language =
-
-# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
-# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
-rendering_viewport_device_scale_factor =
-
-# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
-# the security risk it's not recommended to ignore HTTPS errors.
-rendering_ignore_https_errors =
-
-# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
-# only capture and log error messages. When enabled, debug messages are captured and logged as well.
-# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
-# [log].filter = rendering:debug.
-rendering_verbose_logging =
-
-# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
-# Default is false. This can be useful to enable (true) when troubleshooting.
-rendering_dumpio =
-
-# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
-# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
-rendering_args =
-
-# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
-# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
-# compatible with the plugin.
-rendering_chrome_bin =
-
-# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
-# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
-# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
-rendering_mode =
-
-# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
-# and will cluster using browser instances.
-# Mode 'context' will cluster using incognito pages.
-rendering_clustering_mode =
-# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
-rendering_clustering_max_concurrency =
-
-# Limit the maximum viewport width, height and device scale factor that can be requested.
-rendering_viewport_max_width =
-rendering_viewport_max_height =
-rendering_viewport_max_device_scale_factor =
-
-# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
-# a port not in use.
-grpc_host =
-grpc_port =
 
 [enterprise]
 license_path =

conf/provisioning/plugins/sample.yaml

@@ -1,11 +0,0 @@
-# # config file version
-apiVersion: 1
-
-# apps:
-#   - type: grafana-example-app
-#     org_name: Main Org.
-#     disabled: true
-#   - type: raintank-worldping-app
-#     org_id: 1
-#     jsonData:
-#       apiKey: "API KEY"

conf/sample.ini

@@ -127,8 +127,7 @@
 # This enables data proxy logging, default is false
 ;logging = false
 
-# How long the data proxy waits before timing out, default is 30 seconds.
-# This setting also applies to core backend HTTP data sources where query requests use an HTTP client with timeout set.
+# How long the data proxy should wait before timing out default is 30 (seconds)
 ;timeout = 30
 
 # If enabled and user is not anonymous, data proxy will add X-Grafana-User header with username into the request, default is false.
@@ -143,7 +142,7 @@
 ;reporting_enabled = true
 
 # Set to false to disable all checks to https://grafana.net
-# for new versions (grafana itself and plugins), check is used
+# for new vesions (grafana itself and plugins), check is used
 # in some UI views to notify that grafana or plugin update exists
 # This option does not cause any auto updates, nor send any information
 # only a GET request to http://grafana.com to get latest versions
@@ -190,6 +189,7 @@
 # Set to true if you want to enable http strict transport security (HSTS) response header.
 # This is only sent when HTTPS is enabled in this configuration.
 # HSTS tells browsers that the site should only be accessed using HTTPS.
+# The default version will change to true in the next minor release, 6.3.
 ;strict_transport_security = false
 
 # Sets how long a browser should cache HSTS. Only applied if strict_transport_security is enabled.
@@ -203,12 +203,12 @@
 
 # Set to true to enable the X-Content-Type-Options response header.
 # The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised
-# in the Content-Type headers should not be changed and be followed.
-;x_content_type_options = true
+# in the Content-Type headers should not be changed and be followed. The default will change to true in the next minor release, 6.3.
+;x_content_type_options = false
 
 # Set to true to enable the X-XSS-Protection header, which tells browsers to stop pages from loading
-# when they detect reflected cross-site scripting (XSS) attacks.
-;x_xss_protection = true
+# when they detect reflected cross-site scripting (XSS) attacks. The default will change to true in the next minor release, 6.3.
+;x_xss_protection = false
 
 #################################### Snapshots ###########################
 [snapshots]
@@ -229,13 +229,6 @@
 # Number dashboard versions to keep (per dashboard). Default: 20, Minimum: 1
 ;versions_to_keep = 20
 
-# Minimum dashboard refresh interval. When set, this will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
-# 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_refresh_interval = 5s
-
-# Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
-;default_home_dashboard_path =
-
 #################################### Users ###############################
 [users]
 # disable user signup / registration
@@ -300,9 +293,6 @@
 # This setting is ignored if multiple OAuth providers are configured.
 ;oauth_auto_login = false
 
-# OAuth state max age cookie duration. Defaults to 60 seconds.
-;oauth_state_cookie_max_age = 60
-
 # limit of api_key seconds to live before expiration
 ;api_key_max_seconds_to_live = -1
 
@@ -317,9 +307,6 @@
 # specify role for unauthenticated users
 ;org_role = Viewer
 
-# mask the Grafana version number for unauthenticated users
-;hide_version = false
-
 #################################### Github Auth ##########################
 [auth.github]
 ;enabled = false
@@ -369,34 +356,6 @@
 ;scopes = user:email
 ;allowed_organizations =
 
-#################################### Azure AD OAuth #######################
-[auth.azuread]
-;name = Azure AD
-;enabled = false
-;allow_sign_up = true
-;client_id = some_client_id
-;client_secret = some_client_secret
-;scopes = openid email profile
-;auth_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize
-;token_url = https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token
-;allowed_domains =
-;allowed_groups =
-
-#################################### Okta OAuth #######################
-[auth.okta]
-;name = Okta
-;enabled = false
-;allow_sign_up = true
-;client_id = some_id
-;client_secret = some_secret
-;scopes = openid profile email groups
-;auth_url = https://<tenant-id>.okta.com/oauth2/v1/authorize
-;token_url = https://<tenant-id>.okta.com/oauth2/v1/token
-;api_url = https://<tenant-id>.okta.com/oauth2/v1/userinfo
-;allowed_domains =
-;allowed_groups =
-;role_attribute_path =
-
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
 ;enabled = false
@@ -419,6 +378,47 @@
 ;tls_client_key =
 ;tls_client_ca =
 
+#################################### SAML Auth ###########################
+[auth.saml] # Enterprise only
+# Defaults to false. If true, the feature is enabled.
+;enabled = false
+
+# Base64-encoded public X.509 certificate. Used to sign requests to the IdP
+;certificate =
+
+# Path to the public X.509 certificate. Used to sign requests to the IdP
+;certificate_path =
+
+# Base64-encoded private key. Used to decrypt assertions from the IdP
+;private_key =
+
+;# Path to the private key. Used to decrypt assertions from the IdP
+;private_key_path =
+
+# Base64-encoded IdP SAML metadata XML. Used to verify and obtain binding locations from the IdP
+;idp_metadata =
+
+# Path to the SAML metadata XML. Used to verify and obtain binding locations from the IdP
+;idp_metadata_path =
+
+# URL to fetch SAML IdP metadata. Used to verify and obtain binding locations from the IdP
+;idp_metadata_url =
+
+# Duration, since the IdP issued a response and the SP is allowed to process it. Defaults to 90 seconds.
+;max_issue_delay = 90s
+
+# Duration, for how long the SP's metadata should be valid. Defaults to 48 hours.
+;metadata_valid_duration = 48h
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's name
+;assertion_attribute_name = displayName
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's login handle
+;assertion_attribute_login = mail
+
+# Friendly name or name of the attribute within the SAML assertion to use as the user's email
+;assertion_attribute_email = mail
+
 #################################### Basic Auth ##########################
 [auth.basic]
 ;enabled = true
@@ -460,8 +460,6 @@
 ;from_name = Grafana
 # EHLO identity in SMTP dialog (defaults to instance_name)
 ;ehlo_identity = dashboard.example.com
-# SMTP startTLS policy (defaults to 'OpportunisticStartTLS')
-;startTLS_policy = NoStartTLS
 
 [emails]
 ;welcome_email_on_sign_up = false
@@ -681,9 +679,6 @@
 ;server_url =
 # If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
 ;callback_url =
-# Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
-# which this setting can help protect against by only allowing a certain amount of concurrent requests.
-;concurrent_render_request_limit = 30
 
 [panels]
 # If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities.
@@ -692,68 +687,6 @@
 [plugins]
 ;enable_alpha = false
 ;app_tls_skip_verify_insecure = false
-# Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
-;allow_loading_unsigned_plugins =
-
-#################################### Grafana Image Renderer Plugin ##########################
-[plugin.grafana-image-renderer]
-# Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert.
-# See ICU’s metaZones.txt (https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported
-# timezone IDs. Fallbacks to TZ environment variable if not set.
-;rendering_timezone =
-
-# Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
-# Please refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
-;rendering_language =
-
-# Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
-# Default is 1. Using a higher value will produce more detailed images (higher DPI), but will require more disk space to store an image.
-;rendering_viewport_device_scale_factor =
-
-# Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to
-# the security risk it's not recommended to ignore HTTPS errors.
-;rendering_ignore_https_errors =
-
-# Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is false and will
-# only capture and log error messages. When enabled, debug messages are captured and logged as well.
-# For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure
-# [log].filter = rendering:debug.
-;rendering_verbose_logging =
-
-# Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service.
-# Default is false. This can be useful to enable (true) when troubleshooting.
-;rendering_dumpio =
-
-# Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found
-# here (https://peter.sh/experiments/chromium-command-line-switches/). Multiple arguments is separated with comma-character.
-;rendering_args =
-
-# You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
-# Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
-# compatible with the plugin.
-;rendering_chrome_bin =
-
-# Instruct how headless browser instances are created. Default is 'default' and will create a new browser instance on each request.
-# Mode 'clustered' will make sure that only a maximum of browsers/incognito pages can execute concurrently.
-# Mode 'reusable' will have one browser instance and will create a new incognito page on each request.
-;rendering_mode =
-
-# When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is 'browser'
-# and will cluster using browser instances.
-# Mode 'context' will cluster using incognito pages.
-;rendering_clustering_mode =
-# When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
-;rendering_clustering_max_concurrency =
-
-# Limit the maximum viewport width, height and device scale factor that can be requested.
-;rendering_viewport_max_width =
-;rendering_viewport_max_height =
-;rendering_viewport_max_device_scale_factor =
-
-# Change the listening host and port of the gRPC server. Default host is 127.0.0.1 and default port is 0 and will automatically assign
-# a port not in use.
-;grpc_host =
-;grpc_port =
 
 [enterprise]
 # Path to a valid Grafana Enterprise license.jwt file

contribute/architecture/communication.md

@@ -72,7 +72,7 @@ if err := s.bus.Dispatch(cmd); err != nil {
 
 ### Handle commands
 
-Let other parts of the application dispatch commands to a service, by registering a _command handler_:
+Let others parts of the application dispatch commands to a service, by registering a _command handler_:
 
 To handle a command, register a command handler in the `Init` function.
 
@@ -91,7 +91,7 @@ func (s *MyService) SendStickers(cmd *models.SendStickersCommand) error {
 
 ## Queries
 
-A command handler can optionally populate the command sent to it. This pattern is commonly used to implement _queries_.
+A command handler can optionally populate the command sent it. This pattern is commonly used to implement _queries_.
 
 ### Making a query
 

contribute/developer-guide.md

@@ -4,6 +4,7 @@ This guide helps you get started developing Grafana.
 
 Before you begin, you might want to read [How to contribute to Grafana as a junior dev](https://medium.com/@ivanahuckova/how-to-contribute-to-grafana-as-junior-dev-c01fe3064502) by [Ivana Huckova](https://medium.com/@ivanahuckova).
 
+
 ## Dependencies
 
 Make sure you have the following dependencies installed before setting up your developer environment:
@@ -20,7 +21,7 @@ We recommend using [Homebrew](https://brew.sh/) for installing any missing depen
 ```
 brew install git
 brew install go
-brew install node@12
+brew install node
 
 npm install -g yarn
 ```
@@ -51,7 +52,7 @@ After the command has finished, we can start building our source code:
 yarn start
 ```
 
-Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets every time you change the code.
+Once `yarn start` has built the assets, it will continue to do so whenever any of the files change. This means you don't have to manually build the assets whenever every time you change the code.
 
 Next, we'll build the web server that will serve the frontend assets we just built.
 
@@ -97,35 +98,29 @@ go test -v ./pkg/...
 
 ### Run end-to-end tests
 
-The end to end tests in Grafana use [Cypress](https://www.cypress.io/) to run automated scripts in a headless Chromium browser. Read more about our [e2e framework](/contribute/style-guides/e2e.md).
+The end to end tests in Grafana use [Cypress](https://www.cypress.io/) to run automated scripts in a headless Chromium browser. Read more about our [e2e framework](/contribute/style-guides/e2e.md). 
 
 To run the tests:
 
 ```
-yarn e2e
+yarn e2e-tests
 ```
 
-By default, the end-to-end tests starts a Grafana instance listening on `localhost:3001`. To use a specific URL, set the `BASE_URL` environment variable:
+By default, the end-to-end tests assumes Grafana is available on `localhost:3000`. To use a specific URL, set the `BASE_URL` environment variable:
 
 ```
-BASE_URL=http://localhost:3333 yarn e2e
+BASE_URL=http://localhost:3333 yarn e2e-tests
 ```
 
-To follow the tests in the browser while they're running, use the `yarn e2e:debug`.
+To follow the tests in the browser while they're running, use the `yarn e2e-tests:debug` instead.
 
 ```
-yarn e2e:debug
-```
-
-If you want to pick a test first, use the `yarn e2e:dev`, to pick a test and follow the test in the browser while it runs.
-
-```
-yarn e2e:dev
+yarn e2e-tests:debug
 ```
 
 ## Configure Grafana for development
 
-The default configuration, `grafana.ini`, is located in the `conf` directory.
+The default configuration, `grafana.ini`, is located in the `conf` directory. 
 
 To override the default configuration, create a `custom.ini` file in the `conf` directory. You only need to add the options you wish to override.
 
@@ -135,6 +130,7 @@ Enable the development mode, by adding the following line in your `custom.ini`:
 app_mode = development
 ```
 
+
 ### Add data sources
 
 By now, you should be able to build and test a change you've made to the Grafana source code. In most cases, you need to add at least one data source to verify the change.
@@ -176,7 +172,7 @@ The resulting image will be tagged as grafana/grafana:dev.
 1. Build the frontend: `go run build.go build-frontend`.
 1. Build the Docker image: `make build-docker-dev`.
 
-**Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise, `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.
+**Note:** If you are using Docker for macOS, be sure to set the memory limit to be larger than 2 GiB. Otherwise `grunt build` may fail. The memory limit settings are available under **Docker Desktop** -> **Preferences** -> **Advanced**.
 
 ## Troubleshooting
 
@@ -184,7 +180,7 @@ Are you having issues with setting up your environment? Here are some tips that
 
 ### Too many open files when running `make run`
 
-Depending on your environment, you may have to increase the maximum number of open files allowed. For the rest of this section, we will assume you are on a Unix like OS (e.g. Linux/MacOS), where you can control the maximum number of open files through the [ulimit](https://ss64.com/bash/ulimit.html) shell command.
+Depending on your environment, you may have to increase the maximum number of open files allowed.
 
 To see how many open files are allowed, run:
 
@@ -204,28 +200,7 @@ The number of files needed may be different on your environment. To determine th
 find ./conf ./pkg ./public/views | wc -l
 ```
 
-Another alternative is to limit the files being watched. The directories that are watched for changes are listed in the `.bra.toml` file in the root directory.
-
-To retain your `ulimit` configuration, i.e. so it will be remembered for future sessions, you need to commit it to your command line shell initialization file. Which file this will be depends on the shell you are using, here are some examples:
-
-* zsh -> ~/.zshrc
-* bash -> ~/.bashrc
-
-Commit your ulimit configuration to your shell initialization file as follows ($LIMIT being your chosen limit and $INIT_FILE being the initialization file for your shell):
-
-```
-echo ulimit -S -n $LIMIT >> $INIT_FILE
-```
-
-Your command shell should read the initialization file in question every time it gets started, and apply your `ulimit` command.
-
-For some people, typically using the bash shell, ulimit fails with an error similar to the following:
-
-```
-ulimit: open files: cannot modify limit: Operation not permitted
-```
-
-If that happens to you, chances are you've already set a lower limit and your shell won't let you set a higher one. Try looking in your shell initialization files (~/.bashrc typically), if there's already a ulimit command that you can tweak.
+Another alternative is to limit the files being watched. The directories that are watched for changes are listed in the `.bra.toml` file in the root directory. 
 
 ## Next steps
 

contribute/style-guides/backend.md

@@ -39,3 +39,7 @@ Tests must use the standard library, `testing`. For assertions, prefer using [te
 The majority of our tests uses [GoConvey](http://goconvey.co/) but that's something we want to avoid going forward.
 
 In the `sqlstore` package we do database operations in tests and while some might say that's not suited for unit tests. We think they are fast enough and provide a lot of value.
+
+## General guidelines
+
+- Avoid using import aliases, e.g. `import m "github.com/grafana/grafana/pkg/models"`.

contribute/style-guides/code-comments.md

@@ -1,209 +0,0 @@
-# Guidelines for code comments in grafana-* packages
-
-This document aims to give you some recommendation on how to add code comments to the exported code in the grafana packages.
-
-## Table of Contents
-
-1. [Add package description](#add-package-description)
-1. [Set stability of an API](#set-stability-of-an-api)
-1. [Deprecate an API](#deprecate-an-api)
-1. [Specify parameters](#specify-parameters)
-1. [Set return values](#set-return-values)
-____
-
- ## Add package description
-
-Each package has an overview explaining the overall responsibility and usage of the package. 
-
-You can document this description with [`@packageDocumentation`](https://api-extractor.com/pages/tsdoc/tag_packagedocumentation/) tag.
-
-Add this tag to the `<packageRoot>/src/index.ts` entry file to have one place for the package description.
-
-## Set stability of an API
-
-All `exported` apis from the package should have a release tag to indicate its stability.
-
-- [`@alpha`](https://api-extractor.com/pages/tsdoc/tag_alpha/) - early draft of api and will probably change.
-- [`@beta`](https://api-extractor.com/pages/tsdoc/tag_beta/) - close to being stable but might change.
-- [`@public`](https://api-extractor.com/pages/tsdoc/tag_public/) - ready for usage in production.
-- [`@internal`](https://api-extractor.com/pages/tsdoc/tag_internal/) - for internal use only.
-
-### Main stability of APIs
-
-Add a tag to mark the stability of the whole exported `class/interface/function/type` etc.
-
-Please place the `release tag` at the bottom of the comment to make it consistent among files and easier to read. 
-
-**Do:**
-
-```typescript
-/**
- * Will help to create DataFrame objects and handle 
- * the heavy lifting of creating a complex object.
- * 
- * @example
- * ```typescript
- * const dataFrame = factory.create();
- * ```
- * 
- * @public
- **/
-export class DataFrameFactory {
-    create(): DataFrame { }
-}
-```
-
-**Don't**
-```typescript
-/**
- * Will help to create DataFrame objects and handle 
- * the heavy lifting of creating a complex object.
- * 
- * @public
- * @example
- * ```typescript
- * const dataFrame = factory.create();
- * ```
- **/
-export class DataFrameFactory {
-    create(): DataFrame { }
-}
-```
-
-### Partial stability of APIs
-
-Add the main stability of the API at the top according to [Main stability of API](#main-stability-of-api).
-
-Then override the non-stable parts of the API with the proper [release tag](#release-tags). This should also be place at the bottom of the comment block.
-
-**Do:**
-
-```typescript
-/**
- * Will help to create DataFrame objects and handle 
- * the heavy lifting of creating a complex object.
- * 
- * @example
- * ```typescript
- * const dataFrame = factory.create();
- * ```
- * 
- * @public
- **/
-export class DataFrameFactory {
-    create(): DataFrame { }
-
-    /**
-     * @beta
-     **/
-    createMany(): DataFrames[] {}
-}
-```
-
-**Don't**
-
-```typescript
-/**
- * Will help to create DataFrame objects and handle 
- * the heavy lifting of creating a complex object.
- * 
- * @example
- * ```typescript
- * const dataFrame = factory.create();
- * ```
- **/
-export class DataFrameFactory {
-    /**
-     * @public
-     **/
-    create(): DataFrame { }
-
-    /**
-     * @beta
-     **/
-    createMany(): DataFrame[] {}
-}
-```
-
-## Deprecate an API
-If you want to mark an API as deprecated to signal that this API will be removed in the future, then add the [`@deprecated`](https://api-extractor.com/pages/tsdoc/tag_deprecated/) tag.
-
-If applicable add a reason why the API is deprecated directly after the `@deprecated tag`.
-
-## Specify parameters
-If you want to specify the possible parameters that can be passed to an API, then add the [`@param`](https://api-extractor.com/pages/tsdoc/tag_param/) tag.
-
-This attribute can be skipped if the type provided by `typescript` and the function comment or the function name is enough to explain what the parameters are.
-
-**Do:**
-
-```typescript
-/**
- * Will help to create a resource resolver depending
- * on the current execution context.
- * 
- * @param context - The current execution context.
- * @returns FileResolver if executed on the server otherwise a HttpResolver.
- * @public
- **/
-export const factory = (context: Context): IResolver => {
-    if (context.isServer) {
-        return new FileResolver();
-    }
-    return new HttpResolver();
-}
-```
-
-**Don't**
-
-```typescript
-/**
- * Will compare two numbers to see if they are equal to each others.
- * 
- * @param x - The first number
- * @param y - The second number
- * @public
- **/
-export const isEqual = (x: number, y: number): boolean => {
-    return x === y;
-}
-```
-
-
-## Set return values
-If you want to specify the return value from a function you can use the [`@returns`](https://api-extractor.com/pages/tsdoc/tag_returns/) tag.
-
-This attribute can be skipped if the type provided by `typescript` and the function comment or the function name is enough to explain what the function returns.
-
-**Do:**
-
-```typescript
-/**
- * Will help to create a resource resolver depending
- * on the current execution context.
- * 
- * @param context - The current execution context.
- * @returns FileResolver if executed on the server otherwise a HttpResolver.
- * @public
- **/
-export const factory = (context: Context): IResolver => {
-    if (context.isServer) {
-        return new FileResolver();
-    }
-    return new HttpResolver();
-}
-```
-
-**Don't**
-
-```typescript
-/**
- * Will compare two numbers to see if they are equal to each others.
- * 
- * @returns true if values are equal
- * @public
- **/
-export const isEqual = (x: number, y: number): boolean => {
-    return x === y;
-}
-```

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

@@ -1,144 +0,0 @@
-# Markdown style guide
-
-This guide for Markdown style helps keep contributions consistent across all documentation
-created for Grafana products. Refer to the guide and update its sections as needed when a
-Subject Matter Expert answers a question on Markdown style, or a decision is made about
-how to apply Markdown.
-
-## Headers
-
-In Markdown, the number of "#" symbols creates different heading levels, similar to
-HTML heading levels:
-
-**Example**
-
-* \# is \<h1>.
-* \#\# is \<h2>.
-* \#\#\# is \<h3>.
-
-Start your document with a single ``#`` for the title of the page. Add the sub-headings with two ``##``.
-
-## Bold and emphasis
-
-* Make text **bold** using two asterisks.
-
-**Example:** It is ``**important**`` to use Github Flavored Markdown emoji consistently.
-
-* Make text ``*emphasized*`` using single `` _underscores_`` or a single asterisk.
-
-**Example:** Github Flavored Markdown emoji should _only_ appear in specific cases.
-
-
-## Links and references
-
-Create links to other website by wrapping the display text in square brackets, and
-the web URL in curved brackets.
-
-\[text to display](www.website.com)
-
-**Example:** For more information on including emoji in Github flavored Markdown, refer to the [webfx page on emoji](https://www.webfx.com/tools/emoji-cheat-sheet/) for a list of emoji.
-
-## Block quotes
-
-Include Block quotes inside text using right-facing arrows:
-
-**Example**
-
-> Any important information
-> about emoji can be separated into
-> a blockquote.
-
-## Code blocks
-
-Code blocks written with markdown can show off syntax highlighting specific
-to different languages. Use three back tics to create a code block:
-
-```
-function testNum(a) {
-  if (a > 0) {
-    return "positive";
-  } else {
-    return "NOT positive";
-  }
-}
-```
-
-Write the name of the language after the first set of back tics, no spaces,
-to show specific syntax highlighting. For example; "\```javascript" produces the following:
-
-```javascript
-function testNum(a) {
-  if (a > 0) {
-    return "positive";
-  } else {
-    return "NOT positive";
-  }
-}
-```
-## Tables
-
-Construct a table by typing the table headings, and separating them with
-a "|" character. Then, add a second line of dashes ("-") separated by
-another "|" character. When constructing the table cells, separate each cell data with another
-"|".
-
-**Example**
-
-Heading one | Heading two
-
-\------------|------------
-
-Cell one data| Cell two data
-
-Will publish as:
-
-Heading one | Heading two
-------------|------------
-Cell one data| Cell two data
-
-## Lists
-
-### Numbered lists
-
-To avoid inconsistent list numbering, use repetitive list numbering:
-
-\1. First
-
-\1. Second
-
-\1. Third
-
-The list above will always display as:
-
-1. First
-2. Second
-3. Third
-
-### Unordered lists
-
-Build a list of points - an unordered or unnumbered list - by
-using "\*" characters.
-
-**Example**
-
-* First
-* Another item
-* The last list item
-
-## Images
-
-Include images in a document using the following syntax:
-
-**Example** \!\[Grafana Logo](/link/to/grafanalogo/logo.png)
-
-This follows the format of "!", alt text wrapped in "[]" and the link URL wrapped in "()".
-
-## Comments
-
-You can include comments that will not appear in published markdown using the
-following syntax:
-
-\[comment]: <> (Comment text to display)
-
-The word "comment" wrapped in "[]" followed by a ":", a space, "<>", and then
-the comment itself wrapped in "()".

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

@@ -2,10 +2,6 @@
 
 This style guide applies to all documentation created for Grafana products.
 
-For information about how to write technical documentation, we suggest reviewing the content of the [Google Technical Writing courses](https://developers.google.com/tech-writing).
-
-The [Divio documentation system](https://documentation.divio.com/) site is also a good resource.
-
 ## 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.
@@ -18,32 +14,6 @@ For all items not covered in this guide, refer to the [Microsoft Style Guide](ht
 
 The [codespell](https://github.com/codespell-project/codespell) tool is run for every change to catch common misspellings.
 
-## Inclusive language
-
-This section provides guidelines on how to avoid using charged language in documentation.
-
-### Allowing and blocking
-
-Don't use "whitelist" or "blacklist" when referring to allowing or blocking content or traffic.
-
-* When used as a noun, use "allowlist" or "blocklist".
-* When used as a verb, use "allow" or "block"
-
-Example: _To **allow** outgoing traffic, add the IP to the **allowlist**._
-
-### Leader and follower
-
-Don't use "master" or "slave" to describe relationships between nodes or processes.
-
-* Use "leader", "main" or "primary," instead of "master."
-* Use "follower" or "secondary," instead of "slave."
-
-### Exceptions
-
-When referring to a configuration or settings used by third-party libraries och technologies outside the Grafana project, prefer the original name to avoid confusion.
-
-For example, use "master" when referring to the default Git branch.
-
 ## Grafana-specific style
 
 The following sections provide general guidelines on topics specific to Grafana documentation. Note that for the most part, these are *guidelines*, not rigid rules. If you have questions, ask in the #docs channel of Grafana Slack.
@@ -57,9 +27,8 @@ The following sections provide general guidelines on topics specific to Grafana
 * Write in present tense.
   - Not: The panel will open.
   - Use: The panel opens. Grafana opens the panel.
-* Do not use an ampersand (&) as an abbreviation for "and."
+* Do not use an ampersand (&) as an abbreviation for "and." 
   - **Exceptions:** If an ampersand is used in the Grafana UI, then match the UI.
-* Avoid using internal slang and jargon in technical documentation.
 
 ### File naming conventions
 
@@ -139,7 +108,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
 
 ### Word usage
 
-Grafana products has some words, abbreviations, and terms particular to the Grafana discourse community.
+Grafana products has some words, abbreviations, and slang particular to this discourse community.
 
 #### checkout, check out
 
@@ -168,21 +137,9 @@ Two words, not one
 * Correct, but passive voice: Your list of active alarms is displayed.
 * Incorrect: The list of active alarms displays.
 
-#### drawer
-
-Do not use. This is developer jargon that refers to a UI panel. Refer to the panel or feature by its proper name.
-
-#### intro, introduction
-
-"Introduction" is the preferred word. Use "intro" if there are space constraints (like on the side menu) or you are specifically trying for a less formal, more conversational tone.
-
-#### metadata
-
-One word, not two.
-
 #### open source, open-source
 
-Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._
+Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._ 
 
 Do not hyphenate when it is used as a noun. For example: _Open source is the best way to develop software._
 

contribute/style-guides/e2e.md

@@ -1,51 +1,19 @@
 # End to end test framework
-
 Grafana Labs uses a minimal home grown solution built on top of Cypress for our end to end (e2e) tests.
 
-## Commands
-
-- `yarn e2e` Creates an isolated grafana-server home under `<repo-root>/e2e/tmp` with provisioned data sources and dashboards. This
-  copies locally build binary and frontend assets from your repo root so you need to have a built backend and frontend
-  for this to run locally. The server starts on port 3001 so it does not conflict with your normal dev server.
-- `yarn e2e:debug` Same as above but runs the tests in chrome and does not shutdown after completion.
-- `yarn e2e:dev` Same as above but does not run any tests on startup. It lets you pick a test first.
-
-If you already have a Grafana instance running, you can provide a specific URL by setting the `BASE_URL` environment variable:
-
-```
-BASE_URL=http://172.0.10.2:3333 yarn e2e
-```
-
-The above commands use some utils scripts under `<repo-root>/e2e` that can also be used for more control.
-
-- `./e2e/start-server` This creates a fresh new grafana server working dir, setup's config and starts the server. It
-  will also kill any previously started server that is still running using pid file at `<repo-root>/e2e/tmp/pid`.
-- `./e2e/wait-for-grafana` waits for `$HOST` and `$PORT` to be available. Per default localhost and 3001.
-- `./e2e/run-suite <debug|dev|noarg>` Starts cypress in different modes.
-
-## Test Suites
-
-All the integration tests are located at `e2e/suite<x>/specs`. The page objects and reusable flows are in the
-`packages/grafana-e2e` package.
-
 ## Basic concepts
-
 Here is a good introduction to e2e best practices: https://martinfowler.com/bliki/PageObject.html.
-
 - `Selector`: A unique identifier that is used from the e2e framework to retrieve an element from the Browser
-- `Page`: An abstraction for an object that contains one or more `Selectors` with `visit` function to navigate to the page.
-- `Component`: An abstraction for an object that contains one or more `Selectors` but without `visit` function
+- `Page`: An abstraction for an object that contains one or more `Selectors`
 - `Flow`: An abstraction that contains a sequence of actions on one or more `Pages` that can be reused and shared between tests
 
 ## Basic example
-
 Let's start with a simple example with a single selector. For simplicity, all examples are in JSX.
 
 In our example app, we have an input that we want to type some text into during our e2e test.
-
 ```jsx harmony
 <div>
-  <input type="text" className="gf-form-input login-form-input" />
+    <input type="text" className="gf-form-input login-form-input"/>
 </div>
 ```
 
@@ -53,26 +21,25 @@ We could define a selector using `JQuery` [type selectors](https://api.jquery.co
 
 At Grafana, we use `aria-label` as our preferred way of defining selectors instead of `data-*` attributes. This also aids in accessibility.
 Let's add a descriptive `aria-label` to our simple example.
-
 ```jsx harmony
 <div>
-  <input type="text" className="gf-form-input login-form-input" aria-label="Username input field" />
+    <input type="text" className="gf-form-input login-form-input" aria-label="Username input field"/>
 </div>
 ```
 
 Now that we added the `aria-label` we suddenly get more information about this particular field. It's an input field that represents a username, but there it's still not really signaling that it's part of an e2e test.
 
 The next step is to create a `Page` representation in our e2e test 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:
-
 ```typescript
-export const Login = {
-  url: "/login", // used when called from Login.visit()
-  username: "Username input field", // used when called from Login.username().type('Hello World')
-};
+export const Login = pageFactory({
+  url: '/login', // used when called from Login.visit()
+  selectors: {
+    username: 'Username input field', // used when called from Login.username().type('Hello World')
+  },
+});
 ```
 
-The next step is to add the `Login` page to the exported const `Pages` in `packages/grafana-e2e-selectors/src/selectors/pages.ts` so that it appears when we type `e2e.pages` in our IDE.
-
+The next step is to add the `Login` page to the exported const `Pages` in `packages/grafana-e2e/src/pages/index.ts` so that it appears when we type `e2e.pages` in our IDE.
 ```ecmascript 6
 export const Pages = {
   Login,
@@ -82,21 +49,17 @@ export const Pages = {
 };
 
 ```
-
 Now that we have a `Page` called `Login` in our `Pages` const we can use that to add a selector in our html like shown below and now this really signals to future developers that it is part of an e2e test.
-
 ```jsx harmony
 <div>
-  <input type="text" className="gf-form-input login-form-input" aria-label={selectors.pages.Login.username} />
+    <input type="text" className="gf-form-input login-form-input" aria-label={e2e.pages.Login.selectors.username}/>
 </div>
 ```
 
-The last step in our example is to use our `Login` page as part of a test.
-
+The last step in our example is to use our `Login` page as part of a test. The `pageFactory` function we used before gives us two things:
 - The `url` property is used whenever we call the `visit` function and is equivalent to the Cypress function [cy.visit()](https://docs.cypress.io/api/commands/visit.html#Syntax).
-  > Best practice after calling `visit` is to always call `should` on a selector to prevent flaky tests when you try to access an element that isn't ready. For more information, refer to [Commands vs. assertions](https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions).
-- Any defined selector can be accessed from the `Login` page by invoking it. This is equivalent to the result of the Cypress function [cy.get(...)](https://docs.cypress.io/api/commands/get.html#Syntax).
-
+> Best practice after calling `visit` is to always call `should` on a selector to prevent flaky tests when you try to access an element that isn't ready. For more information, refer to [Commands vs. assertions](https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions).
+- Any defined selector in the `selectors` property can be accessed from the `Login` page by invoking it. This is equivalent to the result of the Cypress function [cy.get(...)](https://docs.cypress.io/api/commands/get.html#Syntax).
 ```ecmascript 6
 describe('Login test', () => {
   it('Should pass', () => {
@@ -110,7 +73,6 @@ describe('Login test', () => {
 ```
 
 ## Advanced example
-
 Let's take a look at an example that uses the same `selector` for multiple items in a list for instance. In this example app we have a list of data sources that we want to click on during an e2e test.
 
 ```jsx harmony
@@ -118,35 +80,36 @@ Let's take a look at an example that uses the same `selector` for multiple items
   {dataSources.map(dataSource => (
     <li className="card-item-wrapper" key={dataSource.id}>
       <a className="card-item" href={`datasources/edit/${dataSource.id}`}>
-        <div className="card-item-name">{dataSource.name}</div>
+        <div className="card-item-name">
+          {dataSource.name}
+        </div>
       </a>
     </li>
   ))}
 </ul>
 ```
-
-````
+```
 
 Just as before in the basic example we'll start by creating a page abstraction using the `pageFactory` function:
 ```typescript
-export const DataSources = {
+export const DataSources = pageFactory({
   url: '/datasources',
-  dataSources: (dataSourceName: string) => `Data source list item ${dataSourceName}`,
-};
-````
-
+  selectors: {
+    dataSources: (dataSourceName: string) => `Data source list item ${dataSourceName}`,
+  },
+});
+```
 You might have noticed that instead of a simple `string` as the `selector`, we're using a `function` that takes a string parameter as an argument and returns a formatted string using the argument.
 
-Just as before we need to add the `DataSources` page to the exported const `Pages` in `packages/grafana-e2e-selectors/src/selectors/pages.ts`.
+Just as before we need to add the `DataSources` page to the exported const `Pages` in `packages/grafana-e2e/src/pages/index.ts`.
 
 The next step is to use the `dataSources` selector function as in our example below:
-
 ```jsx harmony
 <ul>
   {dataSources.map(dataSource => (
     <li className="card-item-wrapper" key={dataSource.id}>
       <a className="card-item" href={`datasources/edit/${dataSource.id}`}>
-        <div className="card-item-name" aria-label={selectors.pages.DataSources.dataSources(dataSource.name)}>
+        <div className="card-item-name" aria-label={e2e.pages.DataSources.selectors.dataSources(dataSource.name)}>
           {dataSource.name}
         </div>
       </a>
@@ -156,7 +119,6 @@ The next step is to use the `dataSources` selector function as in our example be
 ```
 
 When this list is rendered with the data sources with names `A`, `B`, `C` the resulting html would become:
-
 ```jsx harmony
 <div class="card-item-name" aria-label="Data source list item A">
  A
@@ -172,9 +134,7 @@ When this list is rendered with the data sources with names `A`, `B`, `C` the re
 ```
 
 Now we can write our test. The one thing that differs from the `Basic example` is that we pass in which data source we want to click on as an argument to the selector function:
-
 > Best practice after calling `visit` is to always call `should` on a selector to prevent flaky tests when you try to access an element that isn't ready. For more information, refer to [Commands vs. assertions](https://docs.cypress.io/guides/core-concepts/retry-ability.html#Commands-vs-assertions).
-
 ```ecmascript 6
 describe('List test', () => {
   it('Clicking on data source named B', () => {
@@ -187,18 +147,9 @@ describe('List test', () => {
 });
 ```
 
+
 ## Debugging PhantomJS image rendering
 
-### Common Error
-
-The most common error with PhantomJs image rendering is when a PR introduces an import that has functionality that's not supported by PhantomJs. To quickly identify which new import causes this you can use a tool like `es-check`.
-
-1. Run > `npx es-check es5 './public/build/*.js'`
-2. Check the output for files that break es5 compatibility.
-3. Lazy load the failing imports if possible.
-
-### Debugging
-
 There is no easy or comprehensive way to debug PhantomJS smoke test (image rendering) failures. However, PhantomJS exposes remote debugging interface which can give you a sense of what is going wrong in the smoke test. Before performing the steps described below make sure your local Grafana instance is running:
 
 1. Go to `tools/phantomjs` directory

contribute/style-guides/frontend.md

@@ -7,279 +7,31 @@ Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/jav
 - [Frontend Style Guide](#frontend-style-guide)
   - [Table of Contents](#table-of-contents)
   - [Basic rules](#basic-rules)
-  - [Naming conventions](#naming-conventions)
-  - [File and directory naming conventions](#file-and-directory-naming-conventions)
-  - [Code organization](#code-organization)
-    - [Exports](#exports)
-  - [Comments](#comments)
-  - [React](#react)
-    - [Props](#props)
+  - [Organization](#organization)
+  - [Props](#props)
   - [State management](#state-management)
-  
-  - [Proposal for removing or replacing Angular dependencies](https://github.com/grafana/grafana/pull/23048)
 
 ## Basic rules
 
 - Try to keep files small and focused.
 - Break large components up into sub-components.
-- Use spaces for indentation.
 
-### Naming conventions
+## Organization
 
-#### Use `PascalCase` for:
+- Components and types that needs to be used by external plugins needs to go into @grafana/ui
+- Components should get their own folder under features/xxx/components
+  - Sub components can live in that component folders, so small component do not need their own folder
+  - Place test next to their component file (same dir)
+  - Component sass should live in the same folder as component code
+- State logic & domain models should live in features/xxx/state
+- Containers (pages) can live in feature root features/xxx
+  - up for debate?
 
-##### Typescript class names
+## Props
 
-```typescript
-// bad
-class dataLink {
-  //...
-}
-
-// good
-class DataLink {
-  //...
-}
-```
-
-##### Types and interfaces
-
-```
-// bad
-interface buttonProps {
-  //...
-}
-// bad
-interface button_props {
-  //...
-}
-// bad
-interface IButtonProps {
-  //...
-}
-
-// good
-interface ButtonProps {
-  //...
-}
-
-// bad
-type requestInfo = ...
-// bad
-type request_info = ...
-
-// good
-type RequestInfo = ...
-```
-
-##### Enums
-
-```
-// bad
-enum buttonVariant {
- //...
-}
-
-// good
-enum ButtonVariant {
- //...
-}
-```
-
-#### Use `camelCase` for:
-
-##### Functions
-
-```typescript
-// bad
-const CalculatePercentage = () => { ... }
-// bad
-const calculate_percentage = () => { ... }
-
-// good
-const calculatePercentage = () => { ... }
-```
-
-##### Methods
-
-```typescript
-class DateCalculator {
-  // bad
-  CalculateTimeRange () {...}
-}
-class DateCalculator {
-  // bad
-  calculate_time_range () {...}
-}
-
-class DateCalculator {
-  // good
-  calculateTimeRange () {...}
-}
-```
-
-##### Variables
-
-```typescript
-// bad
-const QueryTargets = [];
-// bad
-const query_targets = [];
-
-// good
-const queryTargets = [];
-```
-
-##### React state and properties
-
-```typescript
-interface ModalState {
-  // bad
-  IsActive: boolean;
-  // bad
-  is_active: boolean;
-
-  // good
-  isActive: boolean;
-}
-```
-
-##### Emotion class names
-
-```typescript
-const getStyles  = = () => ({
-  // bad
-  ElementWrapper: css`...`,
-  // bad
-  ["element-wrapper"]: css`...`,
-
-  // good
-  elementWrapper: css`...`,
-});
-```
-
-#### Use `ALL_CAPS` for constants.
-
-```typescript
-// bad
-const constantValue = "This string won't change";
-// bad
-const constant_value = "This string won't change";
-
-// good
-const CONSTANT_VALUE = "This string won't change";
-```
-
-#### Use [BEM](http://getbem.com/) convention for SASS styles.
-
-_SASS styles are deprecated. Please migrate to Emotion whenever you need to modify SASS styles._
-
-### Typing
-
-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 
-
-// bad
-const stringArray = [];
-
-// good
-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. 
-
-> Note: We don't have linting for this enabled because of lots of old code that needs to be fixed first.
-
-```typescript
-// bad
-function transform(value?: string) {
-  if (!value) {
-    return undefined
-  }
-  return applyTransform(value)
-};
-
-// good
-function transform(value?: string): TransformedValue | undefined {
-  if (!value) {
-    return undefined
-  }
-  return applyTransform(value)
-};
-```
-
-### File and directory naming conventions
-
-Name files according to the primary export:
-
-- When the primary export is a class or React component, use PascalCase.
-- When the primary export is a function, use camelCase.
-
-For files exporting multiple utility functions, use the name that describes the responsibility of grouped utilities. For example, a file exporting math utilities should be named `math.ts`.
-
-- Use `constants.ts` for files exporting constants.
-- Use `actions.ts` for files exporting Redux actions.
-- Use `reducers.ts` Redux reducers.
-- Use `*.test.ts(x)` for test files.
-
-### Code organization
-
-Organize your code in a directory that encloses feature code:
-
-- Put Redux state and domain logic code in `state` directory (i.e. `features/my-feature/state/actions.ts`).
-- Put React components in `components` directory (i.e. `features/my-feature/components/ButtonPeopleDreamOf.tsx`).
-- Put test files next to the test subject.
-- Put containers (pages) in feature root (i.e. `features/my-feature/DashboardPage.tsx`).
-- Subcomponents can live in the component folders. Small component do not need their own folder.
-- Component SASS styles should live in the same folder as component code.
-
-For code that needs to be used by external plugin:
-
-- Put components and types in `@grafana/ui`.
-- Put data models and data utilities in `@grafana/data`.
-- Put runtime services interfaces in `@grafana/runtime`.
-
-#### Exports
-
-- Use named exports for all code you want to export from a file.
-- Use declaration exports (i.e. `export const foo = ...`).
-- Export only the code that is meant to be used outside the module.
-
-### Comments
-
-- Use [TSDoc](https://github.com/microsoft/tsdoc) comments to document your code.
-- Use [react-docgen](https://github.com/reactjs/react-docgen) comments (`/** ... */`) for props documentation.
-- Use inline comments for comments inside functions, classes etc.
-- Please try to follow the [code comment guidelines](./code-comments.md) when adding comments.
-
-### Linting
-
-Linting is performed using [@grafana/eslint-config](https://github.com/grafana/eslint-config-grafana).
-
-## React
-
-Use the following conventions when implementing React components:
-
-### Props
-
-##### Name callback props and handlers with an "on" prefix.
+- Name callback props and handlers with an "on" prefix.
 
 ```tsx
-// bad
-handleChange = () => {
-
-};
-
-render() {
-  return (
-    <MyComponent changed={this.handleChange} />
-  );
-}
-
 // good
 onChange = () => {
 
@@ -291,41 +43,51 @@ render() {
   );
 }
 
+// bad
+handleChange = () => {
+
+};
+
+render() {
+  return (
+    <MyComponent changed={this.handleChange} />
+  );
+}
 ```
 
-##### React Component definitions
+- React Component definitions
 
 ```jsx
-// bad
-export class YourClass extends PureComponent { ... }
-
 // good
 export class YourClass extends PureComponent<{},{}> { ... }
+
+// bad
+export class YourClass extends PureComponent { ... }
 ```
 
-##### React Component constructor
+- React Component constructor
 
 ```typescript
+// good
+constructor(props:Props) {...}
+
 // bad
 constructor(props) {...}
-
-// good
-constructor(props: Props) {...}
 ```
 
-##### React Component defaultProps
+- React Component defaultProps
 
 ```typescript
-// bad
-static defaultProps = { ... }
-
 // good
 static defaultProps: Partial<Props> = { ... }
+
+// bad
+static defaultProps = { ... }
 ```
 
 ## State management
 
 - Don't mutate state in reducers or thunks.
-- Use `createSlice`. See [Redux Toolkit](https://redux-toolkit.js.org/) for more details.
+- Use helpers `actionCreatorFactory` and `reducerFactory` instead of traditional `switch statement` reducers in Redux. See [Redux framework](redux.md) for more details.
 - Use `reducerTester` to test reducers. See [Redux framework](redux.md) for more details.
 - Use state selectors to access state instead of accessing state directly.

contribute/style-guides/storybook.md

@@ -1,182 +0,0 @@
-# Storybook
-
-[Storybook](https://storybook.js.org/) is a tool which we use to manage our design system and the components which are a part of it. Storybook consists of _stories:_ each story represents a component and a case in which it is used. To show a wide variety of use cases is good both documentation wise and for troubleshooting -- it might be possible to reproduce a bug for an edge case in a story.
-
-Storybook is:
-
-- A good way to publish our design system with its implementations
-- Used as a tool for documentation
-- Used for debugging and displaying edge cases
-
-## How to create stories
-
-Stories for a component should be placed next to the component file. The Storybook file requires the same name as the component file. For example, a story for `SomeComponent.tsx` will have the file name `SomeComponent.story.tsx`. If a story should be internal, not visible in production, name the file `SomeComponent.story.internal.tsx`.
-
-### Writing stories
-
-When writing stories, we use the [CSF format](https://storybook.js.org/docs/formats/component-story-format/). For more in-depth information on writing stories, see [Storybook’s documentation on writing stories](https://storybook.js.org/docs/basics/writing-stories/).
-
-With the CSF format, the default export defines some general information about the stories in the file:
-
-- `title`: Where the component is going to live in the hierarchy
-- `decorators`: A list which can contain wrappers or provide context, such as theming
-
-```jsx
-// In MyComponent.story.tsx
-
-import MyComponent from './MyComponent';
-
-export default {
-  title: 'General/MyComponent',
-  component: MyComponent,
-  decorators: [ ... ],
-}
-
-```
-
-When it comes to writing the actual stories, you continue in the same file with named exports. The exports are turned into the story name.
-
-```jsx
-// Will produce a story name “some story”
-export const someStory = () => <MyComponent />;
-```
-
-If you want to write cover cases with different values for props, then using knobs is usually enough. You don’t need to create a new story. This will be covered further down.
-
-### Categorization
-
-We currently have these categories:
-
-- **Docs Overview** - Guidelines and information regarding the design system
-- **Forms** - Components commonly used in forms such as different kind of inputs
-- **General** - Components which can be used in a lot of different places
-- **Visualizations** - Data visualizations
-- **Panel** - Components belonging to panels and panel editors
-
-## Writing MDX documentation
-
-An MDX file is basically a markdown file with the possibility to add jsx. These files are used by Storybook to create a “docs” tab.
-
-### Link the MDX file to a component’s stories
-
-To link a component’s stories with an MDX file you have to do this:
-
-```jsx
-// In TabsBar.story.tsx
-
-import { TabsBar } from "./TabsBar";
-
-// Import the MDX file
-import mdx from "./TabsBar.mdx";
-
-export default {
-  title: "General/Tabs/TabsBar",
-  component: TabsBar,
-  parameters: {
-    docs: {
-      // This is the reference required for the MDX file
-      page: mdx,
-    },
-  },
-};
-```
-
-### MDX file structure
-
-There are some things that the MDX file should contain:
-
-- When and why the component should be used
-- Best practices - dos and don’ts for the component
-- Usage examples with code. It is possible to use the `Preview` element to show live examples in MDX
-- Props table. This can be generated by doing the following:
-
-```jsx
-// In MyComponent.mdx
-
-import { Props } from "@storybook/addon-docs/blocks";
-import { MyComponent } from "./MyComponent";
-
-<Props of={MyComponent} />;
-```
-
-### MDX file without a relationship to a component
-
-An MDX file can exist by itself without any connection to a story. This can be good for writing things such as a general guidelines page. Two things are required for this to work:
-
-- The file needs to be named `*.story.mdx`
-- A `Meta` tag must exist that says where in the hierarchy the component lives. It can look like this:
-
-```jsx
-<Meta title="Docs Overview/Color Palettes"/>
-
-# Guidelines for using colors
-
-...
-
-```
-
-You can add parameters to the Meta tag. This example shows how to hide the tools:
-
-```jsx
-<Meta title="Docs Overview/Color Palettes" parameters={{ options: { isToolshown: false }}}/>
-
-# Guidelines for using colors
-
-...
-
-```
-
-## Documenting component properties
-
-A quick way to get an overview of what a component does is by looking at its properties. That's why it is important that we document these in a good way.
-
-### Comments
-
-When writing the props interface for a component, it is possible to add a comment to that specific property, which will end up in the Props table in the MDX file. The comments are generated by [react-docgen](https://github.com/reactjs/react-docgen) and are formatted by writing `/** */`.
-
-```jsx
-interface MyProps {
-  /** Sets the initial values, which are overridden when the query returns a value*/
-  defaultValues: Array<T>;
-}
-```
-
-### Knobs
-
-Knobs is an [addon to Storybook](https://github.com/storybookjs/storybook/tree/master/addons/knobs) which can be used to easily switch values in the UI. A good use case for it is to try different props for the component. Using knobs is easy. Grafana is set up so knobs can be used straight out of the box. Here is an example of how you might use it.
-
-```jsx
-// In MyComponent.story.tsx
-
-import { number, text } from "@storybook/addon-knobs";
-
-export const basicStory = () => (
-  <MyComponent
-    max={number("Max value", 10)}
-    min={number("Min value", -10)}
-    title={text("Title", "Look at the value!")}
-  />
-);
-```
-
-The general convention is that the first parameter of the knob is its name and the second is the default value. There are some more types:
-
-| Knob      | Description                                                                                                                          |
-| --------- | ------------------------------------------------------------------------------------------------------------------------------------ |
-| `text`    | Any text field                                                                                                                       |
-| `number`  | Any number input. Also [available as range](https://github.com/storybookjs/storybook/tree/master/addons/knobs#number-bound-by-range) |
-| `boolean` | A switch between true/false                                                                                                          |
-| `color`   | Color picker                                                                                                                         |
-| `object`  | JSON input or array. Good to use if the property requires more complex data structures.                                              |
-| `array`   | Array of strings separated by a comma                                                                                                |
-| `select`  | Select a value from an options object. Good for trying different test cases.                                                         |
-| `options` | Configurable UI for selecting a range of options                                                                                     |
-| `files`   | File selector                                                                                                                        |
-| `date`    | Select date as stringified Unix timestamp                                                                                            |
-| `button`  | Has a handler which is called when clicked                                                                                           |
-
-## Best practices
-
-- When creating a new component or writing documentation for an existing one, always cover the basic use case it was intended for with a code example.
-- Use stories and knobs to create edge cases. If you are trying to solve a bug, try to reproduce it with a story.
-- Do not create stories in the MDX, always create them in the `*.story.tsx` file.

contribute/style-guides/styling.md

@@ -1,60 +1,37 @@
 # Styling Grafana
 
+## Emotion
+
 [Emotion](https://emotion.sh/docs/introduction) is our default-to-be approach to styling React components. It provides a way for styles to be a consequence of properties and state of a component.
 
-## Usage
+### Usage
 
-### Basic styling
+#### Basic styling
 
-For styling components, use [Emotion's `css` function](https://emotion.sh/docs/emotion#css).
+For styling components use Emotion's `css` function
 
 ```tsx
-import React from 'react';
-import { css } from 'emotion';
+import { css }  from 'emotion';
 
-const ComponentA = () => (
-  <div
-    className={css`
-      background: red;
-    `}
-  >
-    As red as you can get
-  </div>
-);
+
+const ComponentA = () => {
+  return (
+    <div className={css`background: red;`}>
+      As red as you can ge
+    </div>
+  );
+}
 ```
 
-### Styling with theme
+#### Styling complex components
 
-To access the theme in your styles, use the `useStyles` hook. It provides basic memoization and access to the theme object.
+In more complex cases, especially when you need to style multiple DOM elements in one component or when your styles that depend on properties and/or state, you should create a helper function that returns an object with desired stylesheet. This function should also be wrapped in `stylesFactory` helper function that will provide basic memoization.
+
+Let's say you need to style a component that has different background depending on the theme:
 
 ```tsx
-import React, { FC } from 'react';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-import { css } from 'emotion';
-
-const getComponentStyles = (theme: GrafanaTheme) => css`
-  padding: ${theme.spacing.md};
-`;
-
-const Foo: FC<FooProps> = () => {
-  const styles = useStyles(getComponentsStyles);
-
-  // Use styles with className
-};
-```
-
-### Styling complex components
-
-In more complex cases, especially when you need to style multiple DOM elements in one component, or when using styles that depend on properties and/or state, you should create a helper function that returns an object of styles. This function should also be wrapped in the `stylesFactory` helper function, which will provide basic memoization.
-
-Let's say you need to style a component that has a different background depending on the theme:
-
-```tsx
-import React from 'react';
-import { css } from 'emotion';
-import { GrafanaTheme } from '@grafana/data';
-import { selectThemeVariant, stylesFactory, useTheme } from '@grafana/ui';
+import { css, cx }  from 'emotion';
+import { GrafanaTheme, useTheme, selectThemeVariant, stylesFactory } from '@grafana/ui';
 
 const getStyles = stylesFactory((theme: GrafanaTheme) => {
   const backgroundColor = selectThemeVariant({ light: theme.colors.red, dark: theme.colors.blue }, theme.type);
@@ -63,11 +40,9 @@ const getStyles = stylesFactory((theme: GrafanaTheme) => {
     wrapper: css`
       background: ${backgroundColor};
     `,
-    icon: css`
-      font-size: ${theme.typography.size.sm};
-    `,
+    icon: css`font-size:${theme.typography.size.sm}`;
   };
-});
+}
 
 const ComponentA = () => {
   const theme = useTheme();
@@ -79,18 +54,18 @@ const ComponentA = () => {
       <i className={styles.icon} />
     </div>
   );
-};
+});
 ```
 
-For more information about themes at Grafana please see the [themes guide](./themes.md).
+For more information about themes at Grafana please see [themes guide](./themes.md)
 
-### Composing class names
+#### Composing class names
 
-For class composition, use [Emotion's `cx` function](https://emotion.sh/docs/emotion#cx).
+For class composition use Emotion's `cx` function
 
 ```tsx
-import React from 'react';
-import { css, cx } from 'emotion';
+import { css, cx }  from 'emotion';
+
 
 interface Props {
   className?: string;
@@ -99,11 +74,13 @@ interface Props {
 const ComponentA: React.FC<Props> = ({ className }) => {
   const finalClassName = cx(
     className,
-    css`
-      background: red;
-    `
-  );
+    css`background: red`,
+  )
 
-  return <div className={finalClassName}>As red as you can ge</div>;
-};
+  return (
+    <div className={finalClassName}>
+      As red as you can ge
+    </div>
+  );
+}
 ```

contribute/style-guides/themes.md

@@ -2,56 +2,11 @@
 
 ## Overview
 
-**Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana TypeScript and [Sass](https://sass-lang.com/) code. Theme definitions are located in the following files:
-
-- [packages/grafana-ui/src/themes/dark.ts](../../packages/grafana-ui/src/themes/dark.ts)
-- [packages/grafana-ui/src/themes/default.ts](../../packages/grafana-ui/src/themes/default.ts)
-- [packages/grafana-ui/src/themes/light.ts](../../packages/grafana-ui/src/themes/light.ts)
-
-The `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
+**Themes are implemented in Typescript.** That's because our goal is to share variables between Grafana Typescript code and SASS files. Theme definitions are located in `packages/grafana-ui/src/themes/[default|dark|light].ts` files. `default.ts` file holds common variables like typography and spacing definitions, while `[light|dark].ts` primarily specify colors used in themes.
 
 ## Usage
-
-This section provides usage guidelines.
-
 ### Using themes in React components
 
-Here's how to use Grafana themes in React components.
-
-#### useStyles hook
-
-`useStyles` memoizes the function and provides access to the theme.
-
-```tsx
-import React, { FC } from 'react';
-import { GrafanaTheme } from '@grafana/data';
-import { useStyles } from '@grafana/ui';
-import { css } from 'emotion';
-
-const getComponentStyles = (theme: GrafanaTheme) => css`
-  padding: ${theme.spacing.md};
-`;
-
-const Foo: FC<FooProps> = () => {
-  const styles = useStyles(getComponentsStyles);
-
-  // Use styles with className
-};
-```
-
-#### Get the theme object
-
-```tsx
-import React, { FC } from 'react';
-import { useTheme } from '@grafana/ui';
-
-const Foo: FC<FooProps> = () => {
-  const theme = useTheme();
-
-  // Your component has access to the theme variables now
-};
-```
-
 #### Using `ThemeContext` directly
 
 ```tsx
@@ -60,9 +15,23 @@ import { ThemeContext } from '@grafana/ui';
 <ThemeContext.Consumer>{theme => <Foo theme={theme} />}</ThemeContext.Consumer>;
 ```
 
+or
+
+```tsx
+import React, { useContext } from 'react';
+import { ThemeContext } from '@grafana/ui';
+
+const Foo: React.FunctionComponent<FooProps> = () => {
+  const theme = useContext(ThemeContext);
+
+  // Your component has access to the theme variables now
+}
+
+```
+
 #### Using `withTheme` higher-order component (HOC)
 
-With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Components used with `withTheme` must implement the `Themeable` interface.
+With this method your component will be automatically wrapped in `ThemeContext.Consumer` and provided with current theme via `theme` prop. Component used with `withTheme` must implement `Themeable` interface.
 
 ```ts
 import  { ThemeContext, Themeable } from '@grafana/ui';
@@ -74,7 +43,7 @@ const Foo: React.FunctionComponent<FooProps> = () => ...
 export default withTheme(Foo);
 ```
 
-### Test components that use `ThemeContext`
+### Test components that use ThemeContext
 
 When implementing snapshot tests for components that use the `withTheme` HOC, the snapshot will contain the entire theme object. Any change to the theme renders the snapshot outdated.
 
@@ -97,45 +66,61 @@ describe('MyComponent', () => {
     restoreThemeContext();
   });
 
-
-  it('renders correctly', () => {
+  it('renders correctyl', () => {
     const wrapper = mount(<MyComponent />)
     expect(wrapper).toMatchSnapshot();
   });
 });
 ```
 
+### Using themes in Storybook
+
+All stories are wrapped with `ThemeContext.Provider` using global decorator. To render `Themeable` component that's not wrapped by `withTheme` HOC you either create a new component in your story:
+
+```tsx
+// Foo.story.tsx
+const FooWithTheme = withTheme(Foo);
+
+FooStories.add('Story' () => {
+  return <FooWithTheme />
+});
+```
+
+or use `renderComponentWithTheme` helper:
+
+```tsx
+// Bar.story.tsx
+
+BarStories.add('Story' () => {
+  return renderComponentWithTheme(Bar, /* pass props here */)
+});
+```
+
+### Using themes in Angular code
+
+There should be very few cases where theme would be used in Angular context. For this purpose there is a function available that retrieves current theme: `import { getCurrentTheme } from app/core/utils/ConfigProvider`. Angular components should be migrated to React, or if that's not possible at the moment, styled using SASS.
+
+
 ## FAQ
-
-This section provides insight into frequently-asked questions.
-
-### How can I modify Sass variable files?
-
-**If possible, migrate styles to Emotion**
-
+### How can I modify SASS variable files?
 > For the following to apply you need to run `yarn dev` task.
 
-`[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main Sass files for Sass variables to be available. **These files are automatically generated and should never be modified by hand!**
-
-#### If you need to modify a _Sass variable value_ you need to modify the corresponding Typescript file that is the source of the variables:
+`[_variables|_variables.dark|_variables.light].generated.scss` files are the ones that are referenced in the main SASS files for SASS variables to be available. **These files are automatically generated and should never be modified by hand!**.
 
+#### If you need to modify *SASS variable value* you need to modify corresponding Typescript file that is a source of the variables:
 - `_variables.generated.scss` - modify `grafana-ui/src/themes/default.ts`
 - `_variables.light.generated.scss` - modify `grafana-ui/src/themes/light.ts`
 - `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/dark.ts`
 
-#### If you need to _add new variable_ to Sass variables you need to modify corresponding template file:
-
+#### If you need to *add new variable* to SASS variables you need to modify corresponding template file:
 - `_variables.generated.scss` - modify `grafana-ui/src/themes/_variables.scss.tmpl.ts`
 - `_variables.light.generated.scss` - modify `grafana-ui/src/themes/_variables.light.scss.tmpl.ts`
 - `_variables.dark.generated.scss` - modify `grafana-ui/src/themes/_variables.dark.scss.tmpl.ts`
 
+
 ## Limitations
-
-This section describes limitations with Grafana's theming system.
-
-### You must ensure `ThemeContext` provider is available in a React tree
-
-By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in the case of graph legend rendering and the `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using the `provideTheme` function:
+### You must ensure ThemeContext provider is available in a React tree
+  By default all react2angular directives have `ThemeContext.Provider` ensured. But, there are cases where we create another React tree via `ReactDOM.render`. This happens in case of graph legend rendering and `ReactContainer` directive. In such cases theme consumption will fail. To make sure theme context is available in such cases, you need to wrap your rendered component with ThemeContext.Provider using `provideTheme` function:
 
 ```ts
 // graph.ts

contribute/templates/README.md

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

contribute/templates/doc-concept-template.md

@@ -1,42 +0,0 @@
-DELETE THIS LINE: If draft = false, then the document will not be built in the doc site. If the date is earlier than the build date, than the document will not show in the build site. Use these settings to control whether future content is shown in the doc site.
-+++
-draft = "false"
-date = "yyyy-mm-dd"
-title = "Title in sentence case"
-description = "Description in title case"
-keywords = ["grafana", "enter", "keywords", "here"]
-type = "docs"
-[menu.docs]
-name = "Name of topic"
-identifier = "identifier"
-parent = "menu parent"
-weight = 100
-+++
-
-# Concept
-
-The title of the concept topic will generally be a noun or a gerund. Examples include Templates, Templating, Dashboards, and panels.
-
-Concepts are topic types for any information that doesn't involve task lists or reference information. Ideally you use concept elements to explain concepts, ideas, overviews, workflows, and the like. In the intro section, this first paragraph or two, you should explain to the user what to expect in this topic or section.
-
-[Permissions overview](https://grafana.com/docs/grafana/latest/permissions/overview/) is an example of a concept topic.
-
-## Idea
-
-Concept topics or sections explain *what* and *why*. They do not explain *how*. If you are a new user, you might look for concept information to learn about what Grafana is, why it might be useful to you, and what the general workflow is. 
-
-## Workflow
-
-Continuing the example in the previous section, here is a sample Grafana workflow. 
-
-1. Install Grafana. <link to task for installing Grafana>
-2. Set up data sources. <link to data sources concept topic, which links to data source task topics>
-3. Create panels. <link to panel concept topic, which links to tasks>
-4. Create dashboards.  <link to panel concept topic, which links to tasks>
-5. Enter queries. <link to query editor concept topic>
-6. Add users. <link to user management concept topic, which links to tasks>
-7. Create playlists. <link to Playlist topic that contains concept information and tasks>
-
-## Next steps
-
-Concept tasks often link to related information, including *tasks* related to the concept and *reference* topics related to the concept.

contribute/templates/doc-reference-template.md

@@ -1,75 +0,0 @@
-DELETE THIS LINE: If draft = false, then the document will not be built in the doc site. If the date is earlier than the build date, than the document will not show in the build site. Use these settings to control whether future content is shown in the doc site.
-+++
-draft = "false"
-date = "yyyy-mm-dd"
-title = "Title in sentence case"
-description = "Description in title case"
-keywords = ["grafana", "enter", "keywords", "here"]
-type = "docs"
-[menu.docs]
-name = "Name of topic"
-identifier = "identifier"
-parent = "menu parent"
-weight = 100
-+++
-
-# Reference
-
-The *reference* topic type is for storing reference information, such as extensive tables, lists, or other information that is used as support for a task. Reference topics are also designed for API information.
-
-Often reference topics are linked from *task* topics, because they contain information the user needs in order to perform a task.
-
-[Grafana CLI](https://grafana.com/docs/grafana/latest/administration/cli/) is one example of a reference topic.
-
-## Lists
-
-Lists of commands or parameters are often organized in reference topics. The information you need to present will dictate the format.
-
-* They might
-* be in
-* unordered lists.
-
-[Configuration](https://grafana.com/docs/grafana/latest/installation/configuration/) is an example of lists.
-
-## Tables
-
-If you have a large list of things to store in a table, then you are probably dealing with reference information. Hugo accepts either tables in Markdown or in HTML format, so use whichever is easier for you.
-
-The [Glossary](https://grafana.com/docs/grafana/latest/guides/glossary/) provides an example of reference data in a table.
-
-### Empty markdown table
-
-While you might not need a heading for each table, headings are a good way to chunk information if you have several tables. They also make the content easy to skim. Use headings or intro paragraphs like this one to explain to the reader what the information in the table is used for.
-
-|    |    |    |    |    |    |
-|:---|:---|:--:|:--:|---:|---:|
-|    |    |    |    |    |    |
-|    |    |    |    |    |    |
-|    |    |    |    |    |    |
-|    |    |    |    |    |    |
-
-### Empty HTML table
-
-And here is intro text, similar to the paragraph in the previous section. Do not add local styling to the table. The website CSS will take care of that for you.
-
-<table>
-  <tr>
-    <th>Firstname</th>
-    <th>Lastname</th> 
-    <th>Age</th>
-  </tr>
-  <tr>
-    <td>Jill</td>
-    <td>Smith</td> 
-    <td>50</td>
-  </tr>
-  <tr>
-    <td>Eve</td>
-    <td>Jackson</td> 
-    <td>94</td>
-  </tr>
-</table>
-
-## API documentation
-
-API documentation is always a reference topic rather than a task topic, but it has its own rules.

contribute/templates/doc-task-template.md

@@ -1,57 +0,0 @@
-+++
-draft = "false"
-date = "yyyy-mm-dd"
-title = "Title in sentence case"
-description = "Description in title case"
-keywords = ["grafana", "enter", "keywords", "here"]
-type = "docs"
-[menu.docs]
-name = "Name of topic"
-identifier = "identifier"
-parent = "menu parent"
-weight = 100
-+++
-
-# Task
-
-A *task* topic is intended for a procedure that describes how to accomplish a task. It lists a series of steps that users follow to produce an intended outcome. It tells the reader *how* to do something. [Install Grafana plugins](https://grafana.com/docs/grafana/latest/plugins/installation/) and [Playlist](https://grafana.com/docs/grafana/latest/reference/playlist/) are examples of task topics. Playlist includes a small amount of concept information in the introduction, which is appropriate.
-
-Always include an introduction of a short paragraph or two to explain what the task is for, perhaps give the reader an idea of what the outcome will be.
-
-In most cases, each topic should only contain one task. If you have several very short, related tasks, then you might combine them into one topic.
-
-In the case of a long task, then you probably won't need any headings except for the h1 at the top of the page.
-
-1. Start with step one.
-1. Use second-person imperative tense.
-1. Basically, "You, do this" with every sentence.
-1. Do not use the third-person "user" for steps you want the reader ("you") to perform.
-1. Write steps that contain one action, possibly two related actions, such as copy and paste a thing or save and quit the program.
-   If a sentence is not telling the reader to do something, then it is not a step. You can use nested images or paragraphs like this one to add information if necessary.
-
-In many cases, you should tell the reader what the outcome should be so that they know when they are done.
-
-## One-step task
-
-Some tasks are so short, they only contain one step.
-
-Write one-step tasks as simple sentences, not as unordered lists or numbered lists.
-
-## Short task
-
-Short tasks can be grouped. How short constitutes "short" is a judgment call based on number of steps and how long individual steps are.
-
-1. Use your judgment.
-2. Ask your coworkers or someone on the Comm team for advice if you aren't sure.
-
-## Next steps
-
-If the task you are writing leads naturally to one or more other tasks, then include links after the task to help the reader figure out where to go next.
-
-Thanks to internet search engines, every page in the documentation could be page one. Pretend you are explaining your task to a new Grafana user who just walked in off the street.
-
-## Testing
-
-It is a good practice to have someone else test the task you have written. If they can successfully complete the task using *only* what the steps you have written, not guessing or using their inherent knowledge, then your task has passed the test. However, it is very common to find you have skipped steps, because *you* are very familiar with Grafana and the topic you are explaining.
-
-New users or people from other teams are very helpful for these tests.

devenv/README.md

@@ -36,14 +36,5 @@ make devenv sources=influxdb,prometheus2,elastic5
 Some of the blocks support dynamic change of the image version used in the Docker file. The signature looks like this: 
 
 ```bash
-make devenv sources=postgres,openldap,grafana postgres_version=9.2 grafana_version=6.7.0-beta1
+make devenv sources=postgres,openldap postgres_version=9.2
 ```
-
-
-### Notes per block
-
-#### Grafana
-The grafana block is pre-configured with the dev-datasources and dashboards.
-
-#### Jaeger
-Jaeger block runs both Jaeger and Loki container. Loki container sends traces to Jaeger and also logs its own logs into itself so it is possible to setup derived field for traceID from Loki to Jaeger. You need to install a docker plugin for the self logging to work, without it the container won't start. See https://github.com/grafana/loki/tree/master/cmd/docker-driver#plugin-installation for installation instructions.

devenv/bulk_alerting_dashboards/bulkdash_alerting.jsonnet

@@ -0,0 +1,168 @@
+{
+  "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,
+        "name": "bulk alerting",
+        "noDataState": "no_data",
+        "notifications": []
+      },
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "gdev-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
+}

devenv/bulk_alerting_dashboards/dashboard.libsonnet

@@ -1,170 +0,0 @@
-{
-  alertingDashboard(dashboardCounter, datasourceCounter):: {
-    title: "alerting-title-" + dashboardCounter,
-    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: "24h",
-          handler: 1,
-          name: "bulk alerting " + dashboardCounter,
-          noDataState: "no_data",
-          notifications: []
-        },
-        aliasColors: {},
-        bars: false,
-        dashLength: 10,
-        dashes: false,
-        datasource: "gfdev-bulkalerting-" + datasourceCounter,
-        fill: 1,
-        gridPos: {
-          h: 9,
-          w: 12,
-          x: 0,
-          y: 0
-        },
-        id: 1,
-        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: [
-          {
-            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: "",
-    uid: null,
-    version: 0
-  },
-}
-

devenv/bulk_alerting_dashboards/datasources.jsonnet

@@ -1,14 +0,0 @@
-local arr = std.range(1, 100);
-
-{
-    "apiVersion": 1,
-    "datasources": [
-        {
-            "name": 'gfdev-bulkalerting-' + counter,
-            "type": "prometheus",
-            "access": "proxy",
-            "url": "http://localhost:9090"
-        }
-        for counter in arr
-    ],
-}

devenv/datasources.yaml

@@ -246,29 +246,5 @@ datasources:
     access: proxy
     url: http://localhost:3100
     editable: false
-    jsonData:
-      derivedFields:
-        - name: "traceID"
-          matcherRegex: "traceID=(\\w+)"
-          url: "$${__value.raw}"
-          datasourceUid: gdev-jaeger
-        - name: "traceID"
-          matcherRegex: "traceID=(\\w+)"
-          url: "$${__value.raw}"
-          datasourceUid: gdev-zipkin
-
-  - name: gdev-jaeger
-    type: jaeger
-    uid: gdev-jaeger
-    access: proxy
-    url: http://localhost:16686
-    editable: false
-
-  - name: gdev-zipkin
-    type: zipkin
-    uid: gdev-zipkin
-    access: proxy
-    url: http://localhost:9411
-    editable: false
 
 

devenv/datasources_docker.yaml

@@ -1,248 +0,0 @@
-
-apiVersion: 1
-
-datasources:
-  - name: gdev-graphite
-    type: graphite
-    access: proxy
-    url: http://graphite11:80
-    jsonData:
-      graphiteVersion: "1.1"
-
-  - name: gdev-prometheus
-    type: prometheus
-    access: proxy
-    url: http://prometheus:9090
-
-  - name: gdev-slow-prometheus
-    type: prometheus
-    access: proxy
-    url: http://prometheus:3011
-
-  - name: gdev-testdata
-    isDefault: true
-    type: testdata
-
-  - name: gdev-influxdb
-    type: influxdb
-    access: proxy
-    database: site
-    user: grafana
-    url: http://influxdb:8086
-    jsonData:
-      timeInterval: "15s"
-    secureJsonData:
-      password: grafana
-
-  - name: gdev-influxdb-telegraf
-    type: influxdb
-    access: proxy
-    database: telegraf
-    user: grafana
-    url: http://telegraf:8086
-    jsonData:
-      timeInterval: "10s"
-    secureJsonData:
-      password: grafana
-
-  - name: gdev-opentsdb
-    type: opentsdb
-    access: proxy
-    url: http://opentsdb:4242
-    jsonData:
-      tsdbResolution: 1
-      tsdbVersion: 1
-
-  - name: gdev-elasticsearch-v2-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://elasticsearch:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 2
-
-  - name: gdev-elasticsearch-v2-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://elasticsearch:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 2
-
-  - name: gdev-elasticsearch-v5-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://elasticsearch5:10200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 5
-
-  - name: gdev-elasticsearch-v5-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://elasticsearch5:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 5
-
-  - name: gdev-elasticsearch-v6-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://elasticsearch6:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 60
-
-  - name: gdev-elasticsearch-v6-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://elasticsearch6:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 60
-
-  - name: gdev-elasticsearch-v6-filebeat
-    type: elasticsearch
-    access: proxy
-    database: "[filebeat-]YYYY.MM.DD"
-    url: http://elasticsearch6:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 60
-
-  - name: gdev-elasticsearch-v7-metrics
-    type: elasticsearch
-    access: proxy
-    database: "[metrics-]YYYY.MM.DD"
-    url: http://elasticsearch7:9200
-    jsonData:
-      timeInterval: 10s
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 70
-
-  - name: gdev-elasticsearch-v7-logs
-    type: elasticsearch
-    access: proxy
-    database: "[logs-]YYYY.MM.DD"
-    url: http://elasticsearch7:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 70
-
-  - name: gdev-elasticsearch-v7-filebeat
-    type: elasticsearch
-    access: proxy
-    database: "[filebeat-]YYYY.MM.DD"
-    url: http://elasticsearch7:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 70
-      timeInterval: "10s"
-      logMessageField: message
-      logLevelField: fields.level
-
-  - name: gdev-elasticsearch-v7-metricbeat
-    type: elasticsearch
-    access: proxy
-    database: "[metricbeat-]YYYY.MM.DD"
-    url: http://elasticsearch7:9200
-    jsonData:
-      interval: Daily
-      timeField: "@timestamp"
-      esVersion: 70
-      timeInterval: "10s"
-
-  - name: gdev-mysql
-    type: mysql
-    url: mysql:3306
-    database: grafana
-    user: grafana
-    secureJsonData:
-      password: password
-
-  - name: gdev-mysql-ds-tests
-    type: mysql
-    url: mysqltests:3306
-    database: grafana_ds_tests
-    user: grafana
-    secureJsonData:
-      password: password
-
-  - name: gdev-mssql
-    type: mssql
-    url: mssql:1433
-    database: grafana
-    user: grafana
-    secureJsonData:
-      password: Password!
-
-  - name: gdev-mssql-ds-tests
-    type: mssql
-    url: mssqltests:1433
-    database: grafanatest
-    user: grafana
-    secureJsonData:
-      password: Password!
-
-  - name: gdev-postgres
-    type: postgres
-    url: postgres:5432
-    database: grafana
-    user: grafana
-    secureJsonData:
-      password: password
-    jsonData:
-      sslmode: "disable"
-
-  - name: gdev-postgres-ds-tests
-    type: postgres
-    url: postgrestest:5432
-    database: grafanadstest
-    user: grafanatest
-    secureJsonData:
-      password: grafanatest
-    jsonData:
-      sslmode: "disable"
-
-  - name: gdev-cloudwatch
-    type: cloudwatch
-    editable: true
-    jsonData:
-      authType: credentials
-      defaultRegion: eu-west-2
-
-  # Keep to test old /api/prom API
-  - name: gdev-loki-0.3
-    type: loki
-    access: proxy
-    url: http://loki0.3:3100
-    editable: false
-
-  # First version with new v1 API (remove once v1 is out)
-  - name: gdev-loki-0.4
-    type: loki
-    access: proxy
-    url: http://loki0.4:3100
-    editable: false
-
-  - name: gdev-loki
-    type: loki
-    access: proxy
-    url: http://loki:3100
-    editable: false

devenv/dev-dashboards-without-uid/panel_tests_graph.json

@@ -454,7 +454,7 @@
       "yaxes": [
         {
           "format": "percent",
-          "label": "Percent",
+          "label": "Perecent",
           "logBase": 1,
           "max": null,
           "min": null,
@@ -1632,7 +1632,10 @@
   "revision": 8,
   "schemaVersion": 16,
   "style": "dark",
-  "tags": ["gdev", "panel-tests"],
+  "tags": [
+    "gdev",
+    "panel-tests"
+  ],
   "templating": {
     "list": []
   },
@@ -1641,8 +1644,29 @@
     "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"]
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
   },
   "timezone": "browser",
   "title": "Panel Tests - Graph",

devenv/dev-dashboards-without-uid/panel_tests_polystat.json

@@ -428,14 +428,6 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
-            },
-            {
-              "text": "Milli Bitcoin (mBTC)",
-              "value": "currencymBTC"
-            },
-            {
-              "text": "Micro Bitcoin (μBTC)",
-              "value": "currencyμBTC"
             }
           ],
           "text": "currency"

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v2.json

@@ -28,7 +28,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027568655,
+  "iteration": 1554310942895,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +47,7 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +55,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +71,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +170,7 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +178,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +194,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +292,7 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +300,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +316,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +427,6 @@
       "datasource": "gdev-elasticsearch-v2-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +445,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +505,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +529,6 @@
       "datasource": "gdev-elasticsearch-v2-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +547,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +574,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -632,12 +584,6 @@
       "decimals": 0,
       "esGeoPoint": "@location",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -699,7 +645,7 @@
       "valueName": "total"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
@@ -732,5 +678,5 @@
   "timezone": "browser",
   "title": "Datasource tests - Elasticsearch v2",
   "uid": "RlqLq2fiz",
-  "version": 1
+  "version": 5
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v5.json

@@ -28,7 +28,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027589702,
+  "iteration": 1554310560048,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +47,7 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +55,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +71,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +170,7 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +178,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +194,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +292,7 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +300,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +316,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +427,6 @@
       "datasource": "gdev-elasticsearch-v5-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +445,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +505,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +529,6 @@
       "datasource": "gdev-elasticsearch-v5-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +547,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +574,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -633,12 +585,6 @@
       "esGeoPoint": "@location",
       "esLocationName": "",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -700,7 +646,7 @@
       "valueName": "total"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
@@ -733,5 +679,5 @@
   "timezone": "browser",
   "title": "Datasource tests - Elasticsearch v5",
   "uid": "8HjT32Bmz",
-  "version": 1
+  "version": 5
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6.json

@@ -28,7 +28,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027529668,
+  "iteration": 1554310839317,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +47,7 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +55,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +71,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +170,7 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +178,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +194,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +292,7 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +300,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +316,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +427,6 @@
       "datasource": "gdev-elasticsearch-v6-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +445,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +505,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +529,6 @@
       "datasource": "gdev-elasticsearch-v6-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +547,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +574,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -632,12 +584,6 @@
       "decimals": 0,
       "esGeoPoint": "@location",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -699,8 +645,7 @@
       "valueName": "total"
     }
   ],
-  "refresh": false,
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {
@@ -717,7 +662,7 @@
     ]
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-30m",
     "to": "now"
   },
   "timepicker": {
@@ -733,5 +678,5 @@
   "timezone": "browser",
   "title": "Datasource tests - Elasticsearch v6",
   "uid": "NF8Pq2Biz",
-  "version": 1
+  "version": 5
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v6_filebeat.json

@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027621672,
+  "iteration": 1554902936982,
   "links": [
     {
       "asDropdown": true,
@@ -34,21 +34,13 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "gdev-elasticsearch-v6-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 24,
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
@@ -62,9 +54,6 @@
       "lines": false,
       "linewidth": 1,
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 2,
       "points": false,
@@ -153,13 +142,22 @@
       }
     },
     {
-      "datasource": "gdev-elasticsearch-v6-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
+      "columns": [
+        {
+          "text": "@timestamp",
+          "value": "@timestamp"
         },
-        "overrides": []
-      },
+        {
+          "text": "fields.level",
+          "value": "fields.level"
+        },
+        {
+          "text": "message",
+          "value": "message"
+        }
+      ],
+      "datasource": "gdev-elasticsearch-v6-filebeat",
+      "fontSize": "100%",
       "gridPos": {
         "h": 22,
         "w": 24,
@@ -168,35 +166,58 @@
       },
       "id": 2,
       "links": [],
-      "options": {
-        "showLabels": false,
-        "showTime": true,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
+      "pageSize": null,
+      "scroll": true,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
       },
+      "styles": [
+        {
+          "alias": "Time",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "pattern": "@timestamp",
+          "type": "date"
+        },
+        {
+          "alias": "Level",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "decimals": 2,
+          "mappingType": 1,
+          "pattern": "fields.level",
+          "thresholds": [""],
+          "type": "string",
+          "unit": "short",
+          "valueMaps": []
+        },
+        {
+          "alias": "Message",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "decimals": 2,
+          "pattern": "message",
+          "preserveFormat": false,
+          "sanitize": false,
+          "thresholds": [],
+          "type": "string",
+          "unit": "short"
+        }
+      ],
       "targets": [
         {
-          "bucketAggs": [
-            {
-              "$$hashKey": "object:394",
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
+          "bucketAggs": [],
           "metrics": [
             {
-              "$$hashKey": "object:359",
               "field": "select field",
               "id": "1",
               "meta": {},
-              "settings": {},
-              "type": "logs"
+              "settings": {
+                "size": 500
+              },
+              "type": "raw_document"
             }
           ],
           "query": "fields.app:grafana",
@@ -207,10 +228,11 @@
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "logs"
+      "transform": "json",
+      "type": "table"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["gdev", "elasticsearch", "datasource-test"],
   "templating": {
@@ -227,7 +249,7 @@
     ]
   },
   "time": {
-    "from": "now-30m",
+    "from": "now-1h",
     "to": "now"
   },
   "timepicker": {
@@ -237,5 +259,5 @@
   "timezone": "",
   "title": "Datasource tests - Elasticsearch v6 Filebeat",
   "uid": "06tPt4gZz",
-  "version": 1
+  "version": 8
 }

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7.json

@@ -28,7 +28,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027717495,
+  "id": 2342,
+  "iteration": 1555593977614,
   "links": [
     {
       "asDropdown": true,
@@ -47,14 +48,7 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 7,
@@ -62,7 +56,6 @@
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 1,
       "legend": {
         "alignAsTable": true,
@@ -79,9 +72,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -181,14 +171,7 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -196,7 +179,6 @@
         "x": 0,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "alignAsTable": true,
@@ -213,9 +195,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -314,14 +293,7 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "grid": {},
       "gridPos": {
         "h": 6,
@@ -329,7 +301,6 @@
         "x": 12,
         "y": 7
       },
-      "hiddenSeries": false,
       "id": 3,
       "legend": {
         "alignAsTable": true,
@@ -346,9 +317,6 @@
       "linewidth": 2,
       "links": [],
       "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 5,
       "points": false,
@@ -460,12 +428,6 @@
       "datasource": "gdev-elasticsearch-v7-metrics",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -484,13 +446,11 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
         },
         {
-          "align": "auto",
           "colorMode": null,
           "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
@@ -546,7 +506,7 @@
       ],
       "title": "ES Metrics",
       "transform": "table",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "columns": [
@@ -570,12 +530,6 @@
       "datasource": "gdev-elasticsearch-v7-logs",
       "editable": true,
       "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fontSize": "100%",
       "gridPos": {
         "h": 7,
@@ -594,7 +548,6 @@
       },
       "styles": [
         {
-          "align": "auto",
           "dateFormat": "YYYY-MM-DD HH:mm:ss",
           "pattern": "@timestamp",
           "type": "date"
@@ -622,7 +575,7 @@
       ],
       "title": "ES Log query",
       "transform": "json",
-      "type": "table-old"
+      "type": "table"
     },
     {
       "circleMaxSize": 30,
@@ -632,12 +585,6 @@
       "decimals": 0,
       "esGeoPoint": "@location",
       "esMetric": "Average",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 12,
         "w": 24,
@@ -699,7 +646,7 @@
       "valueName": "total"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {

devenv/dev-dashboards/datasource-elasticsearch/elasticsearch_v7_filebeat.json

@@ -15,7 +15,8 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1591027736516,
+  "id": 2341,
+  "iteration": 1555591591930,
   "links": [
     {
       "asDropdown": true,
@@ -34,21 +35,13 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": "gdev-elasticsearch-v7-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
-      "fillGradient": 0,
       "gridPos": {
         "h": 5,
         "w": 24,
         "x": 0,
         "y": 0
       },
-      "hiddenSeries": false,
       "id": 4,
       "legend": {
         "avg": false,
@@ -62,9 +55,6 @@
       "lines": false,
       "linewidth": 1,
       "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
       "percentage": false,
       "pointradius": 2,
       "points": false,
@@ -153,13 +143,22 @@
       }
     },
     {
-      "datasource": "gdev-elasticsearch-v7-filebeat",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
+      "columns": [
+        {
+          "text": "@timestamp",
+          "value": "@timestamp"
         },
-        "overrides": []
-      },
+        {
+          "text": "fields.level",
+          "value": "fields.level"
+        },
+        {
+          "text": "message",
+          "value": "message"
+        }
+      ],
+      "datasource": "gdev-elasticsearch-v7-filebeat",
+      "fontSize": "100%",
       "gridPos": {
         "h": 22,
         "w": 24,
@@ -168,35 +167,58 @@
       },
       "id": 2,
       "links": [],
-      "options": {
-        "showLabels": false,
-        "showTime": true,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
+      "pageSize": null,
+      "scroll": true,
+      "showHeader": true,
+      "sort": {
+        "col": 0,
+        "desc": true
       },
+      "styles": [
+        {
+          "alias": "Time",
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "pattern": "@timestamp",
+          "type": "date"
+        },
+        {
+          "alias": "Level",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "dateFormat": "YYYY-MM-DD HH:mm:ss",
+          "decimals": 2,
+          "mappingType": 1,
+          "pattern": "fields.level",
+          "thresholds": [""],
+          "type": "string",
+          "unit": "short",
+          "valueMaps": []
+        },
+        {
+          "alias": "Message",
+          "colorMode": null,
+          "colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
+          "decimals": 2,
+          "pattern": "message",
+          "preserveFormat": false,
+          "sanitize": false,
+          "thresholds": [],
+          "type": "string",
+          "unit": "short"
+        }
+      ],
       "targets": [
         {
-          "bucketAggs": [
-            {
-              "$$hashKey": "object:522",
-              "field": "@timestamp",
-              "id": "2",
-              "settings": {
-                "interval": "auto",
-                "min_doc_count": 0,
-                "trimEdges": 0
-              },
-              "type": "date_histogram"
-            }
-          ],
+          "bucketAggs": [],
           "metrics": [
             {
-              "$$hashKey": "object:484",
               "field": "select field",
               "id": "1",
               "meta": {},
-              "settings": {},
-              "type": "logs"
+              "settings": {
+                "size": 500
+              },
+              "type": "raw_document"
             }
           ],
           "query": "fields.app:grafana",
@@ -207,10 +229,11 @@
       "timeFrom": null,
       "timeShift": null,
       "title": "Panel Title",
-      "type": "logs"
+      "transform": "json",
+      "type": "table"
     }
   ],
-  "schemaVersion": 25,
+  "schemaVersion": 18,
   "style": "dark",
   "tags": ["elasticsearch", "gdev", "datasource-test"],
   "templating": {

devenv/dev-dashboards/datasource-influxdb/influxdb-logs.json

@@ -1,191 +0,0 @@
-{
-  "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,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": true,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-influxdb-telegraf",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": false,
-        "total": false,
-        "values": false
-      },
-      "lines": false,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "Count",
-          "groupBy": [
-            {
-              "params": ["1m"],
-              "type": "time"
-            },
-            {
-              "params": ["null"],
-              "type": "fill"
-            }
-          ],
-          "measurement": "logs",
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "time_series",
-          "select": [
-            [
-              {
-                "params": ["message"],
-                "type": "field"
-              },
-              {
-                "params": [],
-                "type": "count"
-              }
-            ]
-          ],
-          "tags": []
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Log messages over time",
-      "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
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "datasource": "gdev-influxdb-telegraf",
-      "gridPos": {
-        "h": 18,
-        "w": 24,
-        "x": 0,
-        "y": 6
-      },
-      "id": 2,
-      "options": {
-        "showLabels": false,
-        "showTime": true,
-        "sortOrder": "Descending",
-        "wrapLogMessage": true
-      },
-      "targets": [
-        {
-          "groupBy": [],
-          "measurement": "logs",
-          "orderByTime": "ASC",
-          "policy": "default",
-          "refId": "A",
-          "resultFormat": "table",
-          "select": [
-            [
-              {
-                "params": ["message"],
-                "type": "field"
-              }
-            ]
-          ],
-          "tags": []
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Logs",
-      "type": "logs"
-    }
-  ],
-  "schemaVersion": 22,
-  "style": "dark",
-  "tags": ["gdev", "influxdb", "datasource-test"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Datasource tests - InfluxDB Logs",
-  "uid": "yjRroGsWk",
-  "version": 4
-}

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

@@ -1,217 +0,0 @@
-{
-  "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,
-  "id": null,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-opentsdb",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "aggregator": "sum",
-          "downsampleAggregator": "avg",
-          "downsampleFillPolicy": "none",
-          "metric": "cpu",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "CPU",
-      "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
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-opentsdb",
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "aggregator": "sum",
-          "downsampleAggregator": "avg",
-          "downsampleFillPolicy": "none",
-          "metric": "logins.count",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Login Count",
-      "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
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 22,
-  "style": "dark",
-  "tags": ["datasource-test", "gdev", "opentsdb"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Datasource tests - OpenTSDB",
-  "uid": "tFU1mQyWz",
-  "version": 2
-}

devenv/dev-dashboards/feature-templating/testdata-nested-variables.json

@@ -15,18 +15,12 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "iteration": 1590677937026,
+  "id": 13844,
+  "iteration": 1566896059256,
   "links": [],
   "panels": [
     {
       "content": "## Data center = $datacenter\n\n### server = $server\n\n#### pod = $pod",
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
         "w": 12,
@@ -35,6 +29,7 @@
       },
       "id": 4,
       "mode": "markdown",
+      "options": {},
       "targets": [
         {
           "refId": "A",
@@ -52,12 +47,6 @@
       "colorValue": false,
       "colors": ["#299c46", "rgba(237, 129, 40, 0.89)", "#d44a3a"],
       "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "format": "none",
       "gauge": {
         "maxValue": 100,
@@ -86,6 +75,7 @@
       "maxDataPoints": 100,
       "nullPointMode": "connected",
       "nullText": null,
+      "options": {},
       "postfix": "",
       "postfixFontSize": "50%",
       "prefix": "",
@@ -129,41 +119,6 @@
     },
     {
       "cacheTimeout": null,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "links": [
-            {
-              "targetBlank": true,
-              "title": "Go to drilldown",
-              "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-            }
-          ],
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "nullValueMode": "connected",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
         "w": 4,
@@ -173,15 +128,40 @@
       "id": 8,
       "links": [],
       "options": {
-        "orientation": "horizontal",
-        "reduceOptions": {
+        "fieldOptions": {
           "calcs": ["mean"],
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": true,
+                "title": "Go to drilldown",
+                "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
+              }
+            ],
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "connected",
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "none"
+          },
+          "override": {},
           "values": false
         },
+        "orientation": "horizontal",
         "showThresholdLabels": false,
         "showThresholdMarkers": true
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.4.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -195,41 +175,6 @@
     },
     {
       "cacheTimeout": null,
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "links": [
-            {
-              "targetBlank": true,
-              "title": "Go to drilldown",
-              "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
-            }
-          ],
-          "mappings": [],
-          "max": 100,
-          "min": 0,
-          "nullValueMode": "connected",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
         "w": 4,
@@ -240,14 +185,38 @@
       "links": [],
       "options": {
         "displayMode": "basic",
-        "orientation": "vertical",
-        "reduceOptions": {
+        "fieldOptions": {
           "calcs": ["mean"],
+          "defaults": {
+            "links": [
+              {
+                "targetBlank": true,
+                "title": "Go to drilldown",
+                "url": "/d/O6GmNPvWk/dashboard-tests-nested-template-variables-drilldown?orgId=1&${__all_variables}&${__url_time_range}"
+              }
+            ],
+            "mappings": [],
+            "max": 100,
+            "min": 0,
+            "nullValueMode": "connected",
+            "thresholds": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ],
+            "unit": "none"
+          },
+          "override": {},
           "values": false
         },
-        "showUnfilled": true
+        "orientation": "vertical"
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.4.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -259,108 +228,20 @@
       "title": "React gauge datalink",
       "type": "bargauge"
     },
-    {
-      "datasource": "CsvData",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "server"
-            },
-            "properties": [
-              {
-                "id": "links",
-                "value": [
-                  {
-                    "title": "filter",
-                    "url": "http://localhost:3000/d/-Y-tnEDWk/templating-nested-template-variables?var-datacenter=${__data.fields[datacenter]}&var-server=${__value.raw}"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 6,
-        "w": 24,
-        "x": 0,
-        "y": 9
-      },
-      "id": 11,
-      "options": {
-        "showHeader": true
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "data": [
-            {
-              "fields": [
-                {
-                  "config": {},
-                  "name": "datacenter",
-                  "type": "string",
-                  "values": ["A", "B", "C"]
-                },
-                {
-                  "config": {},
-                  "name": "server",
-                  "type": "string",
-                  "values": ["AA", "BB", "CC"]
-                }
-              ]
-            }
-          ],
-          "refId": "A"
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Data links that filter update variables on current dashboard",
-      "type": "table"
-    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 13,
         "w": 24,
         "x": 0,
-        "y": 15
+        "y": 9
       },
-      "hiddenSeries": false,
       "id": 2,
       "legend": {
         "avg": false,
@@ -435,7 +316,7 @@
     }
   ],
   "refresh": false,
-  "schemaVersion": 25,
+  "schemaVersion": 19,
   "style": "dark",
   "tags": ["gdev", "templating"],
   "templating": {
@@ -443,7 +324,6 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
           "text": "A",
           "value": ["A"]
         },
@@ -469,7 +349,6 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
           "text": "AA",
           "value": ["AA"]
         },
@@ -495,7 +374,6 @@
       {
         "allValue": null,
         "current": {
-          "selected": true,
           "text": "All",
           "value": ["$__all"]
         },
@@ -525,7 +403,7 @@
     "to": "now"
   },
   "timepicker": {
-    "refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
+    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
   },
   "timezone": "",
   "title": "Templating - Nested Template Variables",

devenv/dev-dashboards/feature-templating/testdata-variables-that-update-on-time-change.json

@@ -1,195 +0,0 @@
-{
-  "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,
-  "iteration": 1584435937931,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": null,
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 14,
-        "w": 19,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 2,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": true,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "updatesOnTime: $updatesOnTime",
-          "refId": "A",
-          "scenarioId": "random_walk"
-        },
-        {
-          "alias": "dependsOnFirst: $dependsOnFirst",
-          "refId": "B",
-          "scenarioId": "random_walk"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "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
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "schemaVersion": 22,
-  "style": "dark",
-  "tags": ["gdev", "templating"],
-  "templating": {
-    "list": [
-      {
-        "allValue": null,
-        "current": {
-          "text": "value.1584434137814",
-          "value": "value.1584434137814"
-        },
-        "datasource": "gdev-testdata",
-        "definition": "value.$__from",
-        "hide": 0,
-        "includeAll": false,
-        "index": -1,
-        "label": null,
-        "multi": false,
-        "name": "updatesOnTime",
-        "options": [],
-        "query": "value.$__from",
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": null,
-        "current": {
-          "text": "value.value.1584434072074",
-          "value": "value.value.1584434072074"
-        },
-        "datasource": "gdev-testdata",
-        "definition": "value.$updatesOnTime",
-        "hide": 0,
-        "includeAll": false,
-        "index": -1,
-        "label": null,
-        "multi": false,
-        "name": "dependsOnFirst",
-        "options": [
-          {
-            "selected": true,
-            "text": "value.value.1584434072074",
-            "value": "value.value.1584434072074"
-          }
-        ],
-        "query": "value.$updatesOnTime",
-        "refresh": 0,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
-  },
-  "timezone": "",
-  "title": "Templating - Variables That Refresh On Time Change",
-  "uid": "HeUnbEuZk",
-  "variables": {
-    "list": []
-  },
-  "version": 13
-}

devenv/dev-dashboards/panel-common/shared_queries.json

@@ -155,7 +155,7 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Last non-null",
+      "title": "Last non nulll",
       "type": "gauge"
     },
     {

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

@@ -454,7 +454,7 @@
       "yaxes": [
         {
           "format": "percent",
-          "label": "Percent",
+          "label": "Perecent",
           "logBase": 1,
           "max": null,
           "min": null,

devenv/dev-dashboards/panel-polystat/polystat_test.json

@@ -428,14 +428,6 @@
             {
               "text": "Bitcoin (฿)",
               "value": "currencyBTC"
-            },
-            {
-              "text": "Milli Bitcoin (mBTC)",
-              "value": "currencymBTC"
-            },
-            {
-              "text": "Micro Bitcoin (μBTC)",
-              "value": "currencyμBTC"
             }
           ],
           "text": "currency"

devenv/dev-dashboards/panel-singlestat/singlestat_test.json

@@ -85,7 +85,7 @@
         }
       ],
       "thresholds": "5,10",
-      "title": "prefix 3 ms (green) postfix + sparkline",
+      "title": "prefix 3 ms (green) postfixt + sparkline",
       "type": "singlestat",
       "valueFontSize": "80%",
       "valueMaps": [

devenv/dev-dashboards/panel-stat/panel-stat-tests.json

@@ -19,42 +19,6 @@
   "panels": [
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 3,
         "w": 24,
@@ -65,20 +29,51 @@
       "interval": "6m",
       "options": {
         "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
         "graphMode": "area",
         "justifyMode": "auto",
         "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
@@ -98,42 +93,6 @@
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 6,
         "w": 24,
@@ -144,20 +103,51 @@
       "interval": "7m",
       "options": {
         "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
         "graphMode": "area",
         "justifyMode": "auto",
         "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
@@ -176,42 +166,6 @@
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 6,
         "w": 24,
@@ -222,20 +176,51 @@
       "interval": "7m",
       "options": {
         "colorMode": "value",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
         "graphMode": "area",
         "justifyMode": "auto",
         "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__house_locations",
@@ -254,44 +239,8 @@
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
       "gridPos": {
-        "h": 18,
+        "h": 14,
         "w": 6,
         "x": 0,
         "y": 15
@@ -300,20 +249,51 @@
       "interval": "5m",
       "options": {
         "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
         "graphMode": "area",
         "justifyMode": "auto",
         "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "alias": "__server_names",
@@ -326,49 +306,13 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Horizontal with graph",
+      "title": "Panel Title",
       "type": "stat"
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
       "gridPos": {
-        "h": 9,
+        "h": 11,
         "w": 4,
         "x": 6,
         "y": 15
@@ -377,20 +321,51 @@
       "interval": "10m",
       "options": {
         "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
         "graphMode": "line",
         "justifyMode": "auto",
         "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -423,50 +398,14 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Auto grid",
+      "title": "Panel Title",
       "type": "stat"
     },
     {
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
       "gridPos": {
         "h": 9,
-        "w": 6,
+        "w": 8,
         "x": 10,
         "y": 15
       },
@@ -474,20 +413,51 @@
       "interval": "10m",
       "options": {
         "colorMode": "background",
+        "fieldOptions": {
+          "calcs": ["mean"],
+          "defaults": {
+            "color": {
+              "mode": "thresholds"
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "blue",
+                  "value": null
+                },
+                {
+                  "color": "green",
+                  "value": 10
+                },
+                {
+                  "color": "purple",
+                  "value": 20
+                },
+                {
+                  "color": "orange",
+                  "value": 40
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            },
+            "unit": "areaM2"
+          },
+          "overrides": [],
+          "values": false
+        },
         "graphMode": "line",
         "justifyMode": "auto",
         "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
         "sparkline": {
           "show": true
-        },
-        "textMode": "auto"
+        }
       },
-      "pluginVersion": "7.1.0-pre",
+      "pluginVersion": "6.6.0-pre",
       "targets": [
         {
           "refId": "A",
@@ -520,257 +490,11 @@
       ],
       "timeFrom": null,
       "timeShift": null,
-      "title": "Horizontal",
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "max": 200,
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 8,
-        "x": 16,
-        "y": 15
-      },
-      "id": 15,
-      "interval": "5m",
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "horizontal",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "sparkline": {
-          "show": true
-        },
-        "textMode": "name"
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "max": 200,
-          "min": 0,
-          "noise": 5,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 7,
-          "spread": 20,
-          "startValue": 0
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Text mode name",
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "max": 200,
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 18,
-        "x": 6,
-        "y": 24
-      },
-      "id": 16,
-      "interval": "5m",
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "sparkline": {
-          "show": true
-        },
-        "textMode": "value"
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "max": 200,
-          "min": 0,
-          "noise": 15,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 45,
-          "spread": 1,
-          "startValue": 0
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Value only",
-      "type": "stat"
-    },
-    {
-      "datasource": null,
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "custom": {},
-          "mappings": [],
-          "max": 200,
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 10
-              },
-              {
-                "color": "purple",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 40
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "areaM2"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 5,
-        "w": 24,
-        "x": 0,
-        "y": 33
-      },
-      "id": 17,
-      "interval": "5m",
-      "options": {
-        "colorMode": "background",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["mean"],
-          "fields": "",
-          "values": false
-        },
-        "sparkline": {
-          "show": true
-        },
-        "textMode": "none"
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "__server_names",
-          "max": 200,
-          "min": 0,
-          "noise": 15,
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 200,
-          "spread": 1,
-          "startValue": 0
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "No text",
+      "title": "Panel Title",
       "type": "stat"
     }
   ],
-  "schemaVersion": 26,
+  "schemaVersion": 22,
   "style": "dark",
   "tags": ["gdev", "panel-tests"],
   "templating": {
@@ -784,7 +508,5 @@
     "refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"]
   },
   "timezone": "",
-  "title": "Panel Tests - Stat",
-  "uid": "EJ8_d9jZk",
-  "version": 1
+  "title": "Panel Tests - Stat"
 }

devenv/dev-dashboards/panel-table/table_tests_new.json

@@ -1,602 +0,0 @@
-{
-  "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": [
-    {
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 7,
-      "title": "Cell styles",
-      "type": "row"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "color-background"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 60
-              },
-              {
-                "color": "red",
-                "value": 70
-              }
-            ]
-          },
-          "unit": "degree"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Max"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 84
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Last"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 78
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Mean"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 74
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Field"
-            },
-            "properties": [
-              {
-                "id": "custom.align",
-                "value": "left"
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 7,
-        "x": 0,
-        "y": 1
-      },
-      "id": 4,
-      "options": {
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Last"
-          }
-        ]
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 15,
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Colored background",
-      "transformations": [
-        {
-          "id": "reduce",
-          "options": {
-            "reducers": ["max", "mean", "last"]
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "orange",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 50
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Value"
-            },
-            "properties": [
-              {
-                "id": "custom.displayMode",
-                "value": "gradient-gauge"
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Info"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 92
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Min"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 76
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Max"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 89
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.width",
-                "value": 165
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 8,
-        "x": 7,
-        "y": 1
-      },
-      "id": 2,
-      "options": {
-        "showHeader": true,
-        "sortBy": [
-          {
-            "desc": false,
-            "displayName": "Min"
-          }
-        ]
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Bar gauge cells",
-      "transformations": [
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Time": true
-            },
-            "indexByName": {
-              "Info": 1,
-              "Max": 3,
-              "Min": 2,
-              "Time": 0,
-              "Value": 4
-            },
-            "renameByName": {}
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": null
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "blue",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 50
-              }
-            ]
-          }
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Value"
-            },
-            "properties": [
-              {
-                "id": "custom.displayMode",
-                "value": "lcd-gauge"
-              },
-              {
-                "id": "custom.align",
-                "value": "center"
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 16,
-        "w": 9,
-        "x": 15,
-        "y": 1
-      },
-      "id": 5,
-      "options": {
-        "showHeader": true,
-        "sortBy": []
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Retro LCD cell",
-      "transformations": [
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Info": false,
-              "Max": true,
-              "Min": true,
-              "Time": false
-            },
-            "indexByName": {
-              "Info": 1,
-              "Max": 3,
-              "Min": 2,
-              "Time": 0,
-              "Value": 4
-            },
-            "renameByName": {}
-          }
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "collapsed": false,
-      "datasource": null,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 17
-      },
-      "id": 9,
-      "panels": [],
-      "title": "Data links",
-      "type": "row"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "color-text"
-          },
-          "decimals": 2,
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 50
-              },
-              {
-                "color": "red",
-                "value": 70
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": [
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "Time"
-            },
-            "properties": [
-              {
-                "id": "custom.align",
-                "value": null
-              }
-            ]
-          },
-          {
-            "matcher": {
-              "id": "byName",
-              "options": "{name=\"S1\", server=\"A\"}"
-            },
-            "properties": [
-              {
-                "id": "links",
-                "value": [
-                  {
-                    "title": "Details",
-                    "url": "http://detail?serverLabel=${__field.labels.server}&valueNumeric=${__value.numeric}"
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 18
-      },
-      "id": 3,
-      "maxDataPoints": "10",
-      "options": {
-        "showHeader": true
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "alias": "S1",
-          "labels": "server=A",
-          "refId": "A",
-          "scenarioId": "random_walk",
-          "seriesCount": 1,
-          "stringInput": ""
-        },
-        {
-          "alias": "S2",
-          "labels": "server=B",
-          "refId": "B",
-          "scenarioId": "random_walk",
-          "seriesCount": 1,
-          "stringInput": ""
-        },
-        {
-          "alias": "S3",
-          "labels": "server=C",
-          "refId": "C",
-          "scenarioId": "random_walk",
-          "seriesCount": 1,
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "Data link with labels and numeric value",
-      "transformations": [
-        {
-          "id": "seriesToColumns",
-          "options": {}
-        }
-      ],
-      "type": "table"
-    },
-    {
-      "datasource": "gdev-testdata",
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "align": "center",
-            "displayMode": "auto"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "blue",
-                "value": 20
-              },
-              {
-                "color": "orange",
-                "value": 60
-              },
-              {
-                "color": "red",
-                "value": 70
-              }
-            ]
-          },
-          "unit": "degree"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 5,
-        "x": 12,
-        "y": 18
-      },
-      "id": 10,
-      "options": {
-        "showHeader": false,
-        "sortBy": [
-          {
-            "desc": true,
-            "displayName": "Last"
-          }
-        ]
-      },
-      "pluginVersion": "7.1.0-pre",
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "random_walk_table",
-          "seriesCount": 5,
-          "stringInput": ""
-        }
-      ],
-      "timeFrom": null,
-      "timeShift": null,
-      "title": "No header",
-      "transformations": [
-        {
-          "id": "organize",
-          "options": {
-            "excludeByName": {
-              "Min": true,
-              "Time": true,
-              "Value": true
-            },
-            "indexByName": {
-              "Info": 2,
-              "Max": 4,
-              "Min": 3,
-              "Time": 0,
-              "Value": 1
-            },
-            "renameByName": {}
-          }
-        }
-      ],
-      "type": "table"
-    }
-  ],
-  "schemaVersion": 25,
-  "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 - React Table",
-  "uid": "U_bZIMRMk",
-  "version": 17
-}

devenv/dev-dashboards/scenarios/time_zone_support.json

@@ -1,695 +0,0 @@
-{
-  "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,
-  "id": 28,
-  "links": [],
-  "panels": [
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 4,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "random_walk",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": "2s",
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Millisecond res x-axis and tooltip",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "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
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 0
-      },
-      "hiddenSeries": false,
-      "id": 3,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenario": "random_walk",
-          "scenarioId": "random_walk",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Random walk series",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "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
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 5,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "connected",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "B-series",
-          "yaxis": 2
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        },
-        {
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "2000,3000,4000,1000,3000,10000",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "2 yaxis and axis labels",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "percent",
-          "label": "Perecent",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": "Pressure",
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 12,
-        "y": 7
-      },
-      "hiddenSeries": false,
-      "id": 9,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "B-series",
-          "zindex": -3
-        }
-      ],
-      "spaceLength": 10,
-      "stack": true,
-      "steppedLine": false,
-      "targets": [
-        {
-          "hide": false,
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,null,null,null,null,null,null,100,10,10,20,30,40,10",
-          "target": ""
-        },
-        {
-          "alias": "",
-          "hide": false,
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,10,20,30,40,40,40,100,10,20,20",
-          "target": ""
-        },
-        {
-          "alias": "",
-          "hide": false,
-          "refId": "C",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,10,20,30,40,40,40,100,10,20,20",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Stacking value ontop of nulls",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "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
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "editable": true,
-      "error": false,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 0,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 0,
-        "y": 15
-      },
-      "hiddenSeries": false,
-      "id": 21,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 2,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "C-series",
-          "steppedLine": true
-        }
-      ],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "alias": "",
-          "hide": false,
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,null,40,null,90,null,null,100,null,null,100,null,null,80,null",
-          "target": ""
-        },
-        {
-          "alias": "",
-          "hide": false,
-          "refId": "C",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "20,null40,null,null,50,null,70,null,100,null,10,null,30,null",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Null between points",
-      "tooltip": {
-        "msResolution": false,
-        "shared": true,
-        "sort": 0,
-        "value_type": "cumulative"
-      },
-      "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
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "datasource": "gdev-testdata",
-      "decimals": 3,
-      "fieldConfig": {
-        "defaults": {
-          "custom": {}
-        },
-        "overrides": []
-      },
-      "fill": 1,
-      "fillGradient": 0,
-      "gridPos": {
-        "h": 7,
-        "w": 12,
-        "x": 12,
-        "y": 15
-      },
-      "hiddenSeries": false,
-      "id": 16,
-      "legend": {
-        "alignAsTable": true,
-        "avg": true,
-        "current": true,
-        "max": true,
-        "min": true,
-        "show": true,
-        "total": true,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {
-        "dataLinks": []
-      },
-      "percentage": false,
-      "pointradius": 5,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "refId": "A",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        },
-        {
-          "refId": "B",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        },
-        {
-          "refId": "C",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        },
-        {
-          "refId": "D",
-          "scenarioId": "csv_metric_values",
-          "stringInput": "1,20,90,30,5,0",
-          "target": ""
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Legend Table No Scroll Visible",
-      "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
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    }
-  ],
-  "refresh": false,
-  "revision": 8,
-  "schemaVersion": 25,
-  "style": "dark",
-  "tags": ["gdev", "panel-tests", "graph", "table"],
-  "templating": {
-    "list": []
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": ["10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-  },
-  "timezone": "utc",
-  "title": "Panel Tests - Time zone support",
-  "uid": "5SdHCasdf",
-  "version": 1
-}

devenv/docker/blocks/grafana/.env

@@ -1 +0,0 @@
-grafana_version=6.6.2

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

@@ -1,14 +0,0 @@
-  grafana:
-    image: grafana/grafana:${grafana_version}
-    ports:
-      - "3001:3000"
-    volumes:
-      - "./dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml"
-      - "./dev-dashboards:/usr/share/grafana/devenv/dev-dashboards"
-      - "./datasources_docker.yaml:/etc/grafana/provisioning/datasources/datasources.yaml"
-    environment:
-      GF_RENDERING_SERVER_URL: http://renderer:8081/render
-      GF_RENDERING_CALLBACK_URL: http://grafana:3000/
-
-  renderer:
-    image: grafana/grafana-image-renderer:latest

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

@@ -10,11 +10,6 @@
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
-    # For this to work you need to install the logging driver see https://github.com/grafana/loki/tree/master/cmd/docker-driver#plugin-installation
-    logging:
-      driver: loki
-      options:
-        loki-url: "http://localhost:3100/loki/api/v1/push"
     # Optional jaeger tracing
     environment:
       - JAEGER_AGENT_HOST=jaeger

devenv/docker/blocks/multiple-openldap/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# When not limiting the open file descriptors limit, the memory consumption of
+# When not limiting the open file descritors limit, the memory consumption of
 # slapd is absurdly high. See https://github.com/docker/docker/issues/8231
 ulimit -n 8192
 

devenv/docker/blocks/openldap/entrypoint.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# When not limiting the open file descriptors limit, the memory consumption of
+# When not limiting the open file descritors limit, the memory consumption of
 # slapd is absurdly high. See https://github.com/docker/docker/issues/8231
 ulimit -n 8192
 

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

@@ -1,15 +1,18 @@
   prometheus:
     build: docker/blocks/prometheus
+    network_mode: host
     ports:
       - "9090:9090"
 
   node_exporter:
     image: prom/node-exporter
+    network_mode: host
     ports:
       - "9100:9100"
 
   fake-prometheus-data:
     image: grafana/fake-data-gen
+    network_mode: host
     ports:
       - "9091:9091"
     environment:
@@ -17,10 +20,12 @@
 
   alertmanager:
     image: quay.io/prometheus/alertmanager
+    network_mode: host
     ports:
       - "9093:9093"
 
   prometheus-random-data:
     build: docker/blocks/prometheus_random_data
+    network_mode: host
     ports:
       - "8081:8080"

devenv/docker/blocks/prometheus/prometheus.yml

@@ -15,7 +15,7 @@ alerting:
   - scheme: http
     static_configs:
     - targets:
-      - "alertmanager:9093"
+      - "127.0.0.1:9093"
 
 scrape_configs:
   - job_name: 'prometheus'
@@ -24,16 +24,16 @@ scrape_configs:
 
   - job_name: 'node_exporter'
     static_configs:
-      - targets: ['node_exporter:9100']
+      - targets: ['127.0.0.1:9100']
 
   - job_name: 'fake-data-gen'
     static_configs:
-      - targets: ['fake-prometheus-data:9091']
+      - targets: ['127.0.0.1:9091']
 
   - job_name: 'grafana'
     static_configs:
-      - targets: ['grafana:3000']
+      - targets: ['127.0.0.1:3000']
 
   - job_name: 'prometheus-random-data'
     static_configs:
-      - targets: ['prometheus-random-data:8080']
+      - targets: ['127.0.0.1:8081']

devenv/docker/blocks/prometheus2/Dockerfile

@@ -1,4 +1,3 @@
 FROM prom/prometheus:v2.7.2
 ADD prometheus.yml /etc/prometheus/
-ADD recording.yml /etc/prometheus/
-ADD alert.yml /etc/prometheus/
+ADD alert.rules /etc/prometheus/

devenv/docker/blocks/prometheus2/alert.rules

@@ -0,0 +1,10 @@
+# Alert Rules
+
+ALERT AppCrash
+  IF process_open_fds > 0
+  FOR 15s
+  LABELS { severity="critical" }
+  ANNOTATIONS {
+   summary = "Number of open fds > 0",
+   description = "Just testing"
+  }

devenv/docker/blocks/prometheus2/alert.yml

@@ -1,11 +0,0 @@
-groups:
-  - name: ALERT
-    rules:
-    - alert: AppCrash
-      expr: process_open_fds > 0
-      for: 15s
-      labels:
-        severity: critical
-      annotations:
-        summary: Number of open fds > 0
-        description: Just testing

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

@@ -1,15 +1,18 @@
   prometheus:
     build: docker/blocks/prometheus2
+    network_mode: host
     ports:
       - "9090:9090"
 
   node_exporter:
     image: prom/node-exporter
+    network_mode: host
     ports:
       - "9100:9100"
 
   fake-prometheus-data:
     image: grafana/fake-data-gen
+    network_mode: host
     ports:
       - "9091:9091"
     environment:
@@ -17,10 +20,12 @@
 
   alertmanager:
     image: quay.io/prometheus/alertmanager
+    network_mode: host
     ports:
       - "9093:9093"
 
   prometheus-random-data:
     build: docker/blocks/prometheus_random_data
+    network_mode: host
     ports:
       - "8081:8080"

devenv/docker/blocks/prometheus2/prometheus.yml

@@ -5,17 +5,17 @@ global:
   # scrape_timeout is set to the global default (10s).
 
 # Load and evaluate rules in this file every 'evaluation_interval' seconds.
-rule_files:
-  - "alert.yml"
-  - "recording.yml"
+#rule_files:
+# - "alert.rules"
+# - "first.rules"
 # - "second.rules"
 
-alerting:
-  alertmanagers:
-  - scheme: http
-    static_configs:
-    - targets:
-      - "alertmanager:9093"
+# alerting:
+#   alertmanagers:
+#   - scheme: http
+#     static_configs:
+#     - targets:
+#       - "127.0.0.1:9093"
 
 scrape_configs:
   - job_name: 'prometheus'
@@ -24,16 +24,16 @@ scrape_configs:
 
   - job_name: 'node_exporter'
     static_configs:
-      - targets: ['node_exporter:9100']
+      - targets: ['127.0.0.1:9100']
 
   - job_name: 'fake-data-gen'
     static_configs:
-      - targets: ['fake-prometheus-data:9091']
+      - targets: ['127.0.0.1:9091']
 
   - job_name: 'grafana'
     static_configs:
-      - targets: ['grafana:3000']
+      - targets: ['127.0.0.1:3000']
 
   - job_name: 'prometheus-random-data'
     static_configs:
-      - targets: ['prometheus-random-data:8080']
+      - targets: ['127.0.0.1:8081']

devenv/docker/blocks/prometheus2/recording.yml

@@ -1,16 +0,0 @@
-groups:
-  - name: RECORDING_RULES
-    rules:
-      - record: instance_path:requests:rate5m
-        expr: rate(prometheus_http_requests_total{job="prometheus"}[5m])
-      - record: path:requests:rate5m
-        expr: sum without (instance)(instance_path:requests:rate5m{job="prometheus"})
-      - record: instance_path:reloads_failures:rate5m
-        expr: rate(prometheus_tsdb_reloads_failures_total{job="prometheus"}[5m])
-      - record: instance_path:reloads:rate5m
-        expr: rate(prometheus_tsdb_reloads_total{job="prometheus"}[5m])
-      - record: instance_path:request_failures_per_requests:ratio_rate5m
-        expr: |2
-            instance_path:reloads_failures:rate5m{job="prometheus"}
-          /
-            instance_path:reloads:rate5m{job="prometheus"}

devenv/docker/blocks/prometheus_mac/Dockerfile

@@ -0,0 +1,3 @@
+FROM prom/prometheus:v1.8.2
+ADD prometheus.yml /etc/prometheus/
+ADD alert.rules /etc/prometheus/

devenv/docker/blocks/prometheus_mac/alert.rules

@@ -0,0 +1,10 @@
+# Alert Rules
+
+ALERT AppCrash
+  IF process_open_fds > 0
+  FOR 15s
+  LABELS { severity="critical" }
+  ANNOTATIONS {
+   summary = "Number of open fds > 0",
+   description = "Just testing"
+  }

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

@@ -0,0 +1,26 @@
+  prometheus:
+    build: docker/blocks/prometheus_mac
+    ports:
+      - "9090:9090"
+
+  node_exporter:
+    image: prom/node-exporter
+    ports:
+      - "9100:9100"
+
+  fake-prometheus-data:
+    image: grafana/fake-data-gen
+    ports:
+      - "9091:9091"
+    environment:
+      FD_DATASOURCE: prom
+
+  alertmanager:
+    image: quay.io/prometheus/alertmanager
+    ports:
+      - "9093:9093"
+
+  prometheus-random-data:
+    build: docker/blocks/prometheus_random_data
+    ports:
+      - "8081:8080"

devenv/docker/blocks/prometheus_mac/prometheus.yml

@@ -0,0 +1,39 @@
+# 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:
+      - "alertmanager:9093"
+
+scrape_configs:
+  - job_name: 'prometheus'
+    static_configs:
+      - targets: ['localhost:9090']
+
+  - job_name: 'node_exporter'
+    static_configs:
+      - targets: ['node_exporter:9100']
+
+  - job_name: 'fake-data-gen'
+    static_configs:
+      - targets: ['fake-prometheus-data:9091']
+
+  - job_name: 'grafana'
+    static_configs:
+      - targets: ['host.docker.internal:3000']
+
+  - job_name: 'prometheus-random-data'
+    static_configs:
+      - targets: ['prometheus-random-data:8080']

devenv/docker/blocks/prometheus_random_data/Dockerfile

@@ -1,7 +1,7 @@
 # This Dockerfile builds an image for a client_golang example.
 
 # Builder image, where we build the example.
-FROM golang:1.14.1 AS builder
+FROM golang:1.13.4 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

devenv/docker/blocks/traefik/configs/subpath_no_rewrite.yml

@@ -1,19 +0,0 @@
-http:
-  middlewares:
-    compress-response:
-      compress: {}
-
-  services:
-    grafana-subpath:
-      loadBalancer:
-        servers:
-          - url: 'http://grafana-subpath:3000/'
-
-  routers:
-    grafana-subpath:
-      entryPoints:
-        - web
-      middlewares:
-        - compress-response
-      rule: 'Path(`/grafana`) || PathPrefix(`/grafana/`)'
-      service: grafana-subpath

devenv/docker/blocks/traefik/docker-compose.yml

@@ -1,19 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    image: traefik:v2.1
-    volumes:
-      - './traefik.yml:/etc/traefik/traefik.yml'
-      - './configs:/etc/traefik/configs'
-    ports:
-      - '80:80'
-      - '8080:8080'
-    links:
-      - grafana-subpath
-
-  grafana-subpath:
-    image: grafana/grafana:latest
-    environment:
-      - GF_SERVER_ROOT_URL=/grafana
-      - GF_SERVER_SERVE_FROM_SUB_PATH=true

devenv/docker/blocks/traefik/traefik.yml

@@ -1,18 +0,0 @@
-## traefik.yml
-
-# Entrypoints enabled
-entryPoints:
-  web:
-    address: ':80'
-
-# API and dashboard configuration
-api:
-  insecure: true
-
-# Loggings
-log: {}
-
-# File configurations folder
-providers:
-  file:
-    directory: /etc/traefik/configs

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

@@ -1,6 +0,0 @@
-# There is no data generator for this so easiest way to get some data here is run this example app
-# https://github.com/openzipkin/zipkin-js-example/tree/master/web
-  zipkin:
-    image: openzipkin/zipkin:latest
-    ports:
-      - "9411:9411"

devenv/docker/loadtest/README.md

@@ -35,12 +35,6 @@ Run load test for 10 virtual users:
 $ ./run.sh -v 10
 ```
 
-Run load test and send the results to the database "myDb" in influxDB running locally on port 8086 (with no authentication):
-
-```bash
-$ ./run.sh  -o influxdb=http://localhost:8086/myDb
-```
-
 Run auth token slow test (random query latency between 1 and 30 seconds):
 
 ```bash

devenv/docker/loadtest/run.sh

@@ -8,9 +8,8 @@ run() {
   vus='2'
   testcase='auth_token_test'
   slowQuery=''
-  out=''
 
-  while getopts ":d:u:v:c:s:o:" o; do
+  while getopts ":d:u:v:c:s:" o; do
     case "${o}" in
 				d)
             duration=${OPTARG}
@@ -27,14 +26,11 @@ run() {
         s)
             slowQuery=${OPTARG}
             ;;
-        o)  out=${OPTARG}
-            ;;
-
     esac
 	done
 	shift $((OPTIND-1))
 
-  docker run -t --network=host -v $PWD:/src -e URL=$url -e SLOW_QUERY=$slowQuery -e K6_OUT=$out --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/$testcase.js
+  docker run -t --network=host -v $PWD:/src -e URL=$url -e SLOW_QUERY=$slowQuery --rm -i loadimpact/k6:master run --vus $vus --duration $duration src/$testcase.js
 }
 
 run "$@"

devenv/e2e-api-tests/tsconfig.json

@@ -1,21 +1,24 @@
 {
-  "compilerOptions": {
-    "allowSyntheticDefaultImports": true,
-    "declaration": false,
-    "emitDecoratorMetadata": false,
-    "experimentalDecorators": true,
-    "inlineSourceMap": false,
-    "lib": ["es6"],
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noEmitOnError": false,
-    "noImplicitAny": false,
-    "noImplicitReturns": true,
-    "noImplicitThis": false,
-    "noImplicitUseStrict": false,
-    "noUnusedLocals": true,
-    "sourceMap": true,
-    "target": "es6"
-  },
-  "include": ["*.ts", "**/*.ts"]
+    "compilerOptions": {
+      "moduleResolution": "node",
+      "target": "es6",
+      "lib": ["es6"],
+      "module": "commonjs",
+      "declaration": false,
+      "allowSyntheticDefaultImports": true,
+      "inlineSourceMap": false,
+      "sourceMap": true,
+      "noEmitOnError": false,
+      "emitDecoratorMetadata": false,
+      "experimentalDecorators": true,
+      "noImplicitReturns": true,
+      "noImplicitThis": false,
+      "noImplicitUseStrict":false,
+      "noImplicitAny": false,
+      "noUnusedLocals": true
+    },
+    "include": [
+      "*.ts",
+      "**/*.ts"
+    ]
 }

devenv/setup.sh

@@ -18,21 +18,14 @@ bulkAlertingDashboard() {
 
 		requiresJsonnet
 
-		jsonnet -o "bulk_alerting_dashboards/bulk_alerting_datasources.yaml" ./bulk_alerting_dashboards/datasources.jsonnet
-
-		COUNTER=1
-		DS=1
-		MAX=1000
+		COUNTER=0
+		MAX=100
 		while [  $COUNTER -lt $MAX ]; do
-				jsonnet -o "bulk_alerting_dashboards/alerting_dashboard${COUNTER}.json" \
-					-e "local bulkDash = import 'bulk_alerting_dashboards/dashboard.libsonnet'; bulkDash.alertingDashboard(${COUNTER}, ${DS})"
+				jsonnet -o "bulk_alerting_dashboards/alerting_dashboard${COUNTER}.json" -e "local bulkDash = import 'bulk_alerting_dashboards/bulkdash_alerting.jsonnet'; bulkDash + {  uid: 'bd-${COUNTER}',  title: 'alerting-title-${COUNTER}' }"
 				let COUNTER=COUNTER+1
-				let DS=COUNTER/10
-				let DS=DS+1
 		done
 
 		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_dashboards.yaml ../conf/provisioning/dashboards/custom.yaml
-		ln -s -f ../../../devenv/bulk_alerting_dashboards/bulk_alerting_datasources.yaml ../conf/provisioning/datasources/custom.yaml
 }
 
 requiresJsonnet() {
@@ -59,7 +52,7 @@ usage() {
 	echo "Usage:"
 	echo "  bulk-dashboards                              - create and provisioning 400 dashboards"
 	echo "  bulk-alerting-dashboards                     - create and provisioning 400 dashboards with alerts"
-	echo "  no args                                      - provisioning core datasources and dev dashboards"
+	echo "  no args                                      - provisiong core datasources and dev dashboards"
 }
 
 main() {

docs/Makefile

@@ -1,11 +1,9 @@
 .PHONY: docs docs-test
 
-IMAGE = grafana/docs-base:latest
-
 docs:
-	docker pull ${IMAGE}
-	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE) /bin/bash -c 'make server'
+	docker pull grafana/docs-base:latest
+	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it grafana/docs-base:latest /bin/bash -c 'npm i && make webpack && hugo server -p 3002 -D --ignoreCache --baseUrl http://localhost:3002 --bind 0.0.0.0'
 
 docs-test:
-	docker pull ${IMAGE}
-	docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest --rm -it $(IMAGE) /bin/bash -c 'make prod'
+	docker pull grafana/docs-base:latest
+	docker run -v $(PWD)/sources:/hugo/content/docs/grafana/latest --rm -it grafana/docs-base:latest /bin/bash -c 'npm i && make prod'

docs/sources/_index.md

@@ -6,29 +6,24 @@ type = "docs"
 aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin", "/docs/grafana/v3.1"]
 +++
 
-# Grafana documentation
-
-## Installing Grafana
+# Grafana Documentation
 
+<h2>Installing Grafana</h2>
 <div class="nav-cards">
     <a href="{{< relref "installation/debian.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-linux">
         </div>
-        <h5>Install on Linux</h5>
+        <h5>Installing on Linux</h5>
     </a>
     <a href="{{< relref "installation/mac.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-apple">
         </div>
-        <h5>Install on macOS</h5>
+        <h5>Installing on macOS</h5>
     </a>
-    <a href="{{< relref "installation/windows.md" >}}" class="nav-cards__item nav-cards__item--install">
+      <a href="{{< relref "installation/windows.md" >}}" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-windows">
         </div>
-        <h5>Install on Windows</h5>
-    </a>
-    <a href="{{< relref "installation/docker.md" >}}" class="nav-cards__item nav-cards__item--install">
-        <img src="/static/img/logos/logo-docker.svg">
-        <h5>Run Docker image</h5>
+        <h5>Installing on Windows</h5>
     </a>
     <a href="https://grafana.com/cloud/grafana" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-cloud">
@@ -38,42 +33,41 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
     <a href="https://grafana.com/grafana/download" class="nav-cards__item nav-cards__item--install">
         <div class="nav-cards__icon fa fa-moon-o">
         </div>
-        <h5>Nightly builds</h5>
+        <h5>Nightly Builds</h5>
     </a>
+    <div class="nav-cards__item nav-cards__item--install">
+        <h5>For other platforms read the <a href="{{< relref "project/building_from_source.md" >}}">build from source</a>
+        instructions for more information.</h5>
+    </div>
 </div>
 
-## Guides
+<h2>Guides</h2>
 
 <div class="nav-cards">
-    <a href="{{< relref "getting-started/what-is-grafana.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="https://grafana.com/grafana" class="nav-cards__item nav-cards__item--guide">
         <h4>What is Grafana?</h4>
         <p>Get an overview of Grafana's key features.</p>
     </a>
-    <a href="{{< relref "getting-started/getting-started.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Getting started</h4>
-        <p>Learn the basics of using Grafana.</p>
-    </a>
-    <a href="{{< relref "administration/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "installation/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Configure Grafana</h4>
         <p>Review the configuration and setup options.</p>
     </a>
-    <a href="{{< relref "getting-started/timeseries.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>Intro to time series</h4>
-        <p>Learn about time series data.</p>
+    <a href="{{< relref "guides/getting_started.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>Getting started</h4>
+        <p>Learn the basics of using Grafana.</p>
     </a>
     <a href="{{< relref "administration/provisioning.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Provisioning</h4>
         <p>Learn how to automate your Grafana configuration.</p>
     </a>
-    <a href="{{< relref "guides/whats-new-in-v7-0.md" >}}" class="nav-cards__item nav-cards__item--guide">
-        <h4>What's new in v7.0</h4>
+    <a href="{{< relref "guides/whats-new-in-v6-6.md" >}}" class="nav-cards__item nav-cards__item--guide">
+        <h4>What's new in v6.6</h4>
         <p>Explore the features and enhancements in the latest release.</p>
     </a>
 
 </div>
 
-## Data source guides
-
+<h2>Data Source Guides</h2>
 <div class="nav-cards">
     <a href="{{< relref "features/datasources/graphite.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_graphite.svg" >
@@ -91,9 +85,9 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
       <img src="/img/docs/logos/icon_prometheus.svg" >
       <h5>Prometheus</h5>
     </a>
-    <a href="{{< relref "features/datasources/cloudmonitoring.md" >}}" class="nav-cards__item nav-cards__item--ds">
-      <img src="/img/docs/logos/icon_cloudmonitoring.svg">
-      <h5>Google Cloud Monitoring</h5>
+    <a href="{{< relref "features/datasources/stackdriver.md" >}}" class="nav-cards__item nav-cards__item--ds">
+      <img src="/img/docs/logos/icon_stackdriver.svg">
+      <h5>Google Stackdriver</h5>
     </a>
     <a href="{{< relref "features/datasources/cloudwatch.md" >}}" class="nav-cards__item nav-cards__item--ds">
       <img src="/img/docs/logos/icon_cloudwatch.svg">

docs/sources/administration/_index.md

@@ -8,6 +8,4 @@ identifier = "admin"
 weight = 2
 +++
 
-# Administration
 
-This section provides resources for Grafana administrators.

docs/sources/administration/cli.md

@@ -23,7 +23,7 @@ grafana-cli -h
 Some commands, such as installing or removing plugins, require `sudo` in order to run.
 
 **Windows users**
-Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator.
+Some commands, such as installing or removing plugins, require you to run Windows PowerShell as Administrator. 
 
 Before you enter commands, `cd` into the Grafana bin directory. The default path is:
 ```
@@ -101,40 +101,40 @@ grafana-cli --insecure --pluginUrl https://company.com/grafana/plugins/<plugin-i
 
 ### Enable debug logging
 
-`--debug` or `-d` enables debug logging. Debug output is returned and shown in the terminal.
+`--debug` or `-d` enables debug logging. Debug output is returned and shown in the terminal.  
 
 **Example:**
 ```bash
 grafana-cli --debug plugins install <plugin-id>
 ```
 
-### Override a configuration setting
+### Override a configuration setting  
 
 `--configOverrides` is a command line argument that acts like an environmental variable override.
 
-For example, you can use it to redirect logging to another file (maybe to log plugin installations in Grafana Cloud) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
+For example, you can use it to redirect logging to another file (maybe to log plugin installs in a service like Hosted Grafana) or when resetting the admin password and you have non-default values for some important config value (like where the database is located).
 
 **Example:**
 ```bash
 grafana-cli --configOverrides cfg:default.paths.log=/dev/null plugins install <plugin-id>
 ```
 
-### Override homepath value
+### Override homepath value  
 
 Sets the path for the Grafana install/home path, defaults to working directory. You do not need to use this if you are in the Grafana installation directory when using the CLI.
-
+ 
 **Example:**
 ```bash
-grafana-cli --homepath "c:\Program Files\grafana" admin reset-admin-password mynewpassword
+grafana-cli admin reset-admin-password --homepath "c:\Program Files\grafana" mynewpassword
 ```
 
-### Override config file
+### Override config file         
 
-`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
+`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
 
 **Example:**
 ```bash
-grafana-cli --config "/etc/configuration/" admin reset-admin-password mynewpassword
+grafana-cli admin reset-admin-password --config "/etc/configuration/" mynewpassword
 ```
 
 ## Plugins commands
@@ -200,7 +200,7 @@ grafana-cli admin
 
 If there are two flags being used to set the homepath and the config file path, then running the command returns this error:
 
-> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath
+> Could not find config defaults, make sure homepath command line parameter is set or working directory is homepath 
 
 To correct this, use the `--homepath` global option to specify the Grafana default homepath for this command:
 

docs/sources/administration/image_rendering.md

@@ -1,58 +1,66 @@
 +++
-title = "Image rendering"
+title = "Image Rendering"
 description = ""
-keywords = ["grafana", "image", "rendering", "plugin"]
+keywords = ["grafana", "image", "rendering", "phantomjs"]
 type = "docs"
+aliases = ["/docs/grafana/latest/installation/image-rendering"]
 [menu.docs]
-parent = "features"
+parent = "admin"
 weight = 8
 +++
 
-# Image rendering
+# Image Rendering
 
-Grafana supports automatic rendering of panels and dashboards as PNG images. This allows Grafana to automatically generate images of your panels to include in [alert notifications]({{< relref "../alerting/notifications.md" >}}).
+Grafana supports rendering of panels and dashboards as PNG-images.
 
-While an image is being rendered, the PNG image is temporarily written to the file system. When the image is rendered, the PNG image is temporarily written to the `png` folder in the Grafana `data` folder.
+When an image is being rendered the PNG-image is temporary written to the filesystem, i.e. a sub-directory of Grafana's [data](/installation/configuration/#data) directory named `png`.
 
-A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../administration/configuration/#temp-data-lifetime" >}}) setting.
+A background job runs each 10 minutes and will remove temporary images. You can configure how long time an image should be stored before being removed by configuring the [temp-data-lifetime](/installation/configuration/#temp-data-lifetime) setting.
 
-You can also render a PNG by clicking the dropdown arrow next to a panel title, then clicking **Share > Direct link rendered image**.
+## Requirements
 
-## Memory requirements
+Rendering images may require quite a lot of memory, mainly because there are "browser instances" started in the
+background responsible for the actual rendering. Further, if multiple images are being rendered in parallel it most
+certainly has a bigger memory footprint. Minimum free memory recommendation is 1GB.
 
-Minimum free memory recommendation is 16GB on the system doing the rendering.
+Depending on [rendering method](#rendering-methods) you would need that memory available in the system where the
+rendering process is running. For [Grafana Image renderer plugin](#grafana-image-renderer-plugin) and [PhantomJS](#phantomjs)
+it's the system which Grafana is installed on. For [Remote rendering service](#remote-rendering-service) it is the system where
+that's installed.
 
-Rendering images can require a lot of memory, mainly because Grafana creates browser instances in the background for the actual rendering. If multiple images are rendered in parallel, then the rendering has a bigger memory footprint. One advantage of using the remote rendering service is that the rendering will be done on the remote system, so your local system resources will not be affected by rendering.
+## Rendering methods
 
-## Alerting and render limits
+### Grafana image renderer plugin
 
-Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../administration/configuration/#concurrent_render_limit" >}}).
+> This plugin currently does not work if it is installed in the Grafana docker image. See [Install in Grafana docker image](#install-in-grafana-docker-image).
 
-## Install Grafana Image Renderer plugin
+The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) is a plugin that runs on the backend and handles rendering panels and dashboards as PNG-images using headless chrome.
 
-The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) is a plugin that runs on the backend and handles rendering panels and dashboards as PNG images using headless Chrome.
+You can install it using grafana-cli:
 
-To install the plugin, refer to the [Grafana Image Renderer Installation instructions](https://grafana.com/grafana/plugins/grafana-image-renderer/installation).
+```bash
+grafana-cli plugins install grafana-image-renderer
+```
 
-## Run in custom Grafana Docker image
+For further information and instructions refer to [troubleshooting](#troubleshooting) and the [plugin details](https://grafana.com/grafana/plugins/grafana-image-renderer).
 
- We recommend setting up another Docker container for rendering and using remote rendering. Refer to [Remote rendering service]({{< relref "#remote-rendering-service" >}}) for instructions.
+#### Install in Grafana docker image
 
-If you still want to install the plugin in the Grafana Docker image, refer to [Build with Grafana Image Renderer plugin pre-installed]({{< relref "../installation/docker/#build-with-grafana-image-renderer-plugin-pre-installed" >}}).
+This plugin is not compatible with the current Grafana Docker image without installing further system-level dependencies. We recommend setting up another Docker container for rendering and using remote rendering, see [Remote rendering service](#remote-rendering-service) for reference.
 
-## Remote rendering service
+If you still want to install the plugin in the Grafana docker image we provide instructions for how to build a custom Grafana image, see [Installing using Docker](/installation/docker/#custom-image-with-grafana-image-renderer-plugin-pre-installed).
 
-> Requires an internet connection.
+### Remote rendering service
 
-The [Grafana Image Renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) can also be run as a remote HTTP rendering service. In this setup, Grafana renders an image by making a HTTP request to the remote rendering service, which in turn renders the image and returns it back in the HTTP response to Grafana.
+The [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) can also be run as a remote HTTP rendering service. In this setup Grafana will render an image by making a HTTP request to the remote rendering service, which in turn render the image and returns it back in the HTTP response to Grafana.
 
 You can run the remote HTTP rendering service using Docker or as a standalone Node.js application.
 
-### Run in Docker
+**Using Docker:**
 
-The following example shows how to run Grafana and the remote HTTP rendering service in two separate Docker containers using Docker Compose.
+The following example describes how to run Grafana and the remote HTTP rendering service in two separate docker containers using Docker Compose.
 
-Create a `docker-compose.yml` with the following content:
+Create a `docker-compose.yml` with the following content.
 
 ```yaml
 version: '2'
@@ -72,45 +80,54 @@ services:
       - 8081
 ```
 
-And then run:
+and finally run:
 
 ```bash
 docker-compose up
 ```
 
-## Run as standalone Node.js application
+**Running as standalone Node.js application:**
 
-The following example describes how to build and run the remote HTTP rendering service as a standalone Node.js application and configure Grafana appropriately.
+The following example describes how to build and run the remote HTTP rendering service as a standalone node.js application and configure Grafana appropriately.
 
-1. Clone the [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) Git repository.
+1. Git clone the [Grafana image renderer plugin](https://grafana.com/grafana/plugins/grafana-image-renderer) repository.
 2. Install dependencies and build:
 
-    ```bash
-    yarn install --pure-lockfile
-    yarn run build
-    ```
+```bash
+yarn install --pure-lockfile
+yarn run build
+```
+3. Run the server
 
-3. Run the server:
+```bash
+node build/app.js server --port=8081
+```
+3. Update Grafana configuration:
 
-    ```bash
-    node build/app.js server --port=8081
-    ```
+```
+[rendering]
+server_url = http://localhost:8081/render
+callback_url = http://localhost:3000/
+```
+4. Restart Grafana
 
-4. Update Grafana configuration:
+For further information and instructions refer to [troubleshooting](#troubleshooting) and the [plugin details](https://grafana.com/grafana/plugins/grafana-image-renderer).
 
-    ```
-    [rendering]
-    server_url = http://localhost:8081/render
-    callback_url = http://localhost:3000/
-    ```
+### PhantomJS
 
-5. Restart Grafana.
+> PhantomJS is deprecated since Grafana v6.4 and will be removed in a future release. Please migrate to Grafana image renderer plugin or remote rendering service.
 
-## PhantomJS
+[PhantomJS](https://phantomjs.org/) have been the only supported and default image renderer since Grafana v2.x and is shipped with Grafana.
 
-> Starting from Grafana v7.0.0, all PhantomJS support has been removed. Please use the Grafana Image Renderer plugin or remote rendering service.
+PhantomJS binaries are included for Linux (x64), Windows (x64) and Darwin (x64). For Linux you should ensure that any required libraries, e.g. libfontconfig1, are available.
 
-## Troubleshoot image rendering
+Please note that PhantomJS binaries are not included for ARM. To support this you will need to ensure that a phantomjs binary is available under tools/phantomjs/phantomjs.
+
+## Alerting and render limits
+
+Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../installation/configuration/#concurrent_render_limit" >}}).
+
+## Troubleshooting
 
 Enable debug log messages for rendering in the Grafana configuration file and inspect the Grafana server log.
 
@@ -130,19 +147,19 @@ error while loading shared libraries: libX11.so.6: cannot open shared object fil
 ```
 
 In general you can use the [`ldd`](https://en.wikipedia.org/wiki/Ldd_(Unix)) utility to figure out what shared libraries
-are not installed in your system:
+are missing/not installed in your system:
 
 ```bash
-cd <grafana-image-render plugin directory>
-ldd chrome-linux/chrome
-      linux-vdso.so.1 (0x00007fff1bf65000)
-      libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2047945000)
-      libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2047924000)
-      librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f204791a000)
-      libX11.so.6 => not found
-      libX11-xcb.so.1 => not found
-      libxcb.so.1 => not found
-      libXcomposite.so.1 => not found
+$ cd <grafana-image-render plugin directiry>
+$ ldd chrome-linux/chrome
+        linux-vdso.so.1 (0x00007fff1bf65000)
+        libdl.so.2 => /lib/x86_64-linux-gnu/libdl.so.2 (0x00007f2047945000)
+        libpthread.so.0 => /lib/x86_64-linux-gnu/libpthread.so.0 (0x00007f2047924000)
+        librt.so.1 => /lib/x86_64-linux-gnu/librt.so.1 (0x00007f204791a000)
+        libX11.so.6 => not found
+        libX11-xcb.so.1 => not found
+        libxcb.so.1 => not found
+        libXcomposite.so.1 => not found
         ...
 ```
 
@@ -154,53 +171,25 @@ On Ubuntu 18.10 the following dependencies have been confirmed as needed for the
 libx11-6 libx11-xcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrender1 libxtst6 libglib2.0-0 libnss3 libcups2  libdbus-1-3 libxss1 libxrandr2 libgtk-3-0 libgtk-3-0 libasound2
 ```
 
-**Debian:**
-
-On Debian 9 (Stretch) the following dependencies have been confirmed as needed for the image rendering to function.
-
-```bash
-libx11 libcairo bcairo2 libcairo2 libxtst6 libxcomposite1 libx11-xcb1 libxcursor1 libxdamage1 libnss3 libcups libcups2 libXss libXss1 libxss1 libxrandr2 libasound2 libatk1.0-0 libatk-bridge2.0-0 libpangocairo-1.0-0 libgtk-3-0
-```
-
 **Centos:**
 
-On a minimal Centos installation, the following dependencies have been confirmed as needed for the image rendering to function:
+On a minimal Centos install the following dependencies have been confirmed as needed for the image rendering to function.
 
 ```bash
 libXcomposite libXdamage libXtst cups libXScrnSaver pango atk adwaita-cursor-theme adwaita-icon-theme at at-spi2-atk at-spi2-core cairo-gobject colord-libs dconf desktop-file-utils ed emacs-filesystem gdk-pixbuf2 glib-networking gnutls gsettings-desktop-schemas gtk-update-icon-cache gtk3 hicolor-icon-theme jasper-libs json-glib libappindicator-gtk3 libdbusmenu libdbusmenu-gtk3 libepoxy liberation-fonts liberation-narrow-fonts liberation-sans-fonts liberation-serif-fonts libgusb libindicator-gtk3 libmodman libproxy libsoup libwayland-cursor libwayland-egl libxkbcommon m4 mailx nettle patch psmisc redhat-lsb-core redhat-lsb-submod-security rest spax time trousers xdg-utils xkeyboard-config
 ```
 
-### Certificate signed by internal certificate authorities
-
-In many cases, Grafana runs on internal servers and uses certificates that have not been signed by a CA ([Certificate Authority](https://en.wikipedia.org/wiki/Certificate_authority)) known to Chrome, and therefore cannot be validated. Chrome internally uses NSS ([Network Security Services](https://en.wikipedia.org/wiki/Network_Security_Services)) for cryptogtraphic operations such as the validation of certificates.
-
-If you are using the Grafana Image Renderer with a Grafana server that uses a certificate signed by such a custom CA (for example a company-internal CA), rendering images will fail and you will see messages like this in the Grafana log:
-
-```
-t=2019-12-04T12:39:22+0000 lvl=error msg="Render request failed" logger=rendering error=map[] url="https://192.168.106.101:3443/d-solo/zxDJxNaZk/graphite-metrics?orgId=1&refresh=1m&from=1575438321300&to=1575459921300&var-Host=master1&panelId=4&width=1000&height=500&tz=Europe%2FBerlin&render=1" timestamp=0001-01-01T00:00:00.000Z
-t=2019-12-04T12:39:22+0000 lvl=error msg="Rendering failed." logger=context userId=1 orgId=1 uname=admin error="Rendering failed: Error: net::ERR_CERT_AUTHORITY_INVALID at https://192.168.106.101:3443/d-solo/zxDJxNaZk/graphite-metrics?orgId=1&refresh=1m&from=1575438321300&to=1575459921300&var-Host=master1&panelId=4&width=1000&height=500&tz=Europe%2FBerlin&render=1"
-t=2019-12-04T12:39:22+0000 lvl=error msg="Request Completed" logger=context userId=1 orgId=1 uname=admin method=GET path=/render/d-solo/zxDJxNaZk/graphite-metrics status=500 remote_addr=192.168.106.101 time_ms=310 size=1722 referer="https://grafana.xxx-xxx/d/zxDJxNaZk/graphite-metrics?orgId=1&refresh=1m"
-```
-
-(The severity-level `error` in the above messages might be misspelled with a single `r`)
-
-If this happens, then you have to add the certificate to the trust store. If you have the certificate file for the internal root CA in the file `internal-root-ca.crt.pem`, then use these commands to create a user specific NSS trust store for the Grafana user (`grafana` for the purpose of this example) and execute the following steps:
-
-```[root@server ~]# [ -d /usr/share/grafana/.pki/nssdb ] || mkdir -p /usr/share/grafana/.pki/nssdb
-[root@merver ~]# certutil -d sql:/usr/share/grafana/.pki/nssdb -A -n internal-root-ca -t C -i /etc/pki/tls/certs/internal-root-ca.crt.pem
-[root@server ~]# chown -R grafana: /usr/share/grafana/.pki/nssdb
-```
-
-### Custom Chrome/Chromium
+#### Using custom Chrome/Chromium
 
 As a last resort, if you already have [Chrome](https://www.google.com/chrome/) or [Chromium](https://www.chromium.org/)
-installed on your system, then you can configure [Grafana Image renderer plugin](#grafana-image-renderer-plugin) to use this
+installed on your system you can configure [Grafana Image renderer plugin](#grafana-image-renderer-plugin) to use this
 instead of the pre-packaged version of Chromium.
 
-> Please note that this is not recommended, since you may encounter problems if the installed version of Chrome/Chromium is not
-> compatible with the [Grafana Image renderer plugin](#grafana-image-renderer-plugin).
+> Please note that this is not recommended since you may encounter problems if the installed version of Chrome/Chromium is not
+> is compatible with the [Grafana Image renderer plugin](#grafana-image-renderer-plugin).
 
-To override the path to the Chrome/Chromium executable, set an environment variable and make sure that it's available for the Grafana process. For example:
+To override the path to the Chrome/Chromium executable you can set an environment variable and make sure that
+it's available for the Grafana process, e.g.
 
 ```bash
 export GF_RENDERER_PLUGIN_CHROME_BIN="/usr/bin/chromium-browser"